diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 10:01:36 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 10:01:36 +0100 |
| commit | dc78a21a21568a389cf214ff29113f99286d644a (patch) | |
| tree | ef919a6eedf02a20128dd2b8a7f008353698a1cc /toolchain | |
| parent | e96c649294fd763fa8631b866397a07b9434bbd3 (diff) | |
| parent | 191b566ae5e66d2180924a4151f67e635fd12ad5 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/binutils/Makefile | 1 | ||||
| -rw-r--r-- | toolchain/musl/Makefile | 10 | ||||
| -rw-r--r-- | toolchain/musl/Makefile.inc | 4 | ||||
| -rw-r--r-- | toolchain/musl/patches/i386-syscall.patch | 27 |
4 files changed, 13 insertions, 29 deletions
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 98c92811e..201f8538c 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -36,6 +36,7 @@ $(WRKBUILD)/.configured: --disable-libtool-lock \ --disable-nls \ --disable-werror \ + --disable-plugins \ ${CONFOPTS} \ ); touch $@ diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index f647939b5..44ee75775 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -12,6 +12,9 @@ endif ifeq ($(CPU_ARCH),mips64el) REAL_GNU_TARGET_NAME:= $(subst mips64el,mips,$(REAL_GNU_TARGET_NAME)) endif +ifeq ($(CPU_ARCH),mips64) +REAL_GNU_TARGET_NAME:= $(subst mips64,mips,$(REAL_GNU_TARGET_NAME)) +endif ifeq ($(CPU_ARCH),microblazeel) REAL_GNU_TARGET_NAME:= $(subst microblazeel,microblaze,$(REAL_GNU_TARGET_NAME)) endif @@ -27,6 +30,13 @@ $(WRKBUILD)/.headers: touch $@ $(WRKBUILD)/.compiled: + # reconfigure musl, otherwise linking with libgcc or libgcc_eh is disabled + $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) clean + (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \ + ./configure --prefix=/usr \ + --target=$(REAL_GNU_TARGET_NAME) \ + --disable-gcc-wrapper \ + ) $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all touch $@ diff --git a/toolchain/musl/Makefile.inc b/toolchain/musl/Makefile.inc index 37bd7a981..506280532 100644 --- a/toolchain/musl/Makefile.inc +++ b/toolchain/musl/Makefile.inc @@ -2,8 +2,8 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= musl -PKG_VERSION:= 0.9.14 +PKG_VERSION:= 0.9.15 PKG_RELEASE:= 1 -PKG_MD5SUM:= bfb685695aa942e64c63170589e575b2 +PKG_MD5SUM:= 06f590a38c85722ee9343db2416425f4 PKG_SITES:= http://www.musl-libc.org/releases/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/toolchain/musl/patches/i386-syscall.patch b/toolchain/musl/patches/i386-syscall.patch deleted file mode 100644 index d70701983..000000000 --- a/toolchain/musl/patches/i386-syscall.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nur musl-0.9.14.orig/arch/i386/bits/syscall.h musl-0.9.14/arch/i386/bits/syscall.h ---- musl-0.9.14.orig/arch/i386/bits/syscall.h 2013-09-23 23:01:11.000000000 +0200 -+++ musl-0.9.14/arch/i386/bits/syscall.h 2013-10-22 10:36:44.000000000 +0200 -@@ -333,6 +333,11 @@ - #define __NR_inotify_init1 332 - #define __NR_preadv 333 - #define __NR_pwritev 334 -+#define __NR_rt_tgsigqueueinfo 335 -+#define __NR_perf_event_open 336 -+#define __NR_recvmmsg 337 -+#define __NR_fanotify_init 338 -+#define __NR_fanotify_mark 339 - #define __NR_prlimit64 340 - #define __NR_name_to_handle_at 341 - #define __NR_open_by_handle_at 342 -@@ -683,6 +688,11 @@ - #define SYS_inotify_init1 332 - #define SYS_preadv 333 - #define SYS_pwritev 334 -+#define SYS_rt_tgsigqueueinfo 335 -+#define SYS_perf_event_open 336 -+#define SYS_recvmmsg 337 -+#define SYS_fanotify_init 338 -+#define SYS_fanotify_mark 339 - #define SYS_prlimit64 340 - #define SYS_name_to_handle_at 341 - #define SYS_open_by_handle_at 342 |