d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r353140: Re-add ALLOW_MIPS_SHARED_TEXTREL, sprinkle it around

Browse Source 
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.
This commit is contained in:
Kyle Evans 2020-01-14 17:50:13 +00:00
parent 8683408cec
commit 4b50c45172
6 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/csu/tests/dso/Makefile
View File

@ -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=

2
lib/libc++/Makefile
View File

@ -11,8 +11,6 @@ CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR}
STATIC_CXXFLAGS+= -mlong-calls
.endif
ALLOW_MIPS_SHARED_TEXTREL=
.PATH: ${SRCDIR}
LIB= c++

1
lib/libcxxrt/Makefile
View File

@ -5,7 +5,6 @@ SRCDIR= ${SRCTOP}/contrib/libcxxrt
SHLIB_MAJOR= 1
SHLIBDIR?= /lib
ALLOW_MIPS_SHARED_TEXTREL=
.PATH: ${SRCDIR}

2
lib/libgcc_eh/Makefile.inc
View File

@ -6,8 +6,6 @@ UNWINDSRCDIR= ${SRCTOP}/contrib/llvm-project/libunwind/src
STATIC_CFLAGS+=${PICFLAG} -fvisibility=hidden -DVISIBILITY_HIDDEN
ALLOW_MIPS_SHARED_TEXTREL=
.PATH: ${COMPILERRTDIR}/lib/builtins
.PATH: ${UNWINDSRCDIR}
SRCS_EXC+= gcc_personality_v0.c

2
lib/libpmc/Makefile
View File

@ -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"

13
share/mk/bsd.lib.mk
View File

@ -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
@ -303,15 +299,6 @@ 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}
${SHLIB_NAME_FULL}: beforelinking