D31454.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D31454.diff
View Options

	diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
	--- a/share/mk/bsd.compiler.mk
	+++ b/share/mk/bsd.compiler.mk
	@@ -235,7 +235,14 @@
	${X_}COMPILER_FEATURES+= c++17
	.endif
	.if ${${X_}COMPILER_TYPE} == "clang"
	-${X_}COMPILER_FEATURES+= compressed-debug retpoline init-all
	+${X_}COMPILER_FEATURES+= retpoline init-all
	+# PR257638 lld fails with BE compressed debug. Fixed in main but external tool
	+# chains will initially not have the fix. For now limit the feature to LE
	+# targets.
	+.include <bsd.endian.mk>
	+.if ${TARGET_ENDIANNESS} == "1234"
	+${X_}COMPILER_FEATURES+= compressed-debug
	+.endif
	.endif
	.if ${${X_}COMPILER_TYPE} == "clang" && ${${X_}COMPILER_VERSION} >= 100000 \|\| \
	(${${X_}COMPILER_TYPE} == "gcc" && ${${X_}COMPILER_VERSION} >= 80100)
	diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
	--- a/share/mk/bsd.sys.mk
	+++ b/share/mk/bsd.sys.mk
	@@ -247,7 +247,7 @@

	# Additional flags passed in CFLAGS and CXXFLAGS when MK_DEBUG_FILES is
	# enabled.
	-DEBUG_FILES_CFLAGS?= -g
	+DEBUG_FILES_CFLAGS?= -g -gz=zlib

	# Allow user-specified additional warning flags, plus compiler and file
	# specific flag overrides, unless we've overridden this...