Merge branch 'getopt-cleanup-v2'

makefiles/posix/config_posix_sitl.mk

@@ -23,6 +23,8 @@ MODULES += systemcmds/tests
 #MODULES += systemcmds/reboot
 MODULES += systemcmds/topic_listener
 MODULES	+= systemcmds/ver
+MODULES	+= systemcmds/esc_calib
+MODULES	+= systemcmds/reboot
 
 #
 # General system control

makefiles/posix/posix_elf.mk

@@ -56,9 +56,11 @@ $(PRODUCT_SHARED_PRELINK):	$(OBJS) $(MODULE_OBJS) $(LIBRARY_LIBS) $(GLOBAL_DEPS)
 $(PRODUCT_SHARED_LIB):		$(PRODUCT_SHARED_PRELINK)
 	$(call LINK_A,$@,$(PRODUCT_SHARED_PRELINK))
 
+$(WORK_DIR)apps.h: $(WORK_DIR)builtin_commands
+	$(PX4_BASE)/Tools/posix_apps.py > $(WORK_DIR)apps.h
+
 MAIN = $(PX4_BASE)/src/platforms/posix/main.cpp
-$(WORK_DIR)mainapp: $(PRODUCT_SHARED_LIB)
-	$(PX4_BASE)/Tools/posix_apps.py > apps.h
+$(WORK_DIR)mainapp: $(PRODUCT_SHARED_LIB) $(WORK_DIR)apps.h
 	$(call LINK,$@, -I. $(MAIN) $(PRODUCT_SHARED_LIB))
 
 #

makefiles/posix/toolchain_native.mk

@@ -120,7 +120,7 @@ ifeq ($(CONFIG_BOARD),)
 $(error Board config does not define CONFIG_BOARD)
 endif
 ARCHDEFINES		+= -DCONFIG_ARCH_BOARD_$(CONFIG_BOARD) \
-			-Dnoreturn_function= \
+			-Dnoreturn_function=__attribute__\(\(noreturn\)\) \
 			-I$(PX4_BASE)/src/modules/systemlib \
 			-I$(PX4_BASE)/src/lib/eigen \
 			-I$(PX4_BASE)/src/platforms/posix/include \