diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-31 08:02:21 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-31 08:03:30 +0100 |
| commit | 9819425feecd8d06de1baaf8a8e07f7151623648 (patch) | |
| tree | ffca1ab002784f0ae3c4b48f181f078fe426b4f9 /c/src/lib/libbsp/epiphany | |
| parent | Avoid Newlib-specific _EXFUN() (diff) | |
| download | rtems-9819425feecd8d06de1baaf8a8e07f7151623648.tar.bz2 | |
epiphany: Fixes for GCC 7.3
GCC 7.3 defines __USER_LABEL_PREFIX__ to nothing.
Diffstat (limited to 'c/src/lib/libbsp/epiphany')
| -rw-r--r-- | c/src/lib/libbsp/epiphany/epiphany_sim/start/start.S | 20 | ||||
| -rw-r--r-- | c/src/lib/libbsp/epiphany/epiphany_sim/startup/linkcmds | 28 |
2 files changed, 24 insertions, 24 deletions
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/start/start.S b/c/src/lib/libbsp/epiphany/epiphany_sim/start/start.S index 002cb3b764..7f828ae151 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/start/start.S +++ b/c/src/lib/libbsp/epiphany/epiphany_sim/start/start.S @@ -28,19 +28,19 @@ EXTERN(bsp_section_bss_begin) EXTERN(bsp_section_bss_end) -EXTERN(ISR_Handler) +EXTERN(_ISR_Handler) EXTERN(bsp_start_vector_table_end) EXTERN(bsp_start_vector_table_size) EXTERN(bsp_vector_table_size) EXTERN(bsp_section_stack_begin) -PUBLIC(EPIPHANY_Exception_default) +PUBLIC(_EPIPHANY_Exception_default) PUBLIC(bsp_start_vector_table_begin) -PUBLIC(start) +PUBLIC(_start) .section .vector, "wax" -TYPE_FUNC(start) -SYM(start): +TYPE_FUNC(_start) +SYM(_start): .balign 4 ; b .normal_start @@ -71,7 +71,7 @@ SYM(start): .balign 4 ; 0x24 b _EPIPHANY_Exception_default -_bsp_start_vector_table_begin: +bsp_start_vector_table_begin: .word .normal_start /* Reset */ .word _EPIPHANY_Exception_default /* SW exception */ .word _EPIPHANY_Exception_default /* Data Page Fault */ @@ -117,8 +117,8 @@ _bss_clear_loop: _jump_to_c: /* Jump to bootcard */ - mov r3, %low(_boot_card) - movt r3, %high(_boot_card) + mov r3, %low(boot_card) + movt r3, %high(boot_card) jalr r3 /* Should never reach here */ @@ -162,6 +162,6 @@ _jump_to_c: jr r63 .balign 4 -TYPE_FUNC(EPIPHANY_Exception_default) -SYM(EPIPHANY_Exception_default): +TYPE_FUNC(_EPIPHANY_Exception_default) +SYM(_EPIPHANY_Exception_default): idle diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/startup/linkcmds b/c/src/lib/libbsp/epiphany/epiphany_sim/startup/linkcmds index 31e31becf4..07a4c29a32 100644 --- a/c/src/lib/libbsp/epiphany/epiphany_sim/startup/linkcmds +++ b/c/src/lib/libbsp/epiphany/epiphany_sim/startup/linkcmds @@ -143,21 +143,21 @@ SECTIONS { *(.gcc_except_table .gcc_except_table.*) } > REGION_RODATA AT > REGION_RODATA_LOAD .tdata : { - __TLS_Data_begin = .; + _TLS_Data_begin = .; *(.tdata .tdata.* .gnu.linkonce.td.*) - __TLS_Data_end = .; + _TLS_Data_end = .; } > REGION_RODATA AT > REGION_RODATA_LOAD .tbss : { - __TLS_BSS_begin = .; + _TLS_BSS_begin = .; *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) - __TLS_BSS_end = .; + _TLS_BSS_end = .; } > REGION_RODATA AT > REGION_RODATA_LOAD - __TLS_Data_size = __TLS_Data_end - __TLS_Data_begin; - __TLS_Data_begin = __TLS_Data_size != 0 ? __TLS_Data_begin : __TLS_BSS_begin; - __TLS_Data_end = __TLS_Data_size != 0 ? __TLS_Data_end : __TLS_BSS_begin; - __TLS_BSS_size = __TLS_BSS_end - __TLS_BSS_begin; - __TLS_Size = __TLS_BSS_end - __TLS_Data_begin; - __TLS_Alignment = MAX (ALIGNOF (.tdata), ALIGNOF (.tbss)); + _TLS_Data_size = _TLS_Data_end - _TLS_Data_begin; + _TLS_Data_begin = _TLS_Data_size != 0 ? _TLS_Data_begin : _TLS_BSS_begin; + _TLS_Data_end = _TLS_Data_size != 0 ? _TLS_Data_end : _TLS_BSS_begin; + _TLS_BSS_size = _TLS_BSS_end - _TLS_BSS_begin; + _TLS_Size = _TLS_BSS_end - _TLS_Data_begin; + _TLS_Alignment = MAX (ALIGNOF (.tdata), ALIGNOF (.tbss)); .preinit_array : { PROVIDE_HIDDEN (__preinit_array_start = .); KEEP (*(.preinit_array)) @@ -363,8 +363,8 @@ SECTIONS { } > REGION_STACK AT > REGION_STACK bsp_section_stack_size = bsp_section_stack_begin - bsp_section_stack_end; - _RamBase = ORIGIN (REGION_WORK); - _RamSize = LENGTH (REGION_WORK); - _WorkAreaBase = bsp_section_work_begin; - _HeapSize = 0; + RamBase = ORIGIN (REGION_WORK); + RamSize = LENGTH (REGION_WORK); + WorkAreaBase = bsp_section_work_begin; + HeapSize = 0; } |