From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 29 Jan 2013 23:05:46 +0000 (+0000)
Subject: toolchain/gcc: fix the mips64 linker path to be more musl conforming
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fe766227a218b4643621291a602f17b1bfeafbd2;p=openwrt%2Fstaging%2Fnbd.git

toolchain/gcc: fix the mips64 linker path to be more musl conforming

musl libc does not use /lib32 or /lib64 directories, just /lib

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 35406
---

diff --git a/toolchain/gcc/patches/4.6-linaro/200-musl.patch b/toolchain/gcc/patches/4.6-linaro/200-musl.patch
index 2604def4a9..86a225cf97 100644
--- a/toolchain/gcc/patches/4.6-linaro/200-musl.patch
+++ b/toolchain/gcc/patches/4.6-linaro/200-musl.patch
@@ -236,9 +236,9 @@ diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
  #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 MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
  #define LINUX_DYNAMIC_LINKERN32 \
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
 -			 BIONIC_DYNAMIC_LINKERN32)
diff --git a/toolchain/gcc/patches/4.6.2/200-musl.patch b/toolchain/gcc/patches/4.6.2/200-musl.patch
index 2604def4a9..86a225cf97 100644
--- a/toolchain/gcc/patches/4.6.2/200-musl.patch
+++ b/toolchain/gcc/patches/4.6.2/200-musl.patch
@@ -236,9 +236,9 @@ diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
  #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 MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
  #define LINUX_DYNAMIC_LINKERN32 \
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
 -			 BIONIC_DYNAMIC_LINKERN32)
diff --git a/toolchain/gcc/patches/4.6.3/200-musl.patch b/toolchain/gcc/patches/4.6.3/200-musl.patch
index 2604def4a9..86a225cf97 100644
--- a/toolchain/gcc/patches/4.6.3/200-musl.patch
+++ b/toolchain/gcc/patches/4.6.3/200-musl.patch
@@ -236,9 +236,9 @@ diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
  #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 MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
  #define LINUX_DYNAMIC_LINKERN32 \
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
 -			 BIONIC_DYNAMIC_LINKERN32)
diff --git a/toolchain/gcc/patches/4.7-linaro/200-musl.patch b/toolchain/gcc/patches/4.7-linaro/200-musl.patch
index 491f8c85f3..55c6fd1495 100644
--- a/toolchain/gcc/patches/4.7-linaro/200-musl.patch
+++ b/toolchain/gcc/patches/4.7-linaro/200-musl.patch
@@ -322,9 +322,9 @@ diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
  #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 MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
  #define GNU_USER_DYNAMIC_LINKERN32 \
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
 -			 BIONIC_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 df34a09cce..40348ac647 100644
--- a/toolchain/gcc/patches/4.7.2/200-musl.patch
+++ b/toolchain/gcc/patches/4.7.2/200-musl.patch
@@ -341,9 +341,9 @@ diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
  #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 MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
  #define GNU_USER_DYNAMIC_LINKERN32 \
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
 -			 BIONIC_DYNAMIC_LINKERN32)