Module Name: src
Committed By: maya
Date: Mon Jan 24 00:15:09 UTC 2022
Modified Files:
src/sys/arch/amd64/conf: kern.ldscript.Xen
src/sys/arch/i386/conf: kern.ldscript.Xen
Log Message:
put .note.Xen into PT_NOTE
this is where grub 2.02 and possibly other things expect
to find it.
Fixes booting with grub2 on prgmr.com.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amd64/conf/kern.ldscript.Xen
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/conf/kern.ldscript.Xen
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/kern.ldscript.Xen
diff -u src/sys/arch/amd64/conf/kern.ldscript.Xen:1.17 src/sys/arch/amd64/conf/kern.ldscript.Xen:1.18
--- src/sys/arch/amd64/conf/kern.ldscript.Xen:1.17 Thu May 21 09:36:24 2020
+++ src/sys/arch/amd64/conf/kern.ldscript.Xen Mon Jan 24 00:15:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.17 2020/05/21 09:36:24 jdolecek Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.18 2022/01/24 00:15:09 maya Exp $ */
#include "assym.h"
@@ -13,7 +13,7 @@ SECTIONS
*(.text.*)
*(.stub)
. = ALIGN(__PAGE_SIZE);
- } =0xCC
+ } :main =0xCC
_etext = . ;
PROVIDE (etext = .) ;
@@ -80,5 +80,14 @@ SECTIONS
{
KEEP(*(.note.netbsd.ident));
}
+ .note.Xen :
+ {
+ KEEP(*(.note.Xen));
+ } :notes
}
+PHDRS
+{
+ main PT_LOAD;
+ notes PT_NOTE;
+}
Index: src/sys/arch/i386/conf/kern.ldscript.Xen
diff -u src/sys/arch/i386/conf/kern.ldscript.Xen:1.16 src/sys/arch/i386/conf/kern.ldscript.Xen:1.17
--- src/sys/arch/i386/conf/kern.ldscript.Xen:1.16 Sun Jun 24 18:24:53 2018
+++ src/sys/arch/i386/conf/kern.ldscript.Xen Mon Jan 24 00:15:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.Xen,v 1.16 2018/06/24 18:24:53 maxv Exp $ */
+/* $NetBSD: kern.ldscript.Xen,v 1.17 2022/01/24 00:15:09 maya Exp $ */
#include "assym.h"
@@ -12,7 +12,7 @@ SECTIONS
*(.text.*)
*(.stub)
. = ALIGN(__PAGE_SIZE);
- } =0xCC
+ } :main =0xCC
_etext = . ;
PROVIDE (etext = .) ;
@@ -75,5 +75,14 @@ SECTIONS
{
KEEP(*(.note.netbsd.ident));
}
+ .note.Xen :
+ {
+ KEEP(*(.note.Xen));
+ } :notes
}
+PHDRS
+{
+ main PT_LOAD;
+ notes PT_NOTE;
+}
