From bbc3c0d657a0beaaddc216cec6e4bc753fca1b2b Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Sun, 20 Jun 2021 23:08:04 +0100 Subject: [PATCH 1/6] changed gba.ld to a file and not a symlink --- template/gba.ld | 110 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 1 deletion(-) mode change 120000 => 100644 template/gba.ld diff --git a/template/gba.ld b/template/gba.ld deleted file mode 120000 index 4b691d47..00000000 --- a/template/gba.ld +++ /dev/null @@ -1 +0,0 @@ -../agb/gba.ld \ No newline at end of file diff --git a/template/gba.ld b/template/gba.ld new file mode 100644 index 00000000..0857ba10 --- /dev/null +++ b/template/gba.ld @@ -0,0 +1,109 @@ + +OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm") +OUTPUT_ARCH(arm) + +ENTRY(__start) + +MEMORY { + ewram (w!x) : ORIGIN = 0x02000000, LENGTH = 256K + iwram (w!x) : ORIGIN = 0x03000000, LENGTH = 32K + rom (rx) : ORIGIN = 0x08000000, LENGTH = 32M +} + +__text_start = ORIGIN(rom); + +SECTIONS { + . = __text_start; + + .crt0 : { + KEEP (crt0.o(.text)); + . = ALIGN(4); + } > rom + + .text : { + *(.text .text*); + . = ALIGN(4); + } > rom + __text_end = .; + + .rodata : { + *(.rodata .rodata.*); + . = ALIGN(4); + } > rom + + __iwram_rom_start = .; + .iwram : { + __iwram_data_start = ABSOLUTE(.); + + *(.iwram .iwram.*); + . = ALIGN(4); + + *(.text_iwram .text_iwram.*); + . = ALIGN(4); + + __iwram_data_end = ABSOLUTE(.); + } > iwram AT>rom + + . = __iwram_rom_start + (__iwram_data_end - __iwram_data_start); + + __ewram_rom_start = .; + .ewram : { + __ewram_data_start = ABSOLUTE(.); + + *(.ewram .ewram.*); + . = ALIGN(4); + + *(.data .data.*); + . = ALIGN(4); + + __ewram_data_end = ABSOLUTE(.); + } > ewram AT>rom + + .bss : { + *(.bss .bss.*); + . = ALIGN(4); + } > iwram + + __iwram_rom_length_bytes = __iwram_data_end - __iwram_data_start; + __iwram_rom_length_halfwords = (__iwram_rom_length_bytes + 1) / 2; + + __ewram_rom_length_bytes = __ewram_data_end - __ewram_data_start; + __ewram_rom_length_halfwords = (__ewram_rom_length_bytes + 1) / 2; + + /* debugging sections */ + /* Stabs */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + /* SGI/MIPS DWARF 2 extensions */ + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + + .debug_ranges 0 : { *(.debug_ranges) } + + /* discard anything not already mentioned */ + /DISCARD/ : { *(*) } +} \ No newline at end of file From 018f8dae306deb10e3f0517b869cf8b303c19457 Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Sun, 20 Jun 2021 23:08:44 +0100 Subject: [PATCH 2/6] add check if files are identical --- .github/workflows/linker-script.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/workflows/linker-script.yml diff --git a/.github/workflows/linker-script.yml b/.github/workflows/linker-script.yml new file mode 100644 index 00000000..cfc3ff5a --- /dev/null +++ b/.github/workflows/linker-script.yml @@ -0,0 +1,10 @@ +on: push + +jobs: + build: + runs-on: ubuntu-20.04 + steps: + - name: Check out repository + uses: actions/checkout@v2 + - name: Check if gba.ld files are identical + cmp --silent -- "agb/gba.ld" "template/gba.ld" \ No newline at end of file From a4c4fd6ce0052dc1eb7c82f85308091ff3be2053 Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Sun, 20 Jun 2021 23:10:17 +0100 Subject: [PATCH 3/6] add name --- .github/workflows/linker-script.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/linker-script.yml b/.github/workflows/linker-script.yml index cfc3ff5a..802d7ec3 100644 --- a/.github/workflows/linker-script.yml +++ b/.github/workflows/linker-script.yml @@ -1,3 +1,5 @@ +name: Enforce gba.ld consistency + on: push jobs: From 4714144db57bdc110860c0fe430d61a6e9a010af Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Sun, 20 Jun 2021 23:10:53 +0100 Subject: [PATCH 4/6] add newline --- .github/workflows/linker-script.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linker-script.yml b/.github/workflows/linker-script.yml index 802d7ec3..f59df43c 100644 --- a/.github/workflows/linker-script.yml +++ b/.github/workflows/linker-script.yml @@ -9,4 +9,4 @@ jobs: - name: Check out repository uses: actions/checkout@v2 - name: Check if gba.ld files are identical - cmp --silent -- "agb/gba.ld" "template/gba.ld" \ No newline at end of file + cmp --silent -- "agb/gba.ld" "template/gba.ld" From d2464c2585ca930f5f6490a77e86363b03c6961c Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Sun, 20 Jun 2021 23:11:26 +0100 Subject: [PATCH 5/6] add run to actually run something --- .github/workflows/linker-script.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linker-script.yml b/.github/workflows/linker-script.yml index f59df43c..06e75c39 100644 --- a/.github/workflows/linker-script.yml +++ b/.github/workflows/linker-script.yml @@ -9,4 +9,4 @@ jobs: - name: Check out repository uses: actions/checkout@v2 - name: Check if gba.ld files are identical - cmp --silent -- "agb/gba.ld" "template/gba.ld" + run: cmp --silent -- "agb/gba.ld" "template/gba.ld" From 98a7731dd5161ca3611de4959bbefd8ad67143c4 Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Sun, 20 Jun 2021 23:12:50 +0100 Subject: [PATCH 6/6] make files the same --- template/gba.ld | 1 - 1 file changed, 1 deletion(-) diff --git a/template/gba.ld b/template/gba.ld index 0857ba10..7e2907be 100644 --- a/template/gba.ld +++ b/template/gba.ld @@ -1,4 +1,3 @@ - OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm") OUTPUT_ARCH(arm)