git: 2abf37d5cecb - stable/12 - Retire CLANG_NO_IAS34
Dimitry Andric
dim at FreeBSD.org
Thu Sep 2 23:58:40 UTC 2021
The branch stable/12 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=2abf37d5cecb16d8abffd5a6dedafba17496196e
commit 2abf37d5cecb16d8abffd5a6dedafba17496196e
Author: Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2018-11-01 23:11:47 +0000
Commit: Dimitry Andric <dim at FreeBSD.org>
CommitDate: 2021-09-02 23:29:57 +0000
Retire CLANG_NO_IAS34
CLANG_NO_IAS34 was introduced in r276696 to allow then-HEAD kernels to
be built with clang 3.4 in FreeBSD 10. As FreeBSD 11 and later includes
a version of Clang with a sufficiently capable integrated assembler we
do not need the workaround any longer.
Sponsored by: The FreeBSD Foundation
(cherry picked from commit ea96b3de2b3e4492e6bba3ab35961e3531a006bd)
---
sys/conf/Makefile.amd64 | 3 ---
sys/conf/Makefile.i386 | 3 ---
sys/conf/kern.mk | 4 ----
sys/modules/bios/smapi/Makefile | 2 --
4 files changed, 12 deletions(-)
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 696ef55a3fb0..d34359f1d30b 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -37,9 +37,6 @@ INCLUDES+= -I$S/contrib/libfdt
CFLAGS+= -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
.endif
-ASM_CFLAGS.acpi_wakecode.S= ${CLANG_NO_IAS34}
-ASM_CFLAGS.mpboot.S= ${CLANG_NO_IAS34}
-
%BEFORE_DEPEND
%OBJS
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 6b1eca42f1bb..621ebff79e19 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -32,9 +32,6 @@ S= ../../..
INCLUDES+= -I$S/contrib/libfdt
-ASM_CFLAGS.acpi_wakecode.S= ${CLANG_NO_IAS34}
-ASM_CFLAGS.mpboot.s= ${CLANG_NO_IAS34}
-
%BEFORE_DEPEND
%OBJS
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index fc42d0e0321a..04af60c98cb4 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -42,10 +42,6 @@ NO_WMISLEADING_INDENTATION= -Wno-misleading-indentation
.endif
CLANG_NO_IAS= -no-integrated-as
-.if ${COMPILER_VERSION} < 30500
-# XXX: clang < 3.5 integrated-as doesn't grok .codeNN directives
-CLANG_NO_IAS34= -no-integrated-as
-.endif
.endif
.if ${COMPILER_TYPE} == "gcc"
diff --git a/sys/modules/bios/smapi/Makefile b/sys/modules/bios/smapi/Makefile
index c488491bd525..90506d962dc6 100644
--- a/sys/modules/bios/smapi/Makefile
+++ b/sys/modules/bios/smapi/Makefile
@@ -8,5 +8,3 @@ SRCS= smapi.c smapi_bios.S \
bus_if.h device_if.h
.include <bsd.kmod.mk>
-
-CFLAGS.smapi_bios.S= ${CLANG_NO_IAS34}
More information about the dev-commits-src-branches
mailing list