OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 2... Line 2...
2 From: Steven Barth <steven@midlink.org> 2 From: Steven Barth <steven@midlink.org>
3 Date: Mon, 22 Jun 2015 11:01:56 +0200 3 Date: Mon, 22 Jun 2015 11:01:56 +0200
4 Subject: [PATCH] Add libssp_nonshared.a so GCC's is not needed 4 Subject: [PATCH] Add libssp_nonshared.a so GCC's is not needed
Line 5... Line 5...
5   5  
-   6 Signed-off-by: Steven Barth <steven@midlink.org>
-   7 ---
-   8 Makefile | 10 ++++++++--
-   9 libssp_nonshared/__stack_chk_fail_local.c | 2 ++
-   10 2 files changed, 10 insertions(+), 2 deletions(-)
Line 6... Line 11...
6 Signed-off-by: Steven Barth <steven@midlink.org> 11 create mode 100644 libssp_nonshared/__stack_chk_fail_local.c
7   12  
8 --- a/Makefile 13 --- a/Makefile
9 +++ b/Makefile 14 +++ b/Makefile
Line 14... Line 19...
14 -ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS) 19 -ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS)
15 +ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS) lib/libssp_nonshared.a 20 +ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS) lib/libssp_nonshared.a
16 ALL_TOOLS = obj/musl-gcc 21 ALL_TOOLS = obj/musl-gcc
Line 17... Line 22...
17 22
18 WRAPCC_GCC = gcc 23 WRAPCC_GCC = gcc
-   24 @@ -125,7 +125,8 @@ NOSSP_SRCS = $(wildcard crt/*.c) \
-   25 src/thread/__set_thread_area.c src/thread/$(ARCH)/__set_thread_area.c \
-   26 src/string/memset.c src/string/$(ARCH)/memset.c \
-   27 src/string/memcpy.c src/string/$(ARCH)/memcpy.c \
-   28 - ldso/dlstart.c ldso/dynlink.c
-   29 + ldso/dlstart.c ldso/dynlink.c \
-   30 + src/libssp_nonshared/__stack_chk_fail_local.c
Line 19... Line -...
19 @@ -86,7 +86,7 @@ else -  
20 -  
21 all: $(ALL_LIBS) $(ALL_TOOLS) -  
22 -  
23 -OBJ_DIRS = $(sort $(patsubst %/,%,$(dir $(ALL_LIBS) $(ALL_TOOLS) $(ALL_OBJS) $(GENH) $(GENH_INT))) obj/include) -  
24 +OBJ_DIRS = $(sort $(patsubst %/,%,$(dir $(ALL_LIBS) $(ALL_TOOLS) $(ALL_OBJS) $(GENH) $(GENH_INT))) obj/include obj/libssp_nonshared) -  
25 -  
26 $(ALL_LIBS) $(ALL_TOOLS) $(ALL_OBJS) $(ALL_OBJS:%.o=%.lo) $(GENH) $(GENH_INT): | $(OBJ_DIRS) -  
27 -  
28 @@ -113,6 +113,8 @@ obj/crt/rcrt1.o: $(srcdir)/ldso/dlstart. 31 $(NOSSP_SRCS:%.c=obj/%.o) $(NOSSP_SRCS:%.c=obj/%.lo): CFLAGS_ALL += $(CFLAGS_NOSSP)
29 -  
30 obj/crt/Scrt1.o obj/crt/rcrt1.o: CFLAGS_ALL += -fPIC -  
31 -  
32 +obj/libssp_nonshared/__stack_chk_fail_local.o: CFLAGS_ALL += $(CFLAGS_NOSSP) -  
33 + -  
34 OPTIMIZE_SRCS = $(wildcard $(OPTIMIZE_GLOBS:%=$(srcdir)/src/%)) -  
35 $(OPTIMIZE_SRCS:$(srcdir)/%.c=obj/%.o) $(OPTIMIZE_SRCS:$(srcdir)/%.c=obj/%.lo): CFLAGS += -O3 32
36 33 $(CRT_OBJS): CFLAGS_ALL += -DCRT
37 @@ -165,6 +167,11 @@ lib/libc.a: $(AOBJS) 34 @@ -168,6 +169,11 @@ lib/libc.a: $(AOBJS)
Line 38... Line 35...
38 $(AR) rc $@ $(AOBJS) 35 $(AR) rc $@ $(AOBJS)
39 $(RANLIB) $@ 36 $(RANLIB) $@
40 37
41 +lib/libssp_nonshared.a: obj/libssp_nonshared/__stack_chk_fail_local.o 38 +lib/libssp_nonshared.a: obj/src/libssp_nonshared/__stack_chk_fail_local.o
42 + rm -f $@ 39 + rm -f $@
43 + $(AR) rc $@ $< 40 + $(AR) rc $@ $<
44 + $(RANLIB) $@ 41 + $(RANLIB) $@
45 + 42 +
46 $(EMPTY_LIBS): 43 $(EMPTY_LIBS):
47 rm -f $@ 44 rm -f $@
48 $(AR) rc $@ 45 $(AR) rc $@
49 --- /dev/null 46 --- /dev/null
50 +++ b/libssp_nonshared/__stack_chk_fail_local.c 47 +++ b/src/libssp_nonshared/__stack_chk_fail_local.c