Merge branch 'master' into testing

diff --git a/src/Makefile b/src/Makefile
index a0dea5d..b3594c1 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,7 +39,7 @@ shared/libosmocore/build-target/Makefile: shared/libosmocore/configure shared/li
        cd shared/libosmocore/build-target && ../configure \
                        --host=arm-elf-linux --disable-vty --enable-panic-infloop \
                        --disable-shared --disable-talloc --disable-tests \
-               CC="$(CROSS_TOOL_PREFIX)gcc" CFLAGS="-Os -ffunction-sections -I$(TOPDIR)/target/firmware/include"
+               CC="$(CROSS_TOOL_PREFIX)gcc" CFLAGS="-Os -ffunction-sections -I$(TOPDIR)/target/firmware/include -nostartfiles -nodefaultlibs"
 
 shared/libosmocore/build-target/src/.libs/libosmocore.a: shared/libosmocore/build-target/Makefile
        cd shared/libosmocore/build-target && make

diff --git a/src/host/layer23/.gitignore b/src/host/layer23/.gitignore
index a817b9b..24dbe6d 100644 (file)
--- a/src/host/layer23/.gitignore
+++ b/src/host/layer23/.gitignore
@@ -27,6 +27,7 @@ config.status
 
 # final executables
 src/misc/bcch_scan
+src/misc/cbch_sniff
 src/misc/cell_log
 src/misc/echo_test
 src/misc/layer23

diff --git a/src/shared/.gitignore b/src/shared/.gitignore
new file mode 100644 (file)
index 0000000..5058adb
--- /dev/null
+++ b/src/shared/.gitignore
@@ -0,0 +1,5 @@
+libosmocore/build-host/tests/msgfile/msgfile_test
+libosmocore/build-host/tests/smscb/smscb_test
+libosmocore/build-host/tests/sms/sms_test
+libosmocore/build-host/tests/timer/timer_test
+libosmocore/build-host/tests/ussd/ussd_test