Attachment 206258 Details for Bug 229348 – Fix by adjusting libc.ldscript to not link libssp

[patch] Fix by adjusting libc.ldscript to not link libssp

libssp-D15687.diff (text/plain), 3.22 KB, created by Pedro F. Giffuni on 2019-08-03 21:58:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2019-08-03 21:58:45 UTC

Size: 3.22 KB

patch

obsolete

>Index: gnu/lib/Makefile
>===================================================================
>--- gnu/lib/Makefile	(revision 350540)
>+++ gnu/lib/Makefile	(working copy)
>@@ -4,11 +4,10 @@
> 
> SUBDIR=
> SUBDIR.${MK_DIALOG}+=	libdialog
>-SUBDIR.${MK_GCC}+=	libgcov
>+SUBDIR.${MK_GCC}+=	libgcov libssp
> .if ${MK_GCC} != "no" && ${MK_OPENMP} == "no"
> SUBDIR+=		libgomp
> .endif
>-SUBDIR.${MK_SSP}+=	libssp
> SUBDIR.${MK_TESTS}+=	tests
> 
> .if ${MK_BSD_CRTBEGIN} == "no"
>Index: lib/libc/Makefile
>===================================================================
>--- lib/libc/Makefile	(revision 350540)
>+++ lib/libc/Makefile	(working copy)
>@@ -31,11 +31,7 @@
> 
> 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
>@@ -59,10 +55,6 @@
> 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=
> 
>Index: lib/libc/libc.ldscript
>===================================================================
>--- lib/libc/libc.ldscript	(revision 350540)
>+++ lib/libc/libc.ldscript	(working copy)
>@@ -1,2 +1,2 @@
> /* $FreeBSD$ */
>-GROUP ( @@SHLIB@@ @@LIBDIR@@/libc_nonshared.a @@LIBDIR@@/libssp_nonshared.a )
>+GROUP ( @@SHLIB@@ @@LIBDIR@@/libc_nonshared.a )
>Index: lib/libc/libc_nossp.ldscript
>===================================================================
>--- lib/libc/libc_nossp.ldscript	(revision 350540)
>+++ lib/libc/libc_nossp.ldscript	(nonexistent)
>@@ -1,2 +0,0 @@
>-/* $FreeBSD$ */
>-GROUP ( @@SHLIB@@ @@LIBDIR@@/libc_nonshared.a )
>
>Property changes on: lib/libc/libc_nossp.ldscript
>___________________________________________________________________
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Index: lib/libc/tests/Makefile
>===================================================================
>--- lib/libc/tests/Makefile	(revision 350540)
>+++ lib/libc/tests/Makefile	(working copy)
>@@ -30,12 +30,9 @@
> TESTS_SUBDIRS+=	iconv
> .endif
> 
>-.if ${MK_LOCALES} != "no"
>-TESTS_SUBDIRS+=	locale
>-.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>
>Index: share/mk/local.dirdeps.mk
>===================================================================
>--- share/mk/local.dirdeps.mk	(revision 350540)
>+++ share/mk/local.dirdeps.mk	(working copy)
>@@ -74,7 +74,7 @@
> # this is how we can handle optional dependencies
> .if ${DEP_RELDIR} == "lib/libc"
> DIRDEPS += lib/libc_nonshared
>-.if ${MK_SSP:Uno} != "no" 
>+.if !defined(MK_CLANG) && ${MK_SSP:Uno} != "no" 
> DIRDEPS += gnu/lib/libssp/libssp_nonshared
> .endif
> .else
>Index: share/mk/src.libnames.mk
>===================================================================
>--- share/mk/src.libnames.mk	(revision 350540)
>+++ share/mk/src.libnames.mk	(working copy)
>@@ -343,7 +343,7 @@
> # The libc dependencies are not strictly needed but are defined to make the
> # assert happy.
> _DP_c=		compiler_rt
>-.if ${MK_SSP} != "no"
>+.if  !defined(MK_CLANG) && ${MK_SSP} != "no"
> _DP_c+=		ssp_nonshared
> .endif
> _DP_stdthreads=	pthread

Actions: View | Diff

Attachments on bug 229348: 194651 | 195162 | 206258