Page MenuHomeFreeBSD
Files F171136141

D55676.id.diff
No OneTemporary
Actions

D55676.id.diff
View Options

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -190,12 +190,6 @@
.include <bsd.lib.mk>
-.if (${LIBC_ARCH} == amd64 || ${LIBC_ARCH} == i386) && \
- ${.TARGETS:Mall} == all && \
- defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == ""
-.error ${LIBC_ARCH} libc requires linker ifunc support
-.endif
-
.if !defined(_SKIP_BUILD)
# We need libutil.h, get it directly to avoid
# recording a build dependency
diff --git a/stand/i386/Makefile.inc b/stand/i386/Makefile.inc
--- a/stand/i386/Makefile.inc
+++ b/stand/i386/Makefile.inc
@@ -23,9 +23,7 @@
LDSCRIPT= ${BOOTSRC}/i386/boot.ldscript
LDFLAGS_ORG= -Wl,--defsym,ORG=${ORG},-T,${LDSCRIPT}
LDFLAGS_BIN= -e start ${LDFLAGS_ORG} -Wl,-N,-S,--oformat,binary
-.if ${LINKER_FEATURES:Mbuild-id} != ""
LDFLAGS_BIN+= -Wl,--build-id=none
-.endif
LD_FLAGS_BIN= -static -N --gc-sections
.if ${MACHINE_CPUARCH} == "amd64"
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -115,14 +115,8 @@
# the others.
CFLAGS+= ${CONF_CFLAGS}
-.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id}
LDFLAGS+= --build-id=sha1
-.endif
-.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == "" && \
- !make(install)
-.error kernel requires linker ifunc support
-.endif
.if ${MACHINE_CPUARCH} == "amd64"
LDFLAGS+= -z max-page-size=2097152
.if ${LINKER_TYPE} != "lld"
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -159,9 +159,7 @@
.endif
LDFLAGS+= -warn-common
-.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id}
LDFLAGS+= --build-id=sha1
-.endif
CFLAGS+= ${DEBUG_FLAGS}
.if ${MACHINE_CPUARCH} == aarch64 || ${MACHINE_CPUARCH} == amd64 || \

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 9, 10:37 PM (22 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38616555
Default Alt Text
D55676.id.diff (1 KB)

Event Timeline