summaryrefslogtreecommitdiffstats
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/lib/target-supports.exp8
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dcfb67197f0..b85e51e6fdc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-15 Balaji V. Iyer <balaji.v.iyer@intel.com>
+
+ * lib/target-supports.exp (check_libcilkrts_available): Added an
+ extern "C" if we are using C++ along with a function prototype.
+
2014-01-15 Jeff Law <law@redhat.com>
PR tree-optimization/59747
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 159f88f28dd..ebb28aeb39f 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -1038,9 +1038,13 @@ proc check_iconv_available { test_what } {
# Return true if Cilk Library is supported on the target.
proc check_libcilkrts_available { } {
return [ check_no_compiler_messages_nocache libcilkrts_available executable {
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ int __cilkrts_set_param (const char *, const char *);
int main (void) {
- __cilkrts_set_param ("nworkers", "0");
- return 0;
+ int x = __cilkrts_set_param ("nworkers", "0");
+ return x;
}
} "-fcilkplus -lcilkrts" ]
}
OpenPOWER on IntegriCloud