From d63045a31664f29ba638ca37c0aff4c84a0e0461 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sat, 21 Mar 2015 14:11:07 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7788
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/STM32/NIL-STM32F100-DISCOVERY/Makefile       | 5 -----
 os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s | 8 ++++----
 os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s | 8 ++++----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/demos/STM32/NIL-STM32F100-DISCOVERY/Makefile b/demos/STM32/NIL-STM32F100-DISCOVERY/Makefile
index 3348e562a..d667fa118 100644
--- a/demos/STM32/NIL-STM32F100-DISCOVERY/Makefile
+++ b/demos/STM32/NIL-STM32F100-DISCOVERY/Makefile
@@ -63,11 +63,6 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),)
   USE_EXCEPTIONS_STACKSIZE = 0x400
 endif
 
-# Enables the use of FPU on Cortex-M4.
-ifeq ($(USE_FPU),)
-  USE_FPU = no
-endif
-
 #
 # Architecture or project specific options
 ##############################################################################
diff --git a/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s b/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s
index a80a6ee71..68862f96e 100644
--- a/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s
+++ b/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s
@@ -25,10 +25,6 @@
  * @{
  */
 
-#define _FROM_ASM_
-#include "nilconf.h"
-#include "nilcore.h"
-
 #if !defined(FALSE) || defined(__DOXYGEN__)
 #define FALSE   0
 #endif
@@ -37,6 +33,10 @@
 #define TRUE    1
 #endif
 
+#define _FROM_ASM_
+#include "nilconf.h"
+#include "nilcore.h"
+
 #if !defined(__DOXYGEN__)
 
                 .set    CONTEXT_OFFSET, 0
diff --git a/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s b/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s
index 130ee791c..298110f09 100644
--- a/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s
+++ b/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s
@@ -25,10 +25,6 @@
  * @{
  */
 
-#define _FROM_ASM_
-#include "nilconf.h"
-#include "nilcore.h"
-
 #if !defined(FALSE) || defined(__DOXYGEN__)
 #define FALSE   0
 #endif
@@ -37,6 +33,10 @@
 #define TRUE    1
 #endif
 
+#define _FROM_ASM_
+#include "nilconf.h"
+#include "nilcore.h"
+
 #if !defined(__DOXYGEN__)
 
                 .set    CONTEXT_OFFSET, 0