Changeset e1a27be in mainline for kernel/arch/arm32/Makefile.inc

Timestamp:

2012-12-29T10:48:35Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

17cc8f4f

Parents:

8f88beb (diff), c928bb7 (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:

• kernel/arch/arm32/Makefile.inc (modified) (2 diffs)

kernel/arch/arm32/Makefile.inc

@@ -35 +35 @@
 GCC_CFLAGS += -fno-omit-frame-pointer -mapcs-frame -march=$(subst _,-,$(PROCESSOR)) -mno-unaligned-access
 
+ifeq ($(CONFIG_FPU),y)
+# This is necessary to allow vmsr insn and fpexc manipulation
+# Use vfp32 to allow context save/restore of d16-d31 regs.
+GCC_CFLAGS += -mfloat-abi=hard -mfpu=vfp3
+endif
+
 BITS = 32
 ENDIANESS = LE
@@ -62 +68 @@
         arch/$(KARCH)/src/ras.c
 
+ifeq ($(CONFIG_FPU),y)
+        ARCH_SOURCES += arch/$(KARCH)/src/fpu_context.c
+endif
+
 ifeq ($(MACHINE),gta02)
         ARCH_SOURCES += arch/$(KARCH)/src/mach/gta02/gta02.c
-endif
-
-ifeq ($(MACHINE),testarm)
-        ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c
 endif