diff options
| -rw-r--r-- | sys/arch/sgi/stand/boot/boot.c | 10 | ||||
| -rw-r--r-- | sys/arch/sgi/stand/boot32/ld.script | 1 | ||||
| -rw-r--r-- | sys/arch/sgi/stand/libsa32/heap.h | 0 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sys/arch/sgi/stand/boot/boot.c b/sys/arch/sgi/stand/boot/boot.c index c5451b603bf..b1543181ed3 100644 --- a/sys/arch/sgi/stand/boot/boot.c +++ b/sys/arch/sgi/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.15 2009/11/30 05:19:20 miod Exp $ */ +/* $OpenBSD: boot.c,v 1.16 2010/09/14 16:55:10 miod Exp $ */ /* * Copyright (c) 2004 Opsycon AB, www.opsycon.se. @@ -148,9 +148,11 @@ dobootopts(int argc, char **argv) SystemPartition = &cp[16]; } - /* If "OSLoadOptions=" is missing, see if any arg was given. */ - if (bootauto == AUTO_NONE && *argv[1] == '/') - OSLoadFilename = argv[1]; + /* If "OSLoadFilename=" is missing, see if any arg was given. */ + if (bootauto == AUTO_NONE) { + if (*argv[1] == '/') + OSLoadFilename = argv[1]; + } if (bootauto == AUTO_MINI) { static char loadpart[64]; diff --git a/sys/arch/sgi/stand/boot32/ld.script b/sys/arch/sgi/stand/boot32/ld.script index 7d5b81e7c6f..5ca7826d883 100644 --- a/sys/arch/sgi/stand/boot32/ld.script +++ b/sys/arch/sgi/stand/boot32/ld.script @@ -12,6 +12,7 @@ SECTIONS *(.text) *(.rodata) *(.rodata1) + *(.rodata.str1.4) *(.reginfo) *(.init) *(.stub) diff --git a/sys/arch/sgi/stand/libsa32/heap.h b/sys/arch/sgi/stand/libsa32/heap.h new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/sys/arch/sgi/stand/libsa32/heap.h |