From 56f86567c534fcbd81e1f5374ffb09826902bb51 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 18 Sep 2013 14:43:14 +0200
Subject: add back musl git patch, fix my rebuild issues. build musl a second
 time, after gcc-final

---
 toolchain/musl/Makefile                      |  7 +++---
 toolchain/musl/patches/0.9.13/musl-git.patch | 32 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

(limited to 'toolchain')

diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index 3782e5672..2cce6bebc 100644
--- a/toolchain/musl/Makefile
+++ b/toolchain/musl/Makefile
@@ -28,6 +28,10 @@ $(WRKBUILD)/.compiled:
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
+	$(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install
+	touch $@
+
+$(WRKBUILD)/.fixup:
 	# 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)' \
@@ -39,7 +43,4 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 	$(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install
 	touch $@
 
-$(WRKBUILD)/.fixup:
-	touch $@
-
 include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/musl/patches/0.9.13/musl-git.patch b/toolchain/musl/patches/0.9.13/musl-git.patch
index 110e496f8..a6a87390f 100644
--- a/toolchain/musl/patches/0.9.13/musl-git.patch
+++ b/toolchain/musl/patches/0.9.13/musl-git.patch
@@ -8597,6 +8597,38 @@ diff -Nur musl-0.9.13/src/mman/mprotect.c musl-git/src/mman/mprotect.c
  #include "syscall.h"
  
  int mprotect(void *addr, size_t len, int prot)
+diff -Nur musl-0.9.13/src/signal/sigemptyset.c musl-git/src/signal/sigemptyset.c
+--- musl-0.9.13/src/signal/sigemptyset.c	2013-08-30 23:30:53.000000000 +0200
++++ musl-git/src/signal/sigemptyset.c	2013-09-16 20:31:39.000000000 +0200
+@@ -4,6 +4,10 @@
+ int sigemptyset(sigset_t *set)
+ {
+ 	set->__bits[0] = 0;
+-	if (sizeof(long)==4) set->__bits[1] = 0;
++	if (sizeof(long)==4 || _NSIG > 65) set->__bits[1] = 0;
++	if (sizeof(long)==4 && _NSIG > 65) {
++		set->__bits[2] = 0;
++		set->__bits[3] = 0;
++	}
+ 	return 0;
+ }
+diff -Nur musl-0.9.13/src/signal/sigfillset.c musl-git/src/signal/sigfillset.c
+--- musl-0.9.13/src/signal/sigfillset.c	2013-08-30 23:30:53.000000000 +0200
++++ musl-git/src/signal/sigfillset.c	2013-09-16 20:31:39.000000000 +0200
+@@ -7,8 +7,13 @@
+ #if ULONG_MAX == 0xffffffff
+ 	set->__bits[0] = 0x7ffffffful;
+ 	set->__bits[1] = 0xfffffffcul;
++	if (_NSIG > 65) {
++		set->__bits[2] = 0xfffffffful;
++		set->__bits[3] = 0xfffffffful;
++	}
+ #else
+ 	set->__bits[0] = 0xfffffffc7ffffffful;
++	if (_NSIG > 65) set->__bits[1] = 0xfffffffffffffffful;
+ #endif
+ 	return 0;
+ }
 diff -Nur musl-0.9.13/src/signal/sigqueue.c musl-git/src/signal/sigqueue.c
 --- musl-0.9.13/src/signal/sigqueue.c	2013-08-30 23:30:53.000000000 +0200
 +++ musl-git/src/signal/sigqueue.c	2013-09-16 20:31:39.000000000 +0200
-- 
cgit v1.2.3