summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2018-10-07 07:10:44 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2018-10-07 07:11:28 (GMT)
commitc0969446554e17810c2ce668f4e2d557f258475b (patch)
treed098d1db928db351de11f1597d7e8a05d8d09fab
parentd44e53052e7b6d42b3aaf7da7407e217c87a491f (diff)
musl m68k
-rw-r--r--target/config/Config.in.libc7
-rw-r--r--toolchain/gcc/patches/7.3.0/m68k-musl.patch25
-rw-r--r--toolchain/musl/Makefile.inc6
3 files changed, 32 insertions, 6 deletions
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc
index b417a89..90b7c79 100644
--- a/target/config/Config.in.libc
+++ b/target/config/Config.in.libc
@@ -50,6 +50,7 @@ config ADK_TARGET_LIB_MUSL
depends on (\
ADK_TARGET_ARCH_AARCH64 || \
ADK_TARGET_ARCH_ARM || \
+ ADK_TARGET_ARCH_M68K || \
ADK_TARGET_ARCH_MICROBLAZE || \
ADK_TARGET_ARCH_MIPS || \
ADK_TARGET_ARCH_MIPS64 || \
@@ -164,8 +165,8 @@ config ADK_TARGET_LIB_GLIBC_GIT
bool "git"
depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_CSKY && ADK_EXPERIMENTAL
-config ADK_TARGET_LIB_MUSL_1_1_19
- bool "1.1.19"
+config ADK_TARGET_LIB_MUSL_1_1_20
+ bool "1.1.20"
depends on ADK_TARGET_LIB_MUSL
config ADK_TARGET_LIB_MUSL_GIT
@@ -210,7 +211,7 @@ config ADK_TARGET_LIBC
config ADK_LIBC_VERSION
string
default "1.0.30" if ADK_TARGET_LIB_UCLIBC_NG_1_0_30
- default "1.1.19" if ADK_TARGET_LIB_MUSL_1_1_19
+ default "1.1.20" if ADK_TARGET_LIB_MUSL_1_1_20
default "2.28" if ADK_TARGET_LIB_GLIBC_2_28
default "3.0.0" if ADK_TARGET_LIB_NEWLIB_3_0_0
default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
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 0000000..a7effec
--- /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 9eb3d0c..0198a3e 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