diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0e1e78501f..ec01bffda7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-10  Andrew Burgess  <aburgess@broadcom.com>
+
+	* lib/gdb.exp (gdb_compile_shlib): Add call to get_compiler_info,
+	update comment.
+
 2013-12-10  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.ada/int_deref.exp: Add test verifying that we print
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index d221505d00..ebeb659876 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -2809,12 +2809,19 @@ proc gdb_compile_pthreads {source dest type options} {
     }
 }
 
-# Build a shared library from SOURCES.  You must use get_compiler_info
-# first.
+# Build a shared library from SOURCES.
 
 proc gdb_compile_shlib {sources dest options} {
     set obj_options $options
 
+    set info_options ""
+    if { [lsearch -exact $options "c++"] >= 0 } {
+	set info_options "c++"
+    }
+    if [get_compiler_info ${info_options}] {
+       return -1
+    }
+
     switch -glob [test_compiler_info] {
         "xlc-*" {
             lappend obj_options "additional_flags=-qpic"