summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-02-26 19:59:12 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-02-26 19:59:12 +0000
commit2cbfa260b3daf3a0f015bcc5fffabcede8d70c06 (patch)
treeb2c9ecc20b9a160654cb27d21018a3df7a22362a
parentacba5744f9220c1ed6a776e220168cd28bcb4825 (diff)
Back out the last commit. Bizzarely, that extra l@ makes boong from CD fail!
Why this code, which must be executed, is not failing on disk is an utter mystery. More investigation needed.
-rw-r--r--sys/arch/sparc64/stand/bootblk/bootblk.fth8
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/arch/sparc64/stand/bootblk/bootblk.fth b/sys/arch/sparc64/stand/bootblk/bootblk.fth
index 4d216e60562..49fa814648d 100644
--- a/sys/arch/sparc64/stand/bootblk/bootblk.fth
+++ b/sys/arch/sparc64/stand/bootblk/bootblk.fth
@@ -1,4 +1,4 @@
-\ $OpenBSD: bootblk.fth,v 1.4 2009/09/03 16:39:37 jsing Exp $
+\ $OpenBSD: bootblk.fth,v 1.5 2010/02/26 19:59:11 deraadt Exp $
\ $NetBSD: bootblk.fth,v 1.3 2001/08/15 20:10:24 eeh Exp $
\
\ IEEE 1275 Open Firmware Boot Block
@@ -603,11 +603,7 @@ h# 6000 constant loader-base
loader-base ( buf-len addr )
2dup read-file ( buf-len addr )
ufs-close ( buf-len addr )
-
- dup l@ is-elf? false = if
- ." load-file: not an elf executable" cr
- abort
- then
+ dup is-elf? if ." load-file: not an elf executable" cr abort then
\ Luckily the prom should be able to handle ELF executables by itself