Skip to content

Commit 27898d9

Browse files
author
Wayne Ren
authored
Merge pull request #104 from foss-for-synopsys-dwc-arc-processors/toolchain_option
optimization and bug fixes in toolchain options
2 parents 7aa3e6f + db3d447 commit 27898d9

File tree

15 files changed

+38
-55
lines changed

15 files changed

+38
-55
lines changed

‎board/axs/configs/core_configs.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,3 @@ OPENOCD_CFG_FILE ?= $(OPENOCD_SCRIPT_ROOT)/board/snps_axs103_hs36.cfg
5353
endif
5454

5555
OPENOCD_OPTIONS = -s $(OPENOCD_SCRIPT_ROOT) -f $(OPENOCD_CFG_FILE)
56-
57-
CORE_DEFINES += -DCURRENT_CORE=$(VALID_CUR_CORE)

‎board/emsdp/rev2/configs/core_configs.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,3 @@ $(info BOARD $(BOARD)-$(BD_VER) Core Configurations - $(SUPPORTED_CORES) are sup
4646
$(error $(CUR_CORE) is not supported in $(BOARD)-$(BD_VER), please check it!)
4747
endif
4848
endif
49-
50-
CORE_DEFINES += -DCURRENT_CORE=$(VALID_CUR_CORE)

‎board/hsdk/configs/core_configs.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,3 @@ $(info BOARD $(BOARD)-$(BD_VER) Core Configurations - $(SUPPORTED_CORES) are sup
4343
$(error $(CUR_CORE) is not supported in $(BOARD)-$(BD_VER), please check it!)
4444
endif
4545
endif
46-
47-
CORE_DEFINES += -DCURRENT_CORE=$(VALID_CUR_CORE)

‎board/iotdk/configs/core_configs.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@ override CUR_CORE := arcem9d
1515
VALID_CUR_CORE = $(CUR_CORE)
1616

1717
TCF = $(BOARD_CORE_DIR)/tcf/$(CUR_CORE).tcf
18-
19-
CORE_DEFINES += -DCURRENT_CORE=$(VALID_CUR_CORE)

‎board/linker_template_gnu.ld‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ SECTIONS
2525
{
2626
. = . + IMAGE_HEAD_SIZE;
2727
_f_init = .;
28-
KEEP (*(.init_vector))
29-
KEEP (*(.init_bootstrap))
28+
KEEP (*(.init_vector .init_vector.*))
29+
KEEP (*(.init_bootstrap .init_bootstrap.*))
3030
_e_init = .;
3131
} > REGION_ROM
3232

3333
.vector : ALIGN(1024)
3434
{
3535
_f_vector = .;
36-
*(.vector)
36+
*(.vector .vector.*)
3737
_e_vector = .;
3838
} > REGION_ROM
3939

‎board/linker_template_mw.ld‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ SECTIONS {
2525
. = . + IMAGE_HEAD_SIZE;
2626
}
2727
.init_bootstrap:{
28-
*(.init_vector)
29-
*(.init_bootstrap)
28+
*(.init_vector .init_vector.*)
29+
*(.init_bootstrap .init_bootstrap.*)
3030
}
3131
.vector ALIGN(1024): {
3232
_f_vector = .;
33-
*(.vector)
33+
*(.vector .vector.*)
3434
_e_vector = .;
3535
}
3636
} > REGION_ROM
@@ -40,6 +40,7 @@ SECTIONS {
4040
.text ALIGN(4): {
4141
_f_text = .;
4242
*(TYPE text)
43+
*(.text*)
4344
_e_text = .;
4445
}
4546

‎board/nsim/configs/core_configs.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,3 @@ $(info BOARD $(BOARD)-$(BD_VER) Core Configurations - $(SUPPORTED_CORES) are sup
4343
$(error $(CUR_CORE) is not supported in $(BOARD)-$(BD_VER), please check it!)
4444
endif
4545
endif
46-
47-
CORE_DEFINES += -DCURRENT_CORE=$(VALID_CUR_CORE)

‎library/secureshield/board/secureshield_normal_template_gnu.ld‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@ SECTIONS
2929
/* secureshield code and rodata */
3030
. = ALIGN(4);
3131
_f_rom_secureshieldruntime = .;
32-
KEEP(*(.rom.secureshield.secure))
32+
KEEP(*(.rom.secureshield.secure .rom.secureshield.secure.*))
3333

3434
/* the following are secureshield application configuration */
3535
_f_cfg_secureshield = .;
3636
/* secureshield container configuration tables */
3737
. = ALIGN(32);
3838
__secureshield_cfgtbl_start = .;
39-
KEEP(*(.keep.secureshield.cfgtbl))
39+
KEEP(*(.keep.secureshield.cfgtbl .keep.secureshield.cfgtbl.*))
4040
. = ALIGN(32);
4141
__secureshield_cfgtbl_end = .;
4242

4343
/* pointers to secureshield secure shields configuration tables */
4444
/* note: no further alignment here, we need to have the exact list of pointers */
4545
__secureshield_cfgtbl_ptr_start = .;
46-
KEEP(*(.keep.secureshield.cfgtbl_ptr_first))
47-
KEEP(*(.keep.secureshield.cfgtbl_ptr))
46+
KEEP(*(.keep.secureshield.cfgtbl_ptr_first .keep.secureshield.cfgtbl_ptr_first.*))
47+
KEEP(*(.keep.secureshield.cfgtbl_ptr .keep.secureshield.cfgtbl_ptr.*))
4848
__secureshield_cfgtbl_ptr_end = .;
4949

50-
KEEP(*(.keep.secureshield.ac_table))
50+
KEEP(*(.keep.secureshield.ac_table .keep.secureshield.ac_table.*))
5151

5252
. = ALIGN(32);
5353

@@ -75,8 +75,8 @@ SECTIONS
7575
. = ALIGN(4);
7676
_f_ram_secureshieldruntime = .;
7777

78-
KEEP(*(.ram.secureshield.secure))
79-
KEEP(*(.ram.secureshield.stack))
78+
KEEP(*(.ram.secureshield.secure .ram.secureshield.secure.*))
79+
KEEP(*(.ram.secureshield.stack .ram.secureshield.stack.*))
8080

8181
#if SECURESHIELD_VERSION == 1
8282
_e_ram_secureshieldruntime = _f_ram_secureshieldruntime + CONTAINER_SIZE_ALIGNMENT(. - _f_ram_secureshieldruntime);
@@ -100,15 +100,15 @@ SECTIONS
100100
{
101101
_f_text_background_container = .;
102102
_f_init = .;
103-
KEEP (*(.init_vector))
104-
KEEP (*(.init_bootstrap))
103+
KEEP (*(.init_vector .init_vector.*))
104+
KEEP (*(.init_bootstrap .init_bootstrap.*))
105105
_e_init = .;
106106
} > NORMAL_ROM
107107

108108
.vector : ALIGN(1024)
109109
{
110110
_f_vector = .;
111-
*(.vector)
111+
*(.vector .vector.*)
112112
_e_vector = .;
113113
} > NORMAL_ROM
114114

‎library/secureshield/board/secureshield_normal_template_mw.ld‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,26 @@ SECTIONS {
1717
/* secureshield secure code, rodata, data */
1818
. = ALIGN(4);
1919
_f_rom_secureshieldruntime = .;
20-
KEEP(*(.rom.secureshield.secure))
20+
KEEP(*(.rom.secureshield.secure .rom.secureshield.secure.*))
2121

2222

2323
/* the following are secureshield application configuration */
2424
_f_cfg_secureshield = .;
2525
/* secureshield container configuration tables */
2626
. = ALIGN(32);
2727
__secureshield_cfgtbl_start = .;
28-
KEEP(*(.keep.secureshield.cfgtbl))
28+
KEEP(*(.keep.secureshield.cfgtbl .keep.secureshield.cfgtbl.*))
2929
. = ALIGN(32);
3030
__secureshield_cfgtbl_end = .;
3131

3232
/* pointers to secureshield secure shields configuration tables */
3333
/* note: no further alignment here, we need to have the exact list of pointers */
3434
__secureshield_cfgtbl_ptr_start = .;
35-
KEEP(*(.keep.secureshield.cfgtbl_ptr_first))
36-
KEEP(*(.keep.secureshield.cfgtbl_ptr))
35+
KEEP(*(.keep.secureshield.cfgtbl_ptr_first .keep.secureshield.cfgtbl_ptr_first.*))
36+
KEEP(*(.keep.secureshield.cfgtbl_ptr .keep.secureshield.cfgtbl_ptr.*))
3737
__secureshield_cfgtbl_ptr_end = .;
3838

39-
KEEP(*(.keep.secureshield.ac_table))
39+
KEEP(*(.keep.secureshield.ac_table .keep.secureshield.ac_table.*))
4040

4141
. = ALIGN(32);
4242
_e_cfg_secureshield = .;
@@ -62,8 +62,8 @@ SECTIONS {
6262
/* secureshield runtime data */
6363
. = ALIGN(4);
6464
_f_ram_secureshieldruntime = .;
65-
KEEP(*(.ram.secureshield.secure))
66-
KEEP(*(.ram.secureshield.stack))
65+
KEEP(*(.ram.secureshield.secure .ram.secureshield.secure.*))
66+
KEEP(*(.ram.secureshield.stack .ram.secureshield.stack.*))
6767
#if SECURESHIELD_VERSION == 1
6868
_e_ram_secureshieldruntime = _f_ram_secureshieldruntime + CONTAINER_SIZE_ALIGNMENT(. - _f_ram_secureshieldruntime);
6969
#elif SECURESHIELD_VERSION == 2
@@ -88,21 +88,22 @@ SECTIONS {
8888
.init_bootstrap:{
8989
_f_text_background_container = .;
9090
_f_init = .;
91-
KEEP(*(.init_vector))
92-
KEEP(*(.init_bootstrap))
91+
KEEP(*(.init_vector .init_vector.*))
92+
KEEP(*(.init_bootstrap .init_bootstrap.*))
9393
_e_init = .;
9494
}
9595

9696
.vector ALIGN(1024): {
9797
_f_vector = .;
98-
*(.vector)
98+
*(.vector .vector.*)
9999
_e_vector = .;
100100
}
101101

102102
/* . = ALIGN(SECURESHIELD_CONTAINER_ALIGNMENT); */
103103
.text ALIGN(4): {
104104
_f_text = .;
105105
*(TYPE text)
106+
*(.text*)
106107
_e_text = .;
107108
}
108109

‎library/secureshield/board/secureshield_secure_template_gnu.ld‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SECTIONS {
1313

1414
.text : ALIGN(4) {
1515
_f_text = .;
16-
KEEP(*(.secureshield_init))
16+
KEEP(*(.secureshield_init .secureshield_init.*))
1717
*(.text .text.* .gnu.linkonce.t.*)
1818
_e_text = .;
1919
} > SECURE_ROM

0 commit comments

Comments
 (0)