Changes in uspace/Makefile.common [d75dc05:58563585] in mainline

File:

• uspace/Makefile.common (modified) (13 diffs)

uspace/Makefile.common

@@ -160 +160 @@
 LIBNETTL_PREFIX = $(LIB_PREFIX)/nettl
 
-AFLAGS =
+AFLAGS = --fatal-warnings
 LFLAGS = --fatal-warnings
-
-# FIXME: This condition is a workaround for issues #692 and #693.
-ifneq ($(KARCH),ia64)
-ifneq ($(KARCH),mips32)
-        AFLAGS += --fatal-warnings
-endif
-endif
 
 ifeq ($(STATIC_NEEDED),y)
@@ -210 +203 @@
 endif
 
+ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y)
+        OPTIMIZATION = s
+else
+        OPTIMIZATION = 3
+endif
+
 # PCUT-based unit tests
 ifneq ($(TEST_SOURCES),)
         TEST_OUTPUT = $(TEST_BINARY)
-        TEST_DISASM = $(TEST_BINARY).disasm
         TEST_CFLAGS = -I$(LIB_PREFIX)/pcut/include -D__helenos__
         TEST_OUTPUT_LIBS = $(LIB_PREFIX)/pcut/libpcut.a
-        EXTRA_CLEAN += $(TEST_OUTPUT) $(TEST_OUTPUT).map $(TEST_DISASM)
+        EXTRA_CLEAN += $(TEST_OUTPUT) $(TEST_OUTPUT).map
 ifneq ($(LIBRARY),)
         TEST_OUTPUT_LIBS += $(OUTPUT)
@@ -228 +226 @@
         -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV)
 
-all-test: $(TEST_OUTPUT) $(TEST_DISASM)
+all-test: $(TEST_OUTPUT)
 
 clean:
@@ -235 +233 @@
         find . -name '*.lo' -follow -exec rm \{\} \;
 
-COMMON_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
-        -ffreestanding -fno-builtin -nostdlib -nostdinc -fexec-charset=UTF-8 \
-        -finput-charset=UTF-8 -D__$(ENDIANESS)__
-
-GCC_CFLAGS = -ffunction-sections -Wall -Wextra -Wno-clobbered \
-        -Wno-unused-parameter -Wmissing-prototypes -std=gnu99 \
-        -Werror-implicit-function-declaration \
-        -Wwrite-strings -pipe
-
-# -Wno-missing-prototypes is there because it warns about main().
-# This should be fixed elsewhere.
-CLANG_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-typedef-redefinition \
-        -Wno-missing-prototypes -Wno-unused-command-line-argument \
+GCC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
+        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
+        -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
         -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe -fno-stack-protector -fno-PIC
+        -pipe -ggdb -D__$(ENDIANESS)__
+
+ICC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
+        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
+        -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
+        -Werror-implicit-function-declaration -Wwrite-strings \
+        -pipe -g -D__$(ENDIANESS)__
+
+# clang does not support following options but I am not sure whether
+# something won't break because of that:
+# -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) -finput-charset=UTF-8
+CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+        -ffreestanding -fno-builtin -nostdlib -nostdinc \
+        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
+        -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
+        -integrated-as -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__
+
+LIB_CFLAGS = $(CFLAGS) -fPIC
+LIB_LFLAGS = $(LFLAGS) -shared -soname $(LSONAME) --whole-archive
 
 ifeq ($(CONFIG_DEBUG),y)
-        COMMON_CFLAGS += -Werror
+        GCC_CFLAGS += -Werror
+        ICC_CFLAGS += -Werror
 endif
 
 ifeq ($(CONFIG_LINE_DEBUG),y)
         GCC_CFLAGS += -ggdb
+        ICC_CFLAGS += -g
         CLANG_CFLAGS += -g
 endif
@@ -262 +272 @@
 # Prepare for POSIX before including platform specific stuff
 ifeq ($(POSIX_COMPAT),y)
