d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out previous revision until better tested fix is ready.

Browse Source 
Approved by: re (impliciti, by approving previos check-in)
This commit is contained in:
Alexander Kabaev 2009-06-29 01:33:59 +00:00
parent a162c9ae9c
commit d48890cfb8
8 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -1069,7 +1069,7 @@ libraries:
#
# static libgcc.a prerequisite for shared libc
#
_prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc
_prereq_libs= gnu/lib/libgcc
# These dependencies are not automatically generated:
#

8
gnu/lib/libgcc/Makefile
View File

@ -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

2
gnu/lib/libssp/libssp_nonshared/Makefile
View File

@ -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>

8
gnu/usr.bin/cc/cc_tools/freebsd-native.h
View File

@ -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}"

2
lib/libc/Makefile
View File

@ -26,7 +26,7 @@ PRECIOUSLIB=
#
DPADD+= ${LIBGCC}
LDFLAGS+= -nodefaultlibs
LDADD+= -lgcc -lssp_nonshared
LDADD+= -lgcc
# Define (empty) variables so that make doesn't give substitution
# errors if the included makefiles don't change these:

1
lib/libc/sys/Symbol.map
View File

@ -282,6 +282,7 @@ FBSD_1.0 {
socket;
socketpair;
__stack_chk_fail;
__stack_chk_fail_local;
__stack_chk_guard;
stat;
statfs;

7
lib/libc/sys/stack_protector.c
View File

@ -47,6 +47,7 @@ static void __guard_setup(void) __attribute__((__constructor__, __used__));
static void __fail(const char *);
void __stack_chk_fail(void);
void __chk_fail(void);
void __stack_chk_fail_local(void);
/*LINTED used*/
static void
@ -108,4 +109,8 @@ __chk_fail(void)
__fail("buffer overflow detected; terminated");
}
__sym_compat(__stack_chk_fail_local, __stack_chk_fail, FBSD_1.0);
void
__stack_chk_fail_local(void)
{
__stack_chk_fail();
}

2
libexec/rtld-elf/Makefile
View File

@ -22,7 +22,7 @@ MLINKS= rtld.1 ld-elf.so.1.1 \
CFLAGS+= -fpic -DPIC
LDFLAGS+= -shared -Wl,-Bsymbolic
DPADD= ${LIBC_PIC}
LDADD= -lc_pic -lssp_nonshared
LDADD= -lc_pic
.if ${MACHINE_ARCH} != "ia64"
.if ${MK_SYMVER} == "yes"