diff options
author | Felix Fietkau <nbd@openwrt.org> | 2016-02-25 09:24:46 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-02-25 09:24:46 +0000 |
commit | 621fb574a0a15f2460183697c8fdac9e43858672 (patch) | |
tree | 148b6cef9e185be2776d240333311301eed83879 /toolchain/musl/patches/200-add_libssp_nonshared.patch | |
parent | e24b47f3cd0c419100f7f29b5692868ff222f847 (diff) | |
download | master-187ad058-621fb574a0a15f2460183697c8fdac9e43858672.tar.gz master-187ad058-621fb574a0a15f2460183697c8fdac9e43858672.tar.bz2 master-187ad058-621fb574a0a15f2460183697c8fdac9e43858672.zip |
musl: update to version 1.1.14
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48762 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/musl/patches/200-add_libssp_nonshared.patch')
-rw-r--r-- | toolchain/musl/patches/200-add_libssp_nonshared.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toolchain/musl/patches/200-add_libssp_nonshared.patch b/toolchain/musl/patches/200-add_libssp_nonshared.patch index f6758cdae8..7a2909461b 100644 --- a/toolchain/musl/patches/200-add_libssp_nonshared.patch +++ b/toolchain/musl/patches/200-add_libssp_nonshared.patch @@ -12,7 +12,7 @@ Signed-off-by: Steven Barth <steven@midlink.org> --- a/Makefile +++ b/Makefile -@@ -60,7 +60,7 @@ CRT_LIBS = lib/crt1.o lib/Scrt1.o lib/rc +@@ -66,7 +66,7 @@ CRT_LIBS = $(addprefix lib/,$(notdir $(C STATIC_LIBS = lib/libc.a SHARED_LIBS = lib/libc.so TOOL_LIBS = lib/musl-gcc.specs @@ -21,7 +21,7 @@ Signed-off-by: Steven Barth <steven@midlink.org> ALL_TOOLS = obj/musl-gcc WRAPCC_GCC = gcc -@@ -123,7 +123,8 @@ NOSSP_SRCS = $(wildcard crt/*.c) \ +@@ -125,7 +125,8 @@ NOSSP_SRCS = $(wildcard crt/*.c) \ src/thread/__set_thread_area.c src/thread/$(ARCH)/__set_thread_area.c \ src/string/memset.c src/string/$(ARCH)/memset.c \ src/string/memcpy.c src/string/$(ARCH)/memcpy.c \ @@ -30,8 +30,8 @@ Signed-off-by: Steven Barth <steven@midlink.org> + src/libssp_nonshared/__stack_chk_fail_local.c $(NOSSP_SRCS:%.c=obj/%.o) $(NOSSP_SRCS:%.c=obj/%.lo): CFLAGS_ALL += $(CFLAGS_NOSSP) - $(CRT_LIBS:lib/%=obj/crt/%): CFLAGS_ALL += -DCRT -@@ -167,6 +168,11 @@ lib/libc.a: $(AOBJS) + $(CRT_OBJS): CFLAGS_ALL += -DCRT +@@ -168,6 +169,11 @@ lib/libc.a: $(AOBJS) $(AR) rc $@ $(AOBJS) $(RANLIB) $@ |