925b78ae16
* Fix hardcoded `armhf` in pmb/aportgen/binutils.py * Generate aports: `binutils-aarch64`, `musl-aarch64`, `gcc-aarch64` * Distccd: Remember the cross-compiler architecture (currently armhf or aarch64), that the current distccd is running as, and restart distccd with the correct architecture, in case a different arch is needed than what it is currently running as. (Depending on the cross-compiler arch, the PATH variable gets adjusted before starting distccd) * Testcases: add aport generation for aarch64, add cross-compiling to aarch64 * pmb/parse/arch.py: Add aarch64 to the mapping
32 lines
1 KiB
Diff
32 lines
1 KiB
Diff
From be841c16dd544553c67faac79bd4cc3cd10a1dc0 Mon Sep 17 00:00:00 2001
|
|
From: "Tuan M. Hoang" <tmhoang@flatglobe.org>
|
|
Date: Mon, 21 Nov 2016 01:42:16 +0700
|
|
Subject: [PATCH] main/gcc: add musl s390x dynamic linker
|
|
|
|
---
|
|
gcc/config/s390/linux.h | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
|
|
index 1e3ed35..a244214 100644
|
|
--- a/gcc/config/s390/linux.h
|
|
+++ b/gcc/config/s390/linux.h
|
|
@@ -63,6 +63,15 @@ along with GCC; see the file COPYING3. If not see
|
|
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
|
|
#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
|
|
|
|
+#undef MUSL_DYNAMIC_LINKER
|
|
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-s390x.so.1"
|
|
+#undef MUSL_DYNAMIC_LINKER32
|
|
+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-s390x.so.1"
|
|
+#undef MUSL_DYNAMIC_LINKER64
|
|
+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-s390x.so.1"
|
|
+#undef MUSL_DYNAMIC_LINKERX32
|
|
+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-s390x.so.1"
|
|
+
|
|
#undef LINK_SPEC
|
|
#define LINK_SPEC \
|
|
"%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
|
|
--
|
|
2.10.2
|
|
|