Make ld.so pass its cleanup handler in r7 as required by the PowerPC System V

ABI, and stop calling atexit(4) directly from ld.so on powerpc.

diff --git a/libexec/ld.so/loader.c b/libexec/ld.so/loader.c
index c8f43f9..84e41b2 100644 (file)
--- a/libexec/ld.so/loader.c
+++ b/libexec/ld.so/loader.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: loader.c,v 1.138 2013/12/23 21:18:57 kettenis Exp $ */
+/*     $OpenBSD: loader.c,v 1.139 2013/12/23 22:03:52 kettenis Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -605,7 +605,7 @@ _dl_boot(const char **argv, char **envp, const long dyn_loff, long *dl_data)
        }
 
 #if !defined(__alpha__) && !defined(__hppa__) && !defined(__i386__) && \
-    !defined(__sparc64__)
+    !defined(__powerpc__) && !defined(__sparc64__)
        /*
         * Schedule a routine to be run at shutdown, by using atexit.
         * Cannot call atexit directly from ld.so?

diff --git a/libexec/ld.so/powerpc/ldasm.S b/libexec/ld.so/powerpc/ldasm.S
index d05c917..9940b66 100644 (file)
--- a/libexec/ld.so/powerpc/ldasm.S
+++ b/libexec/ld.so/powerpc/ldasm.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ldasm.S,v 1.15 2013/12/23 21:49:27 kettenis Exp $ */
+/*     $OpenBSD: ldasm.S,v 1.16 2013/12/23 22:03:52 kettenis Exp $ */
 
 /*
  * Copyright (c) 1999 Dale Rahn
@@ -116,8 +116,10 @@ ENTRY(_dl_start)
        mr      4, 21
        mr      5, 22
        mr      6, 23
-       li      7, 0
 
+       bl      _GLOBAL_OFFSET_TABLE_@local-4
+       mflr    31
+       lwz     7, _dl_dtors@got(31)
 
        mtlr    27
        lwz     1, 0(1)         # Restore stack pointer.