diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2016-09-01 09:46:43 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2016-09-01 09:46:43 +0000 |
| commit | f0bd0fc2dac60cd44c9054d7307c06f80da54ad0 (patch) | |
| tree | 2d2803dd5e18ebe76916beb0aa195318f5267794 | |
| parent | d0ecc04b169b4d8231234ad400d33896dc436613 (diff) | |
remove references to sparc
| -rw-r--r-- | sbin/disklabel/Makefile | 4 | ||||
| -rw-r--r-- | sbin/disklabel/editor.c | 14 | ||||
| -rw-r--r-- | sbin/reboot/reboot.8 | 5 |
3 files changed, 5 insertions, 18 deletions
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile index 3a63b90203e..b16ea2e49de 100644 --- a/sbin/disklabel/Makefile +++ b/sbin/disklabel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.62 2016/08/10 14:27:16 deraadt Exp $ +# $OpenBSD: Makefile,v 1.63 2016/09/01 09:46:42 tedu Exp $ PROG= disklabel SRCS= disklabel.c dkcksum.c editor.c manual.c @@ -45,7 +45,7 @@ CFLAGS+= -DSEEALSO="\"fdisk(8), installboot(8)\"" CFLAGS+= -DSEEALSO="\"fdisk(8), pdisk(8)\"" .endif -.if (${MACHINE} == "sparc") || (${MACHINE} == "sparc64") +.if (${MACHINE} == "sparc64") CFLAGS+= -DSEEALSO="\"installboot(8)\"" -DSUN_CYLCHECK -DSUN_AAT0 .endif diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index f52a3139196..08b346b9ecb 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.301 2016/08/19 08:06:25 otto Exp $ */ +/* $OpenBSD: editor.c,v 1.302 2016/09/01 09:46:42 tedu Exp $ */ /* * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com> @@ -676,13 +676,7 @@ cylinderalign: fragsize = lp->d_secsize; if (fragsize > MAXBSIZE / 8) fragsize = MAXBSIZE / 8; -#if defined (__sparc__) && !defined(__sparc64__) - /* can't boot from > 8k boot blocks */ - pp->p_fragblock = - DISKLABELV1_FFS_FRAGBLOCK(i == 0 ? 1024 : fragsize, 8); -#else pp->p_fragblock = DISKLABELV1_FFS_FRAGBLOCK(fragsize, 8); -#endif pp->p_cpg = 1; if (ap->mp[0] != '/') pp->p_fstype = FS_SWAP; @@ -904,13 +898,7 @@ editor_add(struct disklabel *lp, char *p) fragsize = lp->d_secsize; if (fragsize > MAXBSIZE / 8) fragsize = MAXBSIZE / 8; -#if defined (__sparc__) && !defined(__sparc64__) - /* can't boot from > 8k boot blocks */ - pp->p_fragblock = - DISKLABELV1_FFS_FRAGBLOCK(partno == 0 ? 1024 : fragsize, 8); -#else pp->p_fragblock = DISKLABELV1_FFS_FRAGBLOCK(fragsize, 8); -#endif if (get_fstype(lp, partno) == 0 && get_mp(lp, partno) == 0 && get_fsize(lp, partno) == 0 && diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8 index 5c2a6fba6d1..6eed74ec3e6 100644 --- a/sbin/reboot/reboot.8 +++ b/sbin/reboot/reboot.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: reboot.8,v 1.48 2016/05/11 21:52:49 deraadt Exp $ +.\" $OpenBSD: reboot.8,v 1.49 2016/09/01 09:46:42 tedu Exp $ .\" $NetBSD: reboot.8,v 1.3 1995/10/05 05:36:21 mycroft Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)reboot.8 8.1 (Berkeley) 6/9/93 .\" -.Dd $Mdocdate: May 11 2016 $ +.Dd $Mdocdate: September 1 2016 $ .Dt REBOOT 8 .Os .Sh NAME @@ -97,7 +97,6 @@ users advance warning of their impending doom. .Xr boot_i386 8 , .Xr boot_luna88k 8 , .Xr boot_macppc 8 , -.Xr boot_sparc 8 , .Xr boot_sparc64 8 , .Xr boot_zaurus 8 , .Xr rc.d 8 , |