Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch put .note.Xen into PT_NOTE
details: https://anonhg.NetBSD.org/src/rev/a6a3d96990a3
branches: trunk
changeset: 359809:a6a3d96990a3
user: maya <maya%NetBSD.org@localhost>
date: Mon Jan 24 00:15:09 2022 +0000
description:
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.
diffstat:
sys/arch/amd64/conf/kern.ldscript.Xen | 13 +++++++++++--
sys/arch/i386/conf/kern.ldscript.Xen | 13 +++++++++++--
2 files changed, 22 insertions(+), 4 deletions(-)
diffs (66 lines):
diff -r 3fe91aecfc66 -r a6a3d96990a3 sys/arch/amd64/conf/kern.ldscript.Xen
--- a/sys/arch/amd64/conf/kern.ldscript.Xen Sun Jan 23 22:12:16 2022 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript.Xen Mon Jan 24 00:15:09 2022 +0000
@@ -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 @@
*(.text.*)
*(.stub)
. = ALIGN(__PAGE_SIZE);
- } =0xCC
+ } :main =0xCC
_etext = . ;
PROVIDE (etext = .) ;
@@ -80,5 +80,14 @@
{
KEEP(*(.note.netbsd.ident));
}
+ .note.Xen :
+ {
+ KEEP(*(.note.Xen));
+ } :notes
}
+PHDRS
+{
+ main PT_LOAD;
+ notes PT_NOTE;
+}
diff -r 3fe91aecfc66 -r a6a3d96990a3 sys/arch/i386/conf/kern.ldscript.Xen
--- a/sys/arch/i386/conf/kern.ldscript.Xen Sun Jan 23 22:12:16 2022 +0000
+++ b/sys/arch/i386/conf/kern.ldscript.Xen Mon Jan 24 00:15:09 2022 +0000
@@ -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 @@
*(.text.*)
*(.stub)
. = ALIGN(__PAGE_SIZE);
- } =0xCC
+ } :main =0xCC
_etext = . ;
PROVIDE (etext = .) ;
@@ -75,5 +75,14 @@
{
KEEP(*(.note.netbsd.ident));
}
+ .note.Xen :
+ {
+ KEEP(*(.note.Xen));
+ } :notes
}
+PHDRS
+{
+ main PT_LOAD;
+ notes PT_NOTE;
+}
Home |
Main Index |
Thread Index |
Old Index