diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2018-10-07 09:10:44 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2018-10-07 09:11:28 +0200 |
| commit | c0969446554e17810c2ce668f4e2d557f258475b (patch) | |
| tree | d098d1db928db351de11f1597d7e8a05d8d09fab /toolchain | |
| parent | d44e53052e7b6d42b3aaf7da7407e217c87a491f (diff) | |
musl m68k
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/patches/7.3.0/m68k-musl.patch | 25 | ||||
| -rw-r--r-- | toolchain/musl/Makefile.inc | 6 |
2 files changed, 28 insertions, 3 deletions
diff --git a/toolchain/gcc/patches/7.3.0/m68k-musl.patch b/toolchain/gcc/patches/7.3.0/m68k-musl.patch new file mode 100644 index 000000000..a7effec4c --- /dev/null +++ b/toolchain/gcc/patches/7.3.0/m68k-musl.patch @@ -0,0 +1,25 @@ +diff -Nur gcc-7.3.0.orig/gcc/config/m68k/linux.h gcc-7.3.0/gcc/config/m68k/linux.h +--- gcc-7.3.0.orig/gcc/config/m68k/linux.h 2017-01-06 22:21:02.000000000 +0100 ++++ gcc-7.3.0/gcc/config/m68k/linux.h 2018-10-05 06:38:51.000000000 +0200 +@@ -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 -Nur gcc-7.3.0.orig/libgcc/config/m68k/linux-unwind.h gcc-7.3.0/libgcc/config/m68k/linux-unwind.h +--- gcc-7.3.0.orig/libgcc/config/m68k/linux-unwind.h 2017-07-04 12:22:56.000000000 +0200 ++++ gcc-7.3.0/libgcc/config/m68k/linux-unwind.h 2018-10-05 06:38:51.000000000 +0200 +@@ -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 diff --git a/toolchain/musl/Makefile.inc b/toolchain/musl/Makefile.inc index 9eb3d0c02..0198a3e67 100644 --- a/toolchain/musl/Makefile.inc +++ b/toolchain/musl/Makefile.inc @@ -8,10 +8,10 @@ PKG_RELEASE:= 1 PKG_SITES:= git://git.musl-libc.org/musl DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz endif -ifeq ($(ADK_TARGET_LIB_MUSL_1_1_19),y) -PKG_VERSION:= 1.1.19 +ifeq ($(ADK_TARGET_LIB_MUSL_1_1_20),y) +PKG_VERSION:= 1.1.20 PKG_RELEASE:= 1 -PKG_HASH:= db59a8578226b98373f5b27e61f0dd29ad2456f4aa9cec587ba8c24508e4c1d9 +PKG_HASH:= 44be8771d0e6c6b5f82dd15662eb2957c9a3173a19a8b49966ac0542bbd40d61 PKG_SITES:= http://www.musl-libc.org/releases/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif |