From a2e0ca0939af7409b0cc3e6c76047c9836396786 Mon Sep 17 00:00:00 2001 From: Patrick C Lankswert Date: Fri, 13 Feb 2015 15:46:40 -0500 Subject: [PATCH] Formalized the Arduino builds' generation of linker maps Change-Id: If832e3e94de96c0b14b2c49c302dd21d1736ccbf Signed-off-by: Patrick Lankswert Reviewed-on: https://gerrit.iotivity.org/gerrit/344 Tested-by: jenkins-iotivity Reviewed-by: Sachin Agrawal --- build_common/arduino/SConscript | 5 ++--- .../stack/samples/arduino/SimpleClientServer/ocserver/SConscript | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_common/arduino/SConscript b/build_common/arduino/SConscript index d913e32..f24da8b 100644 --- a/build_common/arduino/SConscript +++ b/build_common/arduino/SConscript @@ -374,9 +374,8 @@ else: if target_arch == 'arm': env.AppendUnique(LINKFLAGS = ['-Os', '-Wl,--gc-sections', cpu_flag, - '-T' + variant_folder + '/' + __get_board_info(board, '.build.ldscript'), - '-Wl,-Map,' + env.get('BUILD_DIR') + 'arduino_prj.map']) - env.AppendUnique(LINKFLAGS = Split('-lm -lgcc -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group')) + '-T' + variant_folder + '/' + __get_board_info(board, '.build.ldscript')]) + env.AppendUnique(LINKFLAGS = Split('-lm -lgcc -mthumb -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group')) variant_system_lib = __get_board_info(board, '.build.variant_system_lib') if variant_system_lib: diff --git a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript index 398c0ed..0d37077 100644 --- a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript +++ b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript @@ -13,6 +13,7 @@ arduino_simplecs_env.PrependUnique(CPPPATH = [ arduino_simplecs_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) arduino_simplecs_env.PrependUnique(LIBS = ['octbstack', 'coap']) +arduino_simplecs_env.PrependUnique(LINKFLAGS = ['-Wl,-cref', '-Wl,-Map='+Dir('.').path+'/SimpleClientServer.map']) if not env.get('RELEASE'): arduino_simplecs_env.AppendUnique(CPPDEFINES = ['TB_LOG']) -- 2.7.4