-        CFLAGS += -I$(LIBPOSIX_PREFIX)/include/posix -I$(LIBPOSIX_PREFIX)/include/
+        CFLAGS = -I$(LIBPOSIX_PREFIX)/include/posix -I$(LIBPOSIX_PREFIX)/include/
         BASE_LIBS = $(LIBPOSIX_PREFIX)/libposixaslibc.a $(LIBPOSIX_PREFIX)/libc4posix.a $(LIBSOFTINT_PREFIX)/libsoftint.a
 endif
@@ -277 +287 @@
 
 ifeq ($(COMPILER),gcc_cross)
-        CFLAGS += $(COMMON_CFLAGS) $(GCC_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),gcc_helenos)
-        CFLAGS += $(COMMON_CFLAGS) $(GCC_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),gcc_native)
-        CFLAGS += $(COMMON_CFLAGS) $(GCC_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
+ifeq ($(COMPILER),icc)
+        CFLAGS += $(ICC_CFLAGS)
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+endif
+
 ifeq ($(COMPILER),clang)
-        CFLAGS += $(COMMON_CFLAGS) $(CLANG_CFLAGS)
+        CFLAGS += $(CLANG_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
-
-LIB_CFLAGS = $(CFLAGS) -fPIC
-LIB_LFLAGS = $(LFLAGS) -shared -soname $(LSONAME) --whole-archive
 
 ifneq ($(MAKECMDGOALS),clean)
 -include $(DEPEND)
 endif
-
-AS_CFLAGS := $(addprefix -Xassembler ,$(AFLAGS))
-LD_CFLAGS := $(addprefix -Xlinker ,$(LFLAGS))
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
@@ -311 +320 @@
 
 ifneq ($(BINARY),)
-$(BINARY).disasm: $(BINARY)
+%.disasm: $(BINARY)
 ifeq ($(CONFIG_LINE_DEBUG),y)
         $(OBJDUMP) -d -S $< > $@
@@ -326 +335 @@
 
 ifneq ($(SLIBRARY),)
-$(LOUTPUT).disasm: $(LOUTPUT)
+%.disasm: $(LOUTPUT)
 ifeq ($(CONFIG_LINE_DEBUG),y)
         $(OBJDUMP) -d -S $< > $@
@@ -359 +368 @@
         $(STRIP) $(TEST_OUTPUT)
 endif
-$(TEST_BINARY).disasm: $(TEST_BINARY)
-ifeq ($(CONFIG_LINE_DEBUG),y)
-        $(OBJDUMP) -d -S $< > $@
-else
-        $(OBJDUMP) -d $< > $@
-endif
 endif
 
 %.o: %.S $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
+        $(GCC) $(DEFS) $(GCC_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ -c $< -o $@
 ifeq ($(PRECHECK),y)
         $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -D__ASM__
@@ -374 +377 @@
 
 %.o: %.s $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
+        $(AS) $(AFLAGS) -o $@ $<
 ifeq ($(PRECHECK),y)
         $(JOBFILE) $(JOB) $< $@ as asm
@@ -392 +395 @@
 
 %.lo: %.S $(DEPEND)
-        $(CC) $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
+        $(CC) $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ -c $< -o $@
 ifeq ($(PRECHECK),y)
         $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__
@@ -398 +401 @@
 
 %.lo: %.s $(DEPEND)
-        $(CC) $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) $(AS_CFLAGS) -D__ASM__ -c $< -o $@
+        $(AS) $(AFLAGS) -o $@ $<
 ifeq ($(PRECHECK),y)
         $(JOBFILE) $(JOB) $< $@ as asm
@@ -410 +413 @@
 
 $(DEPEND): $(PRE_DEPEND)
-        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
-        makedepend -f - -o.test.o -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS) -- $(TEST_SOURCES) >> $@ 2> /dev/null
+        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@