Module Name: src
Committed By: skrll
Date: Sat Mar 20 16:36:35 UTC 2010
Modified Files:
src/libexec/ld.elf_so: Makefile
Log Message:
Only apply -Wno-stack-protector where alloca is used.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/libexec/ld.elf_so/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.95 src/libexec/ld.elf_so/Makefile:1.96
--- src/libexec/ld.elf_so/Makefile:1.95 Fri Mar 19 20:53:50 2010
+++ src/libexec/ld.elf_so/Makefile Sat Mar 20 16:36:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2010/03/19 20:53:50 roy Exp $
+# $NetBSD: Makefile,v 1.96 2010/03/20 16:36:35 skrll Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -85,6 +85,10 @@
CPPFLAGS+= -DRTLD_DEFAULT_LIBRARY_PATH=\"${SHLIBDIR}:${LIBDIR}\"
.endif
+# rtld.c and symbol.c use alloca, so disable SSP warnings.
+COPTS.rtld.c+= -Wno-stack-protector
+COPTS.symbol.c+=-Wno-stack-protector
+
LDADD+= -L${CLIBOBJ} -L${DESTDIR}${LIBDIR}
.if ${MKPICLIB} != "no"
LDADD+= -lc_pic
@@ -116,7 +120,3 @@
.include <bsd.man.mk>
.endif
-
-# We use alloca, so disable SSP warnings.
-# This has to come last in the CFLAGS ordering
-CFLAGS+= -Wno-stack-protector
