Attachment #206258 for bug #229348

Lines 4-14 Link Here

(-)gnu/lib/Makefile (-2 / +1 lines)
4		4
5	SUBDIR=	5	SUBDIR=
6	SUBDIR.${MK_DIALOG}+= libdialog	6	SUBDIR.${MK_DIALOG}+= libdialog
7	SUBDIR.${MK_GCC}+= libgcov	7	SUBDIR.${MK_GCC}+= libgcov libssp
8	.if ${MK_GCC} != "no" && ${MK_OPENMP} == "no"	8	.if ${MK_GCC} != "no" && ${MK_OPENMP} == "no"
9	SUBDIR+= libgomp	9	SUBDIR+= libgomp
10	.endif	10	.endif
11	SUBDIR.${MK_SSP}+= libssp
12	SUBDIR.${MK_TESTS}+= tests	11	SUBDIR.${MK_TESTS}+= tests
13		12
14	.if ${MK_BSD_CRTBEGIN} == "no"	13	.if ${MK_BSD_CRTBEGIN} == "no"





LIB=c
SHLIB_MAJOR= 7
.if ${MK_SSP} != "no"
SHLIB_LDSCRIPT=libc.ldscript
.else
SHLIB_LDSCRIPT=libc_nossp.ldscript
.endif
SHLIB_LDSCRIPT_LINKS=libxnet.so
WARNS?=	2
CFLAGS+=-I${LIBC_SRCTOP}/include -I${SRCTOP}/include

LDFLAGS+= -nodefaultlibs
LIBADD+=	compiler_rt

.if ${MK_SSP} != "no"
LIBADD+=	ssp_nonshared
.endif

# Extras that live in either libc.a or libc_nonshared.a
LIBC_NONSHARED_SRCS=


Lines 1-2 Link Here

(-)lib/libc/libc.ldscript (-1 / +1 lines)
1	/* $FreeBSD$ */	1	/* $FreeBSD$ */
2	GROUP ( @@SHLIB@@ @@LIBDIR@@/libc_nonshared.a @@LIBDIR@@/libssp_nonshared.a )	2	GROUP ( @@SHLIB@@ @@LIBDIR@@/libc_nonshared.a )

Lines 1-2 Link Here

(-)lib/libc/libc_nossp.ldscript (-2 lines)
1	/* $FreeBSD$ */
2	GROUP ( @@SHLIB@@ @@LIBDIR@@/libc_nonshared.a )




TESTS_SUBDIRS+=	iconv
.endif

# We never supported FORTIFY_SOURCE
#.if ${MK_LOCALES} != "no"
#TESTS_SUBDIRS+=	locale
#.endif

.if ${MK_SSP} != "no"
TESTS_SUBDIRS+=	ssp
.endif

.include <bsd.test.mk>

Lines 74-80 Link Here

(-)share/mk/local.dirdeps.mk (-1 / +1 lines)
74	# this is how we can handle optional dependencies	74	# this is how we can handle optional dependencies
75	.if ${DEP_RELDIR} == "lib/libc"	75	.if ${DEP_RELDIR} == "lib/libc"
76	DIRDEPS += lib/libc_nonshared	76	DIRDEPS += lib/libc_nonshared
77	.if ${MK_SSP:Uno} != "no"	77	.if !defined(MK_CLANG) && ${MK_SSP:Uno} != "no"
78	DIRDEPS += gnu/lib/libssp/libssp_nonshared	78	DIRDEPS += gnu/lib/libssp/libssp_nonshared
79	.endif	79	.endif
80	.else	80	.else

Lines 343-349 Link Here

(-)share/mk/src.libnames.mk (-1 / +1 lines)
343	# The libc dependencies are not strictly needed but are defined to make the	343	# The libc dependencies are not strictly needed but are defined to make the
344	# assert happy.	344	# assert happy.
345	_DP_c= compiler_rt	345	_DP_c= compiler_rt
346	.if ${MK_SSP} != "no"	346	.if !defined(MK_CLANG) && ${MK_SSP} != "no"
347	_DP_c+= ssp_nonshared	347	_DP_c+= ssp_nonshared
348	.endif	348	.endif
349	_DP_stdthreads= pthread	349	_DP_stdthreads= pthread

Return to bug 229348

Lines 31-41 Link Here

(-)lib/libc/Makefile (-8 lines)
31		31
32	LIB=c	32	LIB=c
33	SHLIB_MAJOR= 7	33	SHLIB_MAJOR= 7
34	.if ${MK_SSP} != "no"
35	SHLIB_LDSCRIPT=libc.ldscript	34	SHLIB_LDSCRIPT=libc.ldscript
36	.else
37	SHLIB_LDSCRIPT=libc_nossp.ldscript
38	.endif
39	SHLIB_LDSCRIPT_LINKS=libxnet.so	35	SHLIB_LDSCRIPT_LINKS=libxnet.so
40	WARNS?= 2	36	WARNS?= 2
41	CFLAGS+=-I${LIBC_SRCTOP}/include -I${SRCTOP}/include	37	CFLAGS+=-I${LIBC_SRCTOP}/include -I${SRCTOP}/include
Lines 59-68 Link Here
59	LDFLAGS+= -nodefaultlibs	55	LDFLAGS+= -nodefaultlibs
60	LIBADD+= compiler_rt	56	LIBADD+= compiler_rt
61		57
62	.if ${MK_SSP} != "no"
63	LIBADD+= ssp_nonshared
64	.endif
65
66	# Extras that live in either libc.a or libc_nonshared.a	58	# Extras that live in either libc.a or libc_nonshared.a
67	LIBC_NONSHARED_SRCS=	59	LIBC_NONSHARED_SRCS=
68		60

Lines 30-41 Link Here

(-)lib/libc/tests/Makefile (-7 / +4 lines)
30	TESTS_SUBDIRS+= iconv	30	TESTS_SUBDIRS+= iconv
31	.endif	31	.endif
32		32
33	.if ${MK_LOCALES} != "no"	33	# We never supported FORTIFY_SOURCE
34	TESTS_SUBDIRS+= locale	34	#.if ${MK_LOCALES} != "no"
35	.endif	35	#TESTS_SUBDIRS+= locale
		36	#.endif
36		37
37	.if ${MK_SSP} != "no"
38	TESTS_SUBDIRS+= ssp
39	.endif
40
41	.include <bsd.test.mk>	38	.include <bsd.test.mk>