8000 Merge branch 'master' of https://github.com/sparkfun/Arduino_Apollo3 · EmbeddedMan/Arduino_Apollo3@a93dc39 · GitHub
[go: up one dir, main page]

Skip to content

Commit a93dc39

Browse files
author
Nathan Seidle
committed
2 parents 4dcbf6a + fee092f commit a93dc39

File tree

13 files changed

+179
-4
lines changed

13 files changed

+179
-4
lines changed

cores/arduino/ard_sup/main.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ extern "C" void _init(void)
1212
{
1313
// Empty definition to resolve linker error within '__libc_init_array'
1414
}
15-
extern "C" void end(void)
16-
{
17-
// Empty definition to satisfy linker error in '_sbrk'
18-
}
15+
void *__dso_handle; // providing the __dso_handle symbol manually. Todo: more research for the *correct* solution
1916

2017
extern "C" int main(void)
2118
{

variants/SparkFun_Artemis/linker_scripts/gcc/ambiq_sbl_app.ld

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,13 @@ SECTIONS
6666
_ebss = .;
6767
} > SRAM
6868

69+
.heap (COPY):
70+
{
71+
__end__ = .;
72+
PROVIDE(end = .);
73+
*(.heap*)
74+
__HeapLimit = .;
75+
} > SRAM
76+
6977
.ARM.attributes 0 : { *(.ARM.attributes) }
7078
}

variants/SparkFun_Artemis/linker_scripts/gcc/artemis_sbl_svl_app.ld

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,15 @@ SECTIONS
6666
_ebss = .;
6767
} > SRAM
6868

69+
.heap (COPY):
70+
{
71+
__end__ = .;
72+
PROVIDE(end = .);
73+
*(.heap*)
74+
__HeapLimit = .;
75+
} > SRAM
76+
77+
/* TODO: Collision Checking (at link time) */
78+
6979
.ARM.attributes 0 : { *(.ARM.attributes) }
7080
}

variants/SparkFun_BlackBoard_Artemis/linker_scripts/gcc/ambiq_sbl_app.ld

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,13 @@ SECTIONS
6666
_ebss = .;
6767
} > SRAM
6868

69+
.heap (COPY):
70+
{
71+
__end__ = .;
72+
PROVIDE(end = .);
73+
*(.heap*)
74+
__HeapLimit = .;
75+
} > SRAM
76+
6977
.ARM.attributes 0 : { *(.ARM.attributes) }
7078
}

variants/SparkFun_BlackBoard_Artemis/linker_scripts/gcc/artemis_sbl_svl_app.ld

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +6 628C 6,15 @@ SECTIONS
6666
_ebss = .;
6767
} > SRAM
6868

69+
.heap (COPY):
70+
{
71+
__end__ = .;
72+
PROVIDE(end = .);
73+
*(.heap*)
74+
__HeapLimit = .;
75+
} > SRAM
76+
77+
/* TODO: Collision Checking (at link time) */
78+
6979
.ARM.attributes 0 : { *(.ARM.attributes) }
7080
}

variants/SparkFun_BlackBoard_Artemis_Mega/linker_scripts/gcc/ambiq_sbl_app.ld

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,13 @@ SECTIONS
6666
_ebss = .;
6767
} > SRAM
6868

69+
.heap (COPY):
70+
{
71+
__end__ = .;
72+
PROVIDE(end = .);
73+
*(.heap*)
74+
__HeapLimit = .;
75+
} > SRAM
76+
6977
.ARM.attributes 0 : { *(.ARM.attributes) }
7078
}

variants/SparkFun_BlackBoard_Artemis_Mega/linker_scripts/gcc/artemis_sbl_svl_app.ld

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,15 @@ SECTIONS
6666
_ebss = .;
6767
} > SRAM
6868

69+
.heap (COPY):
70+
{
71+
__end__ = .;
72+
PROVIDE(end = .);
73+
*(.heap*)
74+
__HeapLimit = .;
75+
} > SRAM
76+
77+
/* TODO: Collision Checking (at link time) */
78+
6979
.ARM.attributes 0 : { *(.ARM.attributes) }
7080
}

variants/SparkFun_BlackBoard_Artemis_Nano/linker_scripts/gcc/ambiq_sbl_app.ld

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,13 @@ SECTIONS
6666
_ebss = .;
6767
} > SRAM
6868

69+
.heap (COPY):
70+
{
71+
__end__ = .;
72+
PROVIDE(end = .);
73+
*(.heap*)
74+
__HeapLimit = .;
75+
} > SRAM
76+
6977
.ARM.attributes 0 : { *(.ARM.attributes) }
7078
}

variants/SparkFun_BlackBoard_Artemis_Nano/linker_scripts/gcc/artemis_sbl_svl_app.ld

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,15 @@ SECTIONS
6666
_ebss = .;
6767
} > SRAM
6868

69+
.heap (COPY):
70+
{
71+
__end__ = .;
72+
PROVIDE(end = .);
73+
*(.heap*)
74+
__HeapLimit = .;
75+
} > SRAM
76+
77+
/* TODO: Collision Checking (at link time) */
78+
6979
.ARM.attributes 0 : { *(.ARM.attributes) }
7080
}

variants/SparkFun_Edge/linker_scripts/gcc/ambiq_sbl_app.ld

Lines changed: 8 additions &am 8368 p; 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,13 @@ SECTIONS
6666
_ebss = .;
6767
} > SRAM
6868

69+
.heap (COPY):
70+
{
71+
__end__ = .;
72+
PROVIDE(end = .);
73+
*(.heap*)
74+
__HeapLimit = .;
75+
} > SRAM
76+
6977
.ARM.attributes 0 : { *(.ARM.attributes) }
7078
}

0 commit comments

Comments
 (0)
0