From d8a99fb73f4c08987be790a780fe95759ef11d2f Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 11 Mar 2015 12:30:14 -0600
Subject: [PATCH] SAMV71-XULT: Enable 64-bit floating point support

---
 arch/arm/src/armv7-m/up_lazyexception.S | 2 +-
 arch/arm/src/efm32/Make.defs            | 2 +-
 arch/arm/src/lpc17xx/Make.defs          | 2 +-
 arch/arm/src/lpc43xx/Make.defs          | 2 +-
 arch/arm/src/sam34/Make.defs            | 2 +-
 arch/arm/src/samv7/Make.defs            | 9 ++++++++-
 arch/arm/src/stm32/Make.defs            | 2 +-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/arch/arm/src/armv7-m/up_lazyexception.S b/arch/arm/src/armv7-m/up_lazyexception.S
index bf02c45dc43..16af52e64ee 100644
--- a/arch/arm/src/armv7-m/up_lazyexception.S
+++ b/arch/arm/src/armv7-m/up_lazyexception.S
@@ -334,7 +334,7 @@ exception_common:
 	 */
 
 	bx		r14						/* And return */
-	.size	handlers, .-handlers
+	.size	exception_common, .-exception_common
 
 /************************************************************************************************
  *  Name: g_intstackalloc/g_intstackbase
diff --git a/arch/arm/src/efm32/Make.defs b/arch/arm/src/efm32/Make.defs
index 50efb7ef907..6ab29250fd4 100644
--- a/arch/arm/src/efm32/Make.defs
+++ b/arch/arm/src/efm32/Make.defs
@@ -51,7 +51,7 @@ CMN_CSRCS += up_sigdeliver.c up_stackframe.c up_svcall.c up_systemreset.c
 CMN_CSRCS += up_udelay.c up_unblocktask.c up_usestack.c up_vfork.c
 
 ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
-ifeq ($(CONFIG_ARMV7M_ARMV7M_LAZYFPU),y)
+ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
 CMN_ASRCS += up_lazyexception.S
 else
 CMN_ASRCS += up_exception.S
diff --git a/arch/arm/src/lpc17xx/Make.defs b/arch/arm/src/lpc17xx/Make.defs
index dc646260912..0b16e7225cb 100644
--- a/arch/arm/src/lpc17xx/Make.defs
+++ b/arch/arm/src/lpc17xx/Make.defs
@@ -58,7 +58,7 @@ CMN_CSRCS += up_sigdeliver.c up_stackframe.c up_unblocktask.c up_usestack.c
 CMN_CSRCS += up_doirq.c up_hardfault.c up_svcall.c up_checkstack.c up_vfork.c
 
 ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
-ifeq ($(CONFIG_ARMV7M_ARMV7M_LAZYFPU),y)
+ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
 CMN_ASRCS += up_lazyexception.S
 else
 CMN_ASRCS += up_exception.S
diff --git a/arch/arm/src/lpc43xx/Make.defs b/arch/arm/src/lpc43xx/Make.defs
index 5483d11eeab..dda686e7397 100644
--- a/arch/arm/src/lpc43xx/Make.defs
+++ b/arch/arm/src/lpc43xx/Make.defs
@@ -48,7 +48,7 @@ CMN_CSRCS += up_unblocktask.c up_usestack.c up_doirq.c up_hardfault.c
 CMN_CSRCS += up_svcall.c up_vfork.c
 
 ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
-ifeq ($(CONFIG_ARMV7M_ARMV7M_LAZYFPU),y)
+ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
 CMN_ASRCS += up_lazyexception.S
 else
 CMN_ASRCS += up_exception.S
diff --git a/arch/arm/src/sam34/Make.defs b/arch/arm/src/sam34/Make.defs
index 2be1b7d1807..59b85681970 100644
--- a/arch/arm/src/sam34/Make.defs
+++ b/arch/arm/src/sam34/Make.defs
@@ -59,7 +59,7 @@ CMN_CSRCS += up_doirq.c up_hardfault.c up_svcall.c up_vfork.c
 # Configuration-dependent common files
 
 ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
-ifeq ($(CONFIG_ARMV7M_ARMV7M_LAZYFPU),y)
+ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
 CMN_ASRCS += up_lazyexception.S
 else
 CMN_ASRCS += up_exception.S
diff --git a/arch/arm/src/samv7/Make.defs b/arch/arm/src/samv7/Make.defs
index e959ce5c847..763953b5e67 100644
--- a/arch/arm/src/samv7/Make.defs
+++ b/arch/arm/src/samv7/Make.defs
@@ -56,7 +56,7 @@ CMN_CSRCS += up_doirq.c up_hardfault.c up_svcall.c up_vfork.c
 # Configuration-dependent common files
 
 ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
-ifeq ($(CONFIG_ARMV7M_ARMV7M_LAZYFPU),y)
+ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
 CMN_ASRCS += up_lazyexception.S
 else
 CMN_ASRCS += up_exception.S
@@ -68,6 +68,13 @@ ifeq ($(CONFIG_ARMV7M_DCACHE),y)
 CMN_CSRCS += up_dcache.c
 endif
 
+ifeq ($(CONFIG_ARCH_FPU),y)
+CMN_ASRCS += up_fpu.S
+ifneq ($(CONFIG_ARMV7M_CMNVECTOR),y)
+CMN_CSRCS += up_copyarmstate.c
+endif
+endif
+
 ifeq ($(CONFIG_ARCH_RAMVECTORS),y)
 CMN_CSRCS += up_ramvec_initialize.c up_ramvec_attach.c
 endif
diff --git a/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs
index eb4d2e0db02..598c74b3aff 100644
--- a/arch/arm/src/stm32/Make.defs
+++ b/arch/arm/src/stm32/Make.defs
@@ -59,7 +59,7 @@ CMN_CSRCS += up_stackcheck.c
 endif
 
 ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
-ifeq ($(CONFIG_ARMV7M_ARMV7M_LAZYFPU),y)
+ifeq ($(CONFIG_ARMV7M_LAZYFPU),y)
 CMN_ASRCS += up_lazyexception.S
 else
 CMN_ASRCS += up_exception.S