diff options
| author | Chris Johns <chrisj@rtems.org> | 2013-12-19 11:45:19 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2013-12-19 11:45:19 +1100 |
| commit | 4a9e52eefc510d7022ddc61c4ecde8db6b9a0217 (patch) | |
| tree | 8cb73efe35735834319fffe15efa81a54cc40623 | |
| parent | Revert "bsps/arm: Use ALIGN_WITH_INPUT" (diff) | |
| download | rtems-4a9e52eefc510d7022ddc61c4ecde8db6b9a0217.tar.bz2 | |
Fix the broken conflict from the revert.
| -rw-r--r-- | c/src/lib/libbsp/arm/shared/startup/linkcmds.base | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/arm/shared/startup/linkcmds.base b/c/src/lib/libbsp/arm/shared/startup/linkcmds.base index 539728e3e7..40b9c30da9 100644 --- a/c/src/lib/libbsp/arm/shared/startup/linkcmds.base +++ b/c/src/lib/libbsp/arm/shared/startup/linkcmds.base @@ -259,20 +259,20 @@ SECTIONS { /* .got */ *(.got.plt) *(.igot.plt) *(.got) *(.igot) -<<<<<<< HEAD - } > REGION_RODATA AT > REGION_RODATA_LOAD - .rtemsroset : ALIGN_WITH_INPUT { -======= ->>>>>>> parent of 287bbb6... bsps/arm: Use ALIGN_WITH_INPUT /* Special FreeBSD linker set sections */ __start_set_sysctl_set = .; *(set_sysctl_*); __stop_set_sysctl_set = .; *(set_domain_*); *(set_pseudo_*); + _bsd__start_set_modmetadata_set = .; + *(_bsd_set_modmetadata_set); + _bsd__stop_set_modmetadata_set = .; + _bsd__start_set_sysctl_set = .; + *(_bsd_set_sysctl_set); + _bsd__stop_set_sysctl_set = .; - KEEP (*(SORT(.rtemsroset.*))) bsp_section_rodata_end = .; } > REGION_RODATA AT > REGION_RODATA_LOAD bsp_section_rodata_size = bsp_section_rodata_end - bsp_section_rodata_begin; @@ -367,18 +367,12 @@ SECTIONS { /* .data1 */ *(.data1) -<<<<<<< HEAD - } > REGION_DATA AT > REGION_DATA_LOAD - .rtemsrwset : ALIGN_WITH_INPUT { - KEEP (*(SORT(.rtemsrwset.*))) -======= /* Special FreeBSD linker set sections */ _bsd__start_set_sysinit_set = .; *(_bsd_set_sysinit_set); _bsd__stop_set_sysinit_set = .; ->>>>>>> parent of 287bbb6... bsps/arm: Use ALIGN_WITH_INPUT bsp_section_data_end = .; } > REGION_DATA AT > REGION_DATA_LOAD bsp_section_data_size = bsp_section_data_end - bsp_section_data_begin; |