Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Apr 2020 22:08:40 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r360511 - in head: lib/libc/db/mpool lib/libc/gen lib/libc/iconv lib/libc/posix1e lib/libc/secure lib/libgcc_s lib/libprocstat share/man/man5 share/mk tools/build/options
Message-ID:  <202004302208.03UM8e0d025024@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhb
Date: Thu Apr 30 22:08:40 2020
New Revision: 360511
URL: https://svnweb.freebsd.org/changeset/base/360511

Log:
  Remove the SYMVER build option.
  
  This option was added as a transition aide when symbol versioning was
  first added.  It was enabled by default in 2007 and is supported even
  by the old GPLv2 binutils.  Trying to disable it currently fails to
  build in libc and at this point it isn't worth fixing the build.
  
  Reported by:	Michael Dexter
  Reviewed by:	imp
  Differential Revision:	https://reviews.freebsd.org/D24637

Deleted:
  head/tools/build/options/WITHOUT_SYMVER
Modified:
  head/lib/libc/db/mpool/Makefile.inc
  head/lib/libc/gen/Makefile.inc
  head/lib/libc/iconv/Makefile.inc
  head/lib/libc/posix1e/Makefile.inc
  head/lib/libc/secure/Makefile.inc
  head/lib/libgcc_s/Makefile
  head/lib/libprocstat/Makefile
  head/share/man/man5/src.conf.5
  head/share/mk/bsd.lib.mk
  head/share/mk/bsd.opts.mk
  head/share/mk/bsd.symver.mk

Modified: head/lib/libc/db/mpool/Makefile.inc
==============================================================================
--- head/lib/libc/db/mpool/Makefile.inc	Thu Apr 30 21:16:08 2020	(r360510)
+++ head/lib/libc/db/mpool/Makefile.inc	Thu Apr 30 22:08:40 2020	(r360511)
@@ -3,7 +3,5 @@
 
 .PATH: ${LIBC_SRCTOP}/db/mpool
 
-SRCS+=	mpool.c
-.if ${MK_SYMVER} == yes
-SRCS+=	mpool-compat.c
-.endif
+SRCS+=	mpool.c \
+	mpool-compat.c

Modified: head/lib/libc/gen/Makefile.inc
==============================================================================
--- head/lib/libc/gen/Makefile.inc	Thu Apr 30 21:16:08 2020	(r360510)
+++ head/lib/libc/gen/Makefile.inc	Thu Apr 30 22:08:40 2020	(r360511)
@@ -34,6 +34,7 @@ SRCS+=	__getosreldate.c \
 	ctermid.c \
 	daemon.c \
 	devname.c \
+	devname-compat11.c \
 	dirfd.c \
 	dirname.c \
 	dirname_compat.c \
@@ -58,7 +59,10 @@ SRCS+=	__getosreldate.c \
 	fstab.c \
 	ftok.c \
 	fts.c \
+	fts-compat.c \
+	fts-compat11.c \
 	ftw.c \
+	ftw-compat11.c \
 	getbootfile.c \
 	getbsize.c \
 	getcap.c \
@@ -71,6 +75,7 @@ SRCS+=	__getosreldate.c \
 	getloadavg.c \
 	getlogin.c \
 	getmntinfo.c \
+	getmntinfo-compat11.c \
 	getnetgrent.c \
 	getosreldate.c \
 	getpagesize.c \
@@ -83,6 +88,7 @@ SRCS+=	__getosreldate.c \
 	getutxent.c \
 	getvfsbyname.c \
 	glob.c \
+	glob-compat11.c \
 	initgroups.c \
 	isatty.c \
 	isinf.c \
@@ -94,6 +100,7 @@ SRCS+=	__getosreldate.c \
 	lrand48.c \
 	mrand48.c \
 	nftw.c \
+	nftw-compat11.c \
 	nice.c \
 	nlist.c \
 	nrand48.c \
@@ -107,10 +114,12 @@ SRCS+=	__getosreldate.c \
 	pw_scan.c \
 	raise.c \
 	readdir.c \
+	readdir-compat11.c \
 	readpassphrase.c \
 	recvmmsg.c \
 	rewinddir.c \
 	scandir.c \
