Changeset 89ac5513 in mainline for uspace/Makefile.common

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/Makefile.common

@@ -171 +171 @@
         OPTIMIZATION = s
 else
-        OPTIMIZATION = 3
+        OPTIMIZATION = 0
 endif
 
@@ -189 +189 @@
         -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
         -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe -g -D__$(ENDIANESS)__
+        -pipe -ggdb -D__$(ENDIANESS)__
 
 ICC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
@@ -198 +198 @@
         -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 = $(LIBC_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 \
+        -ffreestanding -fno-builtin -nostdlib -nostdinc \
         -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe -g -arch $(CLANG_ARCH) -D__$(ENDIANESS)__
+        -integrated-as \
+        -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__
 
 LIB_CFLAGS = $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__
@@ -251 +254 @@
 ifeq ($(COMPILER),clang)
         CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
+        GCC_CFLAGS += $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
@@ -303 +307 @@
 
 %.o: %.S $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
+        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
 ifeq ($(PRECHECK),y)
         $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__