Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Jan 2022 15:00:49 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 98e58025a5af - main - bsd.lib/prog.mk: Remove special case for mips
Message-ID:  <202201031500.203F0nKj056674@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=98e58025a5af1b7f4c1051079d5c8417bf8f6133

commit 98e58025a5af1b7f4c1051079d5c8417bf8f6133
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-01-02 01:00:22 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-01-03 15:00:08 +0000

    bsd.lib/prog.mk: Remove special case for mips
    
    We no longer need to set the TLS model for mips64*.
    
    Sponsored by:           Netflix
---
 share/mk/bsd.lib.mk  | 6 ------
 share/mk/bsd.prog.mk | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 28c159689e71..5c7b73c5a8a9 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -123,12 +123,6 @@ CXXFLAGS+= ${DEBUG_FILES_CFLAGS}
 CTFFLAGS+= -g
 .endif
 
-# clang currently defaults to dynamic TLS for mips64 object files without -fPIC
-.if ${MACHINE_ARCH:Mmips64*} && ${COMPILER_TYPE} == "clang"
-STATIC_CFLAGS+= -ftls-model=initial-exec
-STATIC_CXXFLAGS+= -ftls-model=initial-exec
-.endif
-
 .if ${MACHINE_CPUARCH} == "riscv" && ${LINKER_FEATURES:Mriscv-relaxations} == ""
 CFLAGS += -mno-relax
 .endif
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 437ccf373130..6b8da09edaf0 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -117,11 +117,6 @@ TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
 LDFLAGS+= -static
 .endif
 
-# clang currently defaults to dynamic TLS for mips64 binaries
-.if ${MACHINE_ARCH:Mmips64*} && ${COMPILER_TYPE} == "clang"
-CFLAGS+= -ftls-model=initial-exec
-.endif
-
 .if ${MK_DEBUG_FILES} != "no"
 PROG_FULL=${PROG}.full
 # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory



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