8000 Merge pull request #5284 from tannewt/linking_fixes · michthom/circuitpython@57e4b78 · GitHub
[go: up one dir, main page]
Skip to content

Commit 57e4b78

Browse files
tannewttannewt
authored
Merge pull request adafruit#5284 from tannewt/linking_fixes
Two fixes, one for ble workflow, one for linking
2 parents cf08994 + 0d280fa commit 57e4b78

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

‎ports/atmel-samd/boards/common.template.ld

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ SECTIONS
2929
KEEP(*(.vectors)) /* isr vector table */
3030

3131
/* Sort text sections so that they have fewer *fill* bytes needed. */
32-
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.text)) /* .text sections (code) */
33-
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.text*)) /* .text* sections (code) */
32+
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.text))) /* .text sections (code) */
33+
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.text*))) /* .text* sections (code) */
3434

3535
/* Don't sort rodata because it impacts codegen size. */
3636
*(.rodata) /* .rodata sections (constants, strings, etc.) */
@@ -66,8 +66,8 @@ SECTIONS
6666
_srelocate = .; /* create a global symbol at data start; used by startup code in order to initialize the .data section in RAM */
6767
*(.ramfunc)
6868
*(.ramfunc*)
69-
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.data)) /* .data sections */
70-
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.data*)) /* .data* sections */
69+
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.data))) /* .data sections */
70+
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.data*))) /* .data* sections */
7171

7272
. = ALIGN(4);
7373
_erelocate = .; /* define a global symbol at data end; used by startup code in order to initialize the .data section in RAM */
@@ -79,8 +79,8 @@ SECTIONS
7979
. = ALIGN(4);
8080
_sbss = .;
8181
_szero = .; /* define a global symbol at bss start; used by startup code */
82-
*(.bss)
83-
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*))
82+
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss)))
83+
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
8484
*(COMMON)
8585

8686
. = ALIGN(4);

‎ports/nrf/boards/common.template.ld

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ SECTIONS
6262
.text :
6363
{
6464
. = ALIGN(4);
65-
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.text)) /* .text sections (code) */
66-
*SORT_BY_ALIGNMENT(SORT_BY_NAME(.text*)) /* .text* sections (code) */
65+
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.text))) /* .text sections (code) */
66+
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.text*))) /* .text* sections (code) */
6767
*(.rodata) /* .rodata sections (constants, strings, etc.) */
6868
*(.rodata*) /* .rodata* sections (constants, strings, etc.) */
6969
/* *(.glue_7) */ /* glue arm to thumb code */
@@ -82,8 +82,8 @@ SECTIONS
8282
. = ALIGN(4);
8383
_sdata = .; /* create a global symbol at data start; used by startup code in order to initialise the .data section in RAM */
8484
_ram_start = .; /* create a global symbol at ram start for garbage collector */
85-
*(.data) /* .data sections */
86-
*(.data*) /* .data* sections */
85+
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.data))) /* .data sections */
86+
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.data*))) /* .data* sections */
8787

8888
. = ALIGN(4);
8989
_edata = .; /* define a global symbol at data end; used by startup code in order to initialise the .data section in RAM */
@@ -97,8 +97,8 @@ SECTIONS
9797
{
9898
. = ALIGN(4);
9999
_sbss = .; /* define a global symbol at bss start; used by startup code */
100-
*(.bss)
101-
*(.bss*)
100+
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss)))
101+
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
102102
*(COMMON)
103103

104104
. = ALIGN(4);

‎supervisor/shared/bluetooth/serial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ STATIC bleio_uuid_obj_t supervisor_ble_circuitpython_version_uuid;
5353
const uint8_t circuitpython_base_uuid[16] = {0x6e, 0x68, 0x74, 0x79, 0x50, 0x74, 0x69, 0x75, 0x63, 0x72, 0x69, 0x43, 0x00, 0x00, 0xaf, 0xad };
5454

5555
STATIC mp_obj_list_t characteristic_list;
56-
STATIC mp_obj_t characteristic_list_items[2];
56+
STATIC mp_obj_t characteristic_list_items[3];
5757

5858
STATIC uint32_t _outgoing1[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];
5959
STATIC uint32_t _outgoing2[BLE_GATTS_VAR_ATTR_LEN_MAX / 4];

0 commit comments

Comments
 (0)
0