native: add address sanitizer make target

RIOT-OS · Jul 7, 2015 · 17c64b5 · 17c64b5
1 parent 5d18244
commit 17c64b5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include
@@ -90,6 +90,9 @@ all-debug: export CFLAGS += -g
 all-cachegrind: export CFLAGS += -g
 all-gprof: export CFLAGS += -pg
 all-gprof: export LINKFLAGS += -pg
+all-san-addr: export CFLAGS += -fsanitize=address -fno-omit-frame-pointer -g
+all-san-addr: export CFLAGS += -DNATIVE_IN_CALLOC
+all-san-addr: export LINKFLAGS += -fsanitize=address -fno-omit-frame-pointer -g
 
 export INCLUDES += $(NATIVEINCLUDES)
 
@@ -121,6 +124,8 @@ all-debug: all
 
 all-gprof: all
 
+all-san-addr: all
+
 all-valgrind: all
 
 all-cachegrind: all

diff --git a/cpu/native/syscalls.c b/cpu/native/syscalls.c
@@ -149,7 +149,11 @@ void free(void *ptr)
     _native_syscall_leave();
 }
 
+#ifdef NATIVE_IN_CALLOC
+int _native_in_calloc = 1;
+#else
 int _native_in_calloc = 0;
+#endif
 void *calloc(size_t nmemb, size_t size)
 {
     /* dynamically load calloc when it's needed - this is necessary to
@@ -162,7 +166,7 @@ void *calloc(size_t nmemb, size_t size)
         }
         else {
             _native_in_calloc = 1;
-            *(void **)(&real_calloc) = dlsym(RTLD_NEXT, "calloc");
+            /* *(void **)(&real_calloc) = dlsym(RTLD_NEXT, "calloc"); */
             _native_in_calloc = 0;
         }
     }