2006-04-25 Andrew Haley <aph@redhat.com>

        * java/lang/natClassLoader.cc: Don't include link.h or dladdr.h.
        * boehm.cc: Don't include link.h.
        (_Jv_RegisterLibForGc): Cast away const when calling dladdr().

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113246 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b832f79..04695cb 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-25  Andrew Haley  <aph@redhat.com>
+
+       * java/lang/natClassLoader.cc: Don't include link.h or dladdr.h.
+       * boehm.cc: Don't include link.h.
+       (_Jv_RegisterLibForGc): Cast away const when calling dladdr().
+

 2006-04-24  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/natClass.cc (_Jv_getInterfaceMethod): Skip <clinit>.
 2006-04-24  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/natClass.cc (_Jv_getInterfaceMethod): Skip <clinit>.

diff --git a/libjava/boehm.cc b/libjava/boehm.cc
index 9ee633b..d939f41 100644 (file)
--- a/libjava/boehm.cc
+++ b/libjava/boehm.cc
@@ -36,7 +36,6 @@ details.  */
 #undef _GNU_SOURCE
 #define _GNU_SOURCE
 #include <dlfcn.h>
 #undef _GNU_SOURCE
 #define _GNU_SOURCE
 #include <dlfcn.h>

-#include <link.h>

 #endif
 
 extern "C"
 #endif
 
 extern "C"


@@ -664,8 +663,8 @@ _Jv_RegisterLibForGc (const void *p __attribute__ ((__unused__)))
 {
 #ifdef HAVE_DLFCN_H
   Dl_info info;
 {
 #ifdef HAVE_DLFCN_H
   Dl_info info;

-  
-  if (dladdr (p, &info) != 0)
+
+  if (dladdr (const_cast<void *>(p), &info) != 0)

     {
       filename_node **node = find_file (info.dli_fname);
       if (! *node)
     {
       filename_node **node = find_file (info.dli_fname);
       if (! *node)

diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index e6cfca2..87419c3 100644 (file)
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -45,11 +45,6 @@ details.  */
 #include <gnu/gcj/runtime/BootClassLoader.h>
 #include <gnu/gcj/runtime/SystemClassLoader.h>
 
 #include <gnu/gcj/runtime/BootClassLoader.h>
 #include <gnu/gcj/runtime/SystemClassLoader.h>
 

-#undef _GNU_SOURCE
-#define _GNU_SOURCE
-#include <dlfcn.h>
-#include <link.h>
-

 // Size of local hash table.
 #define HASH_LEN 1013
 
 // Size of local hash table.
 #define HASH_LEN 1013