From d5c5392912992a15cbd1076796bcb8e960d4e86d Mon Sep 17 00:00:00 2001 From: christos Date: Sat, 11 Jan 2003 19:37:48 +0000 Subject: [PATCH] make compile on !playstation --- distrib/utils/sysinst/arch/playstation2/Makefile | 4 ++-- .../sysinst/arch/playstation2/{mbr_buf.s => mbr_buf.S} | 2 ++ distrib/utils/sysinst/arch/playstation2/md.c | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) rename distrib/utils/sysinst/arch/playstation2/{mbr_buf.s => mbr_buf.S} (73%) diff --git a/distrib/utils/sysinst/arch/playstation2/Makefile b/distrib/utils/sysinst/arch/playstation2/Makefile index e0592b2d2a6a..a50780000f4c 100644 --- a/distrib/utils/sysinst/arch/playstation2/Makefile +++ b/distrib/utils/sysinst/arch/playstation2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/10/17 02:05:38 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2003/01/11 19:37:48 christos Exp $ # # Makefile for playstation2 # @@ -7,7 +7,7 @@ SRCS= menu_defs.c msg_defs.c main.c install.c upgrade.c \ txtwalk.c run.c factor.c net.c disks.c disks_lfs.c util.c geom.c \ - label.c target.c md.c mbr.c mbr_buf.s + label.c target.c md.c mbr.c mbr_buf.S savenewlabel.c sizemultname.c fdisk.o md.o: menu_defs.h msg_defs.h diff --git a/distrib/utils/sysinst/arch/playstation2/mbr_buf.s b/distrib/utils/sysinst/arch/playstation2/mbr_buf.S similarity index 73% rename from distrib/utils/sysinst/arch/playstation2/mbr_buf.s rename to distrib/utils/sysinst/arch/playstation2/mbr_buf.S index 0864141e2d99..d914ae9ea97d 100644 --- a/distrib/utils/sysinst/arch/playstation2/mbr_buf.s +++ b/distrib/utils/sysinst/arch/playstation2/mbr_buf.S @@ -1,6 +1,8 @@ +#ifdef __mips__ .abicalls .bss .align 2 .space 2 .globl mbr mbr: .space 512 +#endif diff --git a/distrib/utils/sysinst/arch/playstation2/md.c b/distrib/utils/sysinst/arch/playstation2/md.c index eda2aaa039f0..d9a36e20e8c2 100644 --- a/distrib/utils/sysinst/arch/playstation2/md.c +++ b/distrib/utils/sysinst/arch/playstation2/md.c @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.3 2002/12/05 01:17:27 fvdl Exp $ */ +/* $NetBSD: md.c,v 1.4 2003/01/11 19:37:49 christos Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -48,7 +48,11 @@ #include "menu_defs.h" #include "bsddisklabel.c" +#ifdef __mips__ extern char mbr[512]; +#else +char mbr[512]; +#endif int md_get_info()