Skip to content

Commit

Permalink
initial stab at gcc 8.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanwoodsmall committed Aug 5, 2019
1 parent 8351646 commit 284d57b
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 2 deletions.
4 changes: 2 additions & 2 deletions musl-cross-make-confs/Makefile.arch_indep
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ endif
ARCH := $(shell uname -m | sed 's/^\(arm\).*/\1/g')

# versions
GCCVER := 6.4.0
GCCVER := 8.3.0
BINUTILSVER := 2.32
MUSLVER := 1.1.23
ISLVER := 0.15
ISLVER := 0.21

# musl
MUSLSHA1 := 98f3991d67e0e11dd091eb65890285d8417c7d05
Expand Down
48 changes: 48 additions & 0 deletions musl-cross-make-confs/patches/9999-crosware-ldso_gcc-8.3.0.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
--- gcc-8.3.0.PRISTINE/gcc/config/aarch64/aarch64-linux.h
+++ gcc-8.3.0/gcc/config/aarch64/aarch64-linux.h
@@ -21,10 +21,10 @@
#ifndef GCC_AARCH64_LINUX_H
#define GCC_AARCH64_LINUX_H

-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+#define GLIBC_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/aarch64-linux-musl/lib/ld.so"

#undef MUSL_DYNAMIC_LINKER
-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+#define MUSL_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/aarch64-linux-musl/lib/ld.so"

#undef ASAN_CC1_SPEC
#define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
--- gcc-8.3.0.PRISTINE/gcc/config/arm/linux-eabi.h
+++ gcc-8.3.0/gcc/config/arm/linux-eabi.h
@@ -85,8 +85,7 @@
#else
#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
#endif
-#define MUSL_DYNAMIC_LINKER \
- "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
+#define MUSL_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/arm-linux-musleabihf/lib/ld.so"

/* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
use the GNU/Linux version, not the generic BPABI version. */
--- gcc-8.3.0.PRISTINE/gcc/config/i386/linux.h
+++ gcc-8.3.0/gcc/config/i386/linux.h
@@ -23,4 +23,4 @@
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"

#undef MUSL_DYNAMIC_LINKER
-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
+#define MUSL_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/i686-linux-musl/lib/ld.so"
--- gcc-8.3.0.PRISTINE/gcc/config/i386/linux64.h
+++ gcc-8.3.0/gcc/config/i386/linux64.h
@@ -32,8 +32,8 @@
#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"

#undef MUSL_DYNAMIC_LINKER32
-#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
+#define MUSL_DYNAMIC_LINKER32 "/usr/local/crosware/software/statictoolchain/current/i686-linux-musl/lib/ld.so"
#undef MUSL_DYNAMIC_LINKER64
-#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
+#define MUSL_DYNAMIC_LINKER64 "/usr/local/crosware/software/statictoolchain/current/x86_64-linux-musl/lib/ld.so"
#undef MUSL_DYNAMIC_LINKERX32
#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"

0 comments on commit 284d57b

Please sign in to comment.