diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index cac42103c9..4a65fef02e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-27  Doug Evans  <dje@google.com>
+
+	* lib/gdb.exp (gdb_compile_shlib): Add support for clang.
+
 2014-08-25  Doug Evans  <dje@google.com>
 
 	* gdb.mi/basics.c (callee3, callee2, callee1): Specify result type.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 61e1614bdd..1019ecda25 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -2947,6 +2947,12 @@ proc gdb_compile_shlib {sources dest options} {
         "xlc-*" {
             lappend obj_options "additional_flags=-qpic"
         }
+	"clang-*" {
+	    if { !([istarget "*-*-cygwin*"]
+		   || [istarget "*-*-mingw*"]) } {
+		lappend obj_options "additional_flags=-fpic"
+	    }
+	}
         "gcc-*" {
             if { !([istarget "powerpc*-*-aix*"]
                    || [istarget "rs6000*-*-aix*"]