about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2016-01-25 20:06:31 -0500
committerRich Felker <dalias@aerifal.cx>2016-01-25 20:06:31 -0500
commitf9b8df464da02005a1f3296ad5c16582065befbf (patch)
tree6bfc3be960f914afc9f44f68631453c6358b1fc8
parent1619127c11a5ab5d499d4b8a9b76af74f3132400 (diff)
downloadmusl-f9b8df464da02005a1f3296ad5c16582065befbf.tar.gz
musl-f9b8df464da02005a1f3296ad5c16582065befbf.tar.xz
musl-f9b8df464da02005a1f3296ad5c16582065befbf.zip
add ssp suppression to some arch-override files that may need it
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.
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 82ea024e..de30a607 100644
--- 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)