1.0.18.16: many STYLE-WARNING changes.

[sbcl.git] / src / code / foreign.lisp

diff --git a/src/code/foreign.lisp b/src/code/foreign.lisp
index edc559c..f6a2462 100644 (file)
--- a/src/code/foreign.lisp
+++ b/src/code/foreign.lisp
@@ -35,8 +35,8 @@
     (values
      (or (gethash extern table)
          (gethash (concatenate 'base-string
-                               #!+(and darwin (or x86 x86-64)) "_ldso_stub__"
-                               #!-(and darwin (or x86 x86-64)) "ldso_stub__"
+                               #!+(and darwin (or x86 x86-64 ppc)) "_ldso_stub__"
+                               #!-(and darwin (or x86 x86-64 ppc)) "ldso_stub__"
                                extern) table)))))
 
 (defun find-foreign-symbol-address (name)
@@ -131,9 +131,8 @@ if the symbol isn't found."
               sb!vm:linkage-table-space-end)
       (dohash ((name-and-datap info) *linkage-info* :locked t)
         (let ((table-addr (linkage-info-address info)))
-          (when (<= table-addr
-                    addr
-                    (+ table-addr sb!vm:linkage-table-entry-size))
+          (when (and (<= table-addr addr)
+                     (< addr (+ table-addr sb!vm:linkage-table-entry-size)))
             (return-from sap-foreign-symbol (car name-and-datap))))))
     #!+os-provides-dladdr
     (with-alien ((info (struct dl-info