Merge pull request #4236 from LMESTM/packed_warning

theotherjimmy · web-flow · commit 23c86fc53970 · 2017-05-02T11:24:38.000-05:00
STM32 Fixed warning related to __packed redefinition
diff --git a/targets/TARGET_STM/TARGET_STM32F0/device/stm32f0xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32F0/device/stm32f0xx_hal_def.h
@@ -124,7 +124,7 @@ typedef enum
                                     }while (0)
 #endif /* USE_RTOS */
 
-#if  defined ( __GNUC__ )
+#if  defined ( __GNUC__ ) && !defined ( __CC_ARM )
   #ifndef __weak
     #define __weak   __attribute__((weak))
   #endif /* __weak */
diff --git a/targets/TARGET_STM/TARGET_STM32F1/device/stm32f1xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32F1/device/stm32f1xx_hal_def.h
@@ -124,7 +124,7 @@ typedef enum
                                     }while (0)
 #endif /* USE_RTOS */
 
-#if  defined ( __GNUC__ )
+#if  defined ( __GNUC__ ) && !defined ( __CC_ARM )
   #ifndef __weak
     #define __weak   __attribute__((weak))
   #endif /* __weak */
diff --git a/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_def.h
@@ -145,7 +145,7 @@ static inline  void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
 	} while (__STREXW(newValue,(volatile unsigned long*) ptr));
 }
 
-#if  defined ( __GNUC__ )
+#if  defined ( __GNUC__ ) && !defined ( __CC_ARM )
   #ifndef __weak
     #define __weak   __attribute__((weak))
   #endif /* __weak */
diff --git a/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32F3/device/stm32f3xx_hal_def.h
@@ -144,7 +144,7 @@ static inline  void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
 	} while (__STREXW(newValue,(volatile unsigned long*) ptr));
 }
 
-#if  defined ( __GNUC__ )
+#if  defined ( __GNUC__ ) && !defined ( __CC_ARM )
   #ifndef __weak
     #define __weak   __attribute__((weak))
   #endif /* __weak */
diff --git a/targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_def.h
@@ -146,7 +146,7 @@ static inline  void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
 
 #endif /* USE_RTOS */
 
-#if  defined ( __GNUC__ )
+#if  defined ( __GNUC__ ) && !defined ( __CC_ARM )
   #ifndef __weak
     #define __weak   __attribute__((weak))
   #endif /* __weak */
diff --git a/targets/TARGET_STM/TARGET_STM32F7/device/stm32f7xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32F7/device/stm32f7xx_hal_def.h
@@ -145,7 +145,7 @@ static inline  void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
 	} while (__STREXW(newValue,(volatile unsigned long*) ptr));
 }
 
-#if  defined ( __GNUC__ )
+#if  defined ( __GNUC__ ) && !defined ( __CC_ARM )
   #ifndef __weak
     #define __weak   __attribute__((weak))
   #endif /* __weak */
diff --git a/targets/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32L0/device/stm32l0xx_hal_def.h
@@ -127,7 +127,7 @@ typedef enum
                                     }while (0)
 #endif /* USE_RTOS */
 
-#if  defined ( __GNUC__ )
+#if  defined ( __GNUC__ ) && !defined ( __CC_ARM )
   #ifndef __weak
     #define __weak   __attribute__((weak))
   #endif /* __weak */
diff --git a/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32L1/device/stm32l1xx_hal_def.h
@@ -124,7 +124,7 @@ typedef enum
                                     }while (0)
 #endif /* USE_RTOS */
 
-#if  defined ( __GNUC__ )
+#if  defined ( __GNUC__ ) && !defined ( __CC_ARM )
   #ifndef __weak
     #define __weak   __attribute__((weak))
   #endif /* __weak */
diff --git a/targets/TARGET_STM/TARGET_STM32L4/device/stm32l4xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32L4/device/stm32l4xx_hal_def.h
@@ -147,7 +147,7 @@ static inline  void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)
 	} while (__STREXW(newValue,(volatile unsigned long*) ptr));
 }
 
-#if  defined ( __GNUC__ )
+#if  defined ( __GNUC__ ) && !defined ( __CC_ARM )
   #ifndef __weak
     #define __weak   __attribute__((weak))
   #endif /* __weak */

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)`
`145`	`145`	`} while (__STREXW(newValue,(volatile unsigned long*) ptr));`
`146`	`146`	`}`
`147`	`147`
`148`		`-#if defined ( __GNUC__ )`
	`148`	`+#if defined ( __GNUC__ ) && !defined ( __CC_ARM )`
`149`	`149`	`#ifndef __weak`
`150`	`150`	`#define __weak __attribute__((weak))`
`151`	`151`	`#endif /* __weak */`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)`
`144`	`144`	`} while (__STREXW(newValue,(volatile unsigned long*) ptr));`
`145`	`145`	`}`
`146`	`146`
`147`		`-#if defined ( __GNUC__ )`
	`147`	`+#if defined ( __GNUC__ ) && !defined ( __CC_ARM )`
`148`	`148`	`#ifndef __weak`
`149`	`149`	`#define __weak __attribute__((weak))`
`150`	`150`	`#endif /* __weak */`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ static inline void atomic_clr_u32(volatile uint32_t *ptr, uint32_t mask)`
`147`	`147`	`} while (__STREXW(newValue,(volatile unsigned long*) ptr));`
`148`	`148`	`}`
`149`	`149`
`150`		`-#if defined ( __GNUC__ )`
	`150`	`+#if defined ( __GNUC__ ) && !defined ( __CC_ARM )`
`151`	`151`	`#ifndef __weak`
`152`	`152`	`#define __weak __attribute__((weak))`
`153`	`153`	`#endif /* __weak */`