diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2012-10-12 15:00:34 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2012-10-12 15:00:34 +0000 |
| commit | 3c427d61c866dd9155d662f2600a499a531de865 (patch) | |
| tree | 13b2776a18e0a83da867180b658a9dff34569f77 | |
| parent | ba70b308cfe623a1b235fd5a1bdf18d2db0686c1 (diff) | |
Force 16 byte alignment in boot(8) srt0.S, since this is more likely to get
the required file offset (0x120) for the .text segment.
| -rw-r--r-- | sys/arch/amd64/stand/boot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/boot/srt0.S | 3 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/boot/srt0.S | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c index 945414a2a63..91c6fb32225 100644 --- a/sys/arch/amd64/stand/boot/conf.c +++ b/sys/arch/amd64/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.24 2012/10/09 14:01:36 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.25 2012/10/12 15:00:33 jsing Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -42,7 +42,7 @@ #include <biosdev.h> #include <dev/cons.h> -const char version[] = "3.21"; +const char version[] = "3.22"; int debug = 1; diff --git a/sys/arch/amd64/stand/boot/srt0.S b/sys/arch/amd64/stand/boot/srt0.S index b0780b36ade..9e1ede6c3df 100644 --- a/sys/arch/amd64/stand/boot/srt0.S +++ b/sys/arch/amd64/stand/boot/srt0.S @@ -1,4 +1,4 @@ -/* $OpenBSD: srt0.S,v 1.2 2012/10/09 11:39:57 jsing Exp $ */ +/* $OpenBSD: srt0.S,v 1.3 2012/10/12 15:00:32 jsing Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -40,6 +40,7 @@ .globl Gdtr .text + .align 16 .code16 .globl _start _start: diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c index 45665de7c8d..ee1c88f35f7 100644 --- a/sys/arch/i386/stand/boot/conf.c +++ b/sys/arch/i386/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.48 2012/10/09 14:01:36 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.49 2012/10/12 15:00:33 jsing Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -43,7 +43,7 @@ #include <dev/cons.h> #include "debug.h" -const char version[] = "3.19"; +const char version[] = "3.20"; int debug = 1; diff --git a/sys/arch/i386/stand/boot/srt0.S b/sys/arch/i386/stand/boot/srt0.S index 81e3d7b4f7d..868b3264d1c 100644 --- a/sys/arch/i386/stand/boot/srt0.S +++ b/sys/arch/i386/stand/boot/srt0.S @@ -1,4 +1,4 @@ -/* $OpenBSD: srt0.S,v 1.15 2012/10/09 11:39:57 jsing Exp $ */ +/* $OpenBSD: srt0.S,v 1.16 2012/10/12 15:00:33 jsing Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -40,6 +40,7 @@ .globl Gdtr .text + .align 16 .code16 .globl _start _start: |