diff options
author | kan <kan@FreeBSD.org> | 2009-06-29 01:33:59 +0000 |
---|---|---|
committer | kan <kan@FreeBSD.org> | 2009-06-29 01:33:59 +0000 |
commit | a3faeb1b4110d52bf2e7fe7d46368df8a3b74ff2 (patch) | |
tree | b971befb61e661c38ca8a12e087cc3b59f93ce95 /gnu | |
parent | f780ef8f1980f918f04365b9374ef3f0b5c8652b (diff) | |
download | FreeBSD-src-a3faeb1b4110d52bf2e7fe7d46368df8a3b74ff2.zip FreeBSD-src-a3faeb1b4110d52bf2e7fe7d46368df8a3b74ff2.tar.gz |
Back out previous revision until better tested fix is ready.
Approved by: re (impliciti, by approving previos check-in)
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/lib/libgcc/Makefile | 8 | ||||
-rw-r--r-- | gnu/lib/libssp/libssp_nonshared/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc_tools/freebsd-native.h | 8 |
3 files changed, 2 insertions, 16 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index 65c99d0..49b96e6 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -6,12 +6,6 @@ LIB= gcc SHLIB_NAME= libgcc_s.so.1 SHLIBDIR?= /lib -# -# libgcc is linked in last and thus cannot depend on ssp symbols coming -# from earlier libraries. Disable stack protection for this library. -# -WITHOUT_SSP= yes - .include <bsd.own.mk> .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" @@ -24,7 +18,7 @@ CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \ -I${.CURDIR}/../../usr.bin/cc/cc_tools LDFLAGS+= -nodefaultlibs -LDADD+= -lc -lssp_nonshared +LDADD+= -lc OBJS= # added to below in various ways depending on TARGET_ARCH diff --git a/gnu/lib/libssp/libssp_nonshared/Makefile b/gnu/lib/libssp/libssp_nonshared/Makefile index 9454495..1dcd54f 100644 --- a/gnu/lib/libssp/libssp_nonshared/Makefile +++ b/gnu/lib/libssp/libssp_nonshared/Makefile @@ -13,6 +13,6 @@ SRCS= ssp-local.c CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR}/.. -I${GCCLIB}/libssp -I${GCCLIB}/include -CFLAGS+= -fPIC -DPIC -fvisibility=hidden +CFLAGS+= -fPIC -DPIC .include <bsd.lib.mk> diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h index b9ddea1..6f7fd7b 100644 --- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h +++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h @@ -62,11 +62,3 @@ /* FreeBSD is 4.4BSD derived */ #define bsd4_4 - -/* - * Link in libssp_nonshared to get local hidden symbol for - * __stack_chk_fail_local into each binary that needs it. - * Linux does this with static part of their libc.so linker script, we reuse - * libssp_nonshared.a for the same purpose. - */ -#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all:-lssp_nonshared}" |