Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Oct 2016 13:19:21 +0000 (UTC)
From:      Ruslan Bukin <br@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r307146 - head/lib/libc
Message-ID:  <201610121319.u9CDJLju098700@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: br
Date: Wed Oct 12 13:19:21 2016
New Revision: 307146
URL: https://svnweb.freebsd.org/changeset/base/307146

Log:
  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

Added:
  head/lib/libc/libc_nossp.ldscript   (contents, props changed)
Modified:
  head/lib/libc/Makefile

Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile	Wed Oct 12 12:56:18 2016	(r307145)
+++ head/lib/libc/Makefile	Wed Oct 12 13:19:21 2016	(r307146)
@@ -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

Added: head/lib/libc/libc_nossp.ldscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libc/libc_nossp.ldscript	Wed Oct 12 13:19:21 2016	(r307146)
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+GROUP ( @@SHLIB@@ @@LIBDIR@@/libc_nonshared.a )



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610121319.u9CDJLju098700>