[patch] Re: Fix arm-linux bootstrap problem on cvs.

[jeroen dobbelaere <jeroen.dobbelaere@acunia.com>]

[-- Attachment #1: Type: text/plain, Size: 3352 bytes --]

Richard Earnshaw wrote:
>>>Ok once bootstrap and regtest are successfully completed.  However, 
>>>ChangeLog entries should be:
>>>
>>
>>[..]
>>
>>This will be difficult : for the last few weeks, the tests could not be run
>>as the compiler didn't work.
>>
> 
> 
> It should be possible to compare it with an unmodified compiler built with 
> checking disabled.
> 
> R.
> 

I've made a bootstrap build with tests for the cvs + patch
See <http://gcc.gnu.org/ml/gcc-testresults/2002-07/msg00081.html>

Bootstrapping the cvs without this patch (with --disable-checking) failed :


/usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/gcc/xgcc -shared-libgcc -B/usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/gcc/
  -nostdinc++ -L/usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/armv5l-unknown-linux-gnu/libstdc++-v3/src -L/usr/src/cvs-others/
gcc-trees/gcc-head/build-cvs/armv5l-unknown-linux-gnu/libstdc++-v3/src/.libs -B/usr/local/gcc-3.2-cvs/armv5l-unknown-linux-gnu/b
in/ -B/usr/local/gcc-3.2-cvs/armv5l-unknown-linux-gnu/lib/ -isystem /usr/local/gcc-3.2-cvs/armv5l-unknown-linux-gnu/include -nos
tdinc++ -I/usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/armv5l-unknown-linux-gnu/libstdc++-v3/include/armv5l-unknown-linux-gn
u -I/usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/armv5l-unknown-linux-gnu/libstdc++-v3/include -I../../../../gcc/libstdc++-v
3/libsupc++ -I../../../../gcc/libstdc++-v3/libmath -g -O2 -D_GNU_SOURCE -fno-implicit-templates -Wall -Wno-format -W -Wwrite-str
ings -Winline -fdiagnostics-show-location=once -ffunction-sections -fdata-sections -g -c ../../../../gcc/libstdc++-v3/src/comple
x_io.cc  -fPIC -DPIC -o .libs/complex_io.o
In file included from /usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/armv5l-unknown-linux-gnu/libstdc++-v3/include/ios:49,
                  from /usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/armv5l-unknown-linux-gnu/libstdc++-v3/include/istream:44,
                  from /usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/armv5l-unknown-linux-gnu/libstdc++-v3/include/sstream:44,
                  from /usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/armv5l-unknown-linux-gnu/libstdc++-v3/include/complex:51,
                  from ../../../../gcc/libstdc++-v3/src/complex_io.cc:30:
/usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/armv5l-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h:427: internal com
piler error: internal
    error: Segmentation fault
Please submit a full bug report,
with preprocessed source if appropriate.
See <URL:http://www.gnu.org/software/gcc/bugs.html> for instructions.
make[4]: *** [complex_io.lo] Error 1
make[4]: Leaving directory `/usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/armv5l-unknown-linux-gnu/libstdc++-v3/src'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/armv5l-unknown-linux-gnu/libstdc++-v3'
make[2]: *** [all-recursive-am] Error 2
make[2]: Leaving directory `/usr/src/cvs-others/gcc-trees/gcc-head/build-cvs/armv5l-unknown-linux-gnu/libstdc++-v3'
make[1]: *** [all-target-libstdc++-v3] Error 2
make[1]: Leaving directory `/usr/src/cvs-others/gcc-trees/gcc-head/build-cvs'
make: *** [bootstrap] Error 2

Attached is the patch, with adapted changelog.

Greetings,
-- 
Jeroen Dobbelaere
Embedded Software Engineer

ACUNIA Embedded Solutions
http://www.acunia.com/aes


[-- Attachment #2: gcc-head-arm-linux-build-jdo-2.patch --]
[-- Type: text/plain, Size: 2503 bytes --]

Index: gcc/gcc/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ChangeLog,v
retrieving revision 1.14773
diff -u -r1.14773 ChangeLog
--- gcc/gcc/ChangeLog	3 Jul 2002 09:49:38 -0000	1.14773
+++ gcc/gcc/ChangeLog	3 Jul 2002 11:49:56 -0000
@@ -1,3 +1,13 @@
+2002-07-03  Jeroen Dobbelaere <jeroen.dobbelaere@acunia.com>
+
+	* arm.c (emit_sfm): Don't set RTX_FRAME_RELATED_P on DWARF.
+
+2002-07-03  Jeroen Dobbelaere <jeroen.dobbelaere@acunia.com>
+	    Richard Earnshaw  <rearnsha@arm.com>
+
+	* arm.h (LEGITIMATE_PIC_OPERAND_P): Only test 
+	CONSTANT_POOL_ADDRESS_P on a SYMBOL_REF.  Simplify logic.
+
 Wed Jul  3 10:24:16 2002  J"orn Rennecke <joern.rennecke@superh.com>
 
 	* optabs.c (expand_vector_binop): Don't store using a SUBREG smaller
Index: gcc/gcc/config/arm/arm.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/arm/arm.c,v
retrieving revision 1.214
diff -u -r1.214 arm.c
--- gcc/gcc/config/arm/arm.c	1 Jul 2002 23:07:06 -0000	1.214
+++ gcc/gcc/config/arm/arm.c	3 Jul 2002 11:49:58 -0000
@@ -7922,7 +7922,6 @@
 
   par = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (count));
   dwarf = gen_rtx_PARALLEL (VOIDmode, rtvec_alloc (count));
-  RTX_FRAME_RELATED_P (dwarf) = 1;
 
   reg = gen_rtx_REG (XFmode, base_reg++);
 
Index: gcc/gcc/config/arm/arm.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/arm/arm.h,v
retrieving revision 1.152
diff -u -r1.152 arm.h
--- gcc/gcc/config/arm/arm.h	10 Jun 2002 22:35:45 -0000	1.152
+++ gcc/gcc/config/arm/arm.h	3 Jul 2002 11:49:58 -0000
@@ -2397,12 +2397,13 @@
 /* We can't directly access anything that contains a symbol,
    nor can we indirect via the constant pool.  */
 #define LEGITIMATE_PIC_OPERAND_P(X)					\
-	(   ! symbol_mentioned_p (X)					\
-	 && ! label_mentioned_p (X)					\
-	 && (! CONSTANT_POOL_ADDRESS_P (X)				\
-	     || (   ! symbol_mentioned_p (get_pool_constant (X))  	\
-	         && ! label_mentioned_p (get_pool_constant (X)))))
-     
+	(!(symbol_mentioned_p (X)					\
+	   || label_mentioned_p (X)					\
+	   || (GET_CODE (X) == SYMBOL_REF				\
+	       && CONSTANT_POOL_ADDRESS_P (X)				\
+	       && (symbol_mentioned_p (get_pool_constant (X))		\
+		   || label_mentioned_p (get_pool_constant (X))))))
+
 /* We need to know when we are making a constant pool; this determines
    whether data needs to be in the GOT or can be referenced via a GOT
    offset.  */