Browse Source

Trust STM32 gcc versions

Scott Lahteine 3 years ago
parent
commit
3f93b8baed
2 changed files with 6 additions and 14 deletions
  1. 3
    7
      Marlin/src/HAL/STM32/HAL.h
  2. 3
    7
      Marlin/src/HAL/STM32F1/HAL.h

+ 3
- 7
Marlin/src/HAL/STM32/HAL.h View File

@@ -143,19 +143,15 @@ void _delay_ms(const int delay);
143 143
 
144 144
 extern "C" char* _sbrk(int incr);
145 145
 
146
-#if GCC_VERSION <= 50000
147
-  #pragma GCC diagnostic push
148
-  #pragma GCC diagnostic ignored "-Wunused-function"
149
-#endif
146
+#pragma GCC diagnostic push
147
+#pragma GCC diagnostic ignored "-Wunused-function"
150 148
 
151 149
 static inline int freeMemory() {
152 150
   volatile char top;
153 151
   return &top - reinterpret_cast<char*>(_sbrk(0));
154 152
 }
155 153
 
156
-#if GCC_VERSION <= 50000
157
-  #pragma GCC diagnostic pop
158
-#endif
154
+#pragma GCC diagnostic pop
159 155
 
160 156
 //
161 157
 // ADC

+ 3
- 7
Marlin/src/HAL/STM32F1/HAL.h View File

@@ -191,10 +191,8 @@ inline void HAL_reboot() {}  // reboot the board or restart the bootloader
191 191
 
192 192
 void _delay_ms(const int delay);
193 193
 
194
-#if GCC_VERSION <= 50000
195
-  #pragma GCC diagnostic push
196
-  #pragma GCC diagnostic ignored "-Wunused-function"
197
-#endif
194
+#pragma GCC diagnostic push
195
+#pragma GCC diagnostic ignored "-Wunused-function"
198 196
 
199 197
 /*
200 198
 extern "C" {
@@ -209,9 +207,7 @@ static inline int freeMemory() {
209 207
   return &top - _sbrk(0);
210 208
 }
211 209
 
212
-#if GCC_VERSION <= 50000
213
-  #pragma GCC diagnostic pop
214
-#endif
210
+#pragma GCC diagnostic pop
215 211
 
216 212
 //
217 213
 // ADC

Loading…
Cancel
Save