svn commit: r364649 - in head: lib/libcompiler_rt lib/libgcc_eh lib/libprocstat stand/userboot/userboot

[Alex Richardson]

Author: arichardson
Date: Mon Aug 24 09:20:33 2020
New Revision: 364649
URL: https://svnweb.freebsd.org/changeset/base/364649

Log:
  Avoid adding duplicates to SRCS/OBJS/SOBJS/POBJS
  
  This is a change in preparation for stopping to use lorder.sh (D26044) and
  instead assume that we have a linker newer than ~1990. Without lorder.sh
  duplicates end up being passed to the linker when building .so files and this
  can result in duplicate symbol definition errors.
  
  There is one minor change: libcompiler_rt.a will no longer provide
  gcc_personality_v0 and instead we now only have it in libgcc_eh.a/libgcc_s.so.
  This matches GCC's behaviour.
  
  Reviewed By:	emaste, cem
  Differential Revision: https://reviews.freebsd.org/D26042

Modified:
  head/lib/libcompiler_rt/Makefile.inc
  head/lib/libgcc_eh/Makefile
  head/lib/libgcc_eh/Makefile.inc
  head/lib/libprocstat/Makefile
  head/stand/userboot/userboot/Makefile

Modified: head/lib/libcompiler_rt/Makefile.inc
==============================================================================
--- head/lib/libcompiler_rt/Makefile.inc	Mon Aug 24 09:20:27 2020	(r364648)
+++ head/lib/libcompiler_rt/Makefile.inc	Mon Aug 24 09:20:33 2020	(r364649)
@@ -67,7 +67,6 @@ SRCF+=		floatunsisf
 SRCF+=		floatuntidf
 SRCF+=		floatuntisf
 SRCF+=		floatuntixf
-SRCF+=		gcc_personality_v0	# not in upstream
 SRCF+=		int_util
 SRCF+=		lshrdi3
 SRCF+=		lshrti3

Modified: head/lib/libgcc_eh/Makefile
==============================================================================
--- head/lib/libgcc_eh/Makefile	Mon Aug 24 09:20:27 2020	(r364648)
+++ head/lib/libgcc_eh/Makefile	Mon Aug 24 09:20:33 2020	(r364649)
@@ -8,6 +8,7 @@ NO_PIC=
 MK_SSP=		no
 WARNS?=	2
 
+SRCS_EXC+=	int_util.c
 .include "Makefile.inc"
 
 .if ${.MAKE.LEVEL} > 0

Modified: head/lib/libgcc_eh/Makefile.inc
==============================================================================
--- head/lib/libgcc_eh/Makefile.inc	Mon Aug 24 09:20:27 2020	(r364648)
+++ head/lib/libgcc_eh/Makefile.inc	Mon Aug 24 09:20:33 2020	(r364649)
@@ -9,7 +9,6 @@ STATIC_CFLAGS+=${PICFLAG} -fvisibility=hidden -DVISIBI
 .PATH: ${COMPILERRTDIR}/lib/builtins
 .PATH: ${UNWINDSRCDIR}
 SRCS_EXC+=	gcc_personality_v0.c
-SRCS_EXC+=	int_util.c
 SRCS_EXC+=	Unwind-EHABI.cpp
 SRCS_EXC+=	Unwind-sjlj.c
 SRCS_EXC+=	UnwindLevel1-gcc-ext.c

Modified: head/lib/libprocstat/Makefile
==============================================================================
--- head/lib/libprocstat/Makefile	Mon Aug 24 09:20:27 2020	(r364648)
+++ head/lib/libprocstat/Makefile	Mon Aug 24 09:20:33 2020	(r364649)
@@ -59,8 +59,6 @@ MLINKS+=libprocstat.3 procstat_close.3 \
 CFLAGS+=	-DLIBPROCSTAT_ZFS
 SRCS+=	zfs.c
 OBJS+=	zfs/zfs_defs.o
-SOBJS+=	zfs/zfs_defs.pico
-POBJS+=	zfs/zfs_defs.po
 SUBDIR=	zfs
 zfs/zfs_defs.o: .PHONY
 	@cd ${.CURDIR}/zfs && ${MAKE} zfs_defs.o

Modified: head/stand/userboot/userboot/Makefile
==============================================================================
--- head/stand/userboot/userboot/Makefile	Mon Aug 24 09:20:27 2020	(r364648)
+++ head/stand/userboot/userboot/Makefile	Mon Aug 24 09:20:33 2020	(r364649)
@@ -20,7 +20,6 @@ SRCS+=		bootinfo.c
 SRCS+=		bootinfo32.c
 SRCS+=		bootinfo64.c
 SRCS+=		conf.c
-SRCS+=		console.c
 SRCS+=		copy.c
 SRCS+=		devicename.c
 SRCS+=		elf32_freebsd.c