build: further cleanup common symbols (#63)

7 years ago · a0286bcc29
parent 7910c88f28
commit a0286bcc29
4 changed files with 7 additions and 7 deletions
--- a/SConscript.boardloader
+++ b/SConscript.boardloader
@ -98,13 +98,13 @@ env.Replace(
    CCFLAGS='-Os '
    '-g3 '
    '-nostdlib '
-    '-std=gnu99 -Wall -Werror -Wdouble-promotion -Wpointer-arith '
+    '-std=gnu99 -Wall -Werror -Wdouble-promotion -Wpointer-arith -fno-common '
    '-mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard '
    '-fsingle-precision-constant -fdata-sections -ffunction-sections '
    '-fstack-protector-all -ffreestanding '
    + CCFLAGS_MOD,
    CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
-    LINKFLAGS='-nostdlib -T embed/boardloader/memory.ld --gc-sections -Map=build/boardloader/boardloader.map',
+    LINKFLAGS='-nostdlib -T embed/boardloader/memory.ld --gc-sections -Map=build/boardloader/boardloader.map --warn-common',
    CPPPATH=[
        'embed/boardloader',
        'embed/trezorhal',
--- a/SConscript.bootloader
+++ b/SConscript.bootloader
@ -115,13 +115,13 @@ env.Replace(
    CCFLAGS='-Os '
    '-g3 '
    '-nostdlib '
-    '-std=gnu99 -Wall -Werror -Wdouble-promotion -Wpointer-arith '
+    '-std=gnu99 -Wall -Werror -Wdouble-promotion -Wpointer-arith -fno-common '
    '-mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard '
    '-fsingle-precision-constant -fdata-sections -ffunction-sections '
    '-fstack-protector-all -ffreestanding '
    + CCFLAGS_MOD,
    CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
-    LINKFLAGS='-nostdlib -T embed/bootloader/memory.ld --gc-sections',
+    LINKFLAGS='-nostdlib -T embed/bootloader/memory.ld --gc-sections -Map=build/bootloader/bootloader.map --warn-common',
    CPPPATH=[
        'embed/bootloader',
        'embed/bootloader/nanopb',
--- a/SConscript.firmware
+++ b/SConscript.firmware
@ -320,13 +320,13 @@ env.Replace(
    CCFLAGS='$COPT '
    '-g3 '
    '-nostdlib '
-    '-std=gnu99 -Wall -Werror -Wdouble-promotion -Wpointer-arith '
+    '-std=gnu99 -Wall -Werror -Wdouble-promotion -Wpointer-arith -fno-common '
    '-mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard '
    '-fsingle-precision-constant -fdata-sections -ffunction-sections '
    + CCFLAGS_MOD,
    CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
    CCFLAGS_OPT='-O3',
-    LINKFLAGS='-nostdlib -T embed/firmware/memory.ld --gc-sections',
+    LINKFLAGS='-nostdlib -T embed/firmware/memory.ld --gc-sections -Map=build/firmware/firmware.map --warn-common',
    CPPPATH=[
        '.',
        'embed/firmware',
--- a/embed/trezorhal/stm32.c
+++ b/embed/trezorhal/stm32.c
@ -41,7 +41,7 @@ void SystemInit(void)
    SCB->CPACR |= ((3U << 22) | (3U << 20));
 }

-volatile uint32_t uwTick = 0;
+extern volatile uint32_t uwTick;

 void SysTick_Handler(void)
 {