Changeset 03c971f in mainline for uspace/Makefile.common

Timestamp:

2013-08-15T14:20:16Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

bb2a5b2

Parents:

f2c19b0 (diff), 2921602 (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:

Mainline changes.

File:

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

uspace/Makefile.common

@@ -191 +191 @@
         -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) \
@@ -200 +200 @@
         -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__
@@ -221 +224 @@
 endif
 
-## Setup platform configuration
-#
-
--include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.common
-
-## Compilation options
-#
-
-JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
-
+# Prepare for POSIX before including platform specific stuff
 ifeq ($(POSIX_COMPAT),y)
         CFLAGS = -I$(LIBPOSIX_PREFIX)/include/posix  -I$(LIBPOSIX_PREFIX)/include/
-        LIBS += $(LIBPOSIX_PREFIX)/libposix.a
-endif
+        BASE_LIBS = $(LIBPOSIX_PREFIX)/libposixaslibc.a $(LIBPOSIX_PREFIX)/libc4posix.a $(LIBSOFTINT_PREFIX)/libsoftint.a
+endif
+
+## Setup platform configuration
+#
+
+-include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.common
+
+## Compilation options
+#
+
+JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
 
 ifeq ($(COMPILER),gcc_cross)
@@ -253 +257 @@
 ifeq ($(COMPILER),clang)
         CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
+        GCC_CFLAGS += $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
@@ -310 +315 @@
 
 %.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__