Changeset 03362fbd in mainline for uspace/lib/c/arch/arm32/Makefile.common

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/lib/c/arch/arm32/Makefile.common (modified) (1 diff)

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

@@ -28 +28 @@
 #
 
-GCC_CFLAGS += -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -march=armv4
+GCC_CFLAGS += -ffixed-r9 -mtp=soft -fno-omit-frame-pointer -mapcs-frame -march=$(subst _,-,$(PROCESSOR_ARCH))
+
+ifeq ($(CONFIG_FPU),y)
+GCC_CFLAGS += -mfloat-abi=hard
+else
+BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
+endif
 
 ENDIANESS = LE