Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/librumphijack Use rumphijack_dlsym() to figure out where...



details:   https://anonhg.NetBSD.org/src/rev/fc20b062c214
branches:  trunk
changeset: 763144:fc20b062c214
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Mar 10 23:02:56 2011 +0000

description:
Use rumphijack_dlsym() to figure out where __sysctl() is during
init.  Otherwise powerpc dlsym() DTWT and returns NULL.
(now i have no idea why dlsym() it works from rcinit(), but i'll
opt to not care)

Hah, only took 15min to debug that crap this time around.  I'm
quickly approaching zero-time with it.

diffstat:

 lib/librumphijack/hijack.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 409e5a992f2f -r fc20b062c214 lib/librumphijack/hijack.c
--- a/lib/librumphijack/hijack.c        Thu Mar 10 22:11:05 2011 +0000
+++ b/lib/librumphijack/hijack.c        Thu Mar 10 23:02:56 2011 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: hijack.c,v 1.83 2011/03/10 09:47:32 pooka Exp $       */
+/*      $NetBSD: hijack.c,v 1.84 2011/03/10 23:02:56 pooka Exp $       */
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: hijack.c,v 1.83 2011/03/10 09:47:32 pooka Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.84 2011/03/10 23:02:56 pooka Exp $");
 
 #define __ssp_weak_name(fun) _hijack_ ## fun
 
@@ -1870,7 +1870,7 @@
                op___sysctl = GETSYSCALL(host, __SYSCTL);
                /* we haven't inited yet */
                if (__predict_false(op___sysctl == NULL)) {
-                       op___sysctl = dlsym(RTLD_NEXT, "__sysctl");
+                       op___sysctl = rumphijack_dlsym(RTLD_NEXT, "__sysctl");
                }
        }
 



Home | Main Index | Thread Index | Old Index