From 71f231da83fdd75deab3ce1b8643da50b6f574f5 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 24 Mar 2012 03:16:39 +0100 Subject: Fix Xen boot after c74adfe * i386/Makefrag.am (_START_MAP): Define symbol to 0x100000. * i386/xen/Makefrag.am (_START_MAP): Define symbol to 0xC0000000. * i386/ldscript: Use _START_MAP instead of hardcoding 0x100000. --- i386/Makefrag.am | 1 + i386/ldscript | 2 +- i386/xen/Makefrag.am | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/i386/Makefrag.am b/i386/Makefrag.am index aca4215d..ea5149f5 100644 --- a/i386/Makefrag.am +++ b/i386/Makefrag.am @@ -200,6 +200,7 @@ EXTRA_DIST += \ if PLATFORM_at gnumach_LINKFLAGS += \ --defsym _START=0x100000 \ + --defsym _START_MAP=0x100000 \ -T '$(srcdir)'/i386/ldscript endif diff --git a/i386/ldscript b/i386/ldscript index a63ff77c..ddbbf910 100644 --- a/i386/ldscript +++ b/i386/ldscript @@ -13,7 +13,7 @@ SECTIONS */ . = _START; .text : - AT (0x00100000) + AT (_START_MAP) { *(.text.start) *(.text .stub .text.* .gnu.linkonce.t.*) diff --git a/i386/xen/Makefrag.am b/i386/xen/Makefrag.am index 02e3e120..ecb33ffc 100644 --- a/i386/xen/Makefrag.am +++ b/i386/xen/Makefrag.am @@ -29,5 +29,6 @@ libkernel_a_SOURCES += \ if PLATFORM_xen gnumach_LINKFLAGS += \ --defsym _START=0xC0000000 \ + --defsym _START_MAP=0xC0000000 \ -T '$(srcdir)'/i386/ldscript endif -- cgit v1.2.3