Changeset 9819425 in rtems


Ignore:
Timestamp:
Jan 31, 2018, 7:02:21 AM (17 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
1c64c688
Parents:
865b3027
git-author:
Sebastian Huber <sebastian.huber@…> (01/31/18 07:02:21)
git-committer:
Sebastian Huber <sebastian.huber@…> (01/31/18 07:03:30)
Message:

epiphany: Fixes for GCC 7.3

GCC 7.3 defines USER_LABEL_PREFIX to nothing.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/epiphany/epiphany_sim/start/start.S

    r865b3027 r9819425  
    2929EXTERN(bsp_section_bss_begin)
    3030EXTERN(bsp_section_bss_end)
    31 EXTERN(ISR_Handler)
     31EXTERN(_ISR_Handler)
    3232EXTERN(bsp_start_vector_table_end)
    3333EXTERN(bsp_start_vector_table_size)
     
    3535EXTERN(bsp_section_stack_begin)
    3636
    37 PUBLIC(EPIPHANY_Exception_default)
     37PUBLIC(_EPIPHANY_Exception_default)
    3838PUBLIC(bsp_start_vector_table_begin)
    39 PUBLIC(start)
     39PUBLIC(_start)
    4040
    4141.section .vector, "wax"
    42 TYPE_FUNC(start)
    43 SYM(start):
     42TYPE_FUNC(_start)
     43SYM(_start):
    4444  .balign 4 ;
    4545    b .normal_start
     
    7272    b _EPIPHANY_Exception_default
    7373
    74 _bsp_start_vector_table_begin:
     74bsp_start_vector_table_begin:
    7575  .word .normal_start /* Reset */
    7676  .word _EPIPHANY_Exception_default /* SW exception */
     
    118118_jump_to_c:
    119119  /* Jump to bootcard */
    120   mov  r3, %low(_boot_card)
    121   movt r3, %high(_boot_card)
     120  mov  r3, %low(boot_card)
     121  movt r3, %high(boot_card)
    122122  jalr r3
    123123
     
    163163
    164164.balign 4
    165 TYPE_FUNC(EPIPHANY_Exception_default)
    166 SYM(EPIPHANY_Exception_default):
     165TYPE_FUNC(_EPIPHANY_Exception_default)
     166SYM(_EPIPHANY_Exception_default):
    167167  idle
  • c/src/lib/libbsp/epiphany/epiphany_sim/startup/linkcmds

    r865b3027 r9819425  
    144144       } > REGION_RODATA AT > REGION_RODATA_LOAD
    145145       .tdata :   {
    146                __TLS_Data_begin = .;
     146               _TLS_Data_begin = .;
    147147               *(.tdata .tdata.* .gnu.linkonce.td.*)
    148                __TLS_Data_end = .;
     148               _TLS_Data_end = .;
    149149       } > REGION_RODATA AT > REGION_RODATA_LOAD
    150150       .tbss :   {
    151                __TLS_BSS_begin = .;
     151               _TLS_BSS_begin = .;
    152152               *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon)
    153                __TLS_BSS_end = .;
    154        } > REGION_RODATA AT > REGION_RODATA_LOAD
    155        __TLS_Data_size = __TLS_Data_end - __TLS_Data_begin;
    156        __TLS_Data_begin = __TLS_Data_size != 0 ? __TLS_Data_begin : __TLS_BSS_begin;
    157        __TLS_Data_end = __TLS_Data_size != 0 ? __TLS_Data_end : __TLS_BSS_begin;
    158        __TLS_BSS_size = __TLS_BSS_end - __TLS_BSS_begin;
    159        __TLS_Size = __TLS_BSS_end - __TLS_Data_begin;
    160        __TLS_Alignment = MAX (ALIGNOF (.tdata), ALIGNOF (.tbss));
     153               _TLS_BSS_end = .;
     154       } > REGION_RODATA AT > REGION_RODATA_LOAD
     155       _TLS_Data_size = _TLS_Data_end - _TLS_Data_begin;
     156       _TLS_Data_begin = _TLS_Data_size != 0 ? _TLS_Data_begin : _TLS_BSS_begin;
     157       _TLS_Data_end = _TLS_Data_size != 0 ? _TLS_Data_end : _TLS_BSS_begin;
     158       _TLS_BSS_size = _TLS_BSS_end - _TLS_BSS_begin;
     159       _TLS_Size = _TLS_BSS_end - _TLS_Data_begin;
     160       _TLS_Alignment = MAX (ALIGNOF (.tdata), ALIGNOF (.tbss));
    161161       .preinit_array :   {
    162162               PROVIDE_HIDDEN (__preinit_array_start = .);
     
    364364  bsp_section_stack_size = bsp_section_stack_begin - bsp_section_stack_end;
    365365
    366   _RamBase = ORIGIN (REGION_WORK);
    367   _RamSize = LENGTH (REGION_WORK);
    368   _WorkAreaBase = bsp_section_work_begin;
    369   _HeapSize = 0;
     366  RamBase = ORIGIN (REGION_WORK);
     367  RamSize = LENGTH (REGION_WORK);
     368  WorkAreaBase = bsp_section_work_begin;
     369  HeapSize = 0;
    370370}
  • cpukit/score/cpu/epiphany/epiphany-context-switch.S

    r865b3027 r9819425  
    4040PUBLIC(_CPU_Context_restore_fp)
    4141PUBLIC(_CPU_Context_save_fp)
    42 PUBLIC(restore)
    4342
    4443SYM(_CPU_Context_switch):
     
    123122  str r27, [r0,66]
    124123
    125 SYM(restore):
     124.Lrestore:
    126125
    127126  /* r1 contains buffer address, skip it */
     
    206205SYM(_CPU_Context_restore):
    207206  mov     r1, r0
    208   b       _restore
     207  b       .Lrestore
    209208  nop
    210209
  • cpukit/score/cpu/epiphany/epiphany-exception-handler.S

    r865b3027 r9819425  
    4444EXTERN(bsp_start_vector_table_begin)
    4545EXTERN(_Thread_Dispatch)
    46 PUBLIC(ISR_Handler)
     46PUBLIC(_ISR_Handler)
    4747
    4848.section .text, "ax"
    4949.align 4
    50 TYPE_FUNC(ISR_Handler)
    51 SYM(ISR_Handler):
     50TYPE_FUNC(_ISR_Handler)
     51SYM(_ISR_Handler):
    5252  /* Reserve space for CPU_Exception_frame */
    5353  sub sp, sp, #(CPU_EXCEPTION_FRAME_SIZE)
     
    135135  str r1, [sp,64]
    136136
    137   mov  r33, %low(__Per_CPU_Information)
    138   movt r33, %high(__Per_CPU_Information)
     137  mov  r33, %low(_Per_CPU_Information)
     138  movt r33, %high(_Per_CPU_Information)
    139139
    140140       add  r6, r33, #(PER_CPU_ISR_NEST_LEVEL)
     
    152152  mov  r32, sp
    153153
    154   /* Keep __Per_CPU_Information address in r33 - Callee saved */
     154  /* Keep _Per_CPU_Information address in r33 - Callee saved */
    155155  mov  r33, r18
    156156
     
    164164  mov  r27, r62
    165165  lsl  r27, r27, #2
    166   mov  r26, %low(_bsp_start_vector_table_begin)
     166  mov  r26, %low(bsp_start_vector_table_begin)
    167167  movt r15, #0
    168168  add  r27, r27, r26
     
    185185  mov  sp, r32
    186186
    187   /* Get the address of __Per_CPU_Information */
     187  /* Get the address of _Per_CPU_Information */
    188188  mov r18, r33
    189189
     
    214214  beq     exception_frame_restore
    215215
    216   mov     r35, %low(__Thread_Dispatch)
    217   movt    r35, %high(__Thread_Dispatch)
     216  mov     r35, %low(_Thread_Dispatch)
     217  movt    r35, %high(_Thread_Dispatch)
    218218  jalr    r35
    219219
Note: See TracChangeset for help on using the changeset viewer.