diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-08-24 18:49:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 18:49:42 +0200 |
| commit | fef30a4e67878a1447ac76145fd6addf8e9fecc0 (patch) | |
| tree | 780623f11099b78da51ff86f861f12baa6f9235f /toolchain/musl/patches/200-add_libssp_nonshared.patch | |
| parent | 166656b1bde4dd4272a631512f226276c3a81d26 (diff) | |
| parent | c1858411e0c722d04f08d1caf7af5cb33a2f150f (diff) | |
| download | master-187ad058-fef30a4e67878a1447ac76145fd6addf8e9fecc0.tar.gz master-187ad058-fef30a4e67878a1447ac76145fd6addf8e9fecc0.tar.bz2 master-187ad058-fef30a4e67878a1447ac76145fd6addf8e9fecc0.zip | |
Merge pull request #72 from szogi/master
musl: update musl to version 1.1.15, remove sh3 workaround
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) $@ |