- up to 4.6.0; rel 1

[packages/gcc.git] / gcc-ppc64-m32-m64-multilib-only.patch

diff --git a/gcc-ppc64-m32-m64-multilib-only.patch b/gcc-ppc64-m32-m64-multilib-only.patch
index 0afa9a6b3e4ba264520e258f7f986d81675a89af..45f053a9cc3cbe0082132fed82cef4febfc917c6 100644 (file)
--- a/gcc-ppc64-m32-m64-multilib-only.patch
+++ b/gcc-ppc64-m32-m64-multilib-only.patch
@@ -1,8 +1,8 @@
---- gcc/gcc/config/rs6000/t-linux64    2003-06-03 05:11:45.000000000 -0400
-+++ gcc/gcc/config/rs6000/t-linux64    2003-06-11 17:07:16.000000000 -0400
-@@ -4,13 +4,13 @@ LIB2FUNCS_EXTRA = tramp.S $(srcdir)/conf
- # Modify the shared lib version file
- SHLIB_MKMAP_OPTS = -v dotsyms=1
+--- a/gcc/config/rs6000/t-linux64      2007-09-27 21:56:06.000000000 +0200
++++ b/gcc/config/rs6000/t-linux64      2008-03-04 15:59:23.000000000 +0100
+@@ -14,13 +14,13 @@
+ # it doesn't tell anything about the 32bit libraries on those systems.  Set
+ # MULTILIB_OSDIRNAMES according to what is found on the target.
  
 -MULTILIB_OPTIONS        = m64/m32 msoft-float
 -MULTILIB_DIRNAMES       = 64 32 nof
@@ -11,12 +11,12 @@
  MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
 -MULTILIB_EXCEPTIONS     = m64/msoft-float
 -MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES   = ../lib64 ../lib nof
+-MULTILIB_OSDIRNAMES   = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
 -MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
 +MULTILIB_EXCEPTIONS     =
 +MULTILIB_EXCLUSIONS     =
-+MULTILIB_OSDIRNAMES   = ../lib64 ../lib
++MULTILIB_OSDIRNAMES   = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
 +MULTILIB_MATCHES        =
  
- TARGET_LIBGCC2_CFLAGS = -mno-minimal-toc -fPIC
- 
+ softfp_wrap_start := '\#ifndef __powerpc64__'
+ softfp_wrap_end := '\#endif'