From 92cd0008428d5db6e8cf3ae531cdb24acdfb68e1 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Thu, 23 Mar 2017 15:41:38 +1100
Subject: [PATCH] minimal/Makefile: Change C standard from gnu99 to c99.

---
 minimal/Makefile | 4 ++--
 minimal/main.c   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/minimal/Makefile b/minimal/Makefile
index 42c2d53127..3b446beae7 100644
--- a/minimal/Makefile
+++ b/minimal/Makefile
@@ -22,9 +22,9 @@ ifeq ($(CROSS), 1)
 DFU = ../tools/dfu.py
 PYDFU = ../tools/pydfu.py
 CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
-CFLAGS = $(INC) -Wall -Werror -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
+CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
 else
-CFLAGS = -m32 $(INC) -Wall -Werror -std=gnu99 $(COPT)
+CFLAGS = -m32 $(INC) -Wall -Werror -std=c99 $(COPT)
 endif
 
 #Debugging/Optimization
diff --git a/minimal/main.c b/minimal/main.c
index 496d925e77..5cc88ff668 100644
--- a/minimal/main.c
+++ b/minimal/main.c
@@ -106,7 +106,7 @@ extern uint32_t _estack, _sidata, _sdata, _edata, _sbss, _ebss;
 void Reset_Handler(void) __attribute__((naked));
 void Reset_Handler(void) {
     // set stack pointer
-    asm volatile ("ldr sp, =_estack");
+    __asm volatile ("ldr sp, =_estack");
     // copy .data section from flash to RAM
     for (uint32_t *src = &_sidata, *dest = &_sdata; dest < &_edata;) {
         *dest++ = *src++;