[fix] -std conflict with bsp vexpress-a9

RT-Thread · Jan 3, 2023 · 4891b5a · 4891b5a
1 parent eaca0c3
commit 4891b5a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/components/drivers/spi/SConscript b/components/drivers/spi/SConscript
@@ -29,7 +29,7 @@ if GetDepend('RT_USING_SFUD'):
     if GetDepend('RT_SFUD_USING_SFDP'):
         src_device += ['sfud/src/sfud_sfdp.c']
 
-    if rtconfig.PLATFORM in ['gcc', 'armclang']:
+    if rtconfig.PLATFORM in ['gcc', 'armclang'] and not GetDepend('RT_USING_SMART'):
         LOCAL_CFLAGS += ' -std=c99'
     elif rtconfig.PLATFORM in ['armcc']:
         LOCAL_CFLAGS += ' --c99'

diff --git a/components/libc/compilers/common/include/sys/signal.h b/components/libc/compilers/common/include/sys/signal.h
@@ -12,7 +12,7 @@
 #ifndef __SYS_SIGNAL_H__
 #define __SYS_SIGNAL_H__
 
-#if defined(RT_USING_SMART) && (defined(ARCH_ARMV8) || defined(ARCH_RISCV))
+#if defined(RT_USING_SMART)
 #include <signal.h>
 #else
 
@@ -87,9 +87,9 @@ typedef struct sigaltstack
   size_t    ss_size;  /* Stack size.  */
 } stack_t;
 
-#define SIG_SETMASK 0   /* set mask with sigprocmask() */
-#define SIG_BLOCK   1   /* set of signals to block */
-#define SIG_UNBLOCK 2   /* set of signals to, well, unblock */
+#define SIG_BLOCK   0   /* set of signals to block */
+#define SIG_UNBLOCK 1   /* set of signals to, well, unblock */
+#define SIG_SETMASK 2   /* set mask with sigprocmask() */
 
 #define sigaddset(what,sig) (*(what) |= (1<<(sig)), 0)
 #define sigdelset(what,sig) (*(what) &= ~(1<<(sig)), 0)