diff options
| author | Dale S. Rahn <rahnds@cvs.openbsd.org> | 1997-04-23 21:28:17 +0000 |
|---|---|---|
| committer | Dale S. Rahn <rahnds@cvs.openbsd.org> | 1997-04-23 21:28:17 +0000 |
| commit | aa0c9ab9076ef408ae1401a775cd79fcbd4f6cf0 (patch) | |
| tree | 012b4df0ddad6d5deff748640db86e909c995fec | |
| parent | cee4c7e0a530d69aa2a42a4667b38222c0226e11 (diff) | |
Fix "bug" in linker. actually was bug in asm files that did not correctly
align the global data. This allows the workaround in crt0 to be removed.
| -rw-r--r-- | lib/csu/mvme88k/crt0.c | 4 | ||||
| -rw-r--r-- | lib/libc/arch/mvme88k/sys/brk.S | 3 | ||||
| -rw-r--r-- | lib/libc/arch/mvme88k/sys/sbrk.S | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/lib/csu/mvme88k/crt0.c b/lib/csu/mvme88k/crt0.c index ff5ef2d1339..28f6b5292fe 100644 --- a/lib/csu/mvme88k/crt0.c +++ b/lib/csu/mvme88k/crt0.c @@ -92,12 +92,8 @@ __crt0_real_start(int argc, char *argv[], char *envp[]) { register char *ap; volatile int a = 0; - extern int minbrk asm ("minbrk"); - extern int curbrk asm ("curbrk"); extern int end; - minbrk = (int)&end; - curbrk = (int)&end; environ = envp; /* environ is for the user that can't get at 'envp' */ if (ap = argv[0]) diff --git a/lib/libc/arch/mvme88k/sys/brk.S b/lib/libc/arch/mvme88k/sys/brk.S index b56693a755d..306f2902a31 100644 --- a/lib/libc/arch/mvme88k/sys/brk.S +++ b/lib/libc/arch/mvme88k/sys/brk.S @@ -38,7 +38,7 @@ #if defined(LIBC_SCCS) && !defined(lint) .data /*.asciz "from: @(#)brk.s 5.1 (Berkeley) 5/12/90"*/ - .asciz "$Id: brk.S,v 1.1 1997/03/25 17:07:16 rahnds Exp $" + .asciz "$Id: brk.S,v 1.2 1997/04/23 21:28:16 rahnds Exp $" .text #endif /* LIBC_SCCS and not lint */ @@ -49,6 +49,7 @@ .globl curbrk .data + .align 2 minbrk: .long 0 .text diff --git a/lib/libc/arch/mvme88k/sys/sbrk.S b/lib/libc/arch/mvme88k/sys/sbrk.S index 497aa7711d3..27eac928b77 100644 --- a/lib/libc/arch/mvme88k/sys/sbrk.S +++ b/lib/libc/arch/mvme88k/sys/sbrk.S @@ -38,7 +38,7 @@ #if defined(LIBC_SCCS) && !defined(lint) .data /*.asciz "from: @(#)sbrk.s 5.1 (Berkeley) 5/12/90"*/ - .asciz "$Id: sbrk.S,v 1.2 1997/04/21 21:04:37 rahnds Exp $" + .asciz "$Id: sbrk.S,v 1.3 1997/04/23 21:28:16 rahnds Exp $" .text #endif /* LIBC_SCCS and not lint */ @@ -48,10 +48,11 @@ .globl curbrk .data -curbrk: .long 0 /* -curbrk: .long _end +curbrk: .long 0 */ + .align 2 +curbrk: .long _end .text ENTRY(sbrk) |