Build in -std=c18 mode

Make sure snek code uses only standard C18 language constructs. Signed-off-by: Keith Packard <keithp@keithp.com>
keith-packard · Dec 11, 2022 · e693926 · e693926
1 parent 482648b
commit e693926
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/chips/avr/ao-arch.h b/chips/avr/ao-arch.h
@@ -47,7 +47,7 @@
 
 #define ao_arch_reboot()	/* XXX */
 
-#define ao_arch_nop()		asm("nop")
+#define ao_arch_nop()		__asm__("nop")
 
 #define ao_arch_interrupt(n)	/* nothing */
 

diff --git a/chips/samd21/ao-arch-funcs.h b/chips/samd21/ao-arch-funcs.h
@@ -111,25 +111,25 @@ typedef uint32_t	ao_arch_irq_t;
 static inline uint32_t
 ao_arch_irqsave(void) {
 	uint32_t	primask;
-	asm("mrs %0,primask" : "=&r" (primask));
+	__asm__("mrs %0,primask" : "=&r" (primask));
 	ao_arch_block_interrupts();
 	return primask;
 }
 
 static inline void
 ao_arch_irqrestore(uint32_t primask) {
-	asm("msr primask,%0" : : "r" (primask));
+	__asm__("msr primask,%0" : : "r" (primask));
 }
 
 static inline void
 ao_arch_memory_barrier(void) {
-	asm volatile("" ::: "memory");
+	__asm__ volatile("" ::: "memory");
 }
 
 #define ao_arch_wait_interrupt() do {				\
-		asm("\twfi\n");					\
+		__asm__("\twfi\n");					\
 		ao_arch_release_interrupts();			\
-		asm(".global ao_idle_loc\nao_idle_loc:");	\
+		__asm__(".global ao_idle_loc\nao_idle_loc:");	\
 		ao_arch_block_interrupts();			\
 	} while (0)
 

diff --git a/chips/samd21/ao-arch.h b/chips/samd21/ao-arch.h
@@ -35,10 +35,10 @@
 	(samd21_scb.aircr = ((SAMD21_SCB_AIRCR_VECTKEY_KEY << SAMD21_SCB_AIRCR_VECTKEY) | \
 			  (1 << SAMD21_SCB_AIRCR_SYSRESETREQ)))
 
-#define ao_arch_nop()		asm("nop")
+#define ao_arch_nop()		__asm__("nop")
 #define ao_arch_interrupt(n)	/* nothing */
-#define ao_arch_block_interrupts()	asm("cpsid i")
-#define ao_arch_release_interrupts()	asm("cpsie i")
+#define ao_arch_block_interrupts()	__asm__("cpsid i")
+#define ao_arch_release_interrupts()	__asm__("cpsie i")
 
 /*
  * ao_timer.c

diff --git a/snek-pow.c b/snek-pow.c
@@ -19,7 +19,7 @@
 #include "snek.h"
 #include <math.h>
 
-#ifdef AVR
+#ifdef __AVR__
 #define float double
 #endif
 

diff --git a/snek.defs b/snek.defs
@@ -94,6 +94,7 @@ SNEK_WARNINGS = \
 	-Wimplicit-fallthrough
 
 SNEK_BASE_CFLAGS = \
+	--std=c18 \
 	-D_DEFAULT_SOURCE \
 	$(SNEK_PACKAGE_CFLAGS) \
 	-I$(SNEK_ROOT) $(SNEK_LOCAL_CFLAGS) \