Changeset 7218fe6 in mainline for uspace/lib/c

Timestamp:

2014-03-01T22:50:05Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

440f57f

Parents:

8aaf9dc

Message:

cstyle (no change in functionality)

Location:

uspace/lib/c

Files:

• Makefile (modified) (3 diffs)
• arch/arm32/Makefile.common (modified) (1 diff)

uspace/lib/c/Makefile

@@ -31 +31 @@
 ROOT_PATH = $(USPACE_PREFIX)/..
 
-COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
-COMMON_HEADER = $(ROOT_PATH)/common.h
+CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
-
-CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
 LINKER_SCRIPTS = \
@@ -50 +47 @@
 LSONAME = libc.so0
 
-
--include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
 -include arch/$(UARCH)/Makefile.inc
@@ -160 +155 @@
 include $(USPACE_PREFIX)/Makefile.common
 
-
 $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
         $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@

uspace/lib/c/arch/arm32/Makefile.common

@@ -31 +31 @@
 
 ifeq ($(CONFIG_FPU),y)
-GCC_CFLAGS += -mfloat-abi=hard
+        GCC_CFLAGS += -mfloat-abi=hard
 else
-BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
+        BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
 endif