summaryrefslogtreecommitdiff
path: root/laden
diff options
context:
space:
mode:
authormarcus <marcus>2003-10-12 22:35:16 +0000
committermarcus <marcus>2003-10-12 22:35:16 +0000
commit1360ee229371ef101d3fc44efb25607ee86cd3e0 (patch)
treea71e10ff7aa86229b9142d1d78d565ea44e6aa08 /laden
parent5f8d051dba30f9885e250faed28e418d4a11af49 (diff)
2003-10-12 Marcus Brinkmann <marcus@gnu.org>
* acinclude.m4: New file. * configure.ac: Include laden/config.m4, wortel/config.m4, and physmem/config.m4. laden/ 2003-10-12 Marcus Brinkmann <marcus@gnu.org> * config.m4: New file. * Makefile.am (laden_LDFLAGS): Replace load address with @HURD_LADEN_LOAD_ADDRESS@. physmem/ 2003-10-12 Marcus Brinkmann <marcus@gnu.org> * config.m4: New file. * Makefile.am (physmem_LDFLAGS): Replace load address with @HURD_PHYSMEM_LOAD_ADDRESS@. wortel/ 2003-10-12 Marcus Brinkmann <marcus@gnu.org> * config.m4: New file. * Makefile.am (wortel_LDFLAGS): Replace load address with @HURD_WORTEL_LOAD_ADDRESS@.
Diffstat (limited to 'laden')
-rw-r--r--laden/ChangeLog6
-rw-r--r--laden/Makefile.am3
-rw-r--r--laden/config.m421
3 files changed, 28 insertions, 2 deletions
diff --git a/laden/ChangeLog b/laden/ChangeLog
index 59d22b2..5246e3a 100644
--- a/laden/ChangeLog
+++ b/laden/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-12 Marcus Brinkmann <marcus@gnu.org>
+
+ * config.m4: New file.
+ * Makefile.am (laden_LDFLAGS): Replace load address with
+ @HURD_LADEN_LOAD_ADDRESS@.
+
2003-10-04 Marcus Brinkmann <marcus@gnu.org>
* laden.h (add_memory_map): Don't round END up to 1K.
diff --git a/laden/Makefile.am b/laden/Makefile.am
index 5b474cc..31c0fb0 100644
--- a/laden/Makefile.am
+++ b/laden/Makefile.am
@@ -36,7 +36,6 @@ laden_SOURCES = $(ARCH_SOURCES) \
elf.h loader.h loader.c \
laden.h laden.c kip-fixup.c
-/* FIXME: Make linkbase configurable. */
-laden_LDFLAGS = -u_start -e_start -N -nostdlib -Ttext=0x180000
+laden_LDFLAGS = -u_start -e_start -N -nostdlib -Ttext=@HURD_LADEN_LOAD_ADDRESS@
laden_LDADD = -lgcc ../libc-parts/libc-parts.a
diff --git a/laden/config.m4 b/laden/config.m4
new file mode 100644
index 0000000..3dbd174
--- /dev/null
+++ b/laden/config.m4
@@ -0,0 +1,21 @@
+# config.m4 - Configure snippet for laden.
+# Copyright (C) 2003 Free Software Foundation, Inc.
+# Written by Maurizio Boriani.
+#
+# This file is part of the GNU Hurd.
+#
+# The GNU Hurd is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# The GNU Hurd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+
+HURD_LOAD_ADDRESS(laden, 0x180000)