From d2e76fe34a61979a9d310e4f2917f5a6997e4449 Mon Sep 17 00:00:00 2001 From: Renato Alencar Date: Thu, 9 Dec 2021 14:44:48 -0300 Subject: [PATCH] Fix syntax error on LD scripts --- bindings/hvt/solo5_hvt.lds | 8 ++++---- bindings/muen/solo5_muen.lds | 8 ++++---- bindings/spt/solo5_spt.lds | 8 ++++---- bindings/virtio/solo5_virtio.lds | 8 ++++---- bindings/xen/solo5_xen.lds | 8 ++++---- include/solo5/elf_abi.h | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/bindings/hvt/solo5_hvt.lds b/bindings/hvt/solo5_hvt.lds index a3e0f148..d60f2f5c 100644 --- a/bindings/hvt/solo5_hvt.lds +++ b/bindings/hvt/solo5_hvt.lds @@ -38,7 +38,7 @@ PHDRS { text PT_LOAD FLAGS(5); /* No FILEHDR or PHDRS, force R/E only. FLAGS values come from PF_x in elf.h */ data PT_LOAD; - note.not-openbsd PT_NOTE; /* Must come first. */ + note.not_openbsd PT_NOTE; /* Must come first. */ note.abi PT_NOTE; note.manifest PT_NOTE; } @@ -78,10 +78,10 @@ SECTIONS { { *(.note.solo5.abi*) } :text :note.abi - .note.solo5.not-openbsd : + .note.solo5.not_openbsd : { - *(.note.solo5.not-openbsd*) - } :text :note.not-openbsd + *(.note.solo5.not_openbsd*) + } :text :note.not_openbsd .rodata : { diff --git a/bindings/muen/solo5_muen.lds b/bindings/muen/solo5_muen.lds index b1340bc0..3b5e20b6 100644 --- a/bindings/muen/solo5_muen.lds +++ b/bindings/muen/solo5_muen.lds @@ -39,7 +39,7 @@ PHDRS { FLAGS values come from PF_x in elf.h */ rodata PT_LOAD; data PT_LOAD; - note.not-openbsd PT_NOTE; /* Must come first. */ + note.not_openbsd PT_NOTE; /* Must come first. */ note.abi PT_NOTE; note.manifest PT_NOTE; } @@ -79,10 +79,10 @@ SECTIONS { { *(.note.solo5.abi*) } :rodata :note.abi - .note.solo5.not-openbsd : + .note.solo5.not_openbsd : { - *(.note.solo5.not-openbsd*) - } :rodata :note.not-openbsd + *(.note.solo5.not_openbsd*) + } :rodata :note.not_openbsd .rodata : { diff --git a/bindings/spt/solo5_spt.lds b/bindings/spt/solo5_spt.lds index b85ce14b..fdf39ddf 100644 --- a/bindings/spt/solo5_spt.lds +++ b/bindings/spt/solo5_spt.lds @@ -38,7 +38,7 @@ PHDRS { text PT_LOAD FLAGS(5); /* No FILEHDR or PHDRS, force R/E only. FLAGS values come from PF_x in elf.h */ data PT_LOAD; - note.not-openbsd PT_NOTE; /* Must come first. */ + note.not_openbsd PT_NOTE; /* Must come first. */ note.abi PT_NOTE; note.manifest PT_NOTE; } @@ -78,10 +78,10 @@ SECTIONS { { *(.note.solo5.abi*) } :text :note.abi - .note.solo5.not-openbsd : + .note.solo5.not_openbsd : { - *(.note.solo5.not-openbsd*) - } :text :note.not-openbsd + *(.note.solo5.not_openbsd*) + } :text :note.not_openbsd .rodata : { diff --git a/bindings/virtio/solo5_virtio.lds b/bindings/virtio/solo5_virtio.lds index feba4abd..da1095ea 100644 --- a/bindings/virtio/solo5_virtio.lds +++ b/bindings/virtio/solo5_virtio.lds @@ -38,7 +38,7 @@ PHDRS { text PT_LOAD FLAGS(5); /* No FILEHDR or PHDRS, force R/E only. FLAGS values come from PF_x in elf.h */ data PT_LOAD; - note.not-openbsd PT_NOTE; /* Must come first. */ + note.not_openbsd PT_NOTE; /* Must come first. */ note.abi PT_NOTE; note.manifest PT_NOTE; } @@ -96,10 +96,10 @@ SECTIONS { { *(.note.solo5.abi*) } :data :note.abi - .note.solo5.not-openbsd : + .note.solo5.not_openbsd : { - *(.note.solo5.not-openbsd*) - } :data :note.not-openbsd + *(.note.solo5.not_openbsd*) + } :data :note.not_openbsd /* Read-write data (initialized) */ .got : diff --git a/bindings/xen/solo5_xen.lds b/bindings/xen/solo5_xen.lds index 471206a7..1106c149 100644 --- a/bindings/xen/solo5_xen.lds +++ b/bindings/xen/solo5_xen.lds @@ -38,7 +38,7 @@ PHDRS { text PT_LOAD FLAGS(5); /* No FILEHDR or PHDRS, force R/E only. FLAGS values come from PF_x in elf.h */ data PT_LOAD; - note.not-openbsd PT_NOTE; /* Must come first. */ + note.not_openbsd PT_NOTE; /* Must come first. */ note.xen PT_NOTE; note.abi PT_NOTE; note.manifest PT_NOTE; @@ -97,10 +97,10 @@ SECTIONS { { *(.note.solo5.abi*) } :data :note.abi - .note.solo5.not-openbsd : + .note.solo5.not_openbsd : { - *(.note.solo5.not-openbsd*) - } :data :note.not-openbsd + *(.note.solo5.not_openbsd*) + } :data :note.not_openbsd .note.solo5.xen : { *(.note.solo5.xen*) diff --git a/include/solo5/elf_abi.h b/include/solo5/elf_abi.h index 28090dd1..9e5e9f3d 100644 --- a/include/solo5/elf_abi.h +++ b/include/solo5/elf_abi.h @@ -168,7 +168,7 @@ struct openbsd_note { */ #define DECLARE_OPENBSD_NOTE \ const struct openbsd_note __solo5_openbsd_note \ -__attribute__ ((section (".note.solo5.not-openbsd"), aligned(4))) \ +__attribute__ ((section (".note.solo5.not_openbsd"), aligned(4))) \ = { \ .n_namesz = 8, \ .n_descsz = 4, \