From 976731ee6e809f1201abbed7e85717bda0025fb1 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Fri, 13 Jul 2007 14:07:16 +0000 Subject: [multiple changes] 2007-07-13 Andrew Haley * libgcj.ver: Add __gcj_personality_sj0. * testsuite/libjava.jvmti/jvmti-interp.exp: Likewise. * testsuite/libjava.jni/jni.exp: Use -fdollars-in-identifiers. * testsuite/libjava.jni/cni.exp: Use -fdollars-in-identifiers. * testsuite/libjava.jvmti/jvmti.exp (gcj_jvmti_compile_cxx_to_o): Likewise. * gnu/classpath/natVMStackWalker.cc (getCallingClassLoader): Check klass is non-null. * java/lang/reflect/natField.cc (getAddr): Call _Jv_StackTrace::GetCallingClass only if CALLER is non-null. * java/lang/reflect/natVMProxy.cc (run_proxy): Use _Jv_getFieldInternal to get field proxyClass.m. (_Jv_getFieldInternal): New function. 2007-07-11 Andrew Haley * configure.host (arm*-linux-gnu): New. * sysdep/arm/locks.h: New. From-SVN: r126622 --- libjava/testsuite/libjava.cni/cni.exp | 2 +- libjava/testsuite/libjava.jni/jni.exp | 4 ++-- libjava/testsuite/libjava.jvmti/jvmti-interp.exp | 2 +- libjava/testsuite/libjava.jvmti/jvmti.exp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libjava/testsuite') diff --git a/libjava/testsuite/libjava.cni/cni.exp b/libjava/testsuite/libjava.cni/cni.exp index 61fee3b..aec16b9 100644 --- a/libjava/testsuite/libjava.cni/cni.exp +++ b/libjava/testsuite/libjava.cni/cni.exp @@ -10,7 +10,7 @@ proc gcj_cni_compile_cxx_to_o {file {options {}}} { set oname ${name}.o # Find the generated header. - lappend options "additional_flags=-I. -I.. -I$srcdir/$subdir" + lappend options "additional_flags=-I. -I.. -I$srcdir/$subdir -fdollars-in-identifiers" # Find libgcj headers. lappend options "additional_flags=-I$srcdir/.." diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index 1fff2b2f0..ab22c23 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -31,7 +31,7 @@ proc gcj_jni_compile_c_to_so {file {options {}}} { lappend options "additional_flags=${so_flag} -fPIC" # Find the generated header. - lappend options "additional_flags=-I. -I.. -I$srcdir/$subdir" + lappend options "additional_flags=-I. -I.. -I$srcdir/$subdir -fdollars-in-identifiers" # Ensure that the generated header has correct prototypes. set cfile [file rootname $file].c @@ -219,7 +219,7 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} { lappend options "additional_flags=-I. -I.. -I$srcdir/$subdir" # Find jni.h and jni_md.h. - lappend options "additional_flags=-I$srcdir/../include -I$srcdir/../classpath/include" + lappend options "additional_flags=-I$srcdir/../include -I$srcdir/../classpath/include -fdollars-in-identifiers" # Append C++ options lappend options "additional_flags=$options_cxx" diff --git a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp index bf0662b..68b1fc8 100644 --- a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp +++ b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp @@ -47,7 +47,7 @@ proc gcj_jni_compile_c_to_so {file {options {}}} { # Find jni.h and jni_md.h. lappend options "additional_flags=-I$srcdir/../include \ - -I$srcdir/../classpath/include" + -I$srcdir/../classpath/include -fdollars-in-identifiers" # Append C++ options lappend options "additional_flags=$options_cxx" diff --git a/libjava/testsuite/libjava.jvmti/jvmti.exp b/libjava/testsuite/libjava.jvmti/jvmti.exp index c69fd2b..578eeb1 100644 --- a/libjava/testsuite/libjava.jvmti/jvmti.exp +++ b/libjava/testsuite/libjava.jvmti/jvmti.exp @@ -11,11 +11,11 @@ proc gcj_jvmti_compile_cxx_to_o {file {options {}}} { set oname ${name}.o # Find the generated header. - lappend options "additional_flags=-g -I. -I.." + lappend options "additional_flags=-g -I. -I.. -fdollars-in-identifiers" # Find libgcj headers. lappend options "additional_flags=-I$srcdir/.." # Find jvmti.h, jvmti_md.h, jvmti-int.h, jvm.h requirements - lappend options "additional_flags=-I$srcdir/../include -I$srcdir/../classpath/include -I$objdir/../include -I$objdir/../../boehm-gc/include" + lappend options "additional_flags=-I$srcdir/../include -I$srcdir/../classpath/include -I$objdir/../include -I$objdir/../../boehm-gc/include " set x [libjava_prune_warnings \ [target_compile $file $oname object $options]] -- cgit v1.1