projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 77942fb)
[PATCH 9/13] x86 musl support
authorGregor Richards <gregor.richards@uwaterloo.ca>
Fri, 15 May 2015 13:20:01 +0000 (13:20 +0000)
committerKyrylo Tkachov <ktkachov@gcc.gnu.org>
Fri, 15 May 2015 13:20:01 +0000 (13:20 +0000)
On behalf of Szabolcs Nagy.

2015-05-15  Gregor Richards  <gregor.richards@uwaterloo.ca>

* config/i386/linux.h (MUSL_DYNAMIC_LINKER): Define.
* config/i386/linux64.h (MUSL_DYNAMIC_LINKER32): Define.
(MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32): Define.

From-SVN: r223218

gcc/ChangeLog patch | blob | history
gcc/config/i386/linux.h patch | blob | history
gcc/config/i386/linux64.h patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c757522646c47969939815cef1a4e494df276fa0..caf24c22b121678334430792b25f975d0979bb4e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-15  Gregor Richards  <gregor.richards@uwaterloo.ca>
+
+       * config/i386/linux.h (MUSL_DYNAMIC_LINKER): Define.
+       * config/i386/linux64.h (MUSL_DYNAMIC_LINKER32): Define.
+       (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32): Define.
+
 2015-05-15  Ilya Enkovich  <ilya.enkovich@intel.com>
 
        * ipa-chkp.h (chkp_wrap_function): New.
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
index a1009637705e3560b62a1c17e169a1cbfa5f4e01..385aefd046b675bc43753cb03a714d6da7aee7b8 100644 (file)
--- a/gcc/config/i386/linux.h
+++ b/gcc/config/i386/linux.h
@@ -21,3 +21,6 @@ along with GCC; see the file COPYING3.  If not see
 
 #define GNU_USER_LINK_EMULATION "elf_i386"
 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+
+#undef MUSL_DYNAMIC_LINKER
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
index a27d3bee216044dbc74e2578a00836ceeef8ad17..e300480fc7099628fc02151333601d3ad8cde804 100644 (file)
--- a/gcc/config/i386/linux64.h
+++ b/gcc/config/i386/linux64.h
@@ -30,3 +30,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
 #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
+
+#undef MUSL_DYNAMIC_LINKER32
+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
+#undef MUSL_DYNAMIC_LINKER64
+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
+#undef MUSL_DYNAMIC_LINKERX32
+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"