summaryrefslogtreecommitdiff
path: root/libjava/testsuite
diff options
context:
space:
mode:
authoraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>2009-08-12 16:34:00 +0000
committeraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>2009-08-12 16:34:00 +0000
commitf44e3dd1108813524120827780a45f23196a4802 (patch)
treee16fbabe8bb8dfe6812a509c329d1ecd79bb1c0a /libjava/testsuite
parent27d3c04fe0a482189f9826ea73e8019f044afd16 (diff)
downloadgcc-f44e3dd1108813524120827780a45f23196a4802.tar.gz
2009-08-12 Andrew Haley <aph@redhat.com>
* sysdep/arm/locks.h: Use atomic builtins For Linux EABI. * configure.ac: Add ATOMICSPEC. * libgcj.spec.in: Likewise. * configure.host (arm*-linux*): Add -Wno-abi to cxxflags. (testsuite/libjava.jvmti/jvmti-interp.exp): Likewise. (testsuite/libjava.jvmti/jvmti.exp): Likewise. (testsuite/libjava.jni/jni.exp): Likewise. Set ATOMICSPEC. Set LDFLAGS to work around libtool feature. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150702 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/testsuite')
-rw-r--r--libjava/testsuite/libjava.jni/jni.exp5
-rw-r--r--libjava/testsuite/libjava.jvmti/jvmti-interp.exp7
-rw-r--r--libjava/testsuite/libjava.jvmti/jvmti.exp4
3 files changed, 15 insertions, 1 deletions
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 65051287b5a..68dbd279033 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -165,6 +165,11 @@ proc gcj_jni_test_one {file} {
lappend cxxflaglist "-lstdc++"
}
+ # ARM C++ emits an ABI warning for varargs.
+ if { [istarget "arm*"] } {
+ lappend cxxflaglist "-Wno-abi"
+ }
+
set cxxflags [join $cxxflaglist]
}
diff --git a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
index e81eda52025..62c82e92afc 100644
--- a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
+++ b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
@@ -32,7 +32,12 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
set so_extension "so"
set so_flag "-shared"
}
-
+
+ # ARM C++ emits an ABI warning for varargs.
+ if { [istarget "arm*"] } {
+ lappend options "additional_flags=-Wno-abi"
+ }
+
set filename [file tail $file]
set name [file rootname $filename]
set soname lib${name}.${so_extension}
diff --git a/libjava/testsuite/libjava.jvmti/jvmti.exp b/libjava/testsuite/libjava.jvmti/jvmti.exp
index 578eeb1ef3f..571952e807c 100644
--- a/libjava/testsuite/libjava.jvmti/jvmti.exp
+++ b/libjava/testsuite/libjava.jvmti/jvmti.exp
@@ -16,6 +16,10 @@ proc gcj_jvmti_compile_cxx_to_o {file {options {}}} {
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 "
+ # ARM C++ emits an ABI warning for varargs.
+ if { [istarget "arm*"] } {
+ lappend options "additional_flags=-Wno-abi"
+ }
set x [libjava_prune_warnings \
[target_compile $file $oname object $options]]