+	scandir-compat11.c \
 	seed48.c \
 	seekdir.c \
 	semctl.c \
@@ -147,6 +156,7 @@ SRCS+=	__getosreldate.c \
 	ualarm.c \
 	ulimit.c \
 	uname.c \
+	unvis-compat.c \
 	usleep.c \
 	utime.c \
 	utxdb.c \
@@ -156,18 +166,6 @@ SRCS+=	__getosreldate.c \
 	waitpid.c \
 	waitid.c \
 	wordexp.c
-.if ${MK_SYMVER} == yes
-SRCS+=	devname-compat11.c \
-	fts-compat.c \
-	fts-compat11.c \
-	ftw-compat11.c \
-	getmntinfo-compat11.c \
-	glob-compat11.c \
-	nftw-compat11.c \
-	readdir-compat11.c \
-	scandir-compat11.c \
-	unvis-compat.c
-.endif
 
 CFLAGS.arc4random.c= -I${SRCTOP}/sys -I${SRCTOP}/sys/crypto/chacha20
 

Modified: head/lib/libc/iconv/Makefile.inc
==============================================================================
--- head/lib/libc/iconv/Makefile.inc	Thu Apr 30 21:16:08 2020	(r360510)
+++ head/lib/libc/iconv/Makefile.inc	Thu Apr 30 22:08:40 2020	(r360511)
@@ -14,10 +14,7 @@ SRCS+=	citrus_bcs.c citrus_bcs_strtol.c citrus_bcs_str
 	citrus_esdb.c citrus_hash.c citrus_iconv.c citrus_lookup.c \
 	citrus_lookup_factory.c citrus_mapper.c citrus_memstream.c \
 	citrus_mmap.c citrus_module.c citrus_none.c citrus_pivot_factory.c \
-	citrus_prop.c citrus_stdenc.c bsd_iconv.c
-.if ${MK_SYMVER} == yes
-SRCS+=	iconv_compat.c
-.endif
+	citrus_prop.c citrus_stdenc.c bsd_iconv.c iconv_compat.c
 
 SYM_MAPS+= ${LIBC_SRCTOP}/iconv/Symbol.map
 

Modified: head/lib/libc/posix1e/Makefile.inc
==============================================================================
--- head/lib/libc/posix1e/Makefile.inc	Thu Apr 30 21:16:08 2020	(r360510)
+++ head/lib/libc/posix1e/Makefile.inc	Thu Apr 30 22:08:40 2020	(r360511)
@@ -11,6 +11,7 @@ subr_acl_nfs4.c: ${SRCTOP}/sys/kern/subr_acl_nfs4.c
 CONFS+=	posix1e/mac.conf
 SRCS+=	acl_branding.c			\
 	acl_calc_mask.c			\
+	acl_compat.c			\
 	acl_copy.c			\
 	acl_delete.c			\
 	acl_delete_entry.c		\
@@ -36,9 +37,6 @@ SRCS+=	acl_branding.c			\
 	mac_get.c			\
 	mac_set.c			\
 	subr_acl_nfs4.c
-.if ${MK_SYMVER} == yes
-SRCS+=	acl_compat.c
-.endif
 
 SYM_MAPS+=${LIBC_SRCTOP}/posix1e/Symbol.map
 

Modified: head/lib/libc/secure/Makefile.inc
==============================================================================
--- head/lib/libc/secure/Makefile.inc	Thu Apr 30 21:16:08 2020	(r360510)
+++ head/lib/libc/secure/Makefile.inc	Thu Apr 30 22:08:40 2020	(r360511)
@@ -5,9 +5,7 @@
 .PATH: ${LIBC_SRCTOP}/secure
 
 # Sources common to both syscall interfaces:
-SRCS+=	stack_protector.c
-.if ${MK_SYMVER} == yes
-SRCS+=	stack_protector_compat.c
-.endif
+SRCS+=	stack_protector.c \
+	stack_protector_compat.c
 
 SYM_MAPS+=    ${LIBC_SRCTOP}/secure/Symbol.map

