summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-03-24 03:16:39 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-03-24 03:17:33 +0100
commit71f231da83fdd75deab3ce1b8643da50b6f574f5 (patch)
tree005237c85f7d3877ba6ad5212f4d7939bf813c59
parentc74adfecd0b21ea84f7e98629549f7489c78edc9 (diff)
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.
-rw-r--r--i386/Makefrag.am1
-rw-r--r--i386/ldscript2
-rw-r--r--i386/xen/Makefrag.am1
3 files changed, 3 insertions, 1 deletions
diff --git a/i386/Makefrag.am b/i386/Makefrag.am
index aca4215..ea5149f 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 a63ff77..ddbbf91 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 02e3e12..ecb33ff 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