Skip to content

Commit 5dd4bd0

Browse files
committed
WIP GCC 9.4 upgrade
1 parent 2840123 commit 5dd4bd0

3 files changed

Lines changed: 73 additions & 1 deletion

File tree

musl-cross-make-confs/Makefile.arch_indep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ endif
136136
ARCH := $(shell uname -m | sed 's/^\(arm\).*/\1/g')
137137

138138
# versions
139-
GCCVER := 9.2.0
139+
GCCVER := 9.4.0
140140
BINUTILSVER := 2.33.1
141141
MUSLVER := 1.1.24
142142
ISLVER := 0.21
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--- gcc-9.4.0.PRISTINE/libstdc++-v3/configure 2021-06-01 07:53:06.000000000 +0000
2+
+++ gcc-9.4.0/libstdc++-v3/configure 2021-09-22 23:14:46.492397188 +0000
3+
@@ -15467,8 +15467,8 @@
4+
glibcxx_compiler_shared_flag="-D_GLIBCXX_SHARED"
5+
6+
else
7+
- glibcxx_lt_pic_flag=
8+
- glibcxx_compiler_pic_flag=
9+
+ glibcxx_lt_pic_flag="-prefer-pic"
10+
+ glibcxx_compiler_pic_flag="$lt_prog_compiler_pic_CXX"
11+
glibcxx_compiler_shared_flag=
12+
fi
13+
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
--- gcc-9.2.0.PRISTINE/gcc/config/aarch64/aarch64-linux.h
2+
+++ gcc-9.2.0/gcc/config/aarch64/aarch64-linux.h
3+
@@ -21,10 +21,10 @@
4+
#ifndef GCC_AARCH64_LINUX_H
5+
#define GCC_AARCH64_LINUX_H
6+
7+
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
8+
+#define GLIBC_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/aarch64-linux-musl/lib/ld.so"
9+
10+
#undef MUSL_DYNAMIC_LINKER
11+
-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
12+
+#define MUSL_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/aarch64-linux-musl/lib/ld.so"
13+
14+
#undef ASAN_CC1_SPEC
15+
#define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
16+
--- gcc-9.2.0.PRISTINE/gcc/config/arm/linux-eabi.h
17+
+++ gcc-9.2.0/gcc/config/arm/linux-eabi.h
18+
@@ -88,8 +88,7 @@
19+
#else
20+
#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
21+
#endif
22+
-#define MUSL_DYNAMIC_LINKER \
23+
- "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
24+
+#define MUSL_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/arm-linux-musleabihf/lib/ld.so"
25+
26+
/* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
27+
use the GNU/Linux version, not the generic BPABI version. */
28+
--- gcc-9.2.0.PRISTINE/gcc/config/i386/linux.h
29+
+++ gcc-9.2.0/gcc/config/i386/linux.h
30+
@@ -23,4 +23,4 @@
31+
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
32+
33+
#undef MUSL_DYNAMIC_LINKER
34+
-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
35+
+#define MUSL_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/i686-linux-musl/lib/ld.so"
36+
--- gcc-9.2.0.PRISTINE/gcc/config/i386/linux64.h
37+
+++ gcc-9.2.0/gcc/config/i386/linux64.h
38+
@@ -32,8 +32,8 @@
39+
#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
40+
41+
#undef MUSL_DYNAMIC_LINKER32
42+
-#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
43+
+#define MUSL_DYNAMIC_LINKER32 "/usr/local/crosware/software/statictoolchain/current/i686-linux-musl/lib/ld.so"
44+
#undef MUSL_DYNAMIC_LINKER64
45+
-#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
46+
+#define MUSL_DYNAMIC_LINKER64 "/usr/local/crosware/software/statictoolchain/current/x86_64-linux-musl/lib/ld.so"
47+
#undef MUSL_DYNAMIC_LINKERX32
48+
#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
49+
--- gcc-9.2.0.PRISTINE/gcc/config/riscv/linux.h
50+
+++ gcc-9.2.0/gcc/config/riscv/linux.h
51+
@@ -33,7 +33,7 @@
52+
"%{mabi=lp64d:}"
53+
54+
#undef MUSL_DYNAMIC_LINKER
55+
-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-riscv" XLEN_SPEC MUSL_ABI_SUFFIX ".so.1"
56+
+#define MUSL_DYNAMIC_LINKER "/usr/local/crosware/software/statictoolchain/current/riscv64-linux-musl/lib/ld.so"
57+
58+
/* Because RISC-V only has word-sized atomics, it requries libatomic where
59+
others do not. So link libatomic by default, as needed. */

0 commit comments

Comments
 (0)