diff options
Diffstat (limited to 'sys/arch/sgi/conf')
| -rw-r--r-- | sys/arch/sgi/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/Makefile.sgi | 9 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/files.sgi | 7 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/ld.script | 6 |
4 files changed, 11 insertions, 20 deletions
diff --git a/sys/arch/sgi/conf/GENERIC b/sys/arch/sgi/conf/GENERIC index 4c6d8dba7e1..9df34babddc 100644 --- a/sys/arch/sgi/conf/GENERIC +++ b/sys/arch/sgi/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.7 2004/08/11 15:13:21 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.8 2004/09/09 22:11:39 pefo Exp $ # machine sgi mips64 @@ -8,14 +8,11 @@ include "../../../conf/GENERIC" maxusers 32 # Make options -#makeoption ISALEV="-mips3 -mlong64 -fno-builtin" -makeoption ISALEV="-mips2 -D_MIPS_ISA=_MIPS_ISA_MIPS2" -makeoption ENDIAN="-EB" +#makeoption ABI="-mabi=64" +#makeoption ENDIAN="-EB" # MD options option ARCBIOS # We use arcbios for FW comminication. -#option COMPAT_O32 # Mips o32 ABI compat -#option DB_ELFSIZE=32 #option APERTURE diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi index 53bea276d82..72ea3cad98f 100644 --- a/sys/arch/sgi/conf/Makefile.sgi +++ b/sys/arch/sgi/conf/Makefile.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sgi,v 1.4 2004/08/23 14:26:24 pefo Exp $ +# $OpenBSD: Makefile.sgi,v 1.5 2004/09/09 22:11:39 pefo Exp $ # Makefile for OpenBSD # @@ -29,7 +29,6 @@ CPP?= cpp LD?= ld ${ENDIAN} STRIP?= strip TOUCH?= touch -ISALEV?=-mips3 -mlong64 -fno-builtin CPP+=${ENDIAN} CC+=${ENDIAN} AS+=${ENDIAN} @@ -48,9 +47,9 @@ CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D__sgi__ CDIAGFLAGS= -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes \ -Wno-uninitialized -Wno-format -Wno-main -CFLAGS= ${DEBUG} -O2 ${CDIAGFLAGS} -mno-abicalls ${ISALEV} \ - ${COPTS} -AFLAGS= -x assembler-with-cpp -traditional-cpp -mno-abicalls ${ISALEV} -D_LOCORE +CFLAGS= ${DEBUG} -O2 ${CDIAGFLAGS} -mno-abicalls ${ABI} \ + ${COPTS} -msoft-float -fno-builtin +AFLAGS= -x assembler-with-cpp -traditional-cpp -mno-abicalls ${ABI} -D_LOCORE ### find out what to use for libkern .include "$S/lib/libkern/Makefile.inc" diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi index 2caff721db0..bd27e76f11f 100644 --- a/sys/arch/sgi/conf/files.sgi +++ b/sys/arch/sgi/conf/files.sgi @@ -1,4 +1,4 @@ -# $OpenBSD: files.sgi,v 1.3 2004/08/10 19:08:18 deraadt Exp $ +# $OpenBSD: files.sgi,v 1.4 2004/09/09 22:11:39 pefo Exp $ # # maxpartitions must be first item in files.${ARCH} # @@ -118,8 +118,3 @@ file dev/cninit.c file netinet/in_cksum.c file netns/ns_cksum.c ns -# -# mips o32 ABI compat. -# -#include "compat/mipso32/files.mipso32" - diff --git a/sys/arch/sgi/conf/ld.script b/sys/arch/sgi/conf/ld.script index f9393c3eec1..9076ac46476 100644 --- a/sys/arch/sgi/conf/ld.script +++ b/sys/arch/sgi/conf/ld.script @@ -1,11 +1,11 @@ -OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradlittlemips", - "elf32-tradbigmips") +OUTPUT_FORMAT("elf64-tradbigmips", "elf64-tradlittlemips", + "elf64-tradbigmips") OUTPUT_ARCH(mips) ENTRY(_start) SECTIONS { /* Read-only sections, merged into text segment: */ - . = 0x80100000 + SIZEOF_HEADERS; + . = 0xffffffff80100000 + SIZEOF_HEADERS; .text : { _ftext = . ; |