Revert last couple of changes here. We're going to use
a larger stick since the gdb testsuite is being uncooperative
on option ordering.

llvm-svn: 211239
diff --git a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/prelink.exp b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/prelink.exp
index 9179224..4ea9e1e 100644
--- a/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/prelink.exp
+++ b/clang-tests-external/gdb/7.5/gdb/testsuite/gdb.base/prelink.exp
@@ -40,7 +40,7 @@
 
 # Use -soname so that the new library gets copied by build_executable_own_libs.
 
-if { [gdb_compile_shlib "${srcdir}/${subdir}/${libsrcfile}" "${libfile}" [list debug "additional_flags=-gdwarf-2" "ldflags=-Wl,-soname,[file tail ${libfile}]"]] != ""} {
+if { [gdb_compile_shlib "${srcdir}/${subdir}/${libsrcfile}" "${libfile}" [list debug "ldflags=-Wl,-soname,[file tail ${libfile}]"]] != ""} {
     # If creating the shared library fails, maybe we don't have the right tools
     return -1
 }
@@ -48,7 +48,7 @@
 set srcfile ${testfile}.c
 set executable ${testfile}t
 set binfile ${objdir}/${subdir}/${executable}
-set prelink_args [build_executable_own_libs ${testfile}.exp $executable $srcfile [list debug "additional_flags=-gdwarf-2" "ldflags=-Wl,${libfile},-rpath,[file dirname ${libfile}]"]]
+set prelink_args [build_executable_own_libs ${testfile}.exp $executable $srcfile [list debug "ldflags=-Wl,${libfile},-rpath,[file dirname ${libfile}]"]]
 if {$prelink_args == ""} {
     return -1
 }