Module Name: src
Committed By: matt
Date: Thu Jul 18 21:57:42 UTC 2013
Modified Files:
src/libexec/ld.elf_so/arch/m68k: rtld_start.S
Log Message:
Use new macros from <machine/asm.h> to be more portable
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/libexec/ld.elf_so/arch/m68k/rtld_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/m68k/rtld_start.S
diff -u src/libexec/ld.elf_so/arch/m68k/rtld_start.S:1.9 src/libexec/ld.elf_so/arch/m68k/rtld_start.S:1.10
--- src/libexec/ld.elf_so/arch/m68k/rtld_start.S:1.9 Mon Apr 28 20:23:03 2008
+++ src/libexec/ld.elf_so/arch/m68k/rtld_start.S Thu Jul 18 21:57:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld_start.S,v 1.9 2008/04/28 20:23:03 martin Exp $ */
+/* $NetBSD: rtld_start.S,v 1.10 2013/07/18 21:57:42 matt Exp $ */
/*-
* Copyright (c) 1999, 2002, 2003 The NetBSD Foundation, Inc.
@@ -38,8 +38,9 @@
.rtld_start:
subql #8,%sp | storage for obj and cleanup
- lea (%pc,_GLOBAL_OFFSET_TABLE_@GOTPC),%a0
- lea (%pc,_DYNAMIC),%a1
+ GOT_SETUP(%a0)
+ LEA_LCL(_DYNAMIC,%a1)
+
movel %a1,%a5
subl (%a0),%a5
@@ -63,7 +64,7 @@
.globl _rtld_bind_start
.type _rtld_bind_start,@function
_rtld_bind_start:
- moveml %d0-%d1/%a0-%a1,-(%sp) | preserve caller-saved registers
+ INTERRUPT_SAVEREG
movel 20(%sp),-(%sp) | push reloff
movel (16+4)(%sp),-(%sp) | push obj
jbsr _rtld_bind@PLTPC | %a0 = _rtld_bind(obj, reloff)
@@ -73,7 +74,7 @@ _rtld_bind_start:
#else
movel %d0,(16+4)(%sp) | write fake `return' address over obj
#endif
- moveml (%sp)+,%d0-%d1/%a0-%a1 | restore caller-saved registers
+ INTERRUPT_RESTOREREG | restore caller-saved registers
addql #4,%sp | skip reloff
rts | `return' right into function
.size _rtld_bind_start,.-_rtld_bind_start
