- buildid tool seems to belong to -go

[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 45f053a9cc3cbe0082132fed82cef4febfc917c6..091019e9439e9d4b246d08d9a6e6ebf4c1d36701 100644 (file)
--- a/gcc-ppc64-m32-m64-multilib-only.patch
+++ b/gcc-ppc64-m32-m64-multilib-only.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- gcc-4.7.1/gcc/config/rs6000/t-linux64.orig 2011-11-02 16:23:48.000000000 +0100
++++ gcc-4.7.1/gcc/config/rs6000/t-linux64      2012-07-12 18:36:30.279053123 +0200
+@@ -26,12 +26,10 @@
  # it doesn't tell anything about the 32bit libraries on those systems.  Set
  # MULTILIB_OSDIRNAMES according to what is found on the target.
  
@@ -11,12 +11,11 @@
  MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
 -MULTILIB_EXCEPTIONS     = m64/msoft-float
 -MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES   = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
--MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
+-MULTILIB_OSDIRNAMES   = ../lib64$(call if_multiarch,:powerpc64-linux-gnu)
 +MULTILIB_EXCEPTIONS     =
 +MULTILIB_EXCLUSIONS     =
-+MULTILIB_OSDIRNAMES   = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+ MULTILIB_OSDIRNAMES    += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
+-MULTILIB_OSDIRNAMES    += nof
+-MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
 +MULTILIB_MATCHES        =
- 
- softfp_wrap_start := '\#ifndef __powerpc64__'
- softfp_wrap_end := '\#endif'
+