diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-29 12:05:00 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-29 12:05:00 +0200 |
| commit | 2a18e9830b66fc6f7dfaed59404ecc8b80735d48 (patch) | |
| tree | 719901330afb4310059c05bbdff36542c4bcfc3d | |
| parent | fd43850c4046457dcc4166066f8fd851c559b7b4 (diff) | |
| parent | 14c51462a57a08dcfb6bfad8a6a310282609f8a2 (diff) | |
Merge branch 'master' into master-x86_64
| -rw-r--r-- | x86_64/Makefrag.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/x86_64/Makefrag.am b/x86_64/Makefrag.am index 9451b284..89d3302b 100644 --- a/x86_64/Makefrag.am +++ b/x86_64/Makefrag.am @@ -208,7 +208,7 @@ EXTRA_DIST += \ if PLATFORM_at gnumach_LINKFLAGS += \ --defsym _START_MAP=$(_START_MAP) \ - --defsym _START=_START_MAP+0xC0000000 \ + --defsym _START=_START_MAP+0x40000000 \ -T '$(srcdir)'/x86_64/ldscript endif |