diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7fb73a5be2..de365a7c12 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-17  Doug Evans  <dje@google.com>
+
+	* boards/cc-with-tweaks.exp: New file.
+
 2013-01-17  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.base/completion.exp: Add "set cp-abi" completion test.
diff --git a/gdb/testsuite/boards/cc-with-tweaks.exp b/gdb/testsuite/boards/cc-with-tweaks.exp
new file mode 100644
index 0000000000..e86a0f1726
--- /dev/null
+++ b/gdb/testsuite/boards/cc-with-tweaks.exp
@@ -0,0 +1,54 @@
+# Copyright 2013 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This file is a dejagnu "board file" and is used to run the testsuite
+# with contrib/cc-with-tweaks.sh.
+#
+# NOTE: If using dwz, We assume it is in $PATH.
+#
+# Example usage:
+# bash$ make check \
+#   RUNTESTFLAGS='--target_board=cc-with-tweaks' \
+#   CC_WITH_TWEAKS_FLAGS='-z'
+#
+# The default value of CC_WITH_TWEAKS_FLAGS is "".
+
+if ![info exists CC_WITH_TWEAKS_FLAGS] {
+    set CC_WITH_TWEAKS_FLAGS ""
+}
+
+# This is needed otherwise dejagnu tries to rsh to host "cc-with-tweaks".
+# set_board_info only sets the value if not already set.
+# find_gcc checks for this, so set early.
+unset_board_info isremote
+set_board_info isremote 0
+
+# This is based on baseboards/unix.exp.
+# At the moment we only support systems that unix.exp supports.
+load_generic_config "unix"
+process_multilib_options ""
+set found_gcc [find_gcc]
+set found_gxx [find_g++]
+set_board_info compiler "$found_gcc"
+
+set contrib_dir [file normalize $srcdir/../contrib]
+if ![info exists CC_FOR_TARGET] {
+    set CC_FOR_TARGET "$found_gcc"
+}
+set CC_FOR_TARGET "/bin/sh $contrib_dir/cc-with-tweaks.sh $CC_WITH_TWEAKS_FLAGS $CC_FOR_TARGET"
+if ![info exists CXX_FOR_TARGET] {
+    set CXX_FOR_TARGET "$found_gxx"
+}
+set CXX_FOR_TARGET "/bin/sh $contrib_dir/cc-with-tweaks.sh $CC_WITH_TWEAKS_FLAGS $CXX_FOR_TARGET"