Merge branch 'cmake-2' of github.com:PX4/Firmware into cmake-2

Makefile

@@ -111,7 +111,7 @@ lldb_sitl_ros: posix
 	Tools/sitl_run.sh posix-configs/SITL/init/rc_iris_ros lldb
 
 gdb_sitl_quad: posix
-	Tools/sitl_run.sh posix-configs/SITL/init/rcS lldb
+	Tools/sitl_run.sh posix-configs/SITL/init/rcS gdb
 
 gdb_sitl_plane: posix
 	Tools/sitl_run.sh posix-configs/SITL/init/rc.fixed_wing lldb

Tools/sitl_run.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 cp Tools/posix_lldbinit build_posix_sitl_simple/src/firmware/posix/.lldbinit
+cp Tools/posix.gdbinit build_posix_sitl_simple/src/firmware/posix/.gdbinit
 cd build_posix_sitl_simple/src/firmware/posix
 mkdir -p rootfs/fs/microsd
 mkdir -p rootfs/eeprom
@@ -9,7 +10,7 @@ then
 	lldb -- mainapp ../../../../$1
 elif [ "$2" == "gdb" ]
 then
-	gdb -- mainapp ../../../../$1
+	gdb --args mainapp ../../../../$1
 else
 	./mainapp ../../../../$1
 fi

src/platforms/posix/drivers/barosim/barosim.h

@@ -80,5 +80,5 @@ extern bool crc4(uint16_t *n_prom);
 } /* namespace */
 
 /* interface factories */
-extern device::Device *BAROSIM_sim_interface(barosim::prom_u &prom_buf, uint8_t busnum) __attribute__((weak));
+extern device::Device *BAROSIM_sim_interface(barosim::prom_u &prom_buf, uint8_t busnum);
 typedef device::Device *(*BAROSIM_constructor)(barosim::prom_u &prom_buf, uint8_t busnum);