KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

musl: update to latest git version

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 46481
This commit is contained in:
Felix Fietkau 2015-07-24 15:35:55 +00:00
parent bee26ca0de
commit 5537698be1
5 changed files with 829 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1019
toolchain/musl/patches/001-git-2015-06-25.patch → toolchain/musl/patches/001-git-2015-07-22.patch
View file

File diff suppressed because it is too large Load diff

2
toolchain/musl/patches/010-Add-PowerPC-soft-float-support.patch
View file

@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -498,6 +498,10 @@ trycppif "_MIPSEL || __MIPSEL || __MIPSE @@ -522,6 +522,10 @@ trycppif "_MIPSEL || __MIPSEL || __MIPSE
trycppif __mips_soft_float "$t" && SUBARCH=${SUBARCH}-sf trycppif __mips_soft_float "$t" && SUBARCH=${SUBARCH}-sf
fi fi

4
toolchain/musl/patches/110-read_timezone_from_fs.patch
View file

@ -23,6 +23,6 @@
+ s = tzfile = (void *)__map_file("/etc/TZ", &tzfile_size); + s = tzfile = (void *)__map_file("/etc/TZ", &tzfile_size);
+ } + }
+ +
if (!s || !*s) s = "/etc/localtime"; if (!s) s = "/etc/localtime";
if (!*s) s = __gmt;
if (old_tz && !strcmp(s, old_tz)) return;

16
toolchain/musl/patches/200-add_libssp_nonshared.patch
View file

@ -10,11 +10,9 @@ Signed-off-by: Steven Barth <steven@midlink.org>
2 files changed, 10 insertions(+), 2 deletions(-) 2 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 libssp_nonshared/__stack_chk_fail_local.c create mode 100644 libssp_nonshared/__stack_chk_fail_local.c
diff --git a/Makefile b/Makefile
index 2eb7b30..bfcabf7 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -48,7 +48,7 @@ CRT_LIBS = lib/crt1.o lib/Scrt1.o lib/rcrt1.o lib/crti.o lib/crtn.o @@ -48,7 +48,7 @@ CRT_LIBS = lib/crt1.o lib/Scrt1.o lib/rc
STATIC_LIBS = lib/libc.a STATIC_LIBS = lib/libc.a
SHARED_LIBS = lib/libc.so SHARED_LIBS = lib/libc.so
TOOL_LIBS = lib/musl-gcc.specs TOOL_LIBS = lib/musl-gcc.specs
@ -22,8 +20,8 @@ index 2eb7b30..bfcabf7 100644
+ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS) lib/libssp_nonshared.a +ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS) lib/libssp_nonshared.a
ALL_TOOLS = tools/musl-gcc ALL_TOOLS = tools/musl-gcc
LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH)$(SUBARCH).so.1 WRAPCC_GCC = gcc
@@ -103,7 +103,8 @@ NOSSP_SRCS = $(wildcard crt/*.c) \ @@ -106,7 +106,8 @@ NOSSP_SRCS = $(wildcard crt/*.c) \
src/env/__libc_start_main.c src/env/__init_tls.c \ src/env/__libc_start_main.c src/env/__init_tls.c \
src/thread/__set_thread_area.c src/env/__stack_chk_fail.c \ src/thread/__set_thread_area.c src/env/__stack_chk_fail.c \
src/string/memset.c src/string/memcpy.c \ src/string/memset.c src/string/memcpy.c \
@ -33,7 +31,7 @@ index 2eb7b30..bfcabf7 100644
$(NOSSP_SRCS:%.c=%.o) $(NOSSP_SRCS:%.c=%.lo): CFLAGS += $(CFLAGS_NOSSP) $(NOSSP_SRCS:%.c=%.o) $(NOSSP_SRCS:%.c=%.lo): CFLAGS += $(CFLAGS_NOSSP)
$(CRT_LIBS:lib/%=crt/%): CFLAGS += -DCRT $(CRT_LIBS:lib/%=crt/%): CFLAGS += -DCRT
@@ -144,6 +145,11 @@ lib/libc.a: $(OBJS) @@ -147,6 +148,11 @@ lib/libc.a: $(OBJS)
$(AR) rc $@ $(OBJS) $(AR) rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
@ -45,14 +43,8 @@ index 2eb7b30..bfcabf7 100644
$(EMPTY_LIBS): $(EMPTY_LIBS):
rm -f $@ rm -f $@
$(AR) rc $@ $(AR) rc $@
diff --git a/libssp_nonshared/__stack_chk_fail_local.c b/libssp_nonshared/__stack_chk_fail_local.c
new file mode 100644
index 0000000..2b403a6
--- /dev/null --- /dev/null
+++ b/libssp_nonshared/__stack_chk_fail_local.c +++ b/libssp_nonshared/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+#include "atomic.h" +#include "atomic.h"
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { a_crash(); } +void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { a_crash(); }
--
2.1.4

2
toolchain/musl/patches/300-relative.patch
View file

@ -1,6 +1,6 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -180,7 +180,7 @@ $(DESTDIR)$(includedir)/%: include/% @@ -187,7 +187,7 @@ $(DESTDIR)$(includedir)/%: include/%
$(INSTALL) -D -m 644 $< $@ $(INSTALL) -D -m 644 $< $@
$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so $(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so