diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-07-13 12:24:34 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-07-13 23:04:19 +0200 |
| commit | 9816d2f5f52ef54958a207c83840224749c0c4cb (patch) | |
| tree | c50a987ac75db1c0316bbdba03407e2b59d476bf /toolchain/musl/patches/200-add_libssp_nonshared.patch | |
| parent | 2d3917d5b58281a6f440d57c7ededd43fb82f166 (diff) | |
| download | master-31e0f0ae-9816d2f5f52ef54958a207c83840224749c0c4cb.tar.gz master-31e0f0ae-9816d2f5f52ef54958a207c83840224749c0c4cb.tar.bz2 master-31e0f0ae-9816d2f5f52ef54958a207c83840224749c0c4cb.zip | |
musl: update musl to version 1.1.15
The removed patch is already integrated in upstream musl.
Add one additional patch which fixes a regression on mips.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'toolchain/musl/patches/200-add_libssp_nonshared.patch')
| -rw-r--r-- | toolchain/musl/patches/200-add_libssp_nonshared.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolchain/musl/patches/200-add_libssp_nonshared.patch b/toolchain/musl/patches/200-add_libssp_nonshared.patch index 7a2909461b..218ca41402 100644 --- a/toolchain/musl/patches/200-add_libssp_nonshared.patch +++ b/toolchain/musl/patches/200-add_libssp_nonshared.patch @@ -21,7 +21,7 @@ Signed-off-by: Steven Barth <steven@midlink.org> ALL_TOOLS = obj/musl-gcc WRAPCC_GCC = gcc -@@ -125,7 +125,8 @@ NOSSP_SRCS = $(wildcard crt/*.c) \ +@@ -129,7 +129,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 \ @@ -31,7 +31,7 @@ Signed-off-by: Steven Barth <steven@midlink.org> $(NOSSP_SRCS:%.c=obj/%.o) $(NOSSP_SRCS:%.c=obj/%.lo): CFLAGS_ALL += $(CFLAGS_NOSSP) $(CRT_OBJS): CFLAGS_ALL += -DCRT -@@ -168,6 +169,11 @@ lib/libc.a: $(AOBJS) +@@ -172,6 +173,11 @@ lib/libc.a: $(AOBJS) $(AR) rc $@ $(AOBJS) $(RANLIB) $@ |