musl-cross-make/patches/gcc-9.1.0/0011-m68k.diff
Kevin Mark 0e455cd5ba
Support GCC 9.1.0
Rebased the patches for GCC 8.3.0 onto 9.1.0. Not all applied
cleanly, particularly the PIE patch so I had to get a little
creative. Could definitely use an extra pair of eyes on these
patches.

Independent verification of the SHA1 is always appreciated.

Verified compile with the following config.mak:

    BINUTILS_VER = 2.32
    GCC_VER = 9.1.0
    GMP_VER = 6.1.2
    MPC_VER = 1.1.0
    MPFR_VER = 4.0.2
    ISL_VER = 0.21
    LINUX_VER = 3.0.35

    COMMON_CONFIG += --disable-nls
    GCC_CONFIG += --enable-languages=c,c++
    GCC_CONFIG += --disable-libquadmath --disable-decimal-float
    GCC_CONFIG += --disable-multilib
2019-06-30 23:53:50 -04:00

28 lines
877 B
Diff

diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h
index ebdf02810..beef554b3 100644
--- a/gcc/config/m68k/linux.h
+++ b/gcc/config/m68k/linux.h
@@ -73,6 +73,9 @@ along with GCC; see the file COPYING3. If not see
#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 --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
index fbe0d4748..57c354ee9 100644
--- a/libgcc/config/m68k/linux-unwind.h
+++ b/libgcc/config/m68k/linux-unwind.h
@@ -37,7 +37,7 @@ struct uw_ucontext {
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