Changes in boot/Makefile.build [4872160:9ded977] in mainline

File:

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

boot/Makefile.build

@@ -41 +41 @@
         -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
-        -Werror -pipe
+        -pipe
 
 ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
-        -Werror-implicit-function-declaration -Werror -wd170
+        -Werror-implicit-function-declaration -wd170
 
 SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
@@ -57 +57 @@
         -Werror-implicit-function-declaration -Wwrite-strings \
         -pipe -arch $(CLANG_ARCH)
+
+ifeq ($(CONFIG_DEBUG),y)
+        GCC_CFLAGS += -Werror
+        ICC_CFLAGS += -Werror
+endif
+
+ifeq ($(CONFIG_LINE_DEBUG),y)
+        GCC_CFLAGS += -g
+        ICC_CFLAGS += -g
+        SUNCC_CFLAGS += -g
+        CLANG_CFLAGS += -g
+endif
 
 ifeq ($(COMPILER),gcc_native)
@@ -101 +113 @@
         $(LD) -N $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(COMPONENT_OBJECTS) $(OBJECTS)
 
+$(LINK): $(LINK).comp $(DEPEND)
+        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $(LINK).comp | grep -v "^\#" > $(LINK)
+
 %.o: %.S $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@