git: 4409857538fc - stable/12 - Remove -simplifycfg-dup-ret from CLANG_OPT_SMALL flags for clang 13
Dimitry Andric
dim at FreeBSD.org
Thu Sep 2 23:58:59 UTC 2021
The branch stable/12 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=4409857538fc66cb6ab9217add5ff6138ea28459
commit 4409857538fc66cb6ab9217add5ff6138ea28459
Author: Dimitry Andric <dim at FreeBSD.org>
AuthorDate: 2021-08-29 13:39:16 +0000
Commit: Dimitry Andric <dim at FreeBSD.org>
CommitDate: 2021-09-02 23:30:26 +0000
Remove -simplifycfg-dup-ret from CLANG_OPT_SMALL flags for clang 13
After llvm/clang 13.0.0, the -simplifycfg-dup-ret backend flag is no
longer supported. This was part of CLANG_OPT_SMALL, which is only still
used for stand/i386/boot2 and stand/i386/isoboot, to achieve the very
small binary size required. Luckily clang 13.0.0 does not need any
additional flags for this (I get 240 bytes available when building
boot2).
(cherry picked from commit 22b8ab15c41a9efac201691b40e961b83698aa9c)
---
share/mk/bsd.sys.mk | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index b4221953cc0c..5ab65b48f3c5 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -210,8 +210,10 @@ CWARNFLAGS+= -Wno-unknown-pragmas
# This warning is utter nonsense
CFLAGS+= -Wno-format-zero-length
-CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
- -mllvm -simplifycfg-dup-ret
+CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3
+.if ${COMPILER_VERSION} < 130000
+CLANG_OPT_SMALL+= -mllvm -simplifycfg-dup-ret
+.endif
CLANG_OPT_SMALL+= -mllvm -enable-load-pre=false
CFLAGS.clang+= -Qunused-arguments
.if ${MACHINE_CPUARCH} == "sparc64"
More information about the dev-commits-src-all
mailing list