View | Details | Raw Unified | Return to bug 242941 | Differences between
and this patch

Collapse All | Expand All

(-)b/lib/libc/Makefile (-2 / +4 lines)
Lines 31-37 CFLAGS+=-DNO__SCCSID -DNO__RCSID Link Here
31
31
32
LIB=c
32
LIB=c
33
SHLIB_MAJOR= 7
33
SHLIB_MAJOR= 7
34
.if ${MK_SSP} != "no"
34
.if ${MK_SSP} != "no" && \
35
    (${LIBC_ARCH} == "i386" || ${MACHINE_ARCH:Mpower*} != "")
35
SHLIB_LDSCRIPT=libc.ldscript
36
SHLIB_LDSCRIPT=libc.ldscript
36
.else
37
.else
37
SHLIB_LDSCRIPT=libc_nossp.ldscript
38
SHLIB_LDSCRIPT=libc_nossp.ldscript
Lines 59-65 CFLAGS+=${CANCELPOINTS_CFLAGS} Link Here
59
LDFLAGS+= -nodefaultlibs
60
LDFLAGS+= -nodefaultlibs
60
LIBADD+=	compiler_rt
61
LIBADD+=	compiler_rt
61
62
62
.if ${MK_SSP} != "no"
63
.if ${MK_SSP} != "no" && \
64
    (${LIBC_ARCH} == "i386" || ${MACHINE_ARCH:Mpower*} != "")
63
LIBADD+=	ssp_nonshared
65
LIBADD+=	ssp_nonshared
64
.endif
66
.endif
65
67

Return to bug 242941