Skip to content

Commit aba3f18

Browse files
Merge commit '3aff0c459e77' into for-next
These fixes are a dependency for the Zvkb patches, so I'm merging them into for-next as well as fixes. * commit '3aff0c459e77': RISC-V: Drop invalid test from CONFIG_AS_HAS_OPTION_ARCH kbuild: Add -Wa,--fatal-warnings to as-instr invocation
2 parents 45e0b0f + 3aff0c4 commit aba3f18

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

arch/riscv/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,6 @@ config AS_HAS_OPTION_ARCH
325325
# https://reviews.llvm.org/D123515
326326
def_bool y
327327
depends on $(as-instr, .option arch$(comma) +m)
328-
depends on !$(as-instr, .option arch$(comma) -i)
329328

330329
source "arch/riscv/Kconfig.socs"
331330
source "arch/riscv/Kconfig.errata"

scripts/Kconfig.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ld-option = $(success,$(LD) -v $(1))
3333

3434
# $(as-instr,<instr>)
3535
# Return y if the assembler supports <instr>, n otherwise
36-
as-instr = $(success,printf "%b\n" "$(1)" | $(CC) $(CLANG_FLAGS) -c -x assembler-with-cpp -o /dev/null -)
36+
as-instr = $(success,printf "%b\n" "$(1)" | $(CC) $(CLANG_FLAGS) -Wa$(comma)--fatal-warnings -c -x assembler-with-cpp -o /dev/null -)
3737

3838
# check if $(CC) and $(LD) exist
3939
$(error-if,$(failure,command -v $(CC)),C compiler '$(CC)' not found)

scripts/Makefile.compiler

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ as-option = $(call try-run,\
3838
# Usage: aflags-y += $(call as-instr,instr,option1,option2)
3939

4040
as-instr = $(call try-run,\
41-
printf "%b\n" "$(1)" | $(CC) -Werror $(CLANG_FLAGS) $(KBUILD_AFLAGS) -c -x assembler-with-cpp -o "$$TMP" -,$(2),$(3))
41+
printf "%b\n" "$(1)" | $(CC) -Werror $(CLANG_FLAGS) $(KBUILD_AFLAGS) -Wa$(comma)--fatal-warnings -c -x assembler-with-cpp -o "$$TMP" -,$(2),$(3))
4242

4343
# __cc-option
4444
# Usage: MY_CFLAGS += $(call __cc-option,$(CC),$(MY_CFLAGS),-march=winchip-c6,-march=i586)

0 commit comments

Comments
 (0)