diff options
| -rw-r--r-- | lib/csu/common_elf/os-note-elf.h | 20 | ||||
| -rw-r--r-- | lib/csu/i386/crt0.c | 38 |
2 files changed, 27 insertions, 31 deletions
diff --git a/lib/csu/common_elf/os-note-elf.h b/lib/csu/common_elf/os-note-elf.h index 938c0c246b4..2ce94968c37 100644 --- a/lib/csu/common_elf/os-note-elf.h +++ b/lib/csu/common_elf/os-note-elf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: os-note-elf.h,v 1.3 2003/03/31 19:12:35 rohee Exp $ */ +/* $OpenBSD: os-note-elf.h,v 1.4 2003/11/22 00:50:48 avsm Exp $ */ /* * Contents: * @@ -9,13 +9,11 @@ * version? 0 XXX */ -__asm(" .section \".note.openbsd.ident\", \"a\" - .p2align 2 - - .long 8 - .long 4 - .long 1 - .ascii \"OpenBSD\\0\" - .long 0 - - .p2align 2"); +__asm(" .section \".note.openbsd.ident\", \"a\"\n" +" .p2align 2\n" +" .long 8\n" +" .long 4\n" +" .long 1\n" +" .ascii \"OpenBSD\\0\"\n" +" .long 0\n" +" .p2align 2"); diff --git a/lib/csu/i386/crt0.c b/lib/csu/i386/crt0.c index 14ad9f9468f..57bb170a522 100644 --- a/lib/csu/i386/crt0.c +++ b/lib/csu/i386/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.11 2003/06/27 22:30:38 deraadt Exp $ */ +/* $OpenBSD: crt0.c,v 1.12 2003/11/22 00:50:48 avsm Exp $ */ /* $NetBSD: crt0.c,v 1.20 1995/06/03 13:16:08 pk Exp $ */ /* @@ -33,7 +33,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: crt0.c,v 1.11 2003/06/27 22:30:38 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: crt0.c,v 1.12 2003/11/22 00:50:48 avsm Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -54,24 +54,22 @@ extern unsigned char _etext, _eprol; #endif /* MCRT0 */ -__asm(" - .text - .align 4 - .globl __start - .globl _start -_start: -__start: - pushl %ebx #ps_strings - pushl %ecx # obj - pushl %edx # cleanup - movl 12(%esp),%eax - leal 20(%esp,%eax,4),%ecx - leal 16(%esp),%edx - pushl %ecx - pushl %edx - pushl %eax - call ___start -"); +__asm(".text\n" +" .align 4\n" +" .globl __start\n" +" .globl _start\n" +"_start:\n" +"__start:\n" +" pushl %ebx #ps_strings\n" +" pushl %ecx # obj\n" +" pushl %edx # cleanup\n" +" movl 12(%esp),%eax\n" +" leal 20(%esp,%eax,4),%ecx\n" +" leal 16(%esp),%edx\n" +" pushl %ecx\n" +" pushl %edx\n" +" pushl %eax\n" +" call ___start "); void ___start(int argc, char **argv, char **envp, void (*cleanup)(void), |