From e90303c5603c9ade3287c624540cec278298f570 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 7 Jan 2013 18:16:40 +0000 Subject: [toolchain] gcc: fix build for MIPS64 targets introduced by musl patch Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35046 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/gcc/patches/4.6-linaro/200-musl.patch | 17 +++++++++++++++++ toolchain/gcc/patches/4.6.2/200-musl.patch | 17 +++++++++++++++++ toolchain/gcc/patches/4.6.3/200-musl.patch | 17 +++++++++++++++++ toolchain/gcc/patches/4.7-linaro/200-musl.patch | 14 ++++++++++++++ toolchain/gcc/patches/4.7.2/200-musl.patch | 14 ++++++++++++++ 5 files changed, 79 insertions(+) diff --git a/toolchain/gcc/patches/4.6-linaro/200-musl.patch b/toolchain/gcc/patches/4.6-linaro/200-musl.patch index cee994809c..2604def4a9 100644 --- a/toolchain/gcc/patches/4.6-linaro/200-musl.patch +++ b/toolchain/gcc/patches/4.6-linaro/200-musl.patch @@ -229,3 +229,20 @@ diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host hpux*) os_include_dir="os/hpux" ;; +diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h +--- a/gcc/config/mips/linux64.h 2012-11-12 15:28:31.000000000 +0100 ++++ b/gcc/config/mips/linux64.h 2012-11-29 15:11:14.006324944 +0100 +@@ -40,9 +40,12 @@ + #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" ++#define MUSL_DYNAMIC_LINKERN32 "/lib32/ld-musl-mips.so.1" ++#define MUSL_DYNAMIC_LINKER32 "/lib32/ld-musl-mips.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib64/ld-musl-mips.so.1" + #define LINUX_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +- BIONIC_DYNAMIC_LINKERN32) ++ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) + + #undef LINK_SPEC + #define LINK_SPEC "\ diff --git a/toolchain/gcc/patches/4.6.2/200-musl.patch b/toolchain/gcc/patches/4.6.2/200-musl.patch index cee994809c..2604def4a9 100644 --- a/toolchain/gcc/patches/4.6.2/200-musl.patch +++ b/toolchain/gcc/patches/4.6.2/200-musl.patch @@ -229,3 +229,20 @@ diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host hpux*) os_include_dir="os/hpux" ;; +diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h +--- a/gcc/config/mips/linux64.h 2012-11-12 15:28:31.000000000 +0100 ++++ b/gcc/config/mips/linux64.h 2012-11-29 15:11:14.006324944 +0100 +@@ -40,9 +40,12 @@ + #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" ++#define MUSL_DYNAMIC_LINKERN32 "/lib32/ld-musl-mips.so.1" ++#define MUSL_DYNAMIC_LINKER32 "/lib32/ld-musl-mips.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib64/ld-musl-mips.so.1" + #define LINUX_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +- BIONIC_DYNAMIC_LINKERN32) ++ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) + + #undef LINK_SPEC + #define LINK_SPEC "\ diff --git a/toolchain/gcc/patches/4.6.3/200-musl.patch b/toolchain/gcc/patches/4.6.3/200-musl.patch index cee994809c..2604def4a9 100644 --- a/toolchain/gcc/patches/4.6.3/200-musl.patch +++ b/toolchain/gcc/patches/4.6.3/200-musl.patch @@ -229,3 +229,20 @@ diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host hpux*) os_include_dir="os/hpux" ;; +diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h +--- a/gcc/config/mips/linux64.h 2012-11-12 15:28:31.000000000 +0100 ++++ b/gcc/config/mips/linux64.h 2012-11-29 15:11:14.006324944 +0100 +@@ -40,9 +40,12 @@ + #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" ++#define MUSL_DYNAMIC_LINKERN32 "/lib32/ld-musl-mips.so.1" ++#define MUSL_DYNAMIC_LINKER32 "/lib32/ld-musl-mips.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib64/ld-musl-mips.so.1" + #define LINUX_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +- BIONIC_DYNAMIC_LINKERN32) ++ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) + + #undef LINK_SPEC + #define LINK_SPEC "\ diff --git a/toolchain/gcc/patches/4.7-linaro/200-musl.patch b/toolchain/gcc/patches/4.7-linaro/200-musl.patch index a3f0757f22..491f8c85f3 100644 --- a/toolchain/gcc/patches/4.7-linaro/200-musl.patch +++ b/toolchain/gcc/patches/4.7-linaro/200-musl.patch @@ -315,3 +315,17 @@ diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host hpux*) os_include_dir="os/hpux" ;; +diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h +--- a/gcc/config/mips/linux64.h 2012-11-13 12:42:00.000000000 +0100 ++++ b/gcc/config/mips/linux64.h 2012-11-29 15:35:10.434361723 +0100 +@@ -28,6 +28,9 @@ + #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" ++#define MUSL_DYNAMIC_LINKERN32 "/lib32/ld-musl-mips.so.1" ++#define MUSL_DYNAMIC_LINKER32 "/lib32/ld-musl-mips.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib64/ld-musl-mips.so.1" + #define GNU_USER_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +- BIONIC_DYNAMIC_LINKERN32) ++ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) diff --git a/toolchain/gcc/patches/4.7.2/200-musl.patch b/toolchain/gcc/patches/4.7.2/200-musl.patch index 5d0d49ba6d..df34a09cce 100644 --- a/toolchain/gcc/patches/4.7.2/200-musl.patch +++ b/toolchain/gcc/patches/4.7.2/200-musl.patch @@ -334,3 +334,17 @@ diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host hpux*) os_include_dir="os/hpux" ;; +diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h +--- a/gcc/config/mips/linux64.h 2012-11-13 12:42:00.000000000 +0100 ++++ n/gcc/config/mips/linux64.h 2012-11-29 15:35:10.434361723 +0100 +@@ -28,6 +28,9 @@ + #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" ++#define MUSL_DYNAMIC_LINKERN32 "/lib32/ld-musl-mips.so.1" ++#define MUSL_DYNAMIC_LINKER32 "/lib32/ld-musl-mips.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib64/ld-musl-mips.so.1" + #define GNU_USER_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +- BIONIC_DYNAMIC_LINKERN32) ++ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) -- cgit v1.2.3