aboutsummaryrefslogtreecommitdiff
path: root/lib/libgcc_eh
diff options
context:
space:
mode:
authorAlex Richardson <arichardson@FreeBSD.org>2020-08-24 09:20:33 +0000
committerAlex Richardson <arichardson@FreeBSD.org>2020-08-24 09:20:33 +0000
commit0b862b03998a292a18bcc7f9ac5b05c0303c5de3 (patch)
tree0bc86d76d7ab1ac4e0cdaf3ac2c2d8444285d164 /lib/libgcc_eh
parent06e20d1babecec1f45ffda513f55a8db5f1c0f56 (diff)
downloadsrc-0b862b03998a292a18bcc7f9ac5b05c0303c5de3.tar.gz
src-0b862b03998a292a18bcc7f9ac5b05c0303c5de3.zip
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
Notes
Notes: svn path=/head/; revision=364649
Diffstat (limited to 'lib/libgcc_eh')
-rw-r--r--lib/libgcc_eh/Makefile1
-rw-r--r--lib/libgcc_eh/Makefile.inc1
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/libgcc_eh/Makefile b/lib/libgcc_eh/Makefile
index bf018e16c9e0..ecffbf9cfd6a 100644
--- a/lib/libgcc_eh/Makefile
+++ b/lib/libgcc_eh/Makefile
@@ -8,6 +8,7 @@ NO_PIC=
MK_SSP= no
WARNS?= 2
+SRCS_EXC+= int_util.c
.include "Makefile.inc"
.if ${.MAKE.LEVEL} > 0
diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc
index 9925d156fb04..6e025921180a 100644
--- a/lib/libgcc_eh/Makefile.inc
+++ b/lib/libgcc_eh/Makefile.inc
@@ -9,7 +9,6 @@ STATIC_CFLAGS+=${PICFLAG} -fvisibility=hidden -DVISIBILITY_HIDDEN
.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