]> granicus.if.org Git - musl/commitdiff
add ssp suppression to some arch-override files that may need it
authorRich Felker <dalias@aerifal.cx>
Tue, 26 Jan 2016 01:06:31 +0000 (20:06 -0500)
committerRich Felker <dalias@aerifal.cx>
Tue, 26 Jan 2016 01:06:31 +0000 (20:06 -0500)
these were not covered by the parent-level rules with the new build
system. in the old build system, the equivalent files were often in
arch/$(ARCH)/src and likewise lacked the suppression. this could lead
to early crashing (before thread pointer init) when libc itself was
built with stack protector enabled.

Makefile

index 82ea024ec06f2f467b54f182f720abdd839905f4..de30a6076e38c07e09a8ea622962e89e06936d56 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -118,8 +118,10 @@ $(MEMOPS_SRCS:%.c=obj/%.o) $(MEMOPS_SRCS:%.c=obj/%.lo): CFLAGS_ALL += $(CFLAGS_M
 
 NOSSP_SRCS = $(wildcard crt/*.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/string/memset.c src/string/memcpy.c \
+       src/env/__stack_chk_fail.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 \
        ldso/dlstart.c ldso/dynlink.c
 $(NOSSP_SRCS:%.c=obj/%.o) $(NOSSP_SRCS:%.c=obj/%.lo): CFLAGS_ALL += $(CFLAGS_NOSSP)