From fdb03f97368f55bf3948f5a16f948e079eacca3a Mon Sep 17 00:00:00 2001 From: Stan Shebs Date: Fri, 27 Aug 2021 15:28:23 -0700 Subject: [PATCH] Use clang integrated assembler except when asm is output and not required to be valid --- Makeconfig | 5 ----- Makerules | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makeconfig b/Makeconfig index 24b8d449595..695c3f81f1b 100644 --- a/Makeconfig +++ b/Makeconfig @@ -907,7 +907,6 @@ ifeq ($(with-clang),yes) # Non-string format arguments come from debugging prints in ld.so. +cflags += -Wno-format-security -+cflags += -no-integrated-as endif # with-clang == yes +cflags += $(cflags-cpu) $(+gccwarn) $(+merge-constants) $(+math-flags) \ @@ -1060,10 +1059,6 @@ ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS)) endif ASFLAGS += -Werror=undef $(ASFLAGS-config) $(asflags-cpu) -ifeq ($(with-clang),yes) -ASFLAGS += -no-integrated-as -endif # with-clang == yes - ifndef BUILD_CC BUILD_CC = $(CC) endif diff --git a/Makerules b/Makerules index 35147191e7f..76894886595 100644 --- a/Makerules +++ b/Makerules @@ -260,7 +260,7 @@ $(py-const): $(py-const-dir)%.py: %.pysym $(py-const-script) \ $(common-before-compile) $(make-target-directory) $(AWK) -f $(py-const-script) $< \ - | $(CC) -S -o $@.tmp $(CFLAGS) $(CPPFLAGS) -x c - + | $(CC) -S $(MOARFLAGS) -o $@.tmp $(CFLAGS) $(CPPFLAGS) -x c - echo '# GENERATED FILE\n' > $@.tmp2 echo '# Constant definitions for pretty printers.' >> $@.tmp2 echo '# See gen-py-const.awk for details.\n' >> $@.tmp2 @@ -276,10 +276,11 @@ ifdef gen-as-const-headers # Generating headers for assembly constants. # We need this defined early to get into before-compile before # it's used in sysd-rules, below. +# clang's integrated assembler doesn't like the freaky tokens. $(common-objpfx)%.h $(common-objpfx)%.h.d: $(..)scripts/gen-as-const.awk \ %.sym $(common-before-compile) $(AWK) -f $< $(filter %.sym,$^) \ - | $(CC) -S -o $(@:.h.d=.h)T3 $(CFLAGS) $(CPPFLAGS) -x c - \ + | $(CC) -S $(MOARFLAGS) -o $(@:.h.d=.h)T3 $(CFLAGS) $(CPPFLAGS) -x c - \ -MD -MP -MF $(@:.h=.h.d)T -MT '$(@:.h=.h.d) $(@:.h.d=.h)' sed -n 's/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$$/#define \1 \2/p' \ $(@:.h.d=.h)T3 > $(@:.h.d=.h)T -- 2.47.2