From d8b943d90d5e19e636cbadd37ad35026ab2535c2 Mon Sep 17 00:00:00 2001 From: andreast Date: Thu, 2 Jun 2005 18:12:47 +0000 Subject: [PATCH] 2005-06-03 Andreas Tobler * 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 --- libjava/ChangeLog | 8 ++++++++ libjava/jawt.c | 1 - libjava/testsuite/libjava.jni/jni.exp | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 44df2319469..a98920a7dd5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2005-06-03 Andreas Tobler + + * 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 * gnu/classpath/jdwp/transport/TransportException.java: New file. diff --git a/libjava/jawt.c b/libjava/jawt.c index bb03c638e55..ad5284d4b13 100644 --- a/libjava/jawt.c +++ b/libjava/jawt.c @@ -40,7 +40,6 @@ #include #include #include "classpath_jawt.h" -#include 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 201daaca713..84614260b0b 100644 --- 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.." -- 2.11.4.GIT