Adaptions for arm-none-eabi-gcc version 4.5.1

ultrasystem · Mar 2, 2011 · 48fde04 · 48fde04
1 parent 1a6808d
commit 48fde04
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -97,14 +97,18 @@ FORMAT = ihex
 # ENABLE ONCE GCC 4.4.x is broadly used
 #DEADCODESTRIP = -Wl,-static -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-s
 
+ #define compiler name
+CCNAME = -none-eabi
+#CCNAME = -elf
+
 # Define programs and commands.
-CC     = arm-elf-gcc
-LD     = arm-elf-gcc
+CC     = arm$(CCNAME)-gcc
+LD     = arm$(CCNAME)-gcc
 SHELL = sh
-OBJCOPY = arm-elf-objcopy
-OBJDUMP = arm-elf-objdump
-SIZE = arm-elf-size
-NM = arm-elf-nm
+OBJCOPY = arm$(CCNAME)-objcopy
+OBJDUMP = arm$(CCNAME)-objdump
+SIZE = arm$(CCNAME)-size
+NM = arm$(CCNAME)-nm
 REMOVE = rm -f
 COPY = cp
 

diff --git a/main/common_mainloop_functions.c b/main/common_mainloop_functions.c
@@ -689,7 +689,7 @@ void camera_shutter_handling(uint64_t loop_start_time)
 
 
 /** @brief Low Battery alarm to be called for example with 1 Hz */
-static inline void beep_on_low_voltage(void)
+void beep_on_low_voltage(void)
 {
 	if (global_data.battery_voltage < BATTERY_LOW_VOLTAGE_ALARM)
 	{

diff --git a/main/common_mainloop_functions.h b/main/common_mainloop_functions.h
@@ -61,7 +61,7 @@ void handle_eeprom_write_request(void);
 uint8_t rc_to_255(int chan);
 
 /** @brief Low Battery alarm to be called for example with 1 Hz */
-static inline void beep_on_low_voltage(void);
+void beep_on_low_voltage(void);
 
 /** @brief Measures the peak CPU load */
 uint16_t measure_peak_cpu_load(uint64_t loop_start_time, uint64_t loop_stop_time, uint64_t min_mainloop);