From 83be7a9fe048ed00953acad09be5063cbd58b8b1 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Wed, 20 Jan 2010 17:01:50 +0000
Subject: [PATCH] updated default mac os x compiler configuration

---
 .../cooja/config/external_tools_macosx.config | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/tools/cooja/config/external_tools_macosx.config b/tools/cooja/config/external_tools_macosx.config
index 2f7997482..41c387fab 100644
--- a/tools/cooja/config/external_tools_macosx.config
+++ b/tools/cooja/config/external_tools_macosx.config
@@ -15,7 +15,7 @@ CMD_GREP_SENSORS = grep "^SENSORS_SENSOR([^,]*," -o -d skip -D skip -H -r
 REGEXP_PARSE_SENSORS = ([^/]*.c):SENSORS_SENSOR\\(([^,]*),
 COMPILER_ARGS = -Wall -I/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers -dynamiclib -fno-common
 LINK_COMMAND_1 = gcc -dynamiclib -fno-common -o $(LIBFILE)
-LINK_COMMAND_2 = -framework JavaVM
+LINK_COMMAND_2 = -framework JavaVM -Wl,-map,$(MAPFILE)
 AR_COMMAND_1 = ar rc $(ARFILE)
 AR_COMMAND_2 = 
 CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
@@ -25,19 +25,23 @@ PATH_JAVAC = javac
 DEFAULT_PROJECTDIRS = ../apps/mrm;../apps/mspsim;../apps/avrora
 
 PARSE_WITH_COMMAND = true
-PARSE_COMMAND = nmandsize $(LIBFILE)
-MAPFILE_DATA_START = ^.data[ \t]*0x([0-9A-Fa-f]*)[ \t]*0x[0-9A-Fa-f]*[ \t]*$
-MAPFILE_DATA_SIZE = ^.data[ \t]*0x[0-9A-Fa-f]*[ \t]*0x([0-9A-Fa-f]*)[ \t]*$
-MAPFILE_BSS_START = ^.bss[ \t]*0x([0-9A-Fa-f]*)[ \t]*0x[0-9A-Fa-f]*[ \t]*$
-MAPFILE_BSS_SIZE = ^.bss[ \t]*0x[0-9A-Fa-f]*[ \t]*0x([0-9A-Fa-f]*)[ \t]*$
-MAPFILE_VAR_NAME = ^[ \t]*(0x[0-9A-Fa-f]*)[ \t]*([^ ]*)[ \t]*$
-MAPFILE_VAR_ADDRESS_1 = ^[ \t]*0x([0-9A-Fa-f]*)[ \t]*
-MAPFILE_VAR_ADDRESS_2 = [ \t]*$
+PARSE_COMMAND = /opt/contiki-2.x/tools/cooja/examples/jni_test/mac_users/nmandsize $(LIBFILE)
+MAPFILE_DATA_START = ^__DATA[ ]*__data[ ]*0x([0-9A-Fa-f]*)[ ]*0x[0-9A-Fa-f]*[ ]*$
+MAPFILE_DATA_SIZE = ^__DATA[ ]*__data[ ]*0x[0-9A-Fa-f]*[ ]*0x([0-9A-Fa-f]*)[ ]*$
+MAPFILE_BSS_START = ^__DATA[ ]*__bss[ ]*0x[0-9A-Fa-f]*[ ]*0x([0-9A-Fa-f]*)[ ]*$
+MAPFILE_BSS_SIZE = ^__DATA[ ]*__bss[ ]*0x[0-9A-Fa-f]*[ ]*0x([0-9A-Fa-f]*)[ ]*$
+MAPFILE_COMMON_START = ^__DATA[ ]*__common[ ]*0x([0-9A-Fa-f]*)[ ]*0x[0-9A-Fa-f]*[ ]*$
+MAPFILE_COMMON_SIZE = ^__DATA[ ]*__common[ ]*0x[0-9A-Fa-f]*[ ]*0x([0-9A-Fa-f]*)[ ]*$
+MAPFILE_VAR_NAME = ^[ \\t]*(0x[0-9A-Fa-f]*)[ \\t]*([^ ]*)[ \\t]*$
+MAPFILE_VAR_ADDRESS_1 = ^[ \\t]*0x([0-9A-Fa-f]*)[ \\t]*
+MAPFILE_VAR_ADDRESS_2 = [ \\t]*$
 MAPFILE_VAR_SIZE_1 = ^
-MAPFILE_VAR_SIZE_2 = [ \t]*(0x[0-9A-Fa-f]*)[ \t]*[^ ]*[ \t]*$
+MAPFILE_VAR_SIZE_2 = [ \\t]*(0x[0-9A-Fa-f]*)[ \\t]*[^ ]*[ \\t]*$
 COMMAND_VAR_NAME_ADDRESS = ^[ \t]*([0-9A-Fa-f][0-9A-Fa-f]*)[ \t]\\(__DATA,__[^ ]*\\) external _([^ ]*)$
-COMMAND_DATA_START = ^DATA SECTION START: 0x([0-9A-Fa-f][0-9A-Fa-f]*)$
-COMMAND_DATA_END = ^DATA SECTION END: 0x([0-9A-Fa-f][0-9A-Fa-f]*)$
-COMMAND_BSS_START = ^BSS SECTION START: 0x([0-9A-Fa-f][0-9A-Fa-f]*)$
-COMMAND_BSS_END = ^BSS SECTION END: 0x([0-9A-Fa-f][0-9A-Fa-f]*)$
+COMMAND_DATA_START = ^DATA SECTION START\: 0x([0-9A-Fa-f]+)$
+COMMAND_DATA_END = ^DATA SECTION END\: 0x([0-9A-Fa-f]+)$
+COMMAND_BSS_START = ^COMMON SECTION START\: 0x([0-9A-Fa-f]+)$
+COMMAND_BSS_END = ^COMMON SECTION END\: 0x([0-9A-Fa-f]+)$
+COMMAND_COMMON_START = ^BSS SECTION START\: 0x([0-9A-Fa-f]+)$
+COMMAND_COMMON_END = ^BSS SECTION END\: 0x([0-9A-Fa-f]+)$