Changeset 874ed210 in mainline for boot/Makefile.build

Timestamp:

2019-06-24T16:13:58Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

59d8235

Parents:

d86393c8

Message:

Fold assembler flags into cflags, for consistent behavior

This way —fatal-warning applies to custom assembly in C files as well,
e.g. inline asm, and to some of the attributes that change emitted
assembly.

File:

• boot/Makefile.build (modified) (4 diffs)

boot/Makefile.build

@@ -36 +36 @@
 DEFS = -DBOOT -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
 
-AFLAGS = --fatal-warnings
 LDFLAGS = -Wl,--fatal-warnings,--warn-common $(EXTRA_LDFLAGS)
 
@@ -42 +41 @@
         -ffreestanding -nostdlib \
         -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common \
-        -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
+        -fdebug-prefix-map=$(realpath $(ROOT_PATH))=. \
+        -Wa,--fatal-warnings
 
 GCC_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
@@ -80 +80 @@
 -include $(DEPENDS)
 
-AS_CFLAGS := $(addprefix -Xassembler ,$(AFLAGS))
-
 $(BOOT_OUTPUT): $(RAW)
         $(OBJCOPY) -O $(BFD_OUTPUT) $< $@
@@ -92 +90 @@
 
 %.o: %.s | depend
-        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS)
+        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS)
 
 %.o: %.S | depend
-        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS) $(AS_CFLAGS)
+        $(CC_JOB) -c -MD -MP $(DEFS) $(CFLAGS)
 
 %.o: %.c | depend