backport: jvmti.exp (gcj_jvmti_compile_cxx_to_o): Add -pthread on alpha*-dec-osf*.

	Backport from mainline:
	2010-11-09  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* testsuite/libjava.jvmti/jvmti.exp (gcj_jvmti_compile_cxx_to_o):
	Add -pthread on alpha*-dec-osf*.
	* testsuite/libjava.jvmti/jvmti-interp.exp
	(gcj_jni_compile_c_to_so): Likewise.

From-SVN: r167420

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0f46a6d69f232e593931c7593fdd924a566bc10d..c6396c220c5bcc79cb25b15111a6cd2af2bf9da5 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       Backport from mainline:
+       2010-11-09  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * testsuite/libjava.jvmti/jvmti.exp (gcj_jvmti_compile_cxx_to_o):
+       Add -pthread on alpha*-dec-osf*.
+       * testsuite/libjava.jvmti/jvmti-interp.exp
+       (gcj_jni_compile_c_to_so): Likewise.
+
 2010-11-30  Kai Tietz  <kai.tietz@onevision.com>
 
        Backport from mainline

diff --git a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
index 62c82e92afc1616fbf07034360c153bfabf8b9bf..fd660f35164c8b0516455d450c613d0f77baabb3 100644 (file)
--- a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
+++ b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
@@ -37,6 +37,10 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
   if { [istarget "arm*"] } {
       lappend options "additional_flags=-Wno-abi"
   }
+  # Tru64 UNIX requires <pthread.h> to be compiled with -pthread.
+  if { [istarget "alpha*-dec-osf*"] } {
+      lappend options "additional_flags=-pthread"
+  }
 
   set filename [file tail $file]
   set name [file rootname $filename]

diff --git a/libjava/testsuite/libjava.jvmti/jvmti.exp b/libjava/testsuite/libjava.jvmti/jvmti.exp
index 571952e807cf3a470d63325be1bd79dfd964b474..2d939852e5ed912969e4592620730453a4300323 100644 (file)
--- a/libjava/testsuite/libjava.jvmti/jvmti.exp
+++ b/libjava/testsuite/libjava.jvmti/jvmti.exp
@@ -20,6 +20,10 @@ proc gcj_jvmti_compile_cxx_to_o {file {options {}}} {
   if { [istarget "arm*"] } {
       lappend options "additional_flags=-Wno-abi"
   }
+  # Tru64 UNIX requires <pthread.h> to be compiled with -pthread.
+  if { [istarget "alpha*-dec-osf*"] } {
+      lappend options "additional_flags=-pthread"
+  }
 
   set x [libjava_prune_warnings \
           [target_compile $file $oname object $options]]