mirror of
https://github.com/pmmp/musl-cross-make.git
synced 2024-11-24 10:46:11 +00:00
7ea487218f
new patch: 0017-c++-abi-break.diff fixes a C++ ABI break regression. 0010-static-pie-support.diff was removed as it doesn't apply anymore, and forward-porting it requires arcane knowledge of GCC details. the patches 0018 and 0019 have been copied from GCC 7.3.0. the static pie patch from GCC 6.4.0, renumbered 0020, depends on the reversions they make.
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
diff -ur gcc-6.4.0/gcc/config/m68k/linux.h gcc-6.4.0.new/gcc/config/m68k/linux.h
|
|
--- gcc-6.4.0/gcc/config/m68k/linux.h 2016-01-04 09:30:50.000000000 -0500
|
|
+++ gcc-6.4.0.new/gcc/config/m68k/linux.h 2018-06-12 20:03:47.047502695 -0400
|
|
@@ -73,6 +73,9 @@
|
|
|
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
|
|
|
+#undef MUSL_DYNAMIC_LINKER
|
|
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-m68k.so.1"
|
|
+
|
|
#undef LINK_SPEC
|
|
#define LINK_SPEC "-m m68kelf %{shared} \
|
|
%{!shared: \
|
|
diff -ur gcc-6.4.0/libgcc/config/m68k/linux-atomic.c gcc-6.4.0.new/libgcc/config/m68k/linux-atomic.c
|
|
--- gcc-6.4.0/libgcc/config/m68k/linux-atomic.c 2016-01-04 09:30:50.000000000 -0500
|
|
+++ gcc-6.4.0.new/libgcc/config/m68k/linux-atomic.c 2018-06-07 16:15:11.610163418 -0400
|
|
@@ -33,7 +33,6 @@
|
|
using the kernel helper defined below. There is no support for
|
|
64-bit operations yet. */
|
|
|
|
-#include <asm/unistd.h>
|
|
#include <stdbool.h>
|
|
|
|
#ifndef __NR_atomic_cmpxchg_32
|
|
diff -ur gcc-6.4.0/libgcc/config/m68k/linux-unwind.h gcc-6.4.0.new/libgcc/config/m68k/linux-unwind.h
|
|
--- gcc-6.4.0/libgcc/config/m68k/linux-unwind.h 2016-01-04 09:30:50.000000000 -0500
|
|
+++ gcc-6.4.0.new/libgcc/config/m68k/linux-unwind.h 2018-06-07 16:17:16.964591108 -0400
|
|
@@ -37,7 +37,7 @@
|
|
stack_t uc_stack;
|
|
mcontext_t uc_mcontext;
|
|
unsigned long uc_filler[80];
|
|
- __sigset_t uc_sigmask;
|
|
+ sigset_t uc_sigmask;
|
|
};
|
|
|
|
#define MD_FALLBACK_FRAME_STATE_FOR m68k_fallback_frame_state
|