NuKVM/memtest86plus
3
0
Fork 0
mirror of https://github.com/memtest86plus/memtest86plus.git synced 2026-07-31 00:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix LA64-only linker RWX warnings (#609)

Browse Source 
* Fix LA64 RWX complains from ld

* Fix clause order
This commit is contained in:
Sam Demeulemeester
2026-04-27 22:17:34 +02:00
committed by GitHub
parent eac97205ff
commit 3139edc1bf
3 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/loongarch64/Makefile
+1 -3
View File
@@ -192,9 +192,7 @@ mt86plus: memtest_shared.bin boot/loongarch/header.o ldscripts/memtest_efi.lds
$(eval SPLIT=$(shell nm -t d memtest_shared | awk '/ _etext_ro$$/{print $$1+0}'))
dd if=memtest_shared.bin of=memtest_text.bin bs=$(SPLIT) count=1 2>/dev/null
dd if=memtest_shared.bin of=memtest_data.bin bs=$(SPLIT) skip=1 2>/dev/null
$(LD) --defsym=_bss_size=$(word 3,$(SIZES)) -T ldscripts/memtest_efi.lds boot/loongarch/header.o -b binary memtest_text.bin memtest_data.bin -o memtest.elf
$(OBJCOPY) -O binary memtest.elf mt86plus
rm -f memtest.elf
$(LD) --defsym=_bss_size=$(word 3,$(SIZES)) -T ldscripts/memtest_efi.lds boot/loongarch/header.o -b binary memtest_text.bin memtest_data.bin -o mt86plus
esp.img: mt86plus
@mkdir -p iso/EFI/BOOT
build/loongarch64/ldscripts/memtest_efi.lds
+1 -1
View File
@@ -1,4 +1,4 @@
OUTPUT_FORMAT("elf64-loongarch")
OUTPUT_FORMAT("binary")
OUTPUT_ARCH(loongarch)
ENTRY(head);
build/loongarch64/ldscripts/memtest_shared.lds
+26 -15
View File
@@ -2,6 +2,17 @@ OUTPUT_FORMAT("elf64-loongarch")
OUTPUT_ARCH(loongarch);
ENTRY(startup64);
/* Explicit PHDRS so ld doesn't auto-merge the read-execute and read-write
sections into a single RWX LOAD segment (LoongArch ld will warn otherwise).
The output ELF is later objcopy'd to a flat binary, so these segments are
purely cosmetic, but the warning is silenced and the layout is explicit. */
PHDRS {
text PT_LOAD FLAGS(5); /* R_E */
data PT_LOAD FLAGS(6); /* RW_ */
dynamic PT_DYNAMIC FLAGS(6);
}
SECTIONS {
. = 0;
.text : {
@@ -10,22 +21,22 @@ SECTIONS {
*(.text.*)
*(.plt)
_etext = . ;
} = 0x00004003
} :text = 0x00004003
.rodata : {
*(.rodata)
*(.rodata.*)
}
.dynsym : { *(.dynsym) }
.dynstr : { *(.dynstr) }
.hash : { *(.hash) }
.gnu.hash : { *(.gnu.hash) }
} :text
.dynsym : { *(.dynsym) } :text
.dynstr : { *(.dynstr) } :text
.hash : { *(.hash) } :text
.gnu.hash : { *(.gnu.hash) } :text
.shstrtab : { *(.shstrtab) }
.rela.text : { *(.rela.text .rela.text.*) }
.rela.rodata : { *(.rela.rodata .rela.rodata.*) }
.rela.data : { *(.rela.data .rela.data.*) }
.rela.got : { *(.rela.got .rela.got.*) }
.rela.plt : { *(.rela.plt .rela.plt.*) }
.rela.text : { *(.rela.text .rela.text.*) } :text
.rela.rodata : { *(.rela.rodata .rela.rodata.*) } :text
.rela.data : { *(.rela.data .rela.data.*) } :text
.rela.got : { *(.rela.got .rela.got.*) } :text
.rela.plt : { *(.rela.plt .rela.plt.*) } :text
/* Page-align the boundary between read-only and writable sections.
PE SectionAlignment is 4096, so this ensures the split point
@@ -37,12 +48,12 @@ SECTIONS {
_data = .;
*(.data)
*(.data.*)
}
} :data
.got : {
*(.got.plt)
*(.got)
}
.dynamic : { *(.dynamic) }
} :data
.dynamic : { *(.dynamic) } :data :dynamic
_edata = . ;
. = ALIGN(4);
.bss : {
@@ -57,6 +68,6 @@ SECTIONS {
/* _end must be at least 256 byte aligned */
. = ALIGN(256);
_end = .;
}
} :data
/DISCARD/ : { *(*) }
}