From 32797df534398d49325a9495e69c54297e942f10 Mon Sep 17 00:00:00 2001 From: Ruslan Bukin Date: Wed, 12 Oct 2016 13:19:21 +0000 Subject: [PATCH] Add different libc ldscript: the one without libssp -- we don't have it when MK_SSP==no. This fixes compilation on MIPS. Reviewed by: imp Sponsored by: DARPA, AFRL Sponsored by: HEIF5 Differential Revision: https://reviews.freebsd.org/D8212 --- lib/libc/Makefile | 4 ++++ lib/libc/libc_nossp.ldscript | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 lib/libc/libc_nossp.ldscript diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 2e17ec425d3b..a97b6fcdedb4 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -29,7 +29,11 @@ LIBC_ARCH=${MACHINE_CPUARCH} # to CFLAGS below. -DSYSLIBC_SCCS affects just the system call stubs. 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${LIBC_SRCTOP}/../../include diff --git a/lib/libc/libc_nossp.ldscript b/lib/libc/libc_nossp.ldscript new file mode 100644 index 000000000000..c610cc21e018 --- /dev/null +++ b/lib/libc/libc_nossp.ldscript @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +GROUP ( @@SHLIB@@ @@LIBDIR@@/libc_nonshared.a )