Modified: head/lib/libgcc_s/Makefile
==============================================================================
--- head/lib/libgcc_s/Makefile	Thu Apr 30 21:16:08 2020	(r360510)
+++ head/lib/libgcc_s/Makefile	Thu Apr 30 22:08:40 2020	(r360511)
@@ -12,7 +12,6 @@ WARNS?=	2
 LDFLAGS+=	-nodefaultlibs
 LIBADD+=	c
 
-.if ${MK_SYMVER} == "yes"
 VERSION_DEF=	${.CURDIR}/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 # Export ARM AEABI unwind routines needed by libc and libthr.
@@ -20,7 +19,6 @@ SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 SYMBOL_MAPS+=	${.CURDIR}/${MACHINE_CPUARCH}/Symbol.map
 .else
 SYMBOL_MAPS+=	${.CURDIR}/SymbolDefault.map
-.endif
 .endif
 
 .include "../libcompiler_rt/Makefile.inc"

Modified: head/lib/libprocstat/Makefile
==============================================================================
--- head/lib/libprocstat/Makefile	Thu Apr 30 21:16:08 2020	(r360510)
+++ head/lib/libprocstat/Makefile	Thu Apr 30 22:08:40 2020	(r360511)
@@ -8,13 +8,10 @@ SRCS=	cd9660.c	\
 	common_kvm.c	\
 	core.c		\
 	libprocstat.c	\
+	libprocstat_compat.c \
 	msdosfs.c	\
 	smbfs.c		\
 	udf.c
-
-.if ${MK_SYMVER} == yes
-SRCS+=	libprocstat_compat.c
-.endif
 
 VERSION_DEF=	${LIBCSRCDIR}/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Thu Apr 30 21:16:08 2020	(r360510)
+++ head/share/man/man5/src.conf.5	Thu Apr 30 22:08:40 2020	(r360511)
@@ -1541,8 +1541,6 @@ as
 Set to not build
 .Xr svnlite 1
 and related programs.
-.It Va WITHOUT_SYMVER
-Set to disable symbol versioning when building shared libraries.
 .It Va WITHOUT_SYSCONS
 Set to not build
 .Xr syscons 4

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk	Thu Apr 30 21:16:08 2020	(r360510)
+++ head/share/mk/bsd.lib.mk	Thu Apr 30 22:08:40 2020	(r360511)
@@ -227,7 +227,7 @@ SHLIB_NAME_FULL=${SHLIB_NAME}
 
 # Allow libraries to specify their own version map or have it
 # automatically generated (see bsd.symver.mk above).
-.if ${MK_SYMVER} == "yes" && !empty(VERSION_MAP)
+.if !empty(VERSION_MAP)
 ${SHLIB_NAME_FULL}:	${VERSION_MAP}
 LDFLAGS+=	-Wl,--version-script=${VERSION_MAP}
 .endif

Modified: head/share/mk/bsd.opts.mk
==============================================================================
--- head/share/mk/bsd.opts.mk	Thu Apr 30 21:16:08 2020	(r360510)
+++ head/share/mk/bsd.opts.mk	Thu Apr 30 22:08:40 2020	(r360511)
@@ -63,7 +63,6 @@ __DEFAULT_YES_OPTIONS = \
     OPENSSH \
     PROFILE \
     SSP \
-    SYMVER \
     TESTS \
     TOOLCHAIN \
     WARNS

Modified: head/share/mk/bsd.symver.mk
==============================================================================
--- head/share/mk/bsd.symver.mk	Thu Apr 30 21:16:08 2020	(r360510)
+++ head/share/mk/bsd.symver.mk	Thu Apr 30 22:08:40 2020	(r360511)
@@ -7,7 +7,7 @@ __<bsd.symver.mk>__:
 
 # Generate the version map given the version definitions
 # and symbol maps.
-.if ${MK_SYMVER} == "yes" && !empty(VERSION_DEF) && !empty(SYMBOL_MAPS)
+.if !empty(VERSION_DEF) && !empty(SYMBOL_MAPS)
 # Find the awk script that generates the version map.
 VERSION_GEN?=	version_gen.awk
 VERSION_MAP?=	Version.map



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