diff options
| author | Alexander Kabaev <kan@FreeBSD.org> | 2009-06-29 01:33:59 +0000 |
|---|---|---|
| committer | Alexander Kabaev <kan@FreeBSD.org> | 2009-06-29 01:33:59 +0000 |
| commit | d48890cfb8cf92f9f2d49763781b20fd01e1e9d4 (patch) | |
| tree | b971befb61e661c38ca8a12e087cc3b59f93ce95 /gnu/lib | |
| parent | a162c9ae9c55a9593b15ef618f4df0a045e39dbd (diff) | |
| download | src-d48890cfb8cf92f9f2d49763781b20fd01e1e9d4.tar.gz src-d48890cfb8cf92f9f2d49763781b20fd01e1e9d4.zip | |
Back out previous revision until better tested fix is ready.
Approved by: re (impliciti, by approving previos check-in)
Notes
Notes:
svn path=/head/; revision=195152
Diffstat (limited to 'gnu/lib')
| -rw-r--r-- | gnu/lib/libgcc/Makefile | 8 | ||||
| -rw-r--r-- | gnu/lib/libssp/libssp_nonshared/Makefile | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index 65c99d05c845..49b96e6e3a03 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 94544951fdfd..1dcd54f6d557 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> |