summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1999-02-25 16:42:44 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1999-02-25 16:42:44 +0000
commit12636726fe557100fe3a57a66060167e1e35611a (patch)
treecfcef4fbebcb1c007519a32f911c5523bd34b2a7
parent0f3d9cbe1c3e5b974e9f22dd6f0f51d741a0de98 (diff)
specify text start through the -Ttext, fix ld.script accordingly
-rw-r--r--sys/arch/hppa/conf/Makefile.hppa6
-rw-r--r--sys/arch/hppa/conf/ld.script4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index 0af6207df5c..6d8228b3dc1 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hppa,v 1.4 1998/12/23 17:48:46 mickey Exp $
+# $OpenBSD: Makefile.hppa,v 1.5 1999/02/25 16:42:43 mickey Exp $
# Makefile for OpenBSD
#
@@ -50,9 +50,9 @@ CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dhppa
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wno-uninitialized \
-Wno-format -Wno-main
CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} -msoft-float -mdisable-fpregs \
- -mfast-indirect-calls -mpa-risc-1-0 -mportable-runtime
+ -mpa-risc-1-0 -mfast-indirect-calls -mportable-runtime
AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE
-LINKFLAGS= -T ${HPPA}/conf/ld.script
+LINKFLAGS= -T ${HPPA}/conf/ld.script -Ttext 12000
STRIPFLAGS= -g -X -x
HOSTED_CC= ${HOSTCC}
diff --git a/sys/arch/hppa/conf/ld.script b/sys/arch/hppa/conf/ld.script
index 35371b920d9..b2b5c67fbd6 100644
--- a/sys/arch/hppa/conf/ld.script
+++ b/sys/arch/hppa/conf/ld.script
@@ -1,4 +1,4 @@
-/* $OpenBSD: ld.script,v 1.1 1998/10/30 19:44:09 mickey Exp $ */
+/* $OpenBSD: ld.script,v 1.2 1999/02/25 16:42:42 mickey Exp $ */
OUTPUT_FORMAT("elf32-hppa")
OUTPUT_ARCH(hppa)
@@ -6,7 +6,7 @@ ENTRY(__start)
SECTIONS
{
/* Read-only sections, merged into text segment: */
- . = 0x12000;
+ . = + SIZEOF_HEADERS;
.text :
{
kernel_text = . ;