Author: kevans
Date: Tue Jan 14 17:50:13 2020
New Revision: 356735
URL: https://svnweb.freebsd.org/changeset/base/356735
Log:
Revert r353140: Re-add ALLOW_MIPS_SHARED_TEXTREL, sprinkle it around
arichardson has an actual fix for the same issue that this was working
around; given that we don't build with llvm today, go ahead and revert the
workaround in advance.
Modified:
head/lib/csu/tests/dso/Makefile
head/lib/libc++/Makefile
head/lib/libcxxrt/Makefile
head/lib/libgcc_eh/Makefile.inc
head/lib/libpmc/Makefile
head/share/mk/bsd.lib.mk
Modified: head/lib/csu/tests/dso/Makefile
==============================================================================
--- head/lib/csu/tests/dso/Makefile Tue Jan 14 17:38:34 2020
(r356734)
+++ head/lib/csu/tests/dso/Makefile Tue Jan 14 17:50:13 2020
(r356735)
@@ -5,8 +5,6 @@ SHLIB= h_csu
SHLIB_NAME= libh_csu.so
SHLIB_MAJOR= 1
-ALLOW_MIPS_SHARED_TEXTREL=
-
WITHOUT_STATIC=
WITHOUT_PROFILE=
WITHOUT_PIC=
Modified: head/lib/libc++/Makefile
==============================================================================
--- head/lib/libc++/Makefile Tue Jan 14 17:38:34 2020 (r356734)
+++ head/lib/libc++/Makefile Tue Jan 14 17:50:13 2020 (r356735)
@@ -11,8 +11,6 @@ CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR}
STATIC_CXXFLAGS+= -mlong-calls
.endif
-ALLOW_MIPS_SHARED_TEXTREL=
-
.PATH: ${SRCDIR}
LIB= c++
Modified: head/lib/libcxxrt/Makefile
==============================================================================
--- head/lib/libcxxrt/Makefile Tue Jan 14 17:38:34 2020 (r356734)
+++ head/lib/libcxxrt/Makefile Tue Jan 14 17:50:13 2020 (r356735)
@@ -5,7 +5,6 @@ SRCDIR= ${SRCTOP}/contrib/libcxxrt
SHLIB_MAJOR= 1
SHLIBDIR?= /lib
-ALLOW_MIPS_SHARED_TEXTREL=
.PATH: ${SRCDIR}
Modified: head/lib/libgcc_eh/Makefile.inc
==============================================================================
--- head/lib/libgcc_eh/Makefile.inc Tue Jan 14 17:38:34 2020
(r356734)
+++ head/lib/libgcc_eh/Makefile.inc Tue Jan 14 17:50:13 2020
(r356735)
@@ -6,8 +6,6 @@ UNWINDSRCDIR= ${SRCTOP}/contrib/llvm-project/libunwind
STATIC_CFLAGS+=${PICFLAG} -fvisibility=hidden -DVISIBILITY_HIDDEN
-ALLOW_MIPS_SHARED_TEXTREL=
-
.PATH: ${COMPILERRTDIR}/lib/builtins
.PATH: ${UNWINDSRCDIR}
SRCS_EXC+= gcc_personality_v0.c
Modified: head/lib/libpmc/Makefile
==============================================================================
--- head/lib/libpmc/Makefile Tue Jan 14 17:38:34 2020 (r356734)
+++ head/lib/libpmc/Makefile Tue Jan 14 17:50:13 2020 (r356735)
@@ -5,8 +5,6 @@ LIB= pmc
SRCS= libpmc.c pmclog.c libpmc_pmu_util.c libpmc_json.cc
INCS= pmc.h pmclog.h pmcformat.h
-ALLOW_MIPS_SHARED_TEXTREL=
-
.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
${MACHINE_ARCH} == "i386"
Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk Tue Jan 14 17:38:34 2020 (r356734)
+++ head/share/mk/bsd.lib.mk Tue Jan 14 17:50:13 2020 (r356735)
@@ -291,10 +291,6 @@ CLEANFILES+= ${SOBJS}
.if defined(SHLIB_NAME)
_LIBS+= ${SHLIB_NAME}
-.if ${CFLAGS:M-fexceptions} || defined(SHLIB_CXX) || defined(LIB_CXX)
-ALLOW_MIPS_SHARED_TEXTREL=
-.endif
-
SOLINKOPTS+= -shared -Wl,-x
.if defined(LD_FATAL_WARNINGS) && ${LD_FATAL_WARNINGS} == "no"
SOLINKOPTS+= -Wl,--no-fatal-warnings
@@ -302,15 +298,6 @@ SOLINKOPTS+= -Wl,--no-fatal-warnings
SOLINKOPTS+= -Wl,--fatal-warnings
.endif
SOLINKOPTS+= -Wl,--warn-shared-textrel
-
-.if defined(ALLOW_MIPS_SHARED_TEXTREL) && ${MACHINE_CPUARCH:Mmips}
-# Check if we should be defining ALLOW_SHARED_TEXTREL... basically, C++
-# or -fexceptions in CFLAGS on MIPS. This works around clang/lld attempting
-# to generate text relocations in read-only .eh_frame. A future version of
-# clang/lld should instead transform them into relative references at link
-# time, and then we can stop doing this.
-SOLINKOPTS+= -Wl,-z,notext
-.endif
.if target(beforelinking)
beforelinking: ${SOBJS}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
