[patch] -L flags are fixed just for completeness

profile-multilib-LDFLAGS-escape-r1.patch (text/plain), 4.54 KB, created by Nathan Phillip Brink (binki) (RETIRED) on 2010-03-08 18:46:33 UTC

https://bugs.gentoo.org/308373

Index: arch/amd64/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v
retrieving revision 1.5
diff -u -b -B -r1.5 make.defaults
--- arch/amd64/make.defaults	13 Dec 2009 21:45:25 -0000	1.5
+++ arch/amd64/make.defaults	8 Mar 2010 18:44:42 -0000
@@ -22,7 +22,7 @@
 
 # 32bit specific settings.
 CFLAGS_x86="-m32"
-LDFLAGS_x86="-m elf_i386"
+LDFLAGS_x86="-Wl,-m,elf_i386"
 ASFLAGS_x86="--32"
 CHOST_x86="i686-pc-linux-gnu"
 CDEFINE_x86="__i386__"
Index: arch/amd64-fbsd/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/make.defaults,v
retrieving revision 1.3
diff -u -b -B -r1.3 make.defaults
--- arch/amd64-fbsd/make.defaults	13 Dec 2009 21:45:25 -0000	1.3
+++ arch/amd64-fbsd/make.defaults	8 Mar 2010 18:44:42 -0000
@@ -19,7 +19,7 @@
 
 # 32bit specific settings.
 CFLAGS_x86_fbsd="-m32"
-LDFLAGS_x86_fbsd="-m elf_i386_fbsd"
+LDFLAGS_x86_fbsd="-Wl,-m,elf_i386_fbsd"
 ASFLAGS_x86_fbsd="--32"
 CDEFINE_x86_fbsd="__i386__"
 
Index: arch/powerpc/ppc64/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/ppc64/make.defaults,v
retrieving revision 1.6
diff -u -b -B -r1.6 make.defaults
--- arch/powerpc/ppc64/make.defaults	13 Dec 2009 21:45:29 -0000	1.6
+++ arch/powerpc/ppc64/make.defaults	8 Mar 2010 18:44:42 -0000
@@ -21,12 +21,12 @@
 ABI="ppc64"
 
 #CFLAGS_ppc64="-m64"
-LDFLAGS_ppc64="-m elf64ppc"
+LDFLAGS_ppc64="-Wl,-m,elf64ppc"
 CHOST_ppc64="powerpc64-unknown-linux-gnu"
 CDEFINE_ppc64="__powerpc64__"
 
 CFLAGS_ppc="-m32"
-LDFLAGS_ppc="-m elf32ppc"
+LDFLAGS_ppc="-Wl,-m,elf32ppc"
 CHOST_ppc="powerpc-unknown-linux-gnu"
 CDEFINE_ppc="!__powerpc64__"
 
Index: arch/sparc/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/arch/sparc/make.defaults,v
retrieving revision 1.4
diff -u -b -B -r1.4 make.defaults
--- arch/sparc/make.defaults	27 Dec 2008 10:58:46 -0000	1.4
+++ arch/sparc/make.defaults	8 Mar 2010 18:44:42 -0000
@@ -15,7 +15,7 @@
 # The funky stuffs for handling different kernel compiler than userland compiler
 KERNEL_ABI="sparc64"
 CHOST_sparc64="sparc64-unknown-linux-gnu"
-LDFLAGS_sparc64="-m elf64_sparc"
+LDFLAGS_sparc64="-Wl,-m,elf64_sparc"
 
 # Multilib stuff
 MULTILIB_ABIS="sparc32"
Index: default/linux/amd64/dev/32bit-userland/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/default/linux/amd64/dev/32bit-userland/make.defaults,v
retrieving revision 1.1
diff -u -b -B -r1.1 make.defaults
--- default/linux/amd64/dev/32bit-userland/make.defaults	3 Oct 2009 16:00:24 -0000	1.1
+++ default/linux/amd64/dev/32bit-userland/make.defaults	8 Mar 2010 18:44:42 -0000
@@ -10,4 +10,4 @@
 FEATURES="collision-protect multilib-strict"
 
 CFLAGS_x86="-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
-LDFLAGS_x86="-m elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
+LDFLAGS_x86="-Wl,-m,elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
Index: hardened/amd64/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/make.defaults,v
retrieving revision 1.20
diff -u -b -B -r1.20 make.defaults
--- hardened/amd64/make.defaults	13 Dec 2009 21:45:31 -0000	1.20
+++ hardened/amd64/make.defaults	8 Mar 2010 18:44:42 -0000
@@ -15,7 +15,7 @@
 CXXFLAGS="${CFLAGS}"
 
 CFLAGS_amd64=""
-LDFLAGS_amd64="-m elf_x86_64"
+LDFLAGS_amd64="-Wl,-m,elf_x86_64"
 CHOST_amd64="x86_64-pc-linux-gnu"
 CDEFINE_amd64="__x86_64__"
 LIBDIR_amd64="lib64"
Index: hardened/amd64/multilib/make.defaults
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/multilib/make.defaults,v
retrieving revision 1.5
diff -u -b -B -r1.5 make.defaults
--- hardened/amd64/multilib/make.defaults	8 Jun 2009 18:37:16 -0000	1.5
+++ hardened/amd64/multilib/make.defaults	8 Mar 2010 18:44:42 -0000
@@ -17,7 +17,7 @@
 # Added -L/emul* workaround to aid compilation of 32bit packages
 # See bug #88725 for more info - Herbie Hopkins <[e-mail]> 2005/04/19
 CFLAGS_x86="-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
-LDFLAGS_x86="-m elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
+LDFLAGS_x86="-Wl,-m,elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib"
 CHOST_x86="i686-pc-linux-gnu"
 CDEFINE_x86="__i386__"
 LIBDIR_x86="lib32"