diff options
| author | Stan Shebs <stanshebs@google.com> | 2018-02-07 13:00:02 -0800 |
|---|---|---|
| committer | Stan Shebs <stanshebs@google.com> | 2019-04-30 14:34:20 -0700 |
| commit | 98fa878ff0bc9941d0d68257f0cd4990439dac18 (patch) | |
| tree | 1eea9e7f3f75b29c17963aa965bb18f11742c045 | |
| parent | 47421c20fa908f3efe3b200d718f50fe827745f7 (diff) | |
| download | glibc-98fa878ff0bc9941d0d68257f0cd4990439dac18.tar.gz glibc-98fa878ff0bc9941d0d68257f0cd4990439dac18.tar.xz glibc-98fa878ff0bc9941d0d68257f0cd4990439dac18.zip | |
Use clang integrated assembler except when asm is output and not required to be valid
| -rw-r--r-- | Makeconfig | 7 | ||||
| -rw-r--r-- | Makerules | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/Makeconfig b/Makeconfig index ba00331fb8..daed1892cb 100644 --- a/Makeconfig +++ b/Makeconfig @@ -917,9 +917,6 @@ ifeq ($(with-clang),yes) # Non-string format arguments come from debugging prints in ld.so. +cflags += -Wno-format-security -# Is this still needed? -+cflags += -no-integrated-as - ifeq ($(with-lld),yes) LDFLAGS.so += -fuse-ld=lld LDFLAGS-rtld += -fuse-ld=lld @@ -1076,10 +1073,6 @@ ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS)) endif override 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 e88655c378..ef529288cd 100644 --- a/Makerules +++ b/Makerules @@ -225,6 +225,11 @@ sed-remove-dotdot := -e 's@ *\([^ \/$$][^ \]*\)@ $$(..)\1@g' \ -e 's@^\([^ \/$$][^ \]*\)@$$(..)\1@g' endif +MOARFLAGS = +ifeq ($(with-clang),yes) +MOARFLAGS = -no-integrated-as +endif + ifdef gen-py-const-headers # We'll use a static pattern rule to match .pysym files with their # corresponding generated .py files. @@ -249,7 +254,7 @@ $(py-const): $(py-const-dir)%.py: %.pysym $(py-const-script) \ $(common-before-compile) $(make-target-directory) $(PYTHON) $(py-const-script) --python \ - --cc="$(CC) $(CFLAGS) $(CPPFLAGS)" $< \ + --cc="$(CC) $(MOARFLAGS) $(CFLAGS) $(CPPFLAGS)" $< \ > $@.tmp mv -f $@.tmp $@ @@ -268,7 +273,7 @@ ifdef gen-as-const-headers # may lead to build hang on a many-core machine. $(common-objpfx)%.h $(common-objpfx)%.h.d: $(..)scripts/gen-as-const.py \ %.sym $(common-before-compile) - $(PYTHON) $< --cc="$(CC) $(CFLAGS) $(CPPFLAGS) -DGEN_AS_CONST_HEADERS \ + $(PYTHON) $< --cc="$(CC) $(MOARFLAGS) $(CFLAGS) $(CPPFLAGS) -DGEN_AS_CONST_HEADERS \ -MD -MP -MF $(@:.h=.h.d)T \ -MT '$(@:.h=.h.d) $(@:.h.d=.h)'" \ $(filter %.sym,$^) > $(@:.h.d=.h)T |