diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-06 13:07:17 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-06 13:07:17 +0200 |
| commit | 2781491d77559e5a9f0e0d26698d91da745f14f3 (patch) | |
| tree | bc5a86ba577d887c224f2ba87e16b3f662901641 /core/gcc/gcc_mips64el_lib.patch | |
| parent | 5f875caf9e31730faff78cfa1fc99c30717a924d (diff) | |
Update gcc PKGBUILD and patch for upstream changes, try harder to use our CFLAGS.
Diffstat (limited to 'core/gcc/gcc_mips64el_lib.patch')
| -rw-r--r-- | core/gcc/gcc_mips64el_lib.patch | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/core/gcc/gcc_mips64el_lib.patch b/core/gcc/gcc_mips64el_lib.patch index 425758e88..c938d9b30 100644 --- a/core/gcc/gcc_mips64el_lib.patch +++ b/core/gcc/gcc_mips64el_lib.patch @@ -1,19 +1,9 @@ ---- gcc/config/mips/t-linux64.orig 2011-04-09 20:28:51.729723495 -0300 -+++ gcc/config/mips/t-linux64 2011-04-09 20:29:06.913724013 -0300 -@@ -18,7 +18,7 @@ - - MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 - MULTILIB_DIRNAMES = n32 32 64 --MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 -+MULTILIB_OSDIRNAMES = ../lib ../lib32 ../lib64 - - EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o - ---- gcc/config/mips/linux64.h.orig 2011-04-09 20:27:06.909723735 -0300 -+++ gcc/config/mips/linux64.h 2011-04-09 20:28:16.033723803 -0300 -@@ -35,9 +35,9 @@ - %{!shared: \ - %{profile:-lc_p} %{!profile:-lc}}" +diff -ru gcc-4.7-20120324.orig/gcc/config/mips/linux64.h gcc-4.7-20120324/gcc/config/mips/linux64.h +--- gcc-4.7-20120324.orig/gcc/config/mips/linux64.h 2012-04-06 11:32:50.545152897 +0200 ++++ gcc-4.7-20120324/gcc/config/mips/linux64.h 2012-04-06 12:06:58.501290352 +0200 +@@ -23,9 +23,9 @@ + #define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip" + #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" @@ -21,5 +11,14 @@ -#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" +#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1" #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" - #define LINUX_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" + #define GNU_USER_DYNAMIC_LINKERN32 \ +diff -ru gcc-4.7-20120324.orig/gcc/config/mips/t-linux64 gcc-4.7-20120324/gcc/config/mips/t-linux64 +--- gcc-4.7-20120324.orig/gcc/config/mips/t-linux64 2012-04-06 11:32:50.379989000 +0200 ++++ gcc-4.7-20120324/gcc/config/mips/t-linux64 2012-04-06 12:05:55.461021317 +0200 +@@ -18,4 +18,4 @@ + + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 + MULTILIB_DIRNAMES = n32 32 64 +-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 ++MULTILIB_OSDIRNAMES = ../lib ../lib32 ../lib64 |