2005-06-03 Andreas Tobler <a.tobler@schweiz.ch>

	* jawt.c: Remove malloc.h, covered by stdlib.h.

	* testsuite/libjava.jni/jni.exp
	(gcj_jni_invocation_compile_c_to_binary): Add -bind_at_load to silence
	the build process.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 44df231..a98920a 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-03  Andreas Tobler  <a.tobler@schweiz.ch>
+
+       * jawt.c: Remove malloc.h, covered by stdlib.h.
+
+       * testsuite/libjava.jni/jni.exp
+       (gcj_jni_invocation_compile_c_to_binary): Add -bind_at_load to silence
+       the build process.
+
 2005-06-02  Keith Seitz  <keiths@redhat.com>
 
        * gnu/classpath/jdwp/transport/TransportException.java: New file.

diff --git a/libjava/jawt.c b/libjava/jawt.c
index bb03c63..ad5284d 100644 (file)
--- a/libjava/jawt.c
+++ b/libjava/jawt.c
@@ -40,7 +40,6 @@
 #include <jawt.h>
 #include <jawt_md.h>
 #include "classpath_jawt.h"
-#include <malloc.h>
 
 static jint (JNICALL _Jv_Lock) (JAWT_DrawingSurface* surface);
 static void (JNICALL _Jv_Unlock) (JAWT_DrawingSurface* surface);

diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 201daac..8461426 100644 (file)
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -196,7 +196,7 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} {
 
   # Set some darwin specific options
   if { [istarget "*-*-darwin*"] } {
-      lappend options "additional_flags=-multiply_defined suppress"
+      lappend options "additional_flags= -bind_at_load -multiply_defined suppress"
   }
   # Find the generated header.
   lappend options "additional_flags=-I. -I.."