mirror of
https://github.com/genodelabs/genode.git
synced 2025-04-07 19:34:56 +00:00
hw: adjust gcc package to makeinfo version 5
Makeinfo versions greater 5 treat an @itemx that isn't preceeded by an @item not as warning anymore but as error. The GCC version 4.7.2 that is used by noux currently triggers this error multiple times. This commit adds a patch to 'make prepare PKG="gcc"' that avoids the use of @itemx without preceeding @item. As GCC versions greater than 4.8 should fix this problem by themselves this should be seen as temporary quick fix. ref #964
This commit is contained in:
parent
aca62c7180
commit
1eeb68bf56
@ -56,3 +56,4 @@ $(CONTRIB_DIR)/$(GCC)/configure:: $(CONTRIB_DIR)/$(GCC)
|
||||
@# Noux-specific changes
|
||||
@#
|
||||
$(VERBOSE)patch -d $(CONTRIB_DIR)/$(GCC) -N -p1 < src/noux-pkg/gcc/build.patch
|
||||
$(VERBOSE)patch -d $(CONTRIB_DIR)/$(GCC) -N -p1 < src/noux-pkg/gcc/build_with_makeinfo_5.patch
|
||||
|
115
ports/src/noux-pkg/gcc/build_with_makeinfo_5.patch
Normal file
115
ports/src/noux-pkg/gcc/build_with_makeinfo_5.patch
Normal file
@ -0,0 +1,115 @@
|
||||
From 1b2b17188549c2a8ad3d60eaeacc8ae025ed59cf Mon Sep 17 00:00:00 2001
|
||||
From: Martin Stein <martin.stein@genode-labs.com>
|
||||
Date: Mon, 25 Nov 2013 15:07:16 +0100
|
||||
Subject: [PATCH] fix errors with makeinfo
|
||||
|
||||
---
|
||||
gcc/doc/cppopts.texi | 2 +-
|
||||
gcc/doc/generic.texi | 4 ++--
|
||||
gcc/doc/invoke.texi | 16 ++++++++--------
|
||||
3 files changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/gcc/doc/cppopts.texi b/gcc/doc/cppopts.texi
|
||||
index 205d870..a1b66a2 100644
|
||||
--- a/gcc/doc/cppopts.texi
|
||||
+++ b/gcc/doc/cppopts.texi
|
||||
@@ -803,7 +803,7 @@ Replacement: [ ] @{ @} # \ ^ | ~
|
||||
Enable special code to work around file systems which only permit very
|
||||
short file names, such as MS-DOS@.
|
||||
|
||||
-@itemx --help
|
||||
+@item --help
|
||||
@itemx --target-help
|
||||
@opindex help
|
||||
@opindex target-help
|
||||
diff --git a/gcc/doc/generic.texi b/gcc/doc/generic.texi
|
||||
index 31e8855..261ea23 100644
|
||||
--- a/gcc/doc/generic.texi
|
||||
+++ b/gcc/doc/generic.texi
|
||||
@@ -1415,13 +1415,13 @@ generate these expressions anyhow, if it can tell that strictness does
|
||||
not matter. The type of the operands and that of the result are
|
||||
always of @code{BOOLEAN_TYPE} or @code{INTEGER_TYPE}.
|
||||
|
||||
-@itemx POINTER_PLUS_EXPR
|
||||
+@item POINTER_PLUS_EXPR
|
||||
This node represents pointer arithmetic. The first operand is always
|
||||
a pointer/reference type. The second operand is always an unsigned
|
||||
integer type compatible with sizetype. This is the only binary
|
||||
arithmetic operand that can operate on pointer types.
|
||||
|
||||
-@itemx PLUS_EXPR
|
||||
+@item PLUS_EXPR
|
||||
@itemx MINUS_EXPR
|
||||
@itemx MULT_EXPR
|
||||
These nodes represent various binary arithmetic operations.
|
||||
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
|
||||
index 8fcebf3..5c7e730 100644
|
||||
--- a/gcc/doc/invoke.texi
|
||||
+++ b/gcc/doc/invoke.texi
|
||||
@@ -5179,7 +5179,7 @@ thus dbg_cnt() returns true always unless the upper bound is set by this option.
|
||||
e.g. With -fdbg-cnt=dce:10,tail_call:0
|
||||
dbg_cnt(dce) will return true only for first 10 invocations
|
||||
|
||||
-@itemx -fenable-@var{kind}-@var{pass}
|
||||
+@item -fenable-@var{kind}-@var{pass}
|
||||
@itemx -fdisable-@var{kind}-@var{pass}=@var{range-list}
|
||||
@opindex fdisable-
|
||||
@opindex fenable-
|
||||
@@ -5327,11 +5327,11 @@ Dump after duplicating the computed gotos.
|
||||
@option{-fdump-rtl-ce3} enable dumping after the three
|
||||
if conversion passes.
|
||||
|
||||
-@itemx -fdump-rtl-cprop_hardreg
|
||||
+@item -fdump-rtl-cprop_hardreg
|
||||
@opindex fdump-rtl-cprop_hardreg
|
||||
Dump after hard register copy propagation.
|
||||
|
||||
-@itemx -fdump-rtl-csa
|
||||
+@item -fdump-rtl-csa
|
||||
@opindex fdump-rtl-csa
|
||||
Dump after combining stack adjustments.
|
||||
|
||||
@@ -5342,11 +5342,11 @@ Dump after combining stack adjustments.
|
||||
@option{-fdump-rtl-cse1} and @option{-fdump-rtl-cse2} enable dumping after
|
||||
the two common sub-expression elimination passes.
|
||||
|
||||
-@itemx -fdump-rtl-dce
|
||||
+@item -fdump-rtl-dce
|
||||
@opindex fdump-rtl-dce
|
||||
Dump after the standalone dead code elimination passes.
|
||||
|
||||
-@itemx -fdump-rtl-dbr
|
||||
+@item -fdump-rtl-dbr
|
||||
@opindex fdump-rtl-dbr
|
||||
Dump after delayed branch scheduling.
|
||||
|
||||
@@ -5391,7 +5391,7 @@ Dump after the initialization of the registers.
|
||||
@opindex fdump-rtl-initvals
|
||||
Dump after the computation of the initial value sets.
|
||||
|
||||
-@itemx -fdump-rtl-into_cfglayout
|
||||
+@item -fdump-rtl-into_cfglayout
|
||||
@opindex fdump-rtl-into_cfglayout
|
||||
Dump after converting to cfglayout mode.
|
||||
|
||||
@@ -5421,7 +5421,7 @@ Dump after removing redundant mode switches.
|
||||
@opindex fdump-rtl-rnreg
|
||||
Dump after register renumbering.
|
||||
|
||||
-@itemx -fdump-rtl-outof_cfglayout
|
||||
+@item -fdump-rtl-outof_cfglayout
|
||||
@opindex fdump-rtl-outof_cfglayout
|
||||
Dump after converting from cfglayout mode.
|
||||
|
||||
@@ -5433,7 +5433,7 @@ Dump after the peephole pass.
|
||||
@opindex fdump-rtl-postreload
|
||||
Dump after post-reload optimizations.
|
||||
|
||||
-@itemx -fdump-rtl-pro_and_epilogue
|
||||
+@item -fdump-rtl-pro_and_epilogue
|
||||
@opindex fdump-rtl-pro_and_epilogue
|
||||
Dump after generating the function prologues and epilogues.
|
||||
|
||||
--
|
||||
1.8.3.2
|
||||
|
Loading…
x
Reference in New Issue
Block a user