diff options
Diffstat (limited to 'toolchain/musl')
20 files changed, 785 insertions, 121 deletions
diff --git a/toolchain/musl/Config.in b/toolchain/musl/Config.in index fa1e44570..36edf54e4 100644 --- a/toolchain/musl/Config.in +++ b/toolchain/musl/Config.in @@ -3,12 +3,21 @@ choice prompt "musl Version" depends on TOOLCHAINOPTS && USE_MUSL - default UCLIBC_VERSION_0_9_7 + default MUSL_USE_VERSION_0_9_8 help Select the version of musl you wish to use. - config MUSL_VERSION_0_9_7 - bool "musl 0.9.7" + config MUSL_USE_VERSION_0_9_8 + select MUSL_VERSION_0_9_8 + bool "musl 0.9.8" + + config MUSL_USE_VERSION_0_9_9 + select MUSL_VERSION_0_9_9 + bool "musl 0.9.9" + + config MUSL_USE_VERSION_0_9_10 + select MUSL_VERSION_0_9_10 + bool "musl 0.9.10" endchoice diff --git a/toolchain/musl/Config.version b/toolchain/musl/Config.version index e76033be2..172111dc2 100644 --- a/toolchain/musl/Config.version +++ b/toolchain/musl/Config.version @@ -1,13 +1,20 @@ +if USE_MUSL + config MUSL_VERSION string depends on USE_MUSL - default "0.9.7" if MUSL_VERSION_0_9_7 - default "0.9.7" + default "0.9.8" if MUSL_VERSION_0_9_8 + default "0.9.9" if MUSL_VERSION_0_9_9 + default "0.9.10" if MUSL_VERSION_0_9_10 + +config MUSL_VERSION_0_9_8 + default y if !TOOLCHAINOPTS + bool -if !TOOLCHAINOPTS +config MUSL_VERSION_0_9_9 + bool - config MUSL_VERSION_0_9_7 - default y if USE_MUSL - bool +config MUSL_VERSION_0_9_10 + bool endif diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index 79ea175a4..f95bb05ce 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -21,18 +21,6 @@ endef define Host/Install $(call Host/SetToolchainInfo) $(MAKE) -C $(HOST_BUILD_DIR) DESTDIR="$(TOOLCHAIN_DIR)/" install - ( cd $(TOOLCHAIN_DIR) ; \ - for d in lib usr/lib ; do \ - for f in libc.so libpthread.so libgcc_s.so ; do \ - if [ -f $$$$d/$$$$f -a ! -L $$$$d/$$$$f ] ; then \ - $(SED) 's,/usr/lib/,,g;s,/lib/,,g' $$$$d/$$$$f ; \ - fi \ - done \ - done \ - ) - rm -f \ - $(TOOLCHAIN_DIR)/lib/libresolv*.so* \ - $(TOOLCHAIN_DIR)/lib/libnsl*.so* endef $(eval $(call HostBuild)) diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk index 68cb2396f..75c050787 100644 --- a/toolchain/musl/common.mk +++ b/toolchain/musl/common.mk @@ -11,10 +11,14 @@ PKG_NAME:=musl PKG_VERSION:=$(call qstrip,$(CONFIG_MUSL_VERSION)) PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_SOURCE_VERSION_0.9.8:=e6dcebd5efa2d390f0a24dc11444024e9fd1990c +PKG_SOURCE_VERSION_0.9.9:=a57ac9bf64ba202bd94d1b81bddd93b850c7b9d6 +PKG_SOURCE_VERSION_0.9.10:=7bec92e793d4b8a349796848cf43c7329b0f2ed0 + PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://git.musl-libc.org/musl PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=2df4f6f17b1f14684cb991c53c9ef0ddaa8c7bad +PKG_SOURCE_VERSION:=$(PKG_SOURCE_VERSION_$(PKG_VERSION)) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz LIBC_SO_VERSION:=$(PKG_VERSION) PATCH_DIR:=$(PATH_PREFIX)/patches-$(PKG_VERSION) diff --git a/toolchain/musl/patches-0.9.10/000-install_portability.patch b/toolchain/musl/patches-0.9.10/000-install_portability.patch new file mode 100644 index 000000000..3e018c67e --- /dev/null +++ b/toolchain/musl/patches-0.9.10/000-install_portability.patch @@ -0,0 +1,27 @@ +--- a/Makefile ++++ b/Makefile +@@ -116,16 +116,20 @@ tools/musl-gcc: config.mak + chmod +x $@ + + $(DESTDIR)$(bindir)/%: tools/% +- install -D $< $@ ++ mkdir -p $(dir $@) ++ install $< $@ + + $(DESTDIR)$(libdir)/%.so: lib/%.so +- install -D -m 755 $< $@ ++ mkdir -p $(dir $@) ++ install -m 755 $< $@ + + $(DESTDIR)$(libdir)/%: lib/% +- install -D -m 644 $< $@ ++ mkdir -p $(dir $@) ++ install -m 644 $< $@ + + $(DESTDIR)$(includedir)/%: include/% +- install -D -m 644 $< $@ ++ mkdir -p $(dir $@) ++ install -m 644 $< $@ + + $(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(syslibdir) + ln -sf $(libdir)/libc.so $@ || true diff --git a/toolchain/musl/patches-0.9.10/100-wchar_include.patch b/toolchain/musl/patches-0.9.10/100-wchar_include.patch new file mode 100644 index 000000000..2f36ae580 --- /dev/null +++ b/toolchain/musl/patches-0.9.10/100-wchar_include.patch @@ -0,0 +1,60 @@ +--- a/arch/arm/bits/alltypes.h.sh ++++ b/arch/arm/bits/alltypes.h.sh +@@ -21,6 +21,7 @@ TYPEDEF int ssize_t; + TYPEDEF int ptrdiff_t; + + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF unsigned wchar_t; +--- a/arch/i386/bits/alltypes.h.sh ++++ b/arch/i386/bits/alltypes.h.sh +@@ -25,6 +25,7 @@ TYPEDEF __builtin_va_list va_list; + #else + TYPEDEF struct __va_list * va_list; + #endif ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + #ifdef __WCHAR_TYPE__ +--- a/arch/microblaze/bits/alltypes.h.sh ++++ b/arch/microblaze/bits/alltypes.h.sh +@@ -21,6 +21,7 @@ TYPEDEF int ssize_t; + TYPEDEF int ptrdiff_t; + + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF int wchar_t; +--- a/arch/mips/bits/alltypes.h.sh ++++ b/arch/mips/bits/alltypes.h.sh +@@ -21,6 +21,7 @@ TYPEDEF int ssize_t; + TYPEDEF int ptrdiff_t; + + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF int wchar_t; +--- a/arch/powerpc/bits/alltypes.h.sh ++++ b/arch/powerpc/bits/alltypes.h.sh +@@ -21,6 +21,7 @@ TYPEDEF int ssize_t; + TYPEDEF int ptrdiff_t; + + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF long wchar_t; +--- a/arch/x86_64/bits/alltypes.h.sh ++++ b/arch/x86_64/bits/alltypes.h.sh +@@ -20,6 +20,7 @@ TYPEDEF unsigned long size_t; + TYPEDEF long ssize_t; + TYPEDEF long ptrdiff_t; + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF int wchar_t; diff --git a/toolchain/musl/patches-0.9.10/110-bsd_ether_h.patch b/toolchain/musl/patches-0.9.10/110-bsd_ether_h.patch new file mode 100644 index 000000000..61faf79cb --- /dev/null +++ b/toolchain/musl/patches-0.9.10/110-bsd_ether_h.patch @@ -0,0 +1,196 @@ +--- /dev/null ++++ b/include/netinet/ether.h +@@ -0,0 +1,10 @@ ++#ifndef _NETINET_ETHER_H ++#define _NETINET_ETHER_H ++ ++char *ether_ntoa(const struct ether_addr *); ++struct ether_addr *ether_aton(const char *); ++int ether_ntohost(char *, const struct ether_addr *); ++int ether_hostton(const char *, struct ether_addr *); ++int ether_line(const char *, struct ether_addr *, char *); ++ ++#endif /* !_NETINET_ETHER_H */ +--- /dev/null ++++ b/src/network/ethers.c +@@ -0,0 +1,180 @@ ++/* Origin NetBSD: src/lib/libc/net/ethers.c */ ++ ++/* ++ * ethers(3N) a la Sun. ++ * ++ * Written by Roland McGrath <roland@...b.com> 10/14/93. ++ * Public domain. ++ * ++ * port for musl by Abdoulaye Walsimou GAYE <awg@...toolkit.org> 2012/10/15 ++ */ ++ ++#define _BSD_SOURCE ++#include <net/ethernet.h> ++#include <netinet/ether.h> ++ ++#include <sys/param.h> ++#include <assert.h> ++#include <errno.h> ++#include <paths.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#ifndef _PATH_ETHERS ++#define _PATH_ETHERS "/etc/ethers" ++#endif ++ ++/* ++ * ether_ntoa(): ++ * This function converts this structure into an ASCII string of the form ++ * ``xx:xx:xx:xx:xx:xx'', consisting of 6 hexadecimal numbers separated ++ * by colons. It returns a pointer to a static buffer that is reused for ++ * each call. ++ */ ++char *ether_ntoa(const struct ether_addr *e) ++{ ++ static char a[18]; ++ ++ assert(e != NULL); ++ ++ (void) snprintf(a, sizeof a, "%02x:%02x:%02x:%02x:%02x:%02x", ++ e->ether_addr_octet[0], e->ether_addr_octet[1], ++ e->ether_addr_octet[2], e->ether_addr_octet[3], ++ e->ether_addr_octet[4], e->ether_addr_octet[5]); ++ return a; ++} ++ ++/* ++ * ether_aton(): ++ * This function converts an ASCII string of the same form and to a structure ++ * containing the 6 octets of the address. It returns a pointer to a ++ * static structure that is reused for each call. ++ */ ++struct ether_addr *ether_aton(const char *s) ++{ ++ static struct ether_addr n; ++ unsigned int i[6]; ++ ++ assert(s != NULL); ++ ++ if (sscanf(s, " %x:%x:%x:%x:%x:%x ", &i[0], &i[1], ++ &i[2], &i[3], &i[4], &i[5]) == 6) { ++ n.ether_addr_octet[0] = (unsigned char)i[0]; ++ n.ether_addr_octet[1] = (unsigned char)i[1]; ++ n.ether_addr_octet[2] = (unsigned char)i[2]; ++ n.ether_addr_octet[3] = (unsigned char)i[3]; ++ n.ether_addr_octet[4] = (unsigned char)i[4]; ++ n.ether_addr_octet[5] = (unsigned char)i[5]; ++ return &n; ++ } ++ return NULL; ++} ++ ++/* ++ * ether_ntohost(): ++ * This function interrogates the data base mapping host names to Ethernet ++ * addresses, /etc/ethers. ++ * It looks up the given Ethernet address and writes the associated host name ++ * into the character buffer passed. ++ * It returns zero if it finds the requested host name and -1 if not. ++ */ ++int ether_ntohost(char *hostname, const struct ether_addr *e) ++{ ++ FILE *f; ++ char *p; ++ size_t len; ++ struct ether_addr try; ++ ++ assert(hostname != NULL); ++ assert(e != NULL); ++ ++ f = fopen(_PATH_ETHERS, "r"); ++ if (f == NULL) ++ return -1; ++ while ((p = fgetln(f, &len)) != NULL) { ++ if (p[len - 1] != '\n') ++ continue; /* skip lines w/o \n */ ++ p[--len] = '\0'; ++ if (ether_line(p, &try, hostname) == 0 && ++ memcmp(&try, e, sizeof try) == 0) { ++ (void)fclose(f); ++ return 0; ++ } ++ } ++ (void)fclose(f); ++ errno = ENOENT; ++ return -1; ++} ++ ++/* ++ * ether_hostton(): ++ * This function interrogates the data base mapping host names to Ethernet ++ * addresses, /etc/ethers. ++ * It looks up the given host name and writes the associated Ethernet address ++ * into the structure passed. ++ * It returns zero if it finds the requested address and -1 if not. ++ */ ++int ether_hostton(const char *hostname, struct ether_addr *e) ++{ ++ FILE *f; ++ char *p; ++ size_t len; ++ char try[MAXHOSTNAMELEN + 1]; ++ ++ assert(hostname != NULL); ++ assert(e != NULL); ++ ++ f = fopen(_PATH_ETHERS, "r"); ++ if (f==NULL) ++ return -1; ++ ++ while ((p = fgetln(f, &len)) != NULL) { ++ if (p[len - 1] != '\n') ++ continue; /* skip lines w/o \n */ ++ p[--len] = '\0'; ++ if (ether_line(p, e, try) == 0 && strcmp(hostname, try) == 0) { ++ (void)fclose(f); ++ return 0; ++ } ++ } ++ (void)fclose(f); ++ errno = ENOENT; ++ return -1; ++} ++ ++/* ++ * ether_line(): ++ * This function parses a line from the /etc/ethers file and fills in the passed ++ * ``struct ether_addr'' and character buffer with the Ethernet address and host ++ * name on the line. ++ * It returns zero if the line was successfully parsed and -1 if not. ++ */ ++int ether_line(const char *l, struct ether_addr *e, char *hostname) ++{ ++ unsigned int i[6]; ++ ++#define S2(arg) #arg ++#define S1(arg) S2(arg) ++ static const char fmt[] = " %x:%x:%x:%x:%x:%x" ++ " %" S1(MAXHOSTNAMELEN) "s\n"; ++#undef S2 ++#undef S1 ++ ++ assert(l != NULL); ++ assert(e != NULL); ++ assert(hostname != NULL); ++ ++ if (sscanf(l, fmt, ++ &i[0], &i[1], &i[2], &i[3], &i[4], &i[5], hostname) == 7) { ++ e->ether_addr_octet[0] = (unsigned char)i[0]; ++ e->ether_addr_octet[1] = (unsigned char)i[1]; ++ e->ether_addr_octet[2] = (unsigned char)i[2]; ++ e->ether_addr_octet[3] = (unsigned char)i[3]; ++ e->ether_addr_octet[4] = (unsigned char)i[4]; ++ e->ether_addr_octet[5] = (unsigned char)i[5]; ++ return 0; ++ } ++ errno = EINVAL; ++ return -1; ++} diff --git a/toolchain/musl/patches-0.9.10/120-in_h_are_4_equal_parenthesis.patch b/toolchain/musl/patches-0.9.10/120-in_h_are_4_equal_parenthesis.patch new file mode 100644 index 000000000..8b5dbd442 --- /dev/null +++ b/toolchain/musl/patches-0.9.10/120-in_h_are_4_equal_parenthesis.patch @@ -0,0 +1,11 @@ +--- a/include/netinet/in.h ++++ b/include/netinet/in.h +@@ -146,7 +146,7 @@ uint16_t ntohs(uint16_t); + (IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0xe)) + + #define __ARE_4_EQUAL(a,b) \ +- (!( 0[a]-0[b] | 1[a]-1[b] | 2[a]-2[b] | 3[a]-3[b] )) ++ (!( (0[a]-0[b]) | (1[a]-1[b]) | (2[a]-2[b]) | (3[a]-3[b]) )) + #define IN6_ARE_ADDR_EQUAL(a,b) \ + __ARE_4_EQUAL((const uint32_t *)(a), (const uint32_t *)(b)) + diff --git a/toolchain/musl/patches-0.9.10/130-syslog_log_upto_parenthesis.patch b/toolchain/musl/patches-0.9.10/130-syslog_log_upto_parenthesis.patch new file mode 100644 index 000000000..840dd4013 --- /dev/null +++ b/toolchain/musl/patches-0.9.10/130-syslog_log_upto_parenthesis.patch @@ -0,0 +1,11 @@ +--- a/include/syslog.h ++++ b/include/syslog.h +@@ -21,7 +21,7 @@ extern "C" { + #define LOG_MAKEPRI(f, p) (((f)<<3)|(p)) + + #define LOG_MASK(p) (1<<(p)) +-#define LOG_UPTO(p) ((1<<(p)+1)-1) ++#define LOG_UPTO(p) ((1<<((p)+1))-1) + + #define LOG_KERN (0<<3) + #define LOG_USER (1<<3) diff --git a/toolchain/musl/patches-0.9.7/003-fix_termios_constants_on_mips.patch b/toolchain/musl/patches-0.9.7/003-fix_termios_constants_on_mips.patch deleted file mode 100644 index 73e22a590..000000000 --- a/toolchain/musl/patches-0.9.7/003-fix_termios_constants_on_mips.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 144dc4f479d49b8148f8b1b6b506b0f1096f911b Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Fri, 23 Nov 2012 17:23:38 -0500 -Subject: [PATCH] fix termios constants on mips - ---- - arch/mips/bits/termios.h | 31 +++++++++++++++++++++---------- - 1 file changed, 21 insertions(+), 10 deletions(-) - -diff --git a/arch/mips/bits/termios.h b/arch/mips/bits/termios.h -index 9f6abd8..179af8e 100644 ---- a/arch/mips/bits/termios.h -+++ b/arch/mips/bits/termios.h -@@ -14,19 +14,20 @@ struct termios - #define VQUIT 1 - #define VERASE 2 - #define VKILL 3 --#define VEOF 4 -+#define VMIN 4 - #define VTIME 5 --#define VMIN 6 -+#define VEOL2 6 - #define VSWTC 7 -+#define VSWTCH 7 - #define VSTART 8 - #define VSTOP 9 - #define VSUSP 10 --#define VEOL 11 - #define VREPRINT 12 - #define VDISCARD 13 - #define VWERASE 14 - #define VLNEXT 15 --#define VEOL2 16 -+#define VEOF 16 -+#define VEOL 17 - - #define IGNBRK 0000001 - #define BRKINT 0000002 -@@ -42,6 +43,7 @@ struct termios - #define IXANY 0004000 - #define IXOFF 0010000 - #define IMAXBEL 0020000 -+#define IUTF8 0040000 - - #define OPOST 0000001 - #define OLCUC 0000002 -@@ -94,7 +96,10 @@ struct termios - #define B9600 0000015 - #define B19200 0000016 - #define B38400 0000017 -+#define EXTA 0000016 -+#define EXTB 0000017 - -+#define BOTHER 0010000 - #define B57600 0010001 - #define B115200 0010002 - #define B230400 0010003 -@@ -124,26 +129,32 @@ struct termios - #define PARODD 0001000 - #define HUPCL 0002000 - #define CLOCAL 0004000 -+#define CBAUDEX 0010000 - -+#define CIBAUD 002003600000 -+#define CMSPAR 010000000000 - #define CRTSCTS 020000000000 -+#define IBSHIFT 16 - - #define ISIG 0000001 - #define ICANON 0000002 -+#define XCASE 0000004 - #define ECHO 0000010 - #define ECHOE 0000020 - #define ECHOK 0000040 - #define ECHONL 0000100 - #define NOFLSH 0000200 --#define TOSTOP 0000400 --#define IEXTEN 0100000 -- --/* Extensions? */ --#define CBAUDEX 0010000 -+#define IEXTEN 0000400 - #define ECHOCTL 0001000 - #define ECHOPRT 0002000 - #define ECHOKE 0004000 --#define FLUSHO 0010000 -+#define FLUSHO 0020000 - #define PENDIN 0040000 -+#define TOSTOP 0100000 -+#define ITOSTOP 0100000 -+#define EXTPROC 0200000 -+ -+#define TIOCSER_TEMT 1 - - #define TCOOFF 0 - #define TCOON 1 --- -1.7.10.4 - diff --git a/toolchain/musl/patches-0.9.7/001-bsd_ether_h.patch b/toolchain/musl/patches-0.9.8/001-bsd_ether_h.patch index be3a0217a..be3a0217a 100644 --- a/toolchain/musl/patches-0.9.7/001-bsd_ether_h.patch +++ b/toolchain/musl/patches-0.9.8/001-bsd_ether_h.patch diff --git a/toolchain/musl/patches-0.9.7/002-no_mips_fpu.patch b/toolchain/musl/patches-0.9.8/002-no_mips_fpu.patch index 92af325af..92af325af 100644 --- a/toolchain/musl/patches-0.9.7/002-no_mips_fpu.patch +++ b/toolchain/musl/patches-0.9.8/002-no_mips_fpu.patch diff --git a/toolchain/musl/patches-0.9.8/003-in_h_are_4_equal_parenthesis.patch b/toolchain/musl/patches-0.9.8/003-in_h_are_4_equal_parenthesis.patch new file mode 100644 index 000000000..41aaf5d3d --- /dev/null +++ b/toolchain/musl/patches-0.9.8/003-in_h_are_4_equal_parenthesis.patch @@ -0,0 +1,12 @@ +diff -urN musl-0.9.8/include/netinet/in.h musl-0.9.8.new/include/netinet/in.h +--- musl-0.9.8/include/netinet/in.h 2013-01-25 14:14:07.000000000 +0100 ++++ musl-0.9.8.new/include/netinet/in.h 2013-01-29 21:43:46.843051396 +0100 +@@ -141,7 +141,7 @@ + (IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0xe)) + + #define __ARE_4_EQUAL(a,b) \ +- (!( 0[a]-0[b] | 1[a]-1[b] | 2[a]-2[b] | 3[a]-3[b] )) ++ (!( (0[a]-0[b]) | (1[a]-1[b]) | (2[a]-2[b]) | (3[a]-3[b]) )) + #define IN6_ARE_ADDR_EQUAL(a,b) \ + __ARE_4_EQUAL((const uint32_t *)(a), (const uint32_t *)(b)) + diff --git a/toolchain/musl/patches-0.9.8/004-wchar_include.patch b/toolchain/musl/patches-0.9.8/004-wchar_include.patch new file mode 100644 index 000000000..2f36ae580 --- /dev/null +++ b/toolchain/musl/patches-0.9.8/004-wchar_include.patch @@ -0,0 +1,60 @@ +--- a/arch/arm/bits/alltypes.h.sh ++++ b/arch/arm/bits/alltypes.h.sh +@@ -21,6 +21,7 @@ TYPEDEF int ssize_t; + TYPEDEF int ptrdiff_t; + + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF unsigned wchar_t; +--- a/arch/i386/bits/alltypes.h.sh ++++ b/arch/i386/bits/alltypes.h.sh +@@ -25,6 +25,7 @@ TYPEDEF __builtin_va_list va_list; + #else + TYPEDEF struct __va_list * va_list; + #endif ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + #ifdef __WCHAR_TYPE__ +--- a/arch/microblaze/bits/alltypes.h.sh ++++ b/arch/microblaze/bits/alltypes.h.sh +@@ -21,6 +21,7 @@ TYPEDEF int ssize_t; + TYPEDEF int ptrdiff_t; + + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF int wchar_t; +--- a/arch/mips/bits/alltypes.h.sh ++++ b/arch/mips/bits/alltypes.h.sh +@@ -21,6 +21,7 @@ TYPEDEF int ssize_t; + TYPEDEF int ptrdiff_t; + + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF int wchar_t; +--- a/arch/powerpc/bits/alltypes.h.sh ++++ b/arch/powerpc/bits/alltypes.h.sh +@@ -21,6 +21,7 @@ TYPEDEF int ssize_t; + TYPEDEF int ptrdiff_t; + + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF long wchar_t; +--- a/arch/x86_64/bits/alltypes.h.sh ++++ b/arch/x86_64/bits/alltypes.h.sh +@@ -20,6 +20,7 @@ TYPEDEF unsigned long size_t; + TYPEDEF long ssize_t; + TYPEDEF long ptrdiff_t; + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF int wchar_t; diff --git a/toolchain/musl/patches-0.9.8/005-install_portability.patch b/toolchain/musl/patches-0.9.8/005-install_portability.patch new file mode 100644 index 000000000..3e018c67e --- /dev/null +++ b/toolchain/musl/patches-0.9.8/005-install_portability.patch @@ -0,0 +1,27 @@ +--- a/Makefile ++++ b/Makefile +@@ -116,16 +116,20 @@ tools/musl-gcc: config.mak + chmod +x $@ + + $(DESTDIR)$(bindir)/%: tools/% +- install -D $< $@ ++ mkdir -p $(dir $@) ++ install $< $@ + + $(DESTDIR)$(libdir)/%.so: lib/%.so +- install -D -m 755 $< $@ ++ mkdir -p $(dir $@) ++ install -m 755 $< $@ + + $(DESTDIR)$(libdir)/%: lib/% +- install -D -m 644 $< $@ ++ mkdir -p $(dir $@) ++ install -m 644 $< $@ + + $(DESTDIR)$(includedir)/%: include/% +- install -D -m 644 $< $@ ++ mkdir -p $(dir $@) ++ install -m 644 $< $@ + + $(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(syslibdir) + ln -sf $(libdir)/libc.so $@ || true diff --git a/toolchain/musl/patches-0.9.9/001-arm_shared_libs_regression_fix.patch b/toolchain/musl/patches-0.9.9/001-arm_shared_libs_regression_fix.patch new file mode 100644 index 000000000..c6bfac8a1 --- /dev/null +++ b/toolchain/musl/patches-0.9.9/001-arm_shared_libs_regression_fix.patch @@ -0,0 +1,33 @@ +From d432b2c057fc64256645422382c2f7e32c45b3cc Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Sun, 03 Feb 2013 06:26:33 +0000 +Subject: fix regression that made shared libs crash on arm + +--- +diff --git a/crt/arm/crti.s b/crt/arm/crti.s +index 2f658b7..35ae6ae 100644 +--- a/crt/arm/crti.s ++++ b/crt/arm/crti.s +@@ -5,6 +5,8 @@ _init: + + .weak __fini_array_start + .weak __fini_array_end ++.hidden __fini_array_start ++.hidden __fini_array_end + + .section .fini + .global _fini +diff --git a/crt/arm/crtn.s b/crt/arm/crtn.s +index 928e068..eb0e883 100644 +--- a/crt/arm/crtn.s ++++ b/crt/arm/crtn.s +@@ -1,5 +1,7 @@ + .weak __init_array_start + .weak __init_array_end ++.hidden __init_array_start ++.hidden __init_array_end + + .section .init + adr lr, 1f +-- +cgit v0.9.0.3-65-g4555 diff --git a/toolchain/musl/patches-0.9.9/002-bsd_ether_h.patch b/toolchain/musl/patches-0.9.9/002-bsd_ether_h.patch new file mode 100644 index 000000000..be3a0217a --- /dev/null +++ b/toolchain/musl/patches-0.9.9/002-bsd_ether_h.patch @@ -0,0 +1,219 @@ +Date: Sat, 20 Oct 2012 22:15:44 +0200 +From: Abdoulaye Walsimou Gaye <awg@...toolkit.org> +To: musl@...ts.openwall.com +Cc: Abdoulaye Walsimou Gaye <awg@...toolkit.org> +Subject: [PATCH 3/4] Import BSD functions defined in <netinet/ether.h> from NetBSD + +Signed-off-by: Abdoulaye Walsimou Gaye <awg@...toolkit.org> +--- + include/netinet/ether.h | 14 ++++ + src/network/ethers.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 194 insertions(+) + create mode 100644 include/netinet/ether.h + create mode 100644 src/network/ethers.c + +diff --git a/include/netinet/ether.h b/include/netinet/ether.h +new file mode 100644 +index 0000000..44c614e +--- /dev/null ++++ b/include/netinet/ether.h +@@ -0,0 +1,10 @@ ++#ifndef _NETINET_ETHER_H ++#define _NETINET_ETHER_H ++ ++char *ether_ntoa(const struct ether_addr *); ++struct ether_addr *ether_aton(const char *); ++int ether_ntohost(char *, const struct ether_addr *); ++int ether_hostton(const char *, struct ether_addr *); ++int ether_line(const char *, struct ether_addr *, char *); ++ ++#endif /* !_NETINET_ETHER_H */ +diff --git a/src/network/ethers.c b/src/network/ethers.c +new file mode 100644 +index 0000000..8014581 +--- /dev/null ++++ b/src/network/ethers.c +@@ -0,0 +1,180 @@ ++/* Origin NetBSD: src/lib/libc/net/ethers.c */ ++ ++/* ++ * ethers(3N) a la Sun. ++ * ++ * Written by Roland McGrath <roland@...b.com> 10/14/93. ++ * Public domain. ++ * ++ * port for musl by Abdoulaye Walsimou GAYE <awg@...toolkit.org> 2012/10/15 ++ */ ++ ++#define _BSD_SOURCE ++#include <net/ethernet.h> ++#include <netinet/ether.h> ++ ++#include <sys/param.h> ++#include <assert.h> ++#include <errno.h> ++#include <paths.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#ifndef _PATH_ETHERS ++#define _PATH_ETHERS "/etc/ethers" ++#endif ++ ++/* ++ * ether_ntoa(): ++ * This function converts this structure into an ASCII string of the form ++ * ``xx:xx:xx:xx:xx:xx'', consisting of 6 hexadecimal numbers separated ++ * by colons. It returns a pointer to a static buffer that is reused for ++ * each call. ++ */ ++char *ether_ntoa(const struct ether_addr *e) ++{ ++ static char a[18]; ++ ++ assert(e != NULL); ++ ++ (void) snprintf(a, sizeof a, "%02x:%02x:%02x:%02x:%02x:%02x", ++ e->ether_addr_octet[0], e->ether_addr_octet[1], ++ e->ether_addr_octet[2], e->ether_addr_octet[3], ++ e->ether_addr_octet[4], e->ether_addr_octet[5]); ++ return a; ++} ++ ++/* ++ * ether_aton(): ++ * This function converts an ASCII string of the same form and to a structure ++ * containing the 6 octets of the address. It returns a pointer to a ++ * static structure that is reused for each call. ++ */ ++struct ether_addr *ether_aton(const char *s) ++{ ++ static struct ether_addr n; ++ unsigned int i[6]; ++ ++ assert(s != NULL); ++ ++ if (sscanf(s, " %x:%x:%x:%x:%x:%x ", &i[0], &i[1], ++ &i[2], &i[3], &i[4], &i[5]) == 6) { ++ n.ether_addr_octet[0] = (unsigned char)i[0]; ++ n.ether_addr_octet[1] = (unsigned char)i[1]; ++ n.ether_addr_octet[2] = (unsigned char)i[2]; ++ n.ether_addr_octet[3] = (unsigned char)i[3]; ++ n.ether_addr_octet[4] = (unsigned char)i[4]; ++ n.ether_addr_octet[5] = (unsigned char)i[5]; ++ return &n; ++ } ++ return NULL; ++} ++ ++/* ++ * ether_ntohost(): ++ * This function interrogates the data base mapping host names to Ethernet ++ * addresses, /etc/ethers. ++ * It looks up the given Ethernet address and writes the associated host name ++ * into the character buffer passed. ++ * It returns zero if it finds the requested host name and -1 if not. ++ */ ++int ether_ntohost(char *hostname, const struct ether_addr *e) ++{ ++ FILE *f; ++ char *p; ++ size_t len; ++ struct ether_addr try; ++ ++ assert(hostname != NULL); ++ assert(e != NULL); ++ ++ f = fopen(_PATH_ETHERS, "r"); ++ if (f == NULL) ++ return -1; ++ while ((p = fgetln(f, &len)) != NULL) { ++ if (p[len - 1] != '\n') ++ continue; /* skip lines w/o \n */ ++ p[--len] = '\0'; ++ if (ether_line(p, &try, hostname) == 0 && ++ memcmp(&try, e, sizeof try) == 0) { ++ (void)fclose(f); ++ return 0; ++ } ++ } ++ (void)fclose(f); ++ errno = ENOENT; ++ return -1; ++} ++ ++/* ++ * ether_hostton(): ++ * This function interrogates the data base mapping host names to Ethernet ++ * addresses, /etc/ethers. ++ * It looks up the given host name and writes the associated Ethernet address ++ * into the structure passed. ++ * It returns zero if it finds the requested address and -1 if not. ++ */ ++int ether_hostton(const char *hostname, struct ether_addr *e) ++{ ++ FILE *f; ++ char *p; ++ size_t len; ++ char try[MAXHOSTNAMELEN + 1]; ++ ++ assert(hostname != NULL); ++ assert(e != NULL); ++ ++ f = fopen(_PATH_ETHERS, "r"); ++ if (f==NULL) ++ return -1; ++ ++ while ((p = fgetln(f, &len)) != NULL) { ++ if (p[len - 1] != '\n') ++ continue; /* skip lines w/o \n */ ++ p[--len] = '\0'; ++ if (ether_line(p, e, try) == 0 && strcmp(hostname, try) == 0) { ++ (void)fclose(f); ++ return 0; ++ } ++ } ++ (void)fclose(f); ++ errno = ENOENT; ++ return -1; ++} ++ ++/* ++ * ether_line(): ++ * This function parses a line from the /etc/ethers file and fills in the passed ++ * ``struct ether_addr'' and character buffer with the Ethernet address and host ++ * name on the line. ++ * It returns zero if the line was successfully parsed and -1 if not. ++ */ ++int ether_line(const char *l, struct ether_addr *e, char *hostname) ++{ ++ unsigned int i[6]; ++ ++#define S2(arg) #arg ++#define S1(arg) S2(arg) ++ static const char fmt[] = " %x:%x:%x:%x:%x:%x" ++ " %" S1(MAXHOSTNAMELEN) "s\n"; ++#undef S2 ++#undef S1 ++ ++ assert(l != NULL); ++ assert(e != NULL); ++ assert(hostname != NULL); ++ ++ if (sscanf(l, fmt, ++ &i[0], &i[1], &i[2], &i[3], &i[4], &i[5], hostname) == 7) { ++ e->ether_addr_octet[0] = (unsigned char)i[0]; ++ e->ether_addr_octet[1] = (unsigned char)i[1]; ++ e->ether_addr_octet[2] = (unsigned char)i[2]; ++ e->ether_addr_octet[3] = (unsigned char)i[3]; ++ e->ether_addr_octet[4] = (unsigned char)i[4]; ++ e->ether_addr_octet[5] = (unsigned char)i[5]; ++ return 0; ++ } ++ errno = EINVAL; ++ return -1; ++} +-- +1.7.9.5 + diff --git a/toolchain/musl/patches-0.9.9/003-in_h_are_4_equal_parenthesis.patch b/toolchain/musl/patches-0.9.9/003-in_h_are_4_equal_parenthesis.patch new file mode 100644 index 000000000..41aaf5d3d --- /dev/null +++ b/toolchain/musl/patches-0.9.9/003-in_h_are_4_equal_parenthesis.patch @@ -0,0 +1,12 @@ +diff -urN musl-0.9.8/include/netinet/in.h musl-0.9.8.new/include/netinet/in.h +--- musl-0.9.8/include/netinet/in.h 2013-01-25 14:14:07.000000000 +0100 ++++ musl-0.9.8.new/include/netinet/in.h 2013-01-29 21:43:46.843051396 +0100 +@@ -141,7 +141,7 @@ + (IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0xe)) + + #define __ARE_4_EQUAL(a,b) \ +- (!( 0[a]-0[b] | 1[a]-1[b] | 2[a]-2[b] | 3[a]-3[b] )) ++ (!( (0[a]-0[b]) | (1[a]-1[b]) | (2[a]-2[b]) | (3[a]-3[b]) )) + #define IN6_ARE_ADDR_EQUAL(a,b) \ + __ARE_4_EQUAL((const uint32_t *)(a), (const uint32_t *)(b)) + diff --git a/toolchain/musl/patches-0.9.9/004-wchar_include.patch b/toolchain/musl/patches-0.9.9/004-wchar_include.patch new file mode 100644 index 000000000..2f36ae580 --- /dev/null +++ b/toolchain/musl/patches-0.9.9/004-wchar_include.patch @@ -0,0 +1,60 @@ +--- a/arch/arm/bits/alltypes.h.sh ++++ b/arch/arm/bits/alltypes.h.sh +@@ -21,6 +21,7 @@ TYPEDEF int ssize_t; + TYPEDEF int ptrdiff_t; + + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF unsigned wchar_t; +--- a/arch/i386/bits/alltypes.h.sh ++++ b/arch/i386/bits/alltypes.h.sh +@@ -25,6 +25,7 @@ TYPEDEF __builtin_va_list va_list; + #else + TYPEDEF struct __va_list * va_list; + #endif ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + #ifdef __WCHAR_TYPE__ +--- a/arch/microblaze/bits/alltypes.h.sh ++++ b/arch/microblaze/bits/alltypes.h.sh +@@ -21,6 +21,7 @@ TYPEDEF int ssize_t; + TYPEDEF int ptrdiff_t; + + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF int wchar_t; +--- a/arch/mips/bits/alltypes.h.sh ++++ b/arch/mips/bits/alltypes.h.sh +@@ -21,6 +21,7 @@ TYPEDEF int ssize_t; + TYPEDEF int ptrdiff_t; + + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF int wchar_t; +--- a/arch/powerpc/bits/alltypes.h.sh ++++ b/arch/powerpc/bits/alltypes.h.sh +@@ -21,6 +21,7 @@ TYPEDEF int ssize_t; + TYPEDEF int ptrdiff_t; + + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF long wchar_t; +--- a/arch/x86_64/bits/alltypes.h.sh ++++ b/arch/x86_64/bits/alltypes.h.sh +@@ -20,6 +20,7 @@ TYPEDEF unsigned long size_t; + TYPEDEF long ssize_t; + TYPEDEF long ptrdiff_t; + TYPEDEF __builtin_va_list va_list; ++#define __gnuc_va_list va_list + + #ifndef __cplusplus + TYPEDEF int wchar_t; diff --git a/toolchain/musl/patches-0.9.9/005-install_portability.patch b/toolchain/musl/patches-0.9.9/005-install_portability.patch new file mode 100644 index 000000000..3e018c67e --- /dev/null +++ b/toolchain/musl/patches-0.9.9/005-install_portability.patch @@ -0,0 +1,27 @@ +--- a/Makefile ++++ b/Makefile +@@ -116,16 +116,20 @@ tools/musl-gcc: config.mak + chmod +x $@ + + $(DESTDIR)$(bindir)/%: tools/% +- install -D $< $@ ++ mkdir -p $(dir $@) ++ install $< $@ + + $(DESTDIR)$(libdir)/%.so: lib/%.so +- install -D -m 755 $< $@ ++ mkdir -p $(dir $@) ++ install -m 755 $< $@ + + $(DESTDIR)$(libdir)/%: lib/% +- install -D -m 644 $< $@ ++ mkdir -p $(dir $@) ++ install -m 644 $< $@ + + $(DESTDIR)$(includedir)/%: include/% +- install -D -m 644 $< $@ ++ mkdir -p $(dir $@) ++ install -m 644 $< $@ + + $(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(syslibdir) + ln -sf $(libdir)/libc.so $@ || true |