Drop gdb-testsuite-subdirs-revert.patch.

gdb-6.3-attach-see-vdso-test.patch

@@ -1,5 +1,7 @@
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.base/attach-see-vdso.c	6 Jul 2007 14:14:44 -0000
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/attach-see-vdso.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/attach-see-vdso.c	2016-02-15 23:25:36.749601045 +0100
 @@ -0,0 +1,25 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -26,8 +28,10 @@
 +  pause ();
 +  return 1;
 +}
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.base/attach-see-vdso.exp	6 Jul 2007 14:14:44 -0000
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/attach-see-vdso.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/attach-see-vdso.exp	2016-02-15 23:25:44.889658840 +0100
 @@ -0,0 +1,72 @@
 +# Copyright 2007
 +
@@ -54,8 +58,8 @@
 +
 +set testfile "attach-see-vdso"
 +set srcfile  ${testfile}.c
-+set binfile  ${objdir}/${subdir}/${testfile}
-+set escapedbinfile  [string_to_regexp ${objdir}/${subdir}/${testfile}]
++set binfile  [standard_output_file ${testfile}]
++set escapedbinfile  [string_to_regexp [standard_output_file ${testfile}]]
 +
 +# The kernel VDSO is used for the syscalls returns only on i386 (not x86_64).
 +#

gdb-6.3-bz202689-exec-from-pthread-test.patch

@@ -3,8 +3,10 @@
 	* gdb.threads/threaded-exec.exp, gdb.threads/threaded-exec.c: New files.
 
 
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.threads/threaded-exec.c	17 Jan 2007 23:10:22 -0000
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threaded-exec.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threaded-exec.c	2016-02-16 09:54:06.936904418 +0100
 @@ -0,0 +1,46 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -52,8 +54,10 @@
 +	execl ("/bin/true", "/bin/true", NULL);
 +	abort ();
 +}
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.threads/threaded-exec.exp	17 Jan 2007 23:10:22 -0000
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threaded-exec.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threaded-exec.exp	2016-02-16 09:54:19.965992585 +0100
 @@ -0,0 +1,41 @@
 +# threaded-exec.exp -- Check reset of the tracked threads on exec*(2)
 +# Copyright (C) 2007 Free Software Foundation, Inc.
@@ -77,7 +81,7 @@
 +
 +set testfile threaded-exec
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +
 +if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable []] != "" } {
 +    return -1

gdb-6.3-inferior-notification-20050721.patch

@@ -9,10 +9,10 @@
 
 	* gdb.base/attach-32.exp: Fix forgotten $GDBFLAGS as set.
 
-Index: gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/attach-32.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32.c	2011-03-20 20:15:57.000000000 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/attach-32.c	2016-02-15 23:23:02.923499512 +0100
 @@ -0,0 +1,20 @@
 +/* This program is intended to be started outside of gdb, and then
 +   attached to by gdb.  Thus, it simply spins in a loop.  The loop
@@ -34,10 +34,10 @@ Index: gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32.c
 +    }
 +  return 0;
 +}
-Index: gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/attach-32.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32.exp	2011-03-20 20:20:03.000000000 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/attach-32.exp	2016-02-15 23:25:11.385420957 +0100
 @@ -0,0 +1,245 @@
 +# Copyright 2005 Free Software Foundation, Inc.
 +
@@ -77,9 +77,9 @@ Index: gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32.exp
 +set testfile "attach-32"
 +set srcfile  ${testfile}.c
 +set srcfile2 ${testfile}b.c
-+set binfile  ${objdir}/${subdir}/${testfile}
-+set binfile2 ${objdir}/${subdir}/${testfile}b
-+set escapedbinfile  [string_to_regexp ${objdir}/${subdir}/${testfile}]
++set binfile  [standard_output_file ${testfile}]
++set binfile2 [standard_output_file ${testfile}b]
++set escapedbinfile  [string_to_regexp [standard_output_file ${testfile}]]
 +
 +#execute_anywhere "rm -f ${binfile} ${binfile2}"
 +remote_exec build "rm -f ${binfile} ${binfile2}"
@@ -284,10 +284,10 @@ Index: gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32.exp
 +do_call_attach_tests
 +
 +return 0
-Index: gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32b.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/attach-32b.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.2.50.20110320/gdb/testsuite/gdb.base/attach-32b.c	2011-03-20 20:15:57.000000000 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/attach-32b.c	2016-02-15 23:23:02.924499519 +0100
 @@ -0,0 +1,24 @@
 +/* This program is intended to be started outside of gdb, and then
 +   attached to by gdb.  Thus, it simply spins in a loop.  The loop

gdb-6.3-inheritancetest-20050726.patch

@@ -5,10 +5,10 @@
 	* gdb.cp/b146835b.cc: Ditto.
 	* gdb.cp/b146835.h: Ditto.
 
-Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835b.cc
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/b146835b.cc
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835b.cc	2009-08-12 06:07:50.000000000 +0200
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/b146835b.cc	2016-02-16 09:49:08.743886620 +0100
 @@ -0,0 +1,11 @@
 +#include "b146835.h"
 +
@@ -21,10 +21,10 @@ Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835b.cc
 +void A::funcD (class E *e, class D *d) {}
 +void A::funcE (E *e, D *d) {}
 +void A::funcF (unsigned long x, D *d) {}
-Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.cc
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/b146835.cc
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.cc	2009-08-12 06:07:50.000000000 +0200
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/b146835.cc	2016-02-16 09:49:08.744886627 +0100
 @@ -0,0 +1,32 @@
 +#include "b146835.h"
 +#include <iostream>
@@ -58,10 +58,10 @@ Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.cc
 +   f.foo();
 +}
 +
-Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/b146835.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.exp	2009-08-12 06:58:28.000000000 +0200
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/b146835.exp	2016-02-16 09:51:48.601968339 +0100
 @@ -0,0 +1,47 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
@@ -87,7 +87,7 @@ Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.exp
 +set testfile "b146835"
 +set srcfile ${testfile}.cc
 +set srcfile2 ${testfile}b.cc
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +if {[gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile2}" "${binfile}" executable {debug c++}] != "" } {
 +    return -1
 +}
@@ -110,10 +110,10 @@ Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.exp
 +
 +# Verify that we can access the inherited member d
 +gdb_test "p d" " = \\(D \\*\\) *0x0" "Verify inherited member d accessible"
-Index: gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.h
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/b146835.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20090811/gdb/testsuite/gdb.cp/b146835.h	2009-08-12 06:07:50.000000000 +0200
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/b146835.h	2016-02-16 09:49:08.744886627 +0100
 @@ -0,0 +1,36 @@
 +
 +class A {

gdb-6.3-test-dtorfix-20050121.patch

@@ -1,7 +1,7 @@
-Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.cc
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/constructortest.cc
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.cc	2011-12-19 22:05:02.825431735 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/constructortest.cc	2016-02-16 09:49:08.681886201 +0100
 @@ -0,0 +1,99 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -102,10 +102,10 @@ Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.cc
 +{
 +   y = 2; /* First line D */
 +}
-Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/constructortest.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.exp	2011-12-19 23:07:24.148290893 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/constructortest.exp	2016-02-16 09:52:12.609130779 +0100
 @@ -0,0 +1,130 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
@@ -129,7 +129,7 @@ Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.cp/constructortest.exp
 +
 +set testfile "constructortest"
 +set srcfile ${testfile}.cc
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +# PIE is required for testing proper BREAKPOINT_RE_SET of the multiple-PC
 +# breakpoints.
 +if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++ "additional_flags=-fpie -pie"}] != "" } {

gdb-6.3-test-movedir-20050125.patch

@@ -4,10 +4,10 @@
         * gdb.base/move-dir.c: Ditto.
         * gdb.base/move-dir.h: Ditto.
 
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/move-dir.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.c	2008-12-07 23:57:41.000000000 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/move-dir.c	2016-02-15 23:23:02.892499288 +0100
 @@ -0,0 +1,10 @@
 +#include <stdio.h>
 +#include <stdlib.h>
@@ -19,10 +19,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.c
 +   other();
 +}
 +
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/move-dir.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.exp	2008-12-07 10:13:01.000000000 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/move-dir.exp	2016-02-15 23:29:58.768461406 +0100
 @@ -0,0 +1,57 @@
 +#   Copyright 2005
 +#   Free Software Foundation, Inc.
@@ -44,17 +44,17 @@ Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.exp
 +set testfile "move-dir"
 +set srcfile ${testfile}.c
 +set incfile ${testfile}.h
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +
-+set testdir "${objdir}/${subdir}/incdir"
++set testdir [standard_output_file incdir]
 +
 +remote_exec build "mkdir $testdir"
-+remote_exec build "cp ${srcdir}/${subdir}/${srcfile} ${objdir}/${subdir}"
-+remote_exec build "cp ${srcdir}/${subdir}/${incfile} ${testdir}"
++remote_exec build "cp ${srcdir}/${subdir}/${srcfile} [standard_output_file ${srcfile}]"
++remote_exec build "cp ${srcdir}/${subdir}/${incfile} [standard_output_file ${incfile}]"
 +
 +set additional_flags "additional_flags=-I${subdir}/incdir"
 +
-+if  { [gdb_compile "${objdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
++if  { [gdb_compile [standard_output_file ${srcfile}] "${binfile}" executable [list debug $additional_flags]] != "" } {
 +    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 +}
 +
@@ -81,10 +81,10 @@ Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.exp
 +
 +set timeout $oldtimeout
 +return 0
-Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.h
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/move-dir.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.8.50.20081128/gdb/testsuite/gdb.base/move-dir.h	2008-12-07 10:13:01.000000000 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/move-dir.h	2016-02-15 23:23:02.892499288 +0100
 @@ -0,0 +1,7 @@
 +#include <stdlib.h>
 +

gdb-6.3-test-pie-20050107.patch

@@ -1,39 +1,7 @@
-Index: gdb-7.10.90.20160211/gdb/testsuite/configure.ac
-===================================================================
---- gdb-7.10.90.20160211.orig/gdb/testsuite/configure.ac	2016-02-11 22:37:23.336668130 +0100
-+++ gdb-7.10.90.20160211/gdb/testsuite/configure.ac	2016-02-11 22:37:28.981706957 +0100
-@@ -113,5 +113,5 @@
-   gdb.guile/Makefile gdb.linespec/Makefile \
-   gdb.mi/Makefile gdb.modula2/Makefile gdb.multi/Makefile \
-   gdb.objc/Makefile gdb.opencl/Makefile gdb.opt/Makefile gdb.pascal/Makefile \
--  gdb.perf/Makefile gdb.python/Makefile gdb.reverse/Makefile gdb.stabs/Makefile \
-+  gdb.perf/Makefile gdb.pie/Makefile gdb.python/Makefile gdb.reverse/Makefile gdb.stabs/Makefile \
-   gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile])
-Index: gdb-7.10.90.20160211/gdb/testsuite/configure
-===================================================================
---- gdb-7.10.90.20160211.orig/gdb/testsuite/configure	2016-02-11 22:37:23.338668144 +0100
-+++ gdb-7.10.90.20160211/gdb/testsuite/configure	2016-02-11 22:38:02.365936577 +0100
-@@ -3511,7 +3511,7 @@
- 
- ac_config_files="$ac_config_files lib/pdtrace"
- 
--ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.btrace/Makefile gdb.cell/Makefile gdb.compile/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.dlang/Makefile gdb.fortran/Makefile gdb.gdb/Makefile gdb.go/Makefile gdb.server/Makefile gdb.java/Makefile gdb.guile/Makefile gdb.linespec/Makefile gdb.mi/Makefile gdb.modula2/Makefile gdb.multi/Makefile gdb.objc/Makefile gdb.opencl/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.perf/Makefile gdb.python/Makefile gdb.reverse/Makefile gdb.stabs/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile"
-+ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.btrace/Makefile gdb.cell/Makefile gdb.compile/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.dlang/Makefile gdb.fortran/Makefile gdb.gdb/Makefile gdb.go/Makefile gdb.server/Makefile gdb.java/Makefile gdb.guile/Makefile gdb.linespec/Makefile gdb.mi/Makefile gdb.modula2/Makefile gdb.multi/Makefile gdb.objc/Makefile gdb.opencl/Makefile gdb.opt/Makefile gdb.pascal/Makefile gdb.perf/Makefile gdb.pie/Makefile gdb.python/Makefile gdb.reverse/Makefile gdb.stabs/Makefile gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile"
- 
- 
- cat >confcache <<\_ACEOF
-@@ -4240,6 +4240,7 @@
-     "gdb.opt/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.opt/Makefile" ;;
-     "gdb.pascal/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.pascal/Makefile" ;;
-     "gdb.perf/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.perf/Makefile" ;;
-+    "gdb.pie/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.pie/Makefile" ;;
-     "gdb.python/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.python/Makefile" ;;
-     "gdb.reverse/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.reverse/Makefile" ;;
-     "gdb.stabs/Makefile") CONFIG_FILES="$CONFIG_FILES gdb.stabs/Makefile" ;;
 Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach.c	2016-02-11 22:37:28.983706971 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach.c	2016-02-15 23:23:02.843498936 +0100
 @@ -0,0 +1,20 @@
 +/* This program is intended to be started outside of gdb, and then
 +   attached to by gdb.  Thus, it simply spins in a loop.  The loop
@@ -58,7 +26,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach.c
 Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach2.c	2016-02-11 22:37:28.983706971 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach2.c	2016-02-15 23:23:02.843498936 +0100
 @@ -0,0 +1,24 @@
 +/* This program is intended to be started outside of gdb, and then
 +   attached to by gdb.  Thus, it simply spins in a loop.  The loop
@@ -87,7 +55,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach2.c
 Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break.c	2016-02-11 22:37:28.983706971 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break.c	2016-02-15 23:23:02.844498943 +0100
 @@ -0,0 +1,146 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -238,7 +206,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break.c
 Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break1.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break1.c	2016-02-11 22:37:28.983706971 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break1.c	2016-02-15 23:23:02.844498943 +0100
 @@ -0,0 +1,44 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -287,7 +255,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break1.c
 Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/coremaker.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/coremaker.c	2016-02-11 22:37:28.983706971 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/coremaker.c	2016-02-15 23:23:02.844498943 +0100
 @@ -0,0 +1,142 @@
 +/* Copyright 1992, 1993, 1994, 1995, 1996, 1999
 +   Free Software Foundation, Inc.
@@ -434,8 +402,8 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/coremaker.c
 Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach.exp	2016-02-11 22:37:28.984706978 +0100
-@@ -0,0 +1,417 @@
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach.exp	2016-02-15 23:37:15.190560048 +0100
+@@ -0,0 +1,416 @@
 +#   Copyright 1997, 1999, 2002 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -471,10 +439,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach.exp
 +set testfile "attach"
 +set srcfile  ${testfile}.c
 +set srcfile2 ${testfile}2.c
-+set binfile  ${objdir}/${subdir}/${testfile}
-+set binfile2 ${objdir}/${subdir}/${testfile}2
-+set escapedbinfile  [string_to_regexp ${objdir}/${subdir}/${testfile}]
-+set cleanupfile ${objdir}/${subdir}/${testfile}.awk
++set binfile  [standard_output_file ${testfile}]
++set binfile2 [standard_output_file ${testfile}2]
++set escapedbinfile  [string_to_regexp [standard_output_file ${testfile}]]
++set cleanupfile [standard_output_file ${testfile}.awk]
 +
 +#execute_anywhere "rm -f ${binfile} ${binfile2}"
 +remote_exec build "rm -f ${binfile} ${binfile2}"
@@ -508,7 +476,6 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach.exp
 +   global escapedbinfile
 +   global srcfile
 +   global testfile
-+   global objdir
 +   global subdir
 +   global timeout
 +
@@ -716,7 +683,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach.exp
 +   # when we're cd'd to some directory that doesn't contain the
 +   # a.out.  (We use the source path set by the "dir" command.)
 +   #
-+   send_gdb "dir ${objdir}/${subdir}\n"
++   send_gdb "dir [file dirname [standard_output_file ${testfile}]]\n"
 +   gdb_expect {
 +      -re ".*Source directories searched: .*$gdb_prompt $"\
 +                      {pass "set source path"}
@@ -856,7 +823,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/attach.exp
 Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break.exp	2016-02-11 22:37:28.985706985 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break.exp	2016-02-15 23:37:15.191560055 +0100
 @@ -0,0 +1,954 @@
 +#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
 +#   2000, 2002, 2003, 2004
@@ -886,7 +853,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break.exp
 +set testfile "break"
 +set srcfile ${testfile}.c
 +set srcfile1 ${testfile}1.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug "additional_flags=-w -fpie -pie"}] != "" } {
 +     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
@@ -1699,7 +1666,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break.exp
 +# build a new file with optimization enabled so that we can try breakpoints
 +# on targets with optimized prologues
 +
-+set binfileo2 ${objdir}/${subdir}/${testfile}o2
++set binfileo2 [standard_output_file ${testfile}o2]
 +
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}O0.o" object {debug "additional_flags=-w -O2 -fpie -pie"}] != "" } {
 +     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
@@ -1815,7 +1782,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/break.exp
 Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/corefile.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/corefile.exp	2016-02-11 22:37:28.985706985 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/corefile.exp	2016-02-15 23:37:15.191560055 +0100
 @@ -0,0 +1,233 @@
 +# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 +# Free Software Foundation, Inc.
@@ -1843,7 +1810,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/corefile.exp
 +
 +set testfile "coremaker"
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug "additional_flags=-fpie -pie"}] != "" } {
 +     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 +}
@@ -1868,13 +1835,13 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/corefile.exp
 +# could have many core files lying around, and it may be difficult to
 +# tell which one is ours, so let's run the program in a subdirectory.
 +set found 0
-+set coredir "${objdir}/${subdir}/coredir.[getpid]"
++set coredir [standard_output_file coredir.[getpid]]
 +file mkdir $coredir
 +catch "system \"(cd ${coredir}; ulimit -c unlimited; ${binfile}; true) >/dev/null 2>&1\""
 +#      remote_exec host "${binfile}"
 +foreach i "${coredir}/core ${coredir}/core.coremaker.c ${binfile}.core" {
 +    if [remote_file build exists $i] {
-+	remote_exec build "mv $i ${objdir}/${subdir}/corefile"
++	remote_exec build "mv $i [standard_output_file corefile]"
 +	set found 1
 +    }
 +}
@@ -1883,7 +1850,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/corefile.exp
 +    set names [glob -nocomplain -directory $coredir core.*]
 +    if {[llength $names] == 1} {
 +        set corefile [file join $coredir [lindex $names 0]]
-+        remote_exec build "mv $corefile ${objdir}/${subdir}/corefile"
++        remote_exec build "mv $corefile [standard_output_file corefile]"
 +        set found 1
 +    }
 +}
@@ -1893,10 +1860,10 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/corefile.exp
 +    # ulimit here if we didn't find a core file above.
 +    # Oh, I should mention that any "braindamaged" non-Unix system has
 +    # the same problem. I like the cd bit too, it's really neat'n stuff.
-+    catch "system \"(cd ${objdir}/${subdir}; ${binfile}; true) >/dev/null 2>&1\""
-+    foreach i "${objdir}/${subdir}/core ${objdir}/${subdir}/core.coremaker.c ${binfile}.core" {
++    catch "system \"(cd [file dirname [standard_output_file ${binfile}]]; ${binfile}; true) >/dev/null 2>&1\""
++    foreach i "[standard_output_file core] [standard_output_file core.coremaker.c] ${binfile}.core" {
 +	if [remote_file build exists $i] {
-+	    remote_exec build "mv $i ${objdir}/${subdir}/corefile"
++	    remote_exec build "mv $i [standard_output_file corefile]"
 +	    set found 1
 +	}
 +    }
@@ -1929,13 +1896,13 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/corefile.exp
 +
 +gdb_exit
 +if $verbose>1 then {
-+    send_user "Spawning $GDB -nw $GDBFLAGS -core=$objdir/$subdir/corefile\n"
++    send_user "Spawning $GDB -nw $GDBFLAGS -core=[standard_output_file corefile]\n"
 +}
 +
 +set oldtimeout $timeout
 +set timeout [expr "$timeout + 60"]
 +verbose "Timeout is now $timeout seconds" 2
-+eval "spawn $GDB -nw $GDBFLAGS -core=$objdir/$subdir/corefile"
++eval "spawn $GDB -nw $GDBFLAGS -core=[standard_output_file corefile]"
 +expect {
 +    -re "Couldn't find .* registers in core file.*$gdb_prompt $" {
 +        fail "args: -core=corefile (couldn't find regs)"
@@ -1962,11 +1929,11 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/corefile.exp
 +close;
 +
 +if $verbose>1 then {
-+    send_user "Spawning $GDB -nw $GDBFLAGS $binfile -core=$objdir/$subdir/corefile\n"
++    send_user "Spawning $GDB -nw $GDBFLAGS $binfile -core=[standard_output_file corefile]\n"
 +}
 +
 +
-+eval "spawn $GDB -nw $GDBFLAGS $binfile -core=$objdir/$subdir/corefile";
++eval "spawn $GDB -nw $GDBFLAGS $binfile -core=[standard_output_file corefile]";
 +expect {
 +    -re "Core was generated by .*coremaker.*\r\n\#0  .*\(\).*\r\n$gdb_prompt $" {
 +	pass "args: execfile -core=corefile"
@@ -1993,7 +1960,7 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/corefile.exp
 +
 +# Test basic corefile recognition via core-file command.
 +
-+send_gdb "core-file $objdir/$subdir/corefile\n"
++send_gdb "core-file [standard_output_file corefile]\n"
 +gdb_expect {
 +    -re ".* program is being debugged already.*y or n. $" {
 +	# gdb_load may connect us to a gdbserver.
@@ -2050,27 +2017,3 @@ Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/corefile.exp
 +gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(.*\\).*" "up in corefile.exp (reinit)"
 +
 +gdb_test "core" "No core file now."
-Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/Makefile.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pie/Makefile.in	2016-02-11 22:37:28.985706985 +0100
-@@ -0,0 +1,19 @@
-+VPATH = @srcdir@
-+srcdir = @srcdir@
-+
-+EXECUTABLES =
-+MISCELLANEOUS = arch.inc
-+
-+all info install-info dvi install uninstall installcheck check:
-+	@echo "Nothing to be done for $@..."
-+
-+clean mostlyclean:
-+	-rm -f *~ *.o a.out *.x *.ci *.tmp
-+	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
-+	-rm -f $(MISCELLANEOUS)
-+
-+distclean maintainer-clean realclean: clean
-+	-rm -f *~ core
-+	-rm -f Makefile config.status config.log
-+	-rm -f *-init.exp
-+	-rm -fr *.log summary detail *.plog *.sum *.psum site.*

gdb-6.3-threaded-watchpoints2-20050225.patch

@@ -42,10 +42,10 @@
 
 FIXME: The testcase does not expects multiple watchpoints hits per one stop.
 
-Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/watchthreads-threaded.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/watchthreads-threaded.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/watchthreads-threaded.c	2011-12-19 22:05:02.867431570 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/watchthreads-threaded.c	2016-02-15 23:37:39.766734541 +0100
 @@ -0,0 +1,66 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -113,10 +113,10 @@ Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/watchthreads-threaded.c
 +    pthread_exit(NULL);
 +}
 +
-Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/watchthreads-threaded.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/watchthreads-threaded.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/watchthreads-threaded.exp	2011-12-19 22:28:33.294911982 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/watchthreads-threaded.exp	2016-02-15 23:40:32.484960858 +0100
 @@ -0,0 +1,126 @@
 +# This testcase is part of GDB, the GNU debugger.
 +
@@ -146,7 +146,7 @@ Index: gdb-7.4.50.20111219/gdb/testsuite/gdb.threads/watchthreads-threaded.exp
 +
 +set testfile "watchthreads-threaded"
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
 +    return -1
 +}

gdb-6.5-BEA-testsuite.patch

@@ -1,7 +1,7 @@
-Index: gdb-7.6/gdb/testsuite/gdb.threads/threadcrash.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threadcrash.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.6/gdb/testsuite/gdb.threads/threadcrash.c	2013-05-21 13:35:45.592059786 +0200
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threadcrash.c	2016-02-15 23:37:39.884735379 +0100
 @@ -0,0 +1,301 @@
 +/*
 + * The point of this program is to crash in a multi-threaded app.
@@ -304,10 +304,10 @@ Index: gdb-7.6/gdb/testsuite/gdb.threads/threadcrash.c
 +   
 +   return 0;
 +}
-Index: gdb-7.6/gdb/testsuite/gdb.threads/threadcrash.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threadcrash.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.6/gdb/testsuite/gdb.threads/threadcrash.exp	2013-05-21 13:36:01.451056746 +0200
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threadcrash.exp	2016-02-15 23:38:58.486293458 +0100
 @@ -0,0 +1,37 @@
 +# threadcrash.exp - The point of this program is to crash in a multi-threaded app.
 +
@@ -315,7 +315,7 @@ Index: gdb-7.6/gdb/testsuite/gdb.threads/threadcrash.exp
 +set testfile threadcrash
 +set srcfile ${testfile}.c
 +set shellfile ${srcdir}/${subdir}/${testfile}.sh
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +
 +set GDB_abs ${GDB}
 +if [regexp "^\[^/\]" ${GDB_abs}] {
@@ -346,10 +346,10 @@ Index: gdb-7.6/gdb/testsuite/gdb.threads/threadcrash.exp
 +}
 +
 +return 0
-Index: gdb-7.6/gdb/testsuite/gdb.threads/threadcrash.sh
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threadcrash.sh
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.6/gdb/testsuite/gdb.threads/threadcrash.sh	2013-05-21 13:35:45.593059786 +0200
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threadcrash.sh	2016-02-15 23:37:39.885735386 +0100
 @@ -0,0 +1,324 @@
 +#! /bin/bash
 +
@@ -675,10 +675,10 @@ Index: gdb-7.6/gdb/testsuite/gdb.threads/threadcrash.sh
 +rm -rf $WORKDIR
 +
 +exit $FAILURES
-Index: gdb-7.6/gdb/testsuite/gdb.threads/threadcrash.sh-orig
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threadcrash.sh-orig
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.6/gdb/testsuite/gdb.threads/threadcrash.sh-orig	2013-05-21 13:35:45.593059786 +0200
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threadcrash.sh-orig	2016-02-15 23:37:39.885735386 +0100
 @@ -0,0 +1,248 @@
 +#! /bin/bash
 +

gdb-6.5-bz109921-DW_AT_decl_file-test.patch

@@ -16,8 +16,10 @@ http://sourceware.org/ml/gdb-patches/2007-01/msg00434.html
 	* gdb.dwarf2/dw2-included.exp, gdb.dwarf2/dw2-included.c,
 	gdb.dwarf2/dw2-included.h: New files.
 
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.dwarf2/dw2-included.c	2 Jan 2007 00:20:27 -0000
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-included.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-included.c	2016-02-16 09:52:29.861247534 +0100
 @@ -0,0 +1,26 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -45,8 +47,10 @@ http://sourceware.org/ml/gdb-patches/2007-01/msg00434.html
 +{
 +  return 0;
 +}
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.dwarf2/dw2-included.exp	2 Jan 2007 00:20:27 -0000
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-included.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-included.exp	2016-02-16 09:52:36.481292330 +0100
 @@ -0,0 +1,47 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
@@ -79,7 +83,7 @@ http://sourceware.org/ml/gdb-patches/2007-01/msg00434.html
 +
 +set testfile "dw2-included"
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    return -1
@@ -95,8 +99,10 @@ http://sourceware.org/ml/gdb-patches/2007-01/msg00434.html
 +gdb_test "ptype integer" "type = int\r"
 +# Path varies depending on the build location.
 +gdb_test "info variables integer" "\r\nFile \[^\r\n\]*/gdb.dwarf2/dw2-included.h:\r\nint integer;\r"
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.dwarf2/dw2-included.h	2 Jan 2007 00:20:27 -0000
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-included.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-included.h	2016-02-16 09:52:29.862247541 +0100
 @@ -0,0 +1,20 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +

gdb-6.5-bz185337-resolve-tls-without-debuginfo-v2.patch

@@ -34,11 +34,11 @@ glibc-debuginfo-2.7-2.x86_64: /usr/lib/debug/lib64/libc.so.6.debug:
   <81a2>     DW_AT_name        : (indirect string, offset: 0x280e): __errno_location
   <81a8>     DW_AT_MIPS_linkage_name: (indirect string, offset: 0x2808): *__GI___errno_location
 
-Index: gdb-7.8.1/gdb/printcmd.c
+Index: gdb-7.10.90.20160211/gdb/printcmd.c
 ===================================================================
---- gdb-7.8.1.orig/gdb/printcmd.c	2014-11-21 19:05:44.699959209 +0100
-+++ gdb-7.8.1/gdb/printcmd.c	2014-11-21 19:05:44.868959291 +0100
-@@ -980,6 +980,10 @@ print_command_1 (const char *exp, int vo
+--- gdb-7.10.90.20160211.orig/gdb/printcmd.c	2016-02-15 23:29:53.062420893 +0100
++++ gdb-7.10.90.20160211/gdb/printcmd.c	2016-02-15 23:33:31.068968762 +0100
+@@ -1003,6 +1003,10 @@
  
    if (exp && *exp)
      {
@@ -49,10 +49,10 @@ Index: gdb-7.8.1/gdb/printcmd.c
        expr = parse_expression (exp);
        make_cleanup (free_current_contents, &expr);
        val = evaluate_expression (expr);
-Index: gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-errno.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno.c	2014-11-21 19:05:44.869959291 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-errno.c	2016-02-15 23:30:20.703617148 +0100
 @@ -0,0 +1,28 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -82,10 +82,10 @@ Index: gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno.c
 +
 +  return 0;	/* breakpoint */
 +}
-Index: gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno.exp	2014-11-21 19:05:44.869959291 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-errno.exp	2016-02-15 23:35:25.582781821 +0100
 @@ -0,0 +1,60 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -104,7 +104,7 @@ Index: gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
 +
 +set testfile dw2-errno
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +
 +proc prep {} {
 +    global srcdir subdir binfile
@@ -147,10 +147,10 @@ Index: gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno.exp
 +
 +# TODO: Test the error on resolving ERRNO with only libc loaded.
 +# Just how to find the current libc filename?
-Index: gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno2.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-errno2.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno2.c	2014-11-21 19:05:44.869959291 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-errno2.c	2016-02-15 23:30:20.703617148 +0100
 @@ -0,0 +1,28 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -180,10 +180,10 @@ Index: gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno2.c
 +
 +  return 0;	/* breakpoint */
 +}
-Index: gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno2.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-errno2.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno2.exp	2014-11-21 19:13:01.553171326 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-errno2.exp	2016-02-15 23:35:25.582781821 +0100
 @@ -0,0 +1,71 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -202,7 +202,7 @@ Index: gdb-7.8.1/gdb/testsuite/gdb.dwarf2/dw2-errno2.exp
 +
 +set testfile dw2-errno2
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +
 +proc prep { message {do_xfail 0} } { with_test_prefix $message {
 +    global srcdir subdir binfile variant

gdb-6.5-bz216711-clone-is-outermost.patch

@@ -23,10 +23,10 @@ instead.
 
 	Port to GDB-6.7.
 
-Index: gdb-7.10.50.20160121/gdb/amd64-linux-tdep.c
+Index: gdb-7.10.90.20160211/gdb/amd64-linux-tdep.c
 ===================================================================
---- gdb-7.10.50.20160121.orig/gdb/amd64-linux-tdep.c	2016-01-22 17:19:01.945819383 +0100
-+++ gdb-7.10.50.20160121/gdb/amd64-linux-tdep.c	2016-01-22 17:21:54.609855292 +0100
+--- gdb-7.10.90.20160211.orig/gdb/amd64-linux-tdep.c	2016-02-15 23:37:06.936501443 +0100
++++ gdb-7.10.90.20160211/gdb/amd64-linux-tdep.c	2016-02-15 23:37:39.928735691 +0100
 @@ -292,6 +292,80 @@
  
  /* Set the program counter for process PTID to PC.  */
@@ -117,10 +117,10 @@ Index: gdb-7.10.50.20160121/gdb/amd64-linux-tdep.c
    /* Add the %orig_rax register used for syscall restarting.  */
    set_gdbarch_write_pc (gdbarch, amd64_linux_write_pc);
  
-Index: gdb-7.10.50.20160121/gdb/amd64-tdep.c
+Index: gdb-7.10.90.20160211/gdb/amd64-tdep.c
 ===================================================================
---- gdb-7.10.50.20160121.orig/gdb/amd64-tdep.c	2016-01-22 17:19:01.945819383 +0100
-+++ gdb-7.10.50.20160121/gdb/amd64-tdep.c	2016-01-22 17:21:54.610855298 +0100
+--- gdb-7.10.90.20160211.orig/gdb/amd64-tdep.c	2016-02-15 23:37:06.936501443 +0100
++++ gdb-7.10.90.20160211/gdb/amd64-tdep.c	2016-02-15 23:37:39.929735698 +0100
 @@ -2494,6 +2494,7 @@
  {
    struct amd64_frame_cache *cache =
@@ -160,10 +160,10 @@ Index: gdb-7.10.50.20160121/gdb/amd64-tdep.c
    else
      (*this_id) = frame_id_build (cache->base + 16, get_frame_pc (this_frame));
  }
-Index: gdb-7.10.50.20160121/gdb/i386-tdep.c
+Index: gdb-7.10.90.20160211/gdb/i386-tdep.c
 ===================================================================
---- gdb-7.10.50.20160121.orig/gdb/i386-tdep.c	2016-01-22 17:19:01.945819383 +0100
-+++ gdb-7.10.50.20160121/gdb/i386-tdep.c	2016-01-22 17:21:54.612855310 +0100
+--- gdb-7.10.90.20160211.orig/gdb/i386-tdep.c	2016-02-15 23:37:06.936501443 +0100
++++ gdb-7.10.90.20160211/gdb/i386-tdep.c	2016-02-15 23:37:39.931735713 +0100
 @@ -8305,6 +8305,9 @@
  
    tdep->xsave_xcr0_offset = -1;
@@ -174,10 +174,10 @@ Index: gdb-7.10.50.20160121/gdb/i386-tdep.c
    tdep->record_regmap = i386_record_regmap;
  
    set_gdbarch_long_long_align_bit (gdbarch, 32);
-Index: gdb-7.10.50.20160121/gdb/i386-tdep.h
+Index: gdb-7.10.90.20160211/gdb/i386-tdep.h
 ===================================================================
---- gdb-7.10.50.20160121.orig/gdb/i386-tdep.h	2016-01-22 17:19:01.945819383 +0100
-+++ gdb-7.10.50.20160121/gdb/i386-tdep.h	2016-01-22 17:21:54.612855310 +0100
+--- gdb-7.10.90.20160211.orig/gdb/i386-tdep.h	2016-02-15 23:37:06.936501443 +0100
++++ gdb-7.10.90.20160211/gdb/i386-tdep.h	2016-02-15 23:37:39.932735720 +0100
 @@ -240,6 +240,9 @@
  
    /* Regsets. */
@@ -188,10 +188,10 @@ Index: gdb-7.10.50.20160121/gdb/i386-tdep.h
  };
  
  /* Floating-point registers.  */
-Index: gdb-7.10.50.20160121/gdb/testsuite/gdb.threads/bt-clone-stop.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/bt-clone-stop.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20160121/gdb/testsuite/gdb.threads/bt-clone-stop.c	2016-01-22 17:21:54.612855310 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/bt-clone-stop.c	2016-02-15 23:37:39.932735720 +0100
 @@ -0,0 +1,39 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -232,10 +232,10 @@ Index: gdb-7.10.50.20160121/gdb/testsuite/gdb.threads/bt-clone-stop.c
 +	for (;;)
 +		pause();
 +}
-Index: gdb-7.10.50.20160121/gdb/testsuite/gdb.threads/bt-clone-stop.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/bt-clone-stop.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20160121/gdb/testsuite/gdb.threads/bt-clone-stop.exp	2016-01-22 17:23:42.188497347 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/bt-clone-stop.exp	2016-02-15 23:37:56.197851204 +0100
 @@ -0,0 +1,61 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
@@ -261,7 +261,7 @@ Index: gdb-7.10.50.20160121/gdb/testsuite/gdb.threads/bt-clone-stop.exp
 +
 +set testfile bt-clone-stop
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1

gdb-6.5-bz218379-ppc-solib-trampoline-test.patch

@@ -1,8 +1,10 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
 
 
---- /dev/null	2006-12-17 14:18:21.881669220 -0500
-+++ gdb-6.5/gdb/testsuite/gdb.base/step-over-trampoline.exp	2006-12-17 16:52:51.000000000 -0500
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/step-over-trampoline.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/step-over-trampoline.exp	2016-02-15 23:31:47.312232078 +0100
 @@ -0,0 +1,54 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
@@ -26,7 +28,7 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
 +
 +set testfile step-over-trampoline
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1
@@ -58,8 +60,10 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218379
 +		fail "stepped into trampoline"
 +	}
 +}
---- /dev/null	2006-12-17 14:18:21.881669220 -0500
-+++ gdb-6.5/gdb/testsuite/gdb.base/step-over-trampoline.c	2006-12-17 16:18:12.000000000 -0500
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/step-over-trampoline.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/step-over-trampoline.c	2016-02-15 23:30:54.698858518 +0100
 @@ -0,0 +1,28 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +

gdb-6.5-gcore-buffer-limit-test.patch

@@ -1,6 +1,7 @@
-diff -u -X /home/jkratoch/.diffi.list -ruNp gdb-6.5/gdb/testsuite/gdb.base/gcore-excessive-memory.c gdb-6.5-unknown/gdb/testsuite/gdb.base/gcore-excessive-memory.c
---- gdb-6.5/gdb/testsuite/gdb.base/gcore-excessive-memory.c	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.5-unknown/gdb/testsuite/gdb.base/gcore-excessive-memory.c	2008-01-08 11:25:45.000000000 +0100
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/gcore-excessive-memory.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/gcore-excessive-memory.c	2016-02-15 23:28:15.943731340 +0100
 @@ -0,0 +1,37 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -39,9 +40,10 @@ diff -u -X /home/jkratoch/.diffi.list -ruNp gdb-6.5/gdb/testsuite/gdb.base/gcore
 +
 +  return 0;
 +}
-diff -u -X /home/jkratoch/.diffi.list -ruNp gdb-6.5/gdb/testsuite/gdb.base/gcore-excessive-memory.exp gdb-6.5-unknown/gdb/testsuite/gdb.base/gcore-excessive-memory.exp
---- gdb-6.5/gdb/testsuite/gdb.base/gcore-excessive-memory.exp	1970-01-01 01:00:00.000000000 +0100
-+++ gdb-6.5-unknown/gdb/testsuite/gdb.base/gcore-excessive-memory.exp	2008-01-08 11:47:32.000000000 +0100
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/gcore-excessive-memory.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/gcore-excessive-memory.exp	2016-02-15 23:28:22.720779458 +0100
 @@ -0,0 +1,94 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -61,9 +63,9 @@ diff -u -X /home/jkratoch/.diffi.list -ruNp gdb-6.5/gdb/testsuite/gdb.base/gcore
 +
 +set testfile gcore-excessive-memory
 +set srcfile ${testfile}.c
-+set shfile ${objdir}/${subdir}/${testfile}-gdb.sh
-+set corefile ${objdir}/${subdir}/${testfile}.core
-+set binfile ${objdir}/${subdir}/${testfile}
++set shfile [standard_output_file ${testfile}-gdb.sh]
++set corefile [standard_output_file ${testfile}.core]
++set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1

gdb-6.5-ia64-libunwind-leak-test.patch

@@ -1,6 +1,7 @@
-diff -u -rup gdb-6.3-orig/gdb/testsuite/gdb.base/unwind-leak.c gdb-6.3/gdb/testsuite/gdb.base/unwind-leak.c
---- gdb-6.3-orig/gdb/testsuite/gdb.base/unwind-leak.c	2007-12-19 15:12:55.000000000 -0500
-+++ gdb-6.3/gdb/testsuite/gdb.base/unwind-leak.c	2007-12-19 13:55:22.000000000 -0500
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/unwind-leak.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/unwind-leak.c	2016-02-15 23:32:11.307402446 +0100
 @@ -0,0 +1,29 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -31,9 +32,10 @@ diff -u -rup gdb-6.3-orig/gdb/testsuite/gdb.base/unwind-leak.c gdb-6.3/gdb/tests
 +    alarm (0);
 +  return 0;
 +}
-diff -u -rup gdb-6.3-orig/gdb/testsuite/gdb.base/unwind-leak.exp gdb-6.3/gdb/testsuite/gdb.base/unwind-leak.exp
---- gdb-6.3-orig/gdb/testsuite/gdb.base/unwind-leak.exp	2007-12-19 15:12:53.000000000 -0500
-+++ gdb-6.3/gdb/testsuite/gdb.base/unwind-leak.exp	2007-12-19 15:11:35.000000000 -0500
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/unwind-leak.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/unwind-leak.exp	2016-02-15 23:32:18.559453937 +0100
 @@ -0,0 +1,83 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -53,8 +55,8 @@ diff -u -rup gdb-6.3-orig/gdb/testsuite/gdb.base/unwind-leak.exp gdb-6.3/gdb/tes
 +
 +set testfile unwind-leak
 +set srcfile ${testfile}.c
-+set shfile ${objdir}/${subdir}/${testfile}-gdb.sh
-+set binfile ${objdir}/${subdir}/${testfile}
++set shfile [standard_output_file ${testfile}-gdb.sh]
++set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1

gdb-6.5-missed-trap-on-step-test.patch

@@ -1,8 +1,10 @@
 Fix has been committed to:
 	gdb-6.6-scheduler_locking-step-sw-watchpoints2.patch
 
---- /dev/null	2007-12-14 20:45:09.113039517 +0100
-+++ gdb-6.5/gdb/testsuite/gdb.base/watchpoint-during-step.exp	2007-12-24 19:42:00.000000000 +0100
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/watchpoint-during-step.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/watchpoint-during-step.exp	2016-02-15 23:34:10.455248408 +0100
 @@ -0,0 +1,44 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -22,7 +24,7 @@ Fix has been committed to:
 +
 +set testfile watchpoint-during-step
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1
@@ -48,8 +50,10 @@ Fix has been committed to:
 +# we step from as in this case it is a valid upstream KFAIL gdb/38
 +
 +gdb_test "step" ".*Old value = 2.*New value = 3.*" "Catch the watchpoint"
---- /dev/null	2007-12-14 20:45:09.113039517 +0100
-+++ gdb-6.5/gdb/testsuite/gdb.base/watchpoint-during-step.c	2007-12-24 19:38:10.000000000 +0100
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/watchpoint-during-step.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/watchpoint-during-step.c	2016-02-15 23:32:51.846690279 +0100
 @@ -0,0 +1,30 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +

gdb-6.5-readline-long-line-crash-test.patch

@@ -1,13 +1,11 @@
 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=214196
 
 
-Index: ./gdb/testsuite/gdb.base/readline-overflow.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/readline-overflow.exp
 ===================================================================
-RCS file: ./gdb/testsuite/gdb.base/readline-overflow.exp
-diff -N ./gdb/testsuite/gdb.base/readline-overflow.exp
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.base/readline-overflow.exp	13 Nov 2006 23:42:50 -0000
-@@ -0,0 +1,125 @@
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/readline-overflow.exp	2016-02-15 23:30:29.191677414 +0100
+@@ -0,0 +1,126 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -110,7 +108,8 @@ diff -N ./gdb/testsuite/gdb.base/readline-overflow.exp
 +		gdb_clear_suppressed
 +	}
 +}
-+gdb_test "\r" \
++send_gdb "\r"
++gdb_test "" \
 +         "No executable file specified..*" \
 +         "All the characters transferred"
 +
@@ -133,4 +132,3 @@ diff -N ./gdb/testsuite/gdb.base/readline-overflow.exp
 +}
 +set timeout $oldtimeout1
 +
-+return 0

gdb-6.5-section-num-fixup-test.patch

@@ -1,6 +1,7 @@
-diff -up -ruNp gdb-6.5-orig/gdb/testsuite/gdb.base/datalib-lib.c gdb-6.5/gdb/testsuite/gdb.base/datalib-lib.c
---- gdb-6.5-orig/gdb/testsuite/gdb.base/datalib-lib.c	1969-12-31 19:00:00.000000000 -0500
-+++ gdb-6.5/gdb/testsuite/gdb.base/datalib-lib.c	2008-05-29 13:51:50.000000000 -0400
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/datalib-lib.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/datalib-lib.c	2016-02-15 23:27:19.654331680 +0100
 @@ -0,0 +1,22 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -24,9 +25,10 @@ diff -up -ruNp gdb-6.5-orig/gdb/testsuite/gdb.base/datalib-lib.c gdb-6.5/gdb/tes
 +   bug-gdb@prep.ai.mit.edu  */
 +
 +int var;
-diff -up -ruNp gdb-6.5-orig/gdb/testsuite/gdb.base/datalib-main.c gdb-6.5/gdb/testsuite/gdb.base/datalib-main.c
---- gdb-6.5-orig/gdb/testsuite/gdb.base/datalib-main.c	1969-12-31 19:00:00.000000000 -0500
-+++ gdb-6.5/gdb/testsuite/gdb.base/datalib-main.c	2008-05-29 13:51:39.000000000 -0400
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/datalib-main.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/datalib-main.c	2016-02-15 23:27:19.654331680 +0100
 @@ -0,0 +1,26 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -54,9 +56,10 @@ diff -up -ruNp gdb-6.5-orig/gdb/testsuite/gdb.base/datalib-main.c gdb-6.5/gdb/te
 +{
 +  return 0;
 +}
-diff -up -ruNp gdb-6.5-orig/gdb/testsuite/gdb.base/datalib.exp gdb-6.5/gdb/testsuite/gdb.base/datalib.exp
---- gdb-6.5-orig/gdb/testsuite/gdb.base/datalib.exp	1969-12-31 19:00:00.000000000 -0500
-+++ gdb-6.5/gdb/testsuite/gdb.base/datalib.exp	2008-05-29 14:58:33.000000000 -0400
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/datalib.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/datalib.exp	2016-02-15 23:27:25.968376510 +0100
 @@ -0,0 +1,51 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -77,8 +80,8 @@ diff -up -ruNp gdb-6.5-orig/gdb/testsuite/gdb.base/datalib.exp gdb-6.5/gdb/tests
 +set testfile datalib
 +set srcfilemain ${testfile}-main.c
 +set srcfilelib ${testfile}-lib.c
-+set libfile ${objdir}/${subdir}/${testfile}-lib.so
-+set binfile ${objdir}/${subdir}/${testfile}-main
++set libfile [standard_output_file ${testfile}-lib.so]
++set binfile [standard_output_file ${testfile}-main]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfilelib}" "${libfile}" executable [list debug {additional_flags=-shared -nostdlib}]] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1

gdb-6.5-sharedlibrary-path.patch

@@ -23,10 +23,10 @@ The testsuite needs `gdb-6.5-tls-of-separate-debuginfo.patch'.
 
 	Port to gdb-6.7.50.20080227.
 
-Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-main.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/tls-sepdebug-main.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-main.c	2008-02-27 09:00:15.000000000 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/tls-sepdebug-main.c	2016-02-16 10:16:12.629875073 +0100
 @@ -0,0 +1,25 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -53,10 +53,10 @@ Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-main.c
 +{
 +  return 0;
 +}
-Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c	2008-02-27 09:00:15.000000000 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c	2016-02-16 10:16:12.630875080 +0100
 @@ -0,0 +1,22 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -80,9 +80,11 @@ Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c
 +   bug-gdb@prep.ai.mit.edu  */
 +
 +__thread int var = 42;
---- /dev/null	2009-02-10 00:19:00.494289687 +0100
-+++ gdb-6.8.50.20090209-x/gdb/testsuite/gdb.threads/tls-sepdebug.exp	2009-02-10 00:49:38.000000000 +0100
-@@ -0,0 +1,86 @@
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/tls-sepdebug.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/tls-sepdebug.exp	2016-02-16 10:16:31.241001010 +0100
+@@ -0,0 +1,87 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -107,10 +109,10 @@ Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c
 +set srcmainfile   ${testfile}-main.c
 +set srcsharedfile ${testfile}-shared.c
 +
-+set binmainfile        ${objdir}/${subdir}/${testfile}-main
++set binmainfile        [standard_output_file ${testfile}-main]
 +set binsharedbase      ${testfile}-shared.so
-+set binsharedfile      ${objdir}/${subdir}/${binsharedbase}
-+set binshareddebugfile ${objdir}/${subdir}/${binsharedbase}.debug
++set binsharedfile      [standard_output_file ${binsharedbase}]
++set binshareddebugfile [standard_output_file ${binsharedbase}.debug]
 +
 +# Use explicit -soname as otherwise the full path to the library would get
 +# encoded into ${binmainfile} making LD_LIBRARY_PATH tests useless.
@@ -144,7 +146,8 @@ Index: gdb-6.7.50.20080227/gdb/testsuite/gdb.threads/tls-sepdebug-shared.c
 +# \$PWD is easy - it is the absolute way
 +# ${subdir} would fail on "print var"
 +
-+foreach ld_library_path [list [pwd]/${subdir} ./${subdir}] name { absolute relative }  {
++set absdir [file dirname [standard_output_file ${binsharedbase}]]
++foreach ld_library_path [list $absdir [relative_filename [pwd] $absdir]] name { absolute relative }  {
 +
 +    gdb_exit
 +    gdb_start

gdb-6.6-buildid-locate-misleading-warning-missing-debuginfo-rhbz981154.patch

@@ -15,10 +15,10 @@ Comments by Sergio Durigan Junior <sergiodj@redhat.com>:
   NULL after it is free'd, otherwise the code below thinks that it is still
   valid and doesn't print the necessary warning ("Try: yum install ...").
 
-Index: gdb-7.9.90.20150709/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.9.90.20150709/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp	2015-07-09 22:22:26.278304653 +0200
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-install-warning.exp	2016-02-15 23:31:06.327941085 +0100
 @@ -0,0 +1,97 @@
 +#   Copyright (C) 2014  Free Software Foundation, Inc.
 +
@@ -51,9 +51,9 @@ Index: gdb-7.9.90.20150709/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-inst
 +}
 +
 +# We first need to generate a corefile
-+set escapedfilename [string_to_regexp ${objdir}/${subdir}/gcore.test]
++set escapedfilename [string_to_regexp [standard_output_file gcore.test]]
 +set core_supported 0
-+gdb_test_multiple "gcore ${objdir}/${subdir}/gcore.test" \
++gdb_test_multiple "gcore [standard_output_file gcore.test]" \
 +	"save a corefile" \
 +{
 +  -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
@@ -84,19 +84,19 @@ Index: gdb-7.9.90.20150709/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-inst
 +    gdb_test "set build-id-verbose 1" "" \
 +	"set build-id-verbose"
 +
-+    gdb_test "set debug-file-directory ${objdir}/${subdir}" "" \
++    gdb_test "set debug-file-directory [file dirname [standard_output_file gcore.test]]" "" \
 +	"set debug-file-directory"
 +
-+    gdb_test "core-file ${objdir}/${subdir}/gcore.test" \
-+	"Missing separate debuginfo for the main executable file\r\nTry: (yum|dnf) --enablerepo='\\*debug\\*' install $objdir/$subdir/$build_id_without_debug\r\n.*" \
++    gdb_test "core-file [standard_output_file gcore.test]" \
++	"Missing separate debuginfo for the main executable file\r\nTry: (yum|dnf) --enablerepo='\\*debug\\*' install [standard_output_file $build_id_without_debug]\r\n.*" \
 +	"test first yum/dnf warning"
 +}
 +
 +# Now we define and create our .build-id
-+file mkdir [file dirname ${objdir}/${subdir}/${build_id_without_debug}]
++file mkdir [file dirname [standard_output_file ${build_id_without_debug}]]
 +# Cannot use "file link" (from TCL) because it requires the target file to
 +# exist.
-+remote_exec build "ln -s $binfile ${objdir}/${subdir}/${build_id_without_debug}"
++remote_exec build "ln -s $binfile [standard_output_file ${build_id_without_debug}]"
 +
 +# Reinitialize GDB to get the second yum/dnf warning
 +gdb_exit
@@ -107,21 +107,21 @@ Index: gdb-7.9.90.20150709/gdb/testsuite/gdb.base/rhbz981154-misleading-yum-inst
 +    gdb_test "set build-id-verbose 1" "" \
 +	"set build-id-verbose"
 +
-+    gdb_test "set debug-file-directory ${objdir}/${subdir}" "" \
++    gdb_test "set debug-file-directory [file dirname [standard_output_file gcore.test]]" "" \
 +	"set debug-file-directory"
 +
-+    gdb_test "core-file ${objdir}/${subdir}/gcore.test" \
++    gdb_test "core-file [standard_output_file gcore.test]" \
 +	"Missing separate debuginfo for the main executable file\r\nTry: (yum|dnf) --enablerepo='\\*debug\\*' install $binfile\r\n.*" \
 +	"test second yum/dnf warning"
 +}
 +
 +# Leaving the link there will cause breakage in the next run.
-+remote_exec build "rm -f ${objdir}/${subdir}/${build_id_without_debug}"
-Index: gdb-7.9.90.20150709/gdb/build-id.c
++remote_exec build "rm -f [standard_output_file ${build_id_without_debug}]"
+Index: gdb-7.10.90.20160211/gdb/build-id.c
 ===================================================================
---- gdb-7.9.90.20150709.orig/gdb/build-id.c	2015-07-09 22:22:26.278304653 +0200
-+++ gdb-7.9.90.20150709/gdb/build-id.c	2015-07-09 22:22:51.398502329 +0200
-@@ -589,7 +589,10 @@ build_id_to_debug_bfd (size_t build_id_l
+--- gdb-7.10.90.20160211.orig/gdb/build-id.c	2016-02-15 23:30:55.389863424 +0100
++++ gdb-7.10.90.20160211/gdb/build-id.c	2016-02-15 23:30:55.778866186 +0100
+@@ -589,7 +589,10 @@
  	  do_cleanups (inner);
  
  	  if (abfd == NULL)

gdb-6.6-buildid-locate.patch

@@ -1,7 +1,7 @@
-Index: gdb-7.10.50.20151022/gdb/corelow.c
+Index: gdb-7.10.90.20160211/gdb/corelow.c
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/corelow.c	2015-10-22 22:30:46.226403087 +0200
-+++ gdb-7.10.50.20151022/gdb/corelow.c	2015-10-22 22:30:49.266420986 +0200
+--- gdb-7.10.90.20160211.orig/gdb/corelow.c	2016-02-15 23:25:00.859346221 +0100
++++ gdb-7.10.90.20160211/gdb/corelow.c	2016-02-15 23:26:46.516096395 +0100
 @@ -45,6 +45,10 @@
  #include "gdb_bfd.h"
  #include "completer.h"
@@ -13,7 +13,7 @@ Index: gdb-7.10.50.20151022/gdb/corelow.c
  
  #ifndef O_LARGEFILE
  #define O_LARGEFILE 0
-@@ -266,6 +270,53 @@ add_to_thread_list (bfd *abfd, asection
+@@ -266,6 +270,53 @@
      inferior_ptid = ptid;			/* Yes, make it current.  */
  }
  
@@ -67,7 +67,7 @@ Index: gdb-7.10.50.20151022/gdb/corelow.c
  /* This routine opens and sets up the core file bfd.  */
  
  static void
-@@ -404,6 +455,14 @@ core_open (const char *arg, int from_tty
+@@ -404,6 +455,14 @@
  	switch_to_thread (thread->ptid);
      }
  
@@ -82,7 +82,7 @@ Index: gdb-7.10.50.20151022/gdb/corelow.c
    post_create_inferior (&core_ops, from_tty);
  
    /* Now go through the target stack looking for threads since there
-@@ -1058,4 +1117,11 @@ _initialize_corelow (void)
+@@ -1068,4 +1127,11 @@
    init_core_ops ();
  
    add_target_with_completer (&core_ops, filename_completer);
@@ -94,11 +94,11 @@ Index: gdb-7.10.50.20151022/gdb/corelow.c
 +			   NULL, NULL, NULL,
 +			   &setlist, &showlist);
  }
-Index: gdb-7.10.50.20151022/gdb/doc/gdb.texinfo
+Index: gdb-7.10.90.20160211/gdb/doc/gdb.texinfo
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/doc/gdb.texinfo	2015-10-22 22:30:46.233403128 +0200
-+++ gdb-7.10.50.20151022/gdb/doc/gdb.texinfo	2015-10-22 22:30:49.271421015 +0200
-@@ -18495,6 +18495,27 @@ information files.
+--- gdb-7.10.90.20160211.orig/gdb/doc/gdb.texinfo	2016-02-15 23:25:36.455598958 +0100
++++ gdb-7.10.90.20160211/gdb/doc/gdb.texinfo	2016-02-15 23:26:06.362811302 +0100
+@@ -18684,6 +18684,27 @@
  
  @end table
  
@@ -126,10 +126,10 @@ Index: gdb-7.10.50.20151022/gdb/doc/gdb.texinfo
  @cindex @code{.gnu_debuglink} sections
  @cindex debug link sections
  A debug link is a special section of the executable file named
-Index: gdb-7.10.50.20151022/gdb/solib-svr4.c
+Index: gdb-7.10.90.20160211/gdb/solib-svr4.c
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/solib-svr4.c	2015-10-22 22:30:46.235403140 +0200
-+++ gdb-7.10.50.20151022/gdb/solib-svr4.c	2015-10-22 22:30:49.272421021 +0200
+--- gdb-7.10.90.20160211.orig/gdb/solib-svr4.c	2016-02-15 23:25:00.859346221 +0100
++++ gdb-7.10.90.20160211/gdb/solib-svr4.c	2016-02-15 23:26:46.613097083 +0100
 @@ -45,6 +45,7 @@
  #include "auxv.h"
  #include "gdb_bfd.h"
@@ -138,7 +138,7 @@ Index: gdb-7.10.50.20151022/gdb/solib-svr4.c
  
  static struct link_map_offsets *svr4_fetch_link_map_offsets (void);
  static int svr4_have_link_map_offsets (void);
-@@ -1416,9 +1417,52 @@ svr4_read_so_list (CORE_ADDR lm, CORE_AD
+@@ -1416,9 +1417,52 @@
  	  continue;
  	}
  
@@ -194,11 +194,11 @@ Index: gdb-7.10.50.20151022/gdb/solib-svr4.c
        xfree (buffer);
  
        /* If this entry has no name, or its name matches the name
-Index: gdb-7.10.50.20151022/gdb/elfread.c
+Index: gdb-7.10.90.20160211/gdb/elfread.c
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/elfread.c	2015-10-22 22:30:46.235403140 +0200
-+++ gdb-7.10.50.20151022/gdb/elfread.c	2015-10-22 22:30:49.272421021 +0200
-@@ -1259,9 +1259,10 @@ elf_symfile_read (struct objfile *objfil
+--- gdb-7.10.90.20160211.orig/gdb/elfread.c	2016-02-15 23:25:00.859346221 +0100
++++ gdb-7.10.90.20160211/gdb/elfread.c	2016-02-15 23:26:06.364811316 +0100
+@@ -1259,9 +1259,10 @@
  	   && objfile->separate_debug_objfile == NULL
  	   && objfile->separate_debug_objfile_backlink == NULL)
      {
@@ -211,7 +211,7 @@ Index: gdb-7.10.50.20151022/gdb/elfread.c
  
        if (debugfile == NULL)
  	debugfile = find_separate_debug_file_by_debuglink (objfile);
-@@ -1275,6 +1276,12 @@ elf_symfile_read (struct objfile *objfil
+@@ -1275,6 +1276,12 @@
  	  symbol_file_add_separate (abfd, debugfile, symfile_flags, objfile);
  	  do_cleanups (cleanup);
  	}
@@ -224,11 +224,11 @@ Index: gdb-7.10.50.20151022/gdb/elfread.c
      }
  }
  
-Index: gdb-7.10.50.20151022/gdb/symfile.h
+Index: gdb-7.10.90.20160211/gdb/symfile.h
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/symfile.h	2015-10-22 22:30:46.236403145 +0200
-+++ gdb-7.10.50.20151022/gdb/symfile.h	2015-10-22 22:30:49.273421027 +0200
-@@ -584,6 +584,10 @@ void expand_symtabs_matching (expand_sym
+--- gdb-7.10.90.20160211.orig/gdb/symfile.h	2016-02-15 23:25:00.859346221 +0100
++++ gdb-7.10.90.20160211/gdb/symfile.h	2016-02-15 23:26:46.516096395 +0100
+@@ -584,6 +584,10 @@
  void map_symbol_filenames (symbol_filename_ftype *fun, void *data,
  			   int need_fullname);
  
@@ -239,11 +239,11 @@ Index: gdb-7.10.50.20151022/gdb/symfile.h
  /* From dwarf2read.c */
  
  /* Names for a dwarf2 debugging section.  The field NORMAL is the normal
-Index: gdb-7.10.50.20151022/gdb/testsuite/lib/gdb.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/testsuite/lib/gdb.exp	2015-10-22 22:30:46.237403151 +0200
-+++ gdb-7.10.50.20151022/gdb/testsuite/lib/gdb.exp	2015-10-22 22:30:49.273421027 +0200
-@@ -1640,6 +1640,16 @@ proc default_gdb_start { } {
+--- gdb-7.10.90.20160211.orig/gdb/testsuite/lib/gdb.exp	2016-02-15 23:25:00.859346221 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/lib/gdb.exp	2016-02-15 23:26:46.516096395 +0100
+@@ -1640,6 +1640,16 @@
  	    warning "Couldn't set the width to 0."
  	}
      }
@@ -260,11 +260,11 @@ Index: gdb-7.10.50.20151022/gdb/testsuite/lib/gdb.exp
      return 0
  }
  
-Index: gdb-7.10.50.20151022/gdb/testsuite/lib/mi-support.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/lib/mi-support.exp
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/testsuite/lib/mi-support.exp	2015-10-22 22:30:49.274421033 +0200
-+++ gdb-7.10.50.20151022/gdb/testsuite/lib/mi-support.exp	2015-10-22 22:31:24.869631575 +0200
-@@ -204,6 +204,16 @@ proc default_mi_gdb_start { args } {
+--- gdb-7.10.90.20160211.orig/gdb/testsuite/lib/mi-support.exp	2016-02-15 23:25:00.859346221 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/lib/mi-support.exp	2016-02-15 23:26:46.516096395 +0100
+@@ -204,6 +204,16 @@
  	    warning "Couldn't set the width to 0."
  	}
      }
@@ -281,11 +281,11 @@ Index: gdb-7.10.50.20151022/gdb/testsuite/lib/mi-support.exp
  
      # Create the new PTY for the inferior process.
      if { $separate_inferior_pty } {
-Index: gdb-7.10.50.20151022/gdb/objfiles.h
+Index: gdb-7.10.90.20160211/gdb/objfiles.h
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/objfiles.h	2015-10-22 22:30:46.238403157 +0200
-+++ gdb-7.10.50.20151022/gdb/objfiles.h	2015-10-22 22:30:49.274421033 +0200
-@@ -489,6 +489,10 @@ struct objfile
+--- gdb-7.10.90.20160211.orig/gdb/objfiles.h	2016-02-15 23:25:00.859346221 +0100
++++ gdb-7.10.90.20160211/gdb/objfiles.h	2016-02-15 23:26:06.366811330 +0100
+@@ -489,6 +489,10 @@
  
  #define OBJF_NOT_FILENAME (1 << 6)
  
@@ -296,11 +296,11 @@ Index: gdb-7.10.50.20151022/gdb/objfiles.h
  /* Declarations for functions defined in objfiles.c */
  
  extern struct objfile *allocate_objfile (bfd *, const char *name, int);
-Index: gdb-7.10.50.20151022/gdb/testsuite/gdb.base/corefile.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/corefile.exp
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/testsuite/gdb.base/corefile.exp	2015-10-22 22:30:46.238403157 +0200
-+++ gdb-7.10.50.20151022/gdb/testsuite/gdb.base/corefile.exp	2015-10-22 22:30:49.274421033 +0200
-@@ -293,3 +293,33 @@ gdb_test_multiple "core-file $corefile"
+--- gdb-7.10.90.20160211.orig/gdb/testsuite/gdb.base/corefile.exp	2016-02-15 23:25:00.859346221 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/corefile.exp	2016-02-15 23:26:55.178157896 +0100
+@@ -293,3 +293,33 @@
  	pass $test
      }
  }
@@ -316,7 +316,7 @@ Index: gdb-7.10.50.20151022/gdb/testsuite/gdb.base/corefile.exp
 +    gdb_start
 +
 +    regsub {\.debug$} $buildid {} buildid
-+    set debugdir ${objdir}/${subdir}/${testfile}-debugdir
++    set debugdir [standard_output_file ${testfile}-debugdir]
 +    file delete -force -- $debugdir
 +    file mkdir $debugdir/[file dirname $buildid]
 +    file copy $binfile $debugdir/$buildid
@@ -334,10 +334,10 @@ Index: gdb-7.10.50.20151022/gdb/testsuite/gdb.base/corefile.exp
 +    gdb_test "info files" "Local exec file:\r\n\[ \t\]*`[string_to_regexp $debugdir/$buildid]', file type .*"
 +    pass $wholetest
 +}
-Index: gdb-7.10.50.20151022/gdb/build-id.c
+Index: gdb-7.10.90.20160211/gdb/build-id.c
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/build-id.c	2015-10-22 22:30:46.238403157 +0200
-+++ gdb-7.10.50.20151022/gdb/build-id.c	2015-10-22 22:34:36.579774662 +0200
+--- gdb-7.10.90.20160211.orig/gdb/build-id.c	2016-02-15 23:25:00.859346221 +0100
++++ gdb-7.10.90.20160211/gdb/build-id.c	2016-02-15 23:26:46.516096395 +0100
 @@ -26,11 +26,67 @@
  #include "objfiles.h"
  #include "filenames.h"
@@ -407,7 +407,7 @@ Index: gdb-7.10.50.20151022/gdb/build-id.c
  {
    if (!bfd_check_format (abfd, bfd_object))
      return NULL;
-@@ -42,6 +98,348 @@ build_id_bfd_get (bfd *abfd)
+@@ -42,6 +98,348 @@
    return NULL;
  }
  
@@ -756,7 +756,7 @@ Index: gdb-7.10.50.20151022/gdb/build-id.c
  /* See build-id.h.  */
  
  int
-@@ -50,7 +448,7 @@ build_id_verify (bfd *abfd, size_t check
+@@ -50,7 +448,7 @@
    const struct bfd_build_id *found;
    int retval = 0;
  
@@ -765,7 +765,7 @@ Index: gdb-7.10.50.20151022/gdb/build-id.c
  
    if (found == NULL)
      warning (_("File \"%s\" has no build-id, file skipped"),
-@@ -65,23 +463,56 @@ build_id_verify (bfd *abfd, size_t check
+@@ -65,23 +463,56 @@
    return retval;
  }
  
@@ -829,7 +829,7 @@ Index: gdb-7.10.50.20151022/gdb/build-id.c
  
    /* Keep backward compatibility so that DEBUG_FILE_DIRECTORY being "" will
       cause "/.build-id/..." lookups.  */
-@@ -94,9 +525,12 @@ build_id_to_debug_bfd (size_t build_id_l
+@@ -94,9 +525,12 @@
        size_t debugdir_len = strlen (debugdir);
        const gdb_byte *data = build_id;
        size_t size = build_id_len;
@@ -843,7 +843,7 @@ Index: gdb-7.10.50.20151022/gdb/build-id.c
  
        memcpy (link, debugdir, debugdir_len);
        s = &link[debugdir_len];
-@@ -110,47 +544,281 @@ build_id_to_debug_bfd (size_t build_id_l
+@@ -110,47 +544,281 @@
  	*s++ = '/';
        while (size-- > 0)
  	s += sprintf (s, "%02x", (unsigned) *data++);
@@ -1144,7 +1144,7 @@ Index: gdb-7.10.50.20151022/gdb/build-id.c
        /* Prevent looping on a stripped .debug file.  */
        if (abfd != NULL
  	  && filename_cmp (bfd_get_filename (abfd),
-@@ -170,3 +838,21 @@ find_separate_debug_file_by_buildid (str
+@@ -170,3 +838,21 @@
      }
    return NULL;
  }
@@ -1166,10 +1166,10 @@ Index: gdb-7.10.50.20151022/gdb/build-id.c
 +
 +  observer_attach_executable_changed (debug_print_executable_changed);
 +}
-Index: gdb-7.10.50.20151022/gdb/build-id.h
+Index: gdb-7.10.90.20160211/gdb/build-id.h
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/build-id.h	2015-10-22 22:30:46.239403163 +0200
-+++ gdb-7.10.50.20151022/gdb/build-id.h	2015-10-22 22:30:49.275421039 +0200
+--- gdb-7.10.90.20160211.orig/gdb/build-id.h	2016-02-15 23:25:00.859346221 +0100
++++ gdb-7.10.90.20160211/gdb/build-id.h	2016-02-15 23:26:06.368811345 +0100
 @@ -20,9 +20,10 @@
  #ifndef BUILD_ID_H
  #define BUILD_ID_H
@@ -1183,7 +1183,7 @@ Index: gdb-7.10.50.20151022/gdb/build-id.h
  
  /* Return true if ABFD has NT_GNU_BUILD_ID matching the CHECK value.
     Otherwise, issue a warning and return false.  */
-@@ -36,13 +37,18 @@ extern int build_id_verify (bfd *abfd,
+@@ -36,13 +37,18 @@
     the caller.  */
  
  extern bfd *build_id_to_debug_bfd (size_t build_id_len,
@@ -1204,11 +1204,11 @@ Index: gdb-7.10.50.20151022/gdb/build-id.h
 +					       char **build_id_filename_return);
  
  #endif /* BUILD_ID_H */
-Index: gdb-7.10.50.20151022/gdb/dwarf2read.c
+Index: gdb-7.10.90.20160211/gdb/dwarf2read.c
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/dwarf2read.c	2015-10-22 22:30:46.242403181 +0200
-+++ gdb-7.10.50.20151022/gdb/dwarf2read.c	2015-10-22 22:30:49.278421057 +0200
-@@ -2514,7 +2514,7 @@ dwarf2_get_dwz_file (void)
+--- gdb-7.10.90.20160211.orig/gdb/dwarf2read.c	2016-02-15 23:25:36.461599001 +0100
++++ gdb-7.10.90.20160211/gdb/dwarf2read.c	2016-02-15 23:26:06.373811380 +0100
+@@ -2516,7 +2516,7 @@
      }
  
    if (dwz_bfd == NULL)
@@ -1217,11 +1217,11 @@ Index: gdb-7.10.50.20151022/gdb/dwarf2read.c
  
    if (dwz_bfd == NULL)
      error (_("could not find '.gnu_debugaltlink' file for %s"),
-Index: gdb-7.10.50.20151022/gdb/python/py-objfile.c
+Index: gdb-7.10.90.20160211/gdb/python/py-objfile.c
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/python/py-objfile.c	2015-10-22 22:30:46.243403187 +0200
-+++ gdb-7.10.50.20151022/gdb/python/py-objfile.c	2015-10-22 22:30:49.278421057 +0200
-@@ -139,7 +139,7 @@ objfpy_get_build_id (PyObject *self, voi
+--- gdb-7.10.90.20160211.orig/gdb/python/py-objfile.c	2016-02-15 23:25:00.859346221 +0100
++++ gdb-7.10.90.20160211/gdb/python/py-objfile.c	2016-02-15 23:26:06.373811380 +0100
+@@ -139,7 +139,7 @@
  
    TRY
      {
@@ -1230,7 +1230,7 @@ Index: gdb-7.10.50.20151022/gdb/python/py-objfile.c
      }
    CATCH (except, RETURN_MASK_ALL)
      {
-@@ -548,7 +548,7 @@ objfpy_lookup_objfile_by_build_id (const
+@@ -548,7 +548,7 @@
        /* Don't return separate debug files.  */
        if (objfile->separate_debug_objfile_backlink != NULL)
  	continue;
@@ -1239,11 +1239,11 @@ Index: gdb-7.10.50.20151022/gdb/python/py-objfile.c
        if (obfd_build_id == NULL)
  	continue;
        if (objfpy_build_id_matches (obfd_build_id, build_id))
-Index: gdb-7.10.50.20151022/gdb/coffread.c
+Index: gdb-7.10.90.20160211/gdb/coffread.c
 ===================================================================
---- gdb-7.10.50.20151022.orig/gdb/coffread.c	2015-10-22 22:30:46.244403193 +0200
-+++ gdb-7.10.50.20151022/gdb/coffread.c	2015-10-22 22:30:49.278421057 +0200
-@@ -739,7 +739,7 @@ coff_symfile_read (struct objfile *objfi
+--- gdb-7.10.90.20160211.orig/gdb/coffread.c	2016-02-15 23:25:00.859346221 +0100
++++ gdb-7.10.90.20160211/gdb/coffread.c	2016-02-15 23:26:06.374811387 +0100
+@@ -739,7 +739,7 @@
      {
        char *debugfile;
  

gdb-6.6-bz229517-gcore-without-terminal.patch

@@ -7,20 +7,25 @@
 	* gdb.base/gcorebg.exp, gdb.base/gcorebg.c: New files.
 
 
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.base/gcorebg.c	25 Feb 2007 12:21:20 -0000
-@@ -0,0 +1,43 @@
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/gcorebg.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/gcorebg.c	2016-02-16 10:44:48.998527259 +0100
+@@ -0,0 +1,49 @@
 +#include <stdio.h>
 +#include <sys/types.h>
 +#include <unistd.h>
 +#include <stdlib.h>
 +#include <signal.h>
++#include <string.h>
++#include <assert.h>
 +
 +int main (int argc, char **argv)
 +{
 +  pid_t pid = 0;
 +  pid_t ppid;
-+  char buf[256];
++  char buf[1024*2 + 500];
++  int gotint;
 +
 +  if (argc != 4)
 +    {
@@ -37,8 +42,10 @@
 +        if (strcmp (argv[1], "detached") == 0)
 +	  setpgrp ();
 +	ppid = getppid ();
-+	sprintf (buf, "sh %s -o %s %d", argv[2], argv[3], (int) ppid);
++	gotint = snprintf (buf, sizeof (buf), "sh %s -o %s %d", argv[2], argv[3], (int) ppid);
++	assert (gotint < sizeof (buf));
 +	system (buf);
++	fprintf (stderr, "Killing parent PID %d\n", ppid);
 +	kill (ppid, SIGTERM);
 +	break;
 +
@@ -48,13 +55,16 @@
 +	break;
 +
 +      default:
++	fprintf (stderr,"Sleeping as PID %d\n", getpid ());
 +	sleep (60);
 +    }
 +
 +  return 0;
 +}
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.base/gcorebg.exp	25 Feb 2007 12:21:20 -0000
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/gcorebg.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/gcorebg.exp	2016-02-16 10:44:48.999527265 +0100
 @@ -0,0 +1,113 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -81,14 +91,14 @@
 +# accessible terminal.
 +
 +if ![info exists GCORE] {
-+    set GCORE "${srcdir}/../gdb_gcore.sh"
++    set GCORE "[standard_output_file ../../../../gcore]"
 +}
 +verbose "using GCORE = $GCORE" 2
 +
 +set testfile "gcorebg"
 +set srcfile  ${testfile}.c
-+set binfile  ${objdir}/${subdir}/${testfile}
-+set corefile ${objdir}/${subdir}/${testfile}.test
++set binfile  [standard_output_file ${testfile}]
++set corefile [standard_output_file ${testfile}.test]
 +
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +     untested gcorebg.exp
@@ -137,11 +147,11 @@
 +    pass "Spawning $detached gcore"
 +    remote_expect target 20 {
 +	timeout {
-+	    fail "Spawned $detached gcore finished"
++	    fail "Spawned $detached gcore finished (timeout)"
 +	    remote_exec target "kill -9 -[exp_pid -i $res]"
 +	    return 1
 +	}
-+	eof {
++	"Saved corefile .*\r\nKilling parent PID " {
 +	    pass "Spawned $detached gcore finished"
 +	    remote_wait target 20
 +	}

gdb-6.6-bz235197-fork-detach-info.patch

@@ -3,10 +3,10 @@
 	Port to GDB-6.8pre.
 	Remove the `[' character from the GDB-6.8 default message.
 
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/fork-detach.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/fork-detach.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/fork-detach.c	2015-10-27 22:38:46.693459569 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/fork-detach.c	2016-02-15 23:25:36.686600598 +0100
 @@ -0,0 +1,57 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -65,10 +65,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/fork-detach.c
 +    }
 +  return 0;
 +}
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/fork-detach.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/fork-detach.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/fork-detach.exp	2015-10-27 22:38:46.693459569 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/fork-detach.exp	2016-02-15 23:27:55.792588265 +0100
 @@ -0,0 +1,36 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -88,7 +88,7 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/fork-detach.exp
 +
 +set testfile fork-detach
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1
@@ -106,11 +106,11 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/fork-detach.exp
 +gdb_test "" \
 +         "Detaching after fork from child process.*\\\[Inferior .* exited normally\\\]" \
 +         "Info message caught"
-Index: gdb-7.10.50.20151027/gdb/infrun.c
+Index: gdb-7.10.90.20160211/gdb/infrun.c
 ===================================================================
---- gdb-7.10.50.20151027.orig/gdb/infrun.c	2015-10-27 22:38:34.333386939 +0100
-+++ gdb-7.10.50.20151027/gdb/infrun.c	2015-10-27 22:38:46.695459581 +0100
-@@ -477,7 +477,7 @@ holding the child stopped.  Try \"set de
+--- gdb-7.10.90.20160211.orig/gdb/infrun.c	2016-02-15 23:25:01.432350289 +0100
++++ gdb-7.10.90.20160211/gdb/infrun.c	2016-02-15 23:27:49.274541986 +0100
+@@ -478,7 +478,7 @@
  	      remove_breakpoints_pid (ptid_get_pid (inferior_ptid));
  	    }
  
@@ -119,11 +119,11 @@ Index: gdb-7.10.50.20151027/gdb/infrun.c
  	    {
  	      /* Ensure that we have a process ptid.  */
  	      ptid_t process_ptid = pid_to_ptid (ptid_get_pid (child_ptid));
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/catch-syscall.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/catch-syscall.exp
 ===================================================================
---- gdb-7.10.50.20151027.orig/gdb/testsuite/gdb.base/catch-syscall.exp	2015-10-27 22:43:47.015224320 +0100
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/catch-syscall.exp	2015-10-27 22:44:29.327472955 +0100
-@@ -165,7 +165,7 @@ proc check_for_program_end {} {
+--- gdb-7.10.90.20160211.orig/gdb/testsuite/gdb.base/catch-syscall.exp	2016-02-15 23:25:01.432350289 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/catch-syscall.exp	2016-02-15 23:25:36.689600619 +0100
+@@ -165,7 +165,7 @@
      # Deleting the catchpoints
      delete_breakpoints
  
@@ -132,7 +132,7 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/catch-syscall.exp
  }
  
  proc test_catch_syscall_without_args {} {
-@@ -236,7 +236,7 @@ proc test_catch_syscall_with_wrong_args
+@@ -236,7 +236,7 @@
  	# If it doesn't, everything is right (since we don't have
  	# a syscall named "mlock" in it).  Otherwise, this is a failure.
  	set thistest "catch syscall with unused syscall ($syscall_name)"

gdb-6.7-bz426600-DW_TAG_interface_type-test.patch

@@ -8,8 +8,10 @@ http://sourceware.org/ml/gdb-patches/2007-12/msg00397.html
 
 	* gdb.arch/i386-interface.exp: Fix a testcase race.
 
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.arch/i386-interface.S	22 Dec 2007 19:07:28 -0000
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/i386-interface.S
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/i386-interface.S	2016-02-15 23:23:03.318502357 +0100
 @@ -0,0 +1,628 @@
 +/* Copyright 2007 Free Software Foundation, Inc.
 +
@@ -639,8 +641,10 @@ http://sourceware.org/ml/gdb-patches/2007-12/msg00397.html
 +	.long	0x0
 +	.ident	"GCC: (GNU) 4.3.0 20071221 (experimental)"
 +	.section	.note.GNU-stack,"",@progbits
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.arch/i386-interface.exp	22 Dec 2007 19:07:28 -0000
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/i386-interface.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/i386-interface.exp	2016-02-15 23:23:15.978593556 +0100
 @@ -0,0 +1,59 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -672,7 +676,7 @@ http://sourceware.org/ml/gdb-patches/2007-12/msg00397.html
 +
 +set testfile "i386-interface"
 +set srcfile ${testfile}.S
-+set binfile ${objdir}/${subdir}/${testfile}.o
++set binfile [standard_output_file ${testfile}.o]
 +
 +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug additional_flags=-m32}] != "" } {
 +    untested i386-gnu-cfi.exp

gdb-6.7-charsign-test.patch

@@ -10,8 +10,10 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=224128
 	Port to GDB-6.7 - only the testcase left, patch has been reverted,
 	char-vectors restricted.
 
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.base/charsign.c	26 Jan 2007 10:32:00 -0000
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/charsign.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/charsign.c	2016-02-15 23:26:06.429811778 +0100
 @@ -0,0 +1,37 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -50,8 +52,10 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=224128
 +char_n n_typed[]="A";
 +char_s s_typed[]="A";
 +char_u u_typed[]="A";
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ ./gdb/testsuite/gdb.base/charsign.exp	26 Jan 2007 10:32:00 -0000
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/charsign.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/charsign.exp	2016-02-15 23:26:12.409854237 +0100
 @@ -0,0 +1,63 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -71,7 +75,7 @@ https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=224128
 +
 +set testfile charsign
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +
 +proc do_test { cflags } {
 +    global srcdir

gdb-6.8-bz442765-threaded-exec-test.patch

@@ -1,8 +1,9 @@
 Test various forms of threads tracking across exec(2).
 
-diff -up -u -X /root/jkratoch/.diffi.list -rup gdb-6.8/gdb/testsuite/gdb.threads/threaded-exec.c gdb-6.8-patched/gdb/testsuite/gdb.threads/threaded-exec.c
---- gdb-6.8/gdb/testsuite/gdb.threads/threaded-exec.c	2008-04-16 17:05:19.000000000 -0400
-+++ gdb-6.8-patched/gdb/testsuite/gdb.threads/threaded-exec.c	2008-04-16 14:43:50.000000000 -0400
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threaded-exec.c
+===================================================================
+--- gdb-7.10.90.20160211.orig/gdb/testsuite/gdb.threads/threaded-exec.c	2016-02-16 09:54:45.157163049 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threaded-exec.c	2016-02-16 09:54:46.210170175 +0100
 @@ -18,21 +18,95 @@
     Boston, MA 02111-1307, USA.  */
  
@@ -102,7 +103,7 @@ diff -up -u -X /root/jkratoch/.diffi.list -rup gdb-6.8/gdb/testsuite/gdb.threads
  	pthread_t t1;
  	int i;
  
-@@ -40,7 +114,34 @@ main (void)
+@@ -40,7 +114,34 @@
  	assert (i == 0);
  	i = pthread_join (t1, NULL);
  	assert (i == 0);
@@ -139,16 +140,17 @@ diff -up -u -X /root/jkratoch/.diffi.list -rup gdb-6.8/gdb/testsuite/gdb.threads
 +  execl (cmd, cmd, exec_nothreads, exec_threads, phase_s, NULL);
 +  assert (0);
  }
-diff -up -u -X /root/jkratoch/.diffi.list -rup gdb-6.8/gdb/testsuite/gdb.threads/threaded-exec.exp gdb-6.8-patched/gdb/testsuite/gdb.threads/threaded-exec.exp
---- gdb-6.8/gdb/testsuite/gdb.threads/threaded-exec.exp	2008-04-16 17:05:19.000000000 -0400
-+++ gdb-6.8-patched/gdb/testsuite/gdb.threads/threaded-exec.exp	2008-04-16 14:42:49.000000000 -0400
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threaded-exec.exp
+===================================================================
+--- gdb-7.10.90.20160211.orig/gdb/testsuite/gdb.threads/threaded-exec.exp	2016-02-16 09:54:45.157163049 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/threaded-exec.exp	2016-02-16 09:55:27.397448879 +0100
 @@ -20,9 +20,14 @@
  
  set testfile threaded-exec
  set srcfile ${testfile}.c
--set binfile ${objdir}/${subdir}/${testfile}
-+set binfile_nothreads ${objdir}/${subdir}/${testfile}N
-+set binfile_threads ${objdir}/${subdir}/${testfile}Y
+-set binfile [standard_output_file ${testfile}]
++set binfile_nothreads [standard_output_file ${testfile}N]
++set binfile_threads [standard_output_file ${testfile}Y]
  
 -if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable []] != "" } {
 +if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_nothreads}" executable {additional_flags=-UTHREADS}] != "" } {
@@ -159,7 +161,7 @@ diff -up -u -X /root/jkratoch/.diffi.list -rup gdb-6.8/gdb/testsuite/gdb.threads
      return -1
  }
  
-@@ -30,9 +35,9 @@ gdb_exit
+@@ -30,9 +35,9 @@
  gdb_start
  gdb_reinitialize_dir $srcdir/$subdir
  

gdb-6.8-watchpoint-conditionals-test.patch

@@ -2,8 +2,10 @@ For:
 http://sourceware.org/ml/gdb-patches/2008-04/msg00379.html
 http://sourceware.org/ml/gdb-cvs/2008-04/msg00104.html
 
---- /dev/null	2008-11-04 06:31:10.599601840 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint-cond.exp	2008-11-04 06:43:29.000000000 +0100
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/watchpoint-cond.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/watchpoint-cond.exp	2016-02-15 23:33:49.519099759 +0100
 @@ -0,0 +1,37 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -22,7 +24,7 @@ http://sourceware.org/ml/gdb-cvs/2008-04/msg00104.html
 +
 +set testfile watchpoint-cond
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1
@@ -42,8 +44,10 @@ http://sourceware.org/ml/gdb-cvs/2008-04/msg00104.html
 +
 +gdb_test "watch i if i < 20" "atchpoint \[0-9\]+: i"
 +gdb_test "cont" "atchpoint \[0-9\]+: i.*Old value = 20.*New value = 19.*"
---- /dev/null	2008-11-04 06:31:10.599601840 +0100
-+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint-cond.c	2008-11-04 06:42:48.000000000 +0100
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/watchpoint-cond.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/watchpoint-cond.c	2016-02-15 23:32:51.974691188 +0100
 @@ -0,0 +1,31 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +

gdb-archer-vla-tests.patch

@@ -1,8 +1,8 @@
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.ada/packed_array.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.ada/packed_array.exp
 ===================================================================
---- gdb-7.10.50.20151027.orig/gdb/testsuite/gdb.ada/packed_array.exp	2015-10-27 02:48:32.000000000 +0100
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.ada/packed_array.exp	2015-11-03 22:23:27.212877605 +0100
-@@ -56,5 +56,11 @@ gdb_test_multiple "$test" "$test" {
+--- gdb-7.10.90.20160211.orig/gdb/testsuite/gdb.ada/packed_array.exp	2016-02-15 23:33:29.830959972 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.ada/packed_array.exp	2016-02-15 23:35:56.289999846 +0100
+@@ -56,5 +56,11 @@
          # are.  Observed with (FSF GNU Ada 4.5.3 20110124).
          xfail $test
      }
@@ -14,10 +14,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.ada/packed_array.exp
 +    }
  }
  
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S	2015-11-03 22:23:27.212877605 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S	2016-02-15 23:35:56.290999853 +0100
 @@ -0,0 +1,455 @@
 +	.file	"x86_64-vla-typedef.c"
 +	.section	.debug_abbrev,"",@progbits
@@ -474,11 +474,11 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.arch/x86_64-vla-typedef-foo.S
 +	.string	"GNU C 4.3.2 20081105 (Red Hat 4.3.2-7)"
 +	.ident	"GCC: (GNU) 4.3.2 20081105 (Red Hat 4.3.2-7)"
 +	.section	.note.GNU-stack,"",@progbits
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c	2015-11-03 22:23:27.213877611 +0100
-@@ -0,0 +1,43 @@
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c	2016-02-15 23:35:56.290999853 +0100
+@@ -0,0 +1,45 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
 +   Copyright 2008 Free Software Foundation, Inc.
@@ -513,6 +513,8 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
 +
 +#else
 +
++void foo (int size);
++
 +int
 +main (void)
 +{
@@ -522,10 +524,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.arch/x86_64-vla-typedef.c
 +}
 +
 +#endif
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp	2015-11-03 22:23:27.213877611 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp	2016-02-15 23:35:56.290999853 +0100
 @@ -0,0 +1,64 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -552,8 +554,8 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
 +set testfile x86_64-vla-typedef
 +set srcasmfile ${testfile}-foo.S
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
-+set binobjfile ${objdir}/${subdir}/${testfile}-foo.o
++set binfile [standard_output_file ${testfile}]
++set binobjfile [standard_output_file ${testfile}-foo.o]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcasmfile}" "${binobjfile}" object {}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1
@@ -591,10 +593,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.arch/x86_64-vla-typedef.exp
 +gdb_test "whatis array" "type = array_t" "second: whatis array"
 +
 +gdb_test "ptype array" "type = char \\\[78\\\]" "second: ptype array"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/arrayidx.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/arrayidx.c
 ===================================================================
---- gdb-7.10.50.20151027.orig/gdb/testsuite/gdb.base/arrayidx.c	2015-10-27 02:48:32.000000000 +0100
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/arrayidx.c	2015-11-03 22:23:27.213877611 +0100
+--- gdb-7.10.90.20160211.orig/gdb/testsuite/gdb.base/arrayidx.c	2016-02-15 23:33:29.830959972 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/arrayidx.c	2016-02-15 23:35:56.290999853 +0100
 @@ -17,6 +17,13 @@
  
  int array[] = {1, 2, 3, 4};
@@ -609,11 +611,11 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/arrayidx.c
  int
  main (void)
  {
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/arrayidx.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/arrayidx.exp
 ===================================================================
---- gdb-7.10.50.20151027.orig/gdb/testsuite/gdb.base/arrayidx.exp	2015-10-27 02:48:32.000000000 +0100
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/arrayidx.exp	2015-11-03 22:23:27.213877611 +0100
-@@ -49,4 +49,12 @@ gdb_test "print array" \
+--- gdb-7.10.90.20160211.orig/gdb/testsuite/gdb.base/arrayidx.exp	2016-02-15 23:33:29.830959972 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/arrayidx.exp	2016-02-15 23:35:56.291999860 +0100
+@@ -49,4 +49,12 @@
           "\\{\\\[0\\\] = 1, \\\[1\\\] = 2, \\\[2\\\] = 3, \\\[3\\\] = 4\\}" \
           "Print array with array-indexes on"
  
@@ -627,10 +629,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/arrayidx.exp
 +	unsupported "$test (no GCC)"
 +    }
 +}
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/internal-var-field-address.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/internal-var-field-address.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/internal-var-field-address.c	2015-11-03 22:23:27.213877611 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/internal-var-field-address.c	2016-02-15 23:35:56.291999860 +0100
 @@ -0,0 +1,20 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -652,10 +654,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/internal-var-field-address.c
 +struct {
 +  int field;
 +} staticstruct = { 1 };
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/internal-var-field-address.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/internal-var-field-address.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/internal-var-field-address.exp	2015-11-03 22:23:27.213877611 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/internal-var-field-address.exp	2016-02-15 23:35:56.291999860 +0100
 @@ -0,0 +1,26 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -683,10 +685,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/internal-var-field-address.ex
 +
 +gdb_test {set $varstruct = staticstruct}
 +gdb_test {p $varstruct.field} " = 1"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-frame.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-frame.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-frame.c	2015-11-03 22:23:27.213877611 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-frame.c	2016-02-15 23:35:56.291999860 +0100
 @@ -0,0 +1,31 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -719,10 +721,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-frame.c
 +  f (s);
 +  return 0;
 +}
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-frame.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-frame.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-frame.exp	2015-11-03 22:23:27.213877611 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-frame.exp	2016-02-15 23:35:56.291999860 +0100
 @@ -0,0 +1,38 @@
 +# Copyright 2011 Free Software Foundation, Inc.
 +#
@@ -762,10 +764,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-frame.exp
 +}
 +
 +gdb_test "bt full" "\r\n +s = \"X\\\\000\"\r\n.*"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-overflow.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-overflow.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-overflow.c	2015-11-03 22:23:27.213877611 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-overflow.c	2016-02-15 23:35:56.291999860 +0100
 @@ -0,0 +1,30 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -797,10 +799,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-overflow.c
 +
 +  return 0;
 +}
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-overflow.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-overflow.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-overflow.exp	2015-11-03 22:23:27.213877611 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla-overflow.exp	2016-02-15 23:35:56.292999867 +0100
 @@ -0,0 +1,109 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -832,9 +834,9 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-overflow.exp
 +# #29 in backtrace_command_1 () at ../../gdb/stack.c:1273
 +
 +set testfile vla-overflow
-+set shfile ${objdir}/${subdir}/${testfile}-gdb.sh
++set shfile [standard_output_file ${testfile}-gdb.sh]
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1
@@ -911,10 +913,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla-overflow.exp
 +gdb_test "bt" "in \[^ \]*abort \\(.* in main \\(.*" "Backtrace after abort()"
 +
 +verbose -log "kb_found in bt after abort() = [expr [memory_v_pages_get] * $pagesize / 1024]"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla.c	2015-11-03 22:23:27.213877611 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla.c	2016-02-15 23:35:56.292999867 +0100
 @@ -0,0 +1,55 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -971,10 +973,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla.c
 +  foo (78);
 +  return 0;
 +}
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla.exp	2015-11-03 22:23:27.214877617 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/vla.exp	2016-02-15 23:35:56.292999867 +0100
 @@ -0,0 +1,62 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -993,7 +995,7 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla.exp
 +
 +set testfile vla
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1
@@ -1038,10 +1040,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.base/vla.exp
 +gdb_test "p temp1" " = '1' <repeats 78 times>" "second: print temp1"
 +gdb_test "p temp2" " = '2' <repeats 78 times>" "second: print temp2"
 +gdb_test "p temp3" " = '3' <repeats 48 times>" "second: print temp3"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S	2015-11-03 22:23:27.214877617 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S	2016-02-15 23:35:56.292999867 +0100
 @@ -0,0 +1,246 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -1289,10 +1291,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.S
 +	.string		"char"
 +.Luint_str:
 +	.string		"unsigned int"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp	2015-11-03 22:23:27.214877617 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp	2016-02-15 23:35:56.292999867 +0100
 @@ -0,0 +1,66 @@
 +# Copyright 2010 Free Software Foundation, Inc.
 +
@@ -1360,10 +1362,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-bound-loclist.exp
 +
 +# The register contains unpredictable value - the array size.
 +gdb_test "ptype reg_string" {type = char \[-?[0-9]+\]}
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-stripped.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-stripped.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-stripped.c	2015-11-03 22:23:27.214877617 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-stripped.c	2016-02-15 23:35:56.293999874 +0100
 @@ -0,0 +1,42 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -1407,10 +1409,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-stripped.c
 +  func1 (1, 2);
 +  return 0;
 +}
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp	2015-11-03 22:23:27.214877617 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp	2016-02-15 23:35:56.293999874 +0100
 @@ -0,0 +1,79 @@
 +# Copyright 2006 Free Software Foundation, Inc.
 +
@@ -1491,10 +1493,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-stripped.exp
 +gdb_test "step" \
 +         "func.* \\(.*\\) at .*" \
 +         "step"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S	2015-11-03 22:23:27.214877617 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.S	2016-02-15 23:35:56.293999874 +0100
 @@ -0,0 +1,83 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -1579,10 +1581,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-loca
 +
 +	.byte		0x0			/* Terminator */
 +	.byte		0x0			/* Terminator */
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp	2015-11-03 22:23:27.214877617 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-location.exp	2016-02-15 23:35:56.293999874 +0100
 @@ -0,0 +1,37 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -1621,10 +1623,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-struct-member-data-loca
 +clean_restart $binfile
 +
 +gdb_test "ptype struct some_struct" "type = struct some_struct {\[\r\n \t\]*void field;\[\r\n \t\]*}"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.S
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.S	2015-11-03 22:23:27.214877617 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.S	2016-02-15 23:35:56.293999874 +0100
 @@ -0,0 +1,121 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -1747,10 +1749,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.S
 +	.byte		0x0			/* Terminator */
 +
 +	.byte		0x0			/* Terminator */
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.exp	2015-11-03 22:23:27.215877623 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.exp	2016-02-15 23:35:56.293999874 +0100
 @@ -0,0 +1,39 @@
 +# Copyright 2012 Free Software Foundation, Inc.
 +
@@ -1791,10 +1793,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.dwarf2/dw2-subrange-no-type.exp
 +
 +gdb_test "ptype notype_string" {type = char \[129\]}
 +gdb_test "p notype_string" " = 'x' <repeats 129 times>"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dwarf-stride.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dwarf-stride.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dwarf-stride.exp	2015-11-03 22:23:27.215877623 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dwarf-stride.exp	2016-02-15 23:35:56.294999881 +0100
 @@ -0,0 +1,42 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -1838,10 +1840,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dwarf-stride.exp
 +gdb_continue_to_breakpoint "break-here" ".*break-here.*"
 +gdb_test "p c40pt(1)" " = '0-hello.*"
 +gdb_test "p c40pt(2)" " = '1-hello.*"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dwarf-stride.f90
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dwarf-stride.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dwarf-stride.f90	2015-11-03 22:23:27.215877623 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dwarf-stride.f90	2016-02-15 23:35:56.294999881 +0100
 @@ -0,0 +1,40 @@
 +! Copyright 2009 Free Software Foundation, Inc.
 +!
@@ -1883,10 +1885,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dwarf-stride.f90
 +  print *, c40pt  ! break-here
 +
 +end program repro
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dynamic.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dynamic.exp	2015-11-03 22:27:25.481281904 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.exp	2016-02-15 23:36:39.358305635 +0100
 @@ -0,0 +1,151 @@
 +# Copyright 2007 Free Software Foundation, Inc.
 +
@@ -1913,7 +1915,7 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dynamic.exp
 +
 +set testfile "dynamic"
 +set srcfile ${testfile}.f90
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f90 quiet}] != "" } {
 +    untested "Couldn't compile ${srcfile}"
@@ -2039,10 +2041,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dynamic.exp
 +gdb_test "p vart(3,8)" "\\$\[0-9\]* = 9"
 +# maps to foo::vary(1,3)
 +gdb_test "p vart(2,9)" "\\$\[0-9\]* = 10"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dynamic.f90
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dynamic.f90	2015-11-03 22:23:27.215877623 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/dynamic.f90	2016-02-15 23:35:56.294999881 +0100
 @@ -0,0 +1,98 @@
 +! Copyright 2007 Free Software Foundation, Inc.
 +!
@@ -2142,10 +2144,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/dynamic.f90
 +  if (x (1, 1) .ne. 8 .or. x (2, 2) .ne. 9 .or. x (1, 2) .ne. 4) call abort
 +  if (x (3, 1) .ne. 10) call abort
 +end
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/string.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/string.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/string.exp	2015-11-03 22:23:27.215877623 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/string.exp	2016-02-15 23:36:39.359305642 +0100
 @@ -0,0 +1,59 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -2170,7 +2172,7 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/string.exp
 +
 +set testfile "string"
 +set srcfile ${testfile}.f90
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f90 quiet}] != "" } {
 +    untested "Couldn't compile ${srcfile}"
@@ -2206,10 +2208,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/string.exp
 +gdb_continue_to_breakpoint "var-finish"
 +gdb_test "p e" "\\$\[0-9\]* = 'e   '" "p e re-set"
 +gdb_test "p f" "\\$\[0-9\]* = \\(\\( 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   '\\) \\( 'f2  ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   '\\) \\( 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   ', 'f   '\\) \\)" "p *f re-set"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/string.f90
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/string.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/string.f90	2015-11-03 22:23:27.215877623 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/string.f90	2016-02-15 23:35:56.295999888 +0100
 @@ -0,0 +1,37 @@
 +! Copyright 2008 Free Software Foundation, Inc.
 +!
@@ -2248,10 +2250,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/string.f90
 +  h = 'h'
 +  call foo (g, h)
 +end
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/subrange.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/subrange.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/subrange.exp	2015-11-03 22:23:27.215877623 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/subrange.exp	2016-02-15 23:35:56.295999888 +0100
 @@ -0,0 +1,72 @@
 +# Copyright 2011 Free Software Foundation, Inc.
 +
@@ -2325,10 +2327,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/subrange.exp
 +gdb_unload
 +setup_kfail "*-*-*" "vlaregression/9999"
 +gdb_test {p $a (3, 2:2)} { = \(23\)}
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/subrange.f90
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/subrange.f90
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/subrange.f90	2015-11-03 22:23:27.215877623 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.fortran/subrange.f90	2016-02-15 23:35:56.295999888 +0100
 @@ -0,0 +1,28 @@
 +! Copyright 2011 Free Software Foundation, Inc.
 +!
@@ -2358,10 +2360,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.fortran/subrange.f90
 +  ptr => a
 +  write (*,*) a                 ! break-static
 +end
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.mi/mi2-var-stale-type.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.mi/mi2-var-stale-type.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.mi/mi2-var-stale-type.c	2015-11-03 22:23:27.216877629 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.mi/mi2-var-stale-type.c	2016-02-15 23:35:56.295999888 +0100
 @@ -0,0 +1,26 @@
 +/* Copyright 2011 Free Software Foundation, Inc.
 +
@@ -2389,10 +2391,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.mi/mi2-var-stale-type.c
 +
 +  return 0;
 +}
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp	2015-11-03 22:23:27.216877629 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp	2016-02-15 23:35:56.295999888 +0100
 @@ -0,0 +1,57 @@
 +# Copyright 2011 Free Software Foundation, Inc.
 +#
@@ -2451,10 +2453,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.mi/mi2-var-stale-type.exp
 +mi_create_varobj "vla" "vla" "create local variable vla"
 +
 +mi_gdb_test "-var-update *" "\\^done,changelist=.*" "-var-update *"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.opt/array-from-register-func.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register-func.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.opt/array-from-register-func.c	2015-11-03 22:23:27.216877629 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register-func.c	2016-02-15 23:35:56.295999888 +0100
 @@ -0,0 +1,22 @@
 +/* This file is part of GDB, the GNU debugger.
 +
@@ -2478,10 +2480,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.opt/array-from-register-func.c
 +{
 +  return arr[0];
 +}
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.opt/array-from-register.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.opt/array-from-register.c	2015-11-03 22:23:27.216877629 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register.c	2016-02-15 23:35:56.296999895 +0100
 @@ -0,0 +1,28 @@
 +/* This file is part of GDB, the GNU debugger.
 +
@@ -2511,10 +2513,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.opt/array-from-register.c
 +
 +  return 0;
 +}
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.opt/array-from-register.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.opt/array-from-register.exp	2015-11-03 22:23:27.216877629 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.opt/array-from-register.exp	2016-02-15 23:35:56.296999895 +0100
 @@ -0,0 +1,33 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +#
@@ -2549,10 +2551,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.opt/array-from-register.exp
 +# Seen regression:
 +# Address requested for identifier "arr" which is in register $rdi
 +gdb_test "p arr\[0\]" "\\$\[0-9\]+ = 42"
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.pascal/arrays.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pascal/arrays.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.pascal/arrays.exp	2015-11-03 22:23:27.216877629 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pascal/arrays.exp	2016-02-15 23:36:39.359305642 +0100
 @@ -0,0 +1,104 @@
 +# Copyright 2008, 2009 Free Software Foundation, Inc.
 +#
@@ -2577,7 +2579,7 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.pascal/arrays.exp
 +
 +set testfile "arrays"
 +set srcfile ${testfile}.pas
-+set binfile ${objdir}/${subdir}/${testfile}$EXEEXT
++set binfile [standard_output_file ${testfile}$EXEEXT]
 +
 +# These tests only work with fpc, using the -gw3 compile-option
 +pascal_init
@@ -2658,10 +2660,10 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.pascal/arrays.exp
 +}
 +gdb_test "print DynArrChar" ".* = 'abcdefghijklm'" "Print dynamic array of char"
 +
-Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.pascal/arrays.pas
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.pascal/arrays.pas
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.10.50.20151027/gdb/testsuite/gdb.pascal/arrays.pas	2015-11-03 22:23:27.216877629 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.pascal/arrays.pas	2016-02-15 23:35:56.296999895 +0100
 @@ -0,0 +1,82 @@
 +{
 + Copyright 2008, 2009 Free Software Foundation, Inc.
@@ -2745,11 +2747,11 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/gdb.pascal/arrays.pas
 +  s := 'test'#0'string';
 +  writeln(s); { set breakpoint 2 here }
 +end.
-Index: gdb-7.10.50.20151027/gdb/testsuite/lib/gdb.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/lib/gdb.exp
 ===================================================================
---- gdb-7.10.50.20151027.orig/gdb/testsuite/lib/gdb.exp	2015-11-03 22:23:26.684874457 +0100
-+++ gdb-7.10.50.20151027/gdb/testsuite/lib/gdb.exp	2015-11-03 22:23:27.217877635 +0100
-@@ -173,6 +173,11 @@ proc gdb_unload {} {
+--- gdb-7.10.90.20160211.orig/gdb/testsuite/lib/gdb.exp	2016-02-15 23:35:55.326993008 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/lib/gdb.exp	2016-02-15 23:35:56.297999903 +0100
+@@ -173,6 +173,11 @@
  	    send_gdb "y\n"
  	    exp_continue
  	}
@@ -2761,11 +2763,11 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/lib/gdb.exp
  	-re "Discard symbol table from .*y or n.*$" {
  	    send_gdb "y\n"
  	    exp_continue
-Index: gdb-7.10.50.20151027/gdb/testsuite/lib/pascal.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/lib/pascal.exp
 ===================================================================
---- gdb-7.10.50.20151027.orig/gdb/testsuite/lib/pascal.exp	2015-10-27 02:48:32.000000000 +0100
-+++ gdb-7.10.50.20151027/gdb/testsuite/lib/pascal.exp	2015-11-03 22:23:27.217877635 +0100
-@@ -37,6 +37,9 @@ proc pascal_init {} {
+--- gdb-7.10.90.20160211.orig/gdb/testsuite/lib/pascal.exp	2016-02-15 23:33:29.830959972 +0100
++++ gdb-7.10.90.20160211/gdb/testsuite/lib/pascal.exp	2016-02-15 23:35:56.298999910 +0100
+@@ -37,6 +37,9 @@
      global pascal_compiler_is_fpc
      global gpc_compiler
      global fpc_compiler
@@ -2775,7 +2777,7 @@ Index: gdb-7.10.50.20151027/gdb/testsuite/lib/pascal.exp
      global env
   
      if { $pascal_init_done == 1 } {
-@@ -64,6 +67,20 @@ proc pascal_init {} {
+@@ -64,6 +67,20 @@
  	    set pascal_compiler_is_fpc 1
  	    verbose -log "Free Pascal compiler found"
  	}

gdb-lineno-makeup-test.patch

@@ -6,8 +6,10 @@ http://sourceware.org/ml/gdb-patches/2006-11/msg00253.html
 	[rfc] Do not make up line information
 http://sourceware.org/ml/gdb-cvs/2006-11/msg00127.html
 
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/lineno-makeup-func.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/lineno-makeup-func.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/lineno-makeup-func.c	2016-02-15 23:29:16.595161971 +0100
 @@ -0,0 +1,21 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -30,8 +32,10 @@ http://sourceware.org/ml/gdb-cvs/2006-11/msg00127.html
 +func (void)
 +{
 +}
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/lineno-makeup.c
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/lineno-makeup.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/lineno-makeup.c	2016-02-15 23:29:23.873213646 +0100
 @@ -0,0 +1,35 @@
 +/* This testcase is part of GDB, the GNU debugger.
 +
@@ -60,7 +64,7 @@ http://sourceware.org/ml/gdb-cvs/2006-11/msg00127.html
 +   (s390_analyze_prologue) would skip the whole body till reaching `main'.  */
 +
 +extern void func (void);
-+asm ("func: .incbin \"gdb.base/lineno-makeup-func.bin\"");
++asm ("func: .incbin \"" BINFILENAME "\"");
 +
 +int
 +main (void)
@@ -68,8 +72,10 @@ http://sourceware.org/ml/gdb-cvs/2006-11/msg00127.html
 +  func ();
 +  return 0;
 +}
---- /dev/null
-+++ b/gdb/testsuite/gdb.base/lineno-makeup.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.base/lineno-makeup.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.base/lineno-makeup.exp	2016-02-15 23:29:23.873213646 +0100
 @@ -0,0 +1,78 @@
 +# Copyright 2009 Free Software Foundation, Inc.
 +
@@ -89,9 +95,9 @@ http://sourceware.org/ml/gdb-cvs/2006-11/msg00127.html
 +set testfile "lineno-makeup"
 +set srcfuncfile ${testfile}-func.c
 +set srcfile ${testfile}.c
-+set objfuncfile ${objdir}/${subdir}/${testfile}-func.o
-+set binfuncfile ${objdir}/${subdir}/${testfile}-func.bin
-+set binfile ${objdir}/${subdir}/${testfile}
++set objfuncfile [standard_output_file ${testfile}-func.o]
++set binfuncfile [standard_output_file ${testfile}-func.bin]
++set binfile [standard_output_file ${testfile}]
 +
 +if { [gdb_compile "${srcdir}/${subdir}/${srcfuncfile}" "${objfuncfile}" object {}] != "" } {
 +    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
@@ -105,7 +111,7 @@ http://sourceware.org/ml/gdb-cvs/2006-11/msg00127.html
 +set binfuncfilesize [file size $binfuncfile]
 +verbose -log "file size $binfuncfile = $binfuncfilesize"
 +
-+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
++if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug additional_flags=-DBINFILENAME=\"$binfuncfile\"]] != "" } {
 +    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 +}
 +

gdb-rhbz947564-findvar-assertion-frame-failed-testcase.patch

@@ -1,7 +1,7 @@
-Index: gdb-7.5.91.20130407/gdb/testsuite/gdb.threads/tls-rhbz947564.cc
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/tls-rhbz947564.cc
 ===================================================================
---- /dev/null
-+++ gdb-7.5.91.20130407/gdb/testsuite/gdb.threads/tls-rhbz947564.cc
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/tls-rhbz947564.cc	2016-02-15 23:39:21.791458927 +0100
 @@ -0,0 +1,53 @@
 +#include <iostream>
 +#include <pthread.h>
@@ -56,10 +56,10 @@ Index: gdb-7.5.91.20130407/gdb/testsuite/gdb.threads/tls-rhbz947564.cc
 +
 +  return 0;
 +}
-Index: gdb-7.5.91.20130407/gdb/testsuite/gdb.threads/tls-rhbz947564.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/tls-rhbz947564.exp
 ===================================================================
---- /dev/null
-+++ gdb-7.5.91.20130407/gdb/testsuite/gdb.threads/tls-rhbz947564.exp
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/tls-rhbz947564.exp	2016-02-15 23:39:30.029517418 +0100
 @@ -0,0 +1,75 @@
 +# Copyright (C) 2013 Free Software Foundation, Inc.
 +
@@ -78,7 +78,7 @@ Index: gdb-7.5.91.20130407/gdb/testsuite/gdb.threads/tls-rhbz947564.exp
 +
 +set testfile tls-rhbz947564
 +set srcfile ${testfile}.cc
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +
 +if [istarget "*-*-linux"] then {
 +    set target_cflags "-D_MIT_POSIX_THREADS"

gdb-simultaneous-step-resume-breakpoint-test.patch

@@ -1,5 +1,7 @@
---- /dev/null	2009-09-25 12:44:54.497650251 +0200
-+++ ./gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.exp	2009-09-25 17:27:12.000000000 +0200
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.exp	2016-02-15 23:38:23.366044101 +0100
 @@ -0,0 +1,65 @@
 +# Copyright (C) 2009 Free Software Foundation, Inc.
 +
@@ -21,7 +23,7 @@
 +
 +set testfile simultaneous-step-resume-breakpoint
 +set srcfile ${testfile}.c
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +
 +if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
 +    return -1
@@ -66,8 +68,10 @@
 +
 +gdb_test "continue" "sleep-after.*" "second continue"
 +gdb_test "continue" "final-exit.*" "third continue"
---- /dev/null	2009-09-25 12:44:54.497650251 +0200
-+++ ./gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.c	2009-09-25 17:29:42.000000000 +0200
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.threads/simultaneous-step-resume-breakpoint.c	2016-02-15 23:38:18.257007826 +0100
 @@ -0,0 +1,79 @@
 +/* Copyright 2009 Free Software Foundation, Inc.
 +

gdb-test-expr-cumulative-archer.patch

@@ -1,8 +1,10 @@
 archer archer-keiths-expr-cumulative
 b5a7497340b24199f0c7ba7fdf0d54d4df44d6bc
 
---- /dev/null	2011-01-12 06:28:36.282000001 +0100
-+++ ./gdb/testsuite/gdb.cp/namespace-nested-imports.cc	2009-09-25 06:50:38.000000000 +0200
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/namespace-nested-imports.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/namespace-nested-imports.cc	2016-02-15 23:34:32.196402773 +0100
 @@ -0,0 +1,36 @@
 +namespace A
 +{
@@ -40,8 +42,10 @@ b5a7497340b24199f0c7ba7fdf0d54d4df44d6bc
 +  //ab;
 +  return C::first();
 +}
---- /dev/null	2011-01-12 06:28:36.282000001 +0100
-+++ ./gdb/testsuite/gdb.cp/namespace-nested-imports.exp	2009-09-25 06:50:38.000000000 +0200
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/namespace-nested-imports.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/namespace-nested-imports.exp	2016-02-15 23:34:51.926542859 +0100
 @@ -0,0 +1,50 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -60,7 +64,7 @@ b5a7497340b24199f0c7ba7fdf0d54d4df44d6bc
 +
 +set testfile namespace-nested-imports
 +set srcfile ${testfile}.cc
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1
@@ -93,8 +97,10 @@ b5a7497340b24199f0c7ba7fdf0d54d4df44d6bc
 +gdb_continue_to_breakpoint "C::D::second"
 +
 +gdb_test "print ab" "= 11"
---- /dev/null	2011-01-12 06:28:36.282000001 +0100
-+++ ./gdb/testsuite/gdb.cp/namespace-no-imports.cc	2009-09-25 06:50:38.000000000 +0200
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/namespace-no-imports.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/namespace-no-imports.cc	2016-02-15 23:34:32.196402773 +0100
 @@ -0,0 +1,37 @@
 +
 +namespace A
@@ -133,8 +139,10 @@ b5a7497340b24199f0c7ba7fdf0d54d4df44d6bc
 +  A::B::C::abc;
 +  return A::B::first();
 +}
---- /dev/null	2011-01-12 06:28:36.282000001 +0100
-+++ ./gdb/testsuite/gdb.cp/namespace-no-imports.exp	2009-09-25 06:50:38.000000000 +0200
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/namespace-no-imports.exp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.cp/namespace-no-imports.exp	2016-02-15 23:34:51.926542859 +0100
 @@ -0,0 +1,69 @@
 +# Copyright 2008 Free Software Foundation, Inc.
 +
@@ -153,7 +161,7 @@ b5a7497340b24199f0c7ba7fdf0d54d4df44d6bc
 +
 +set testfile namespace-no-imports
 +set srcfile ${testfile}.cc
-+set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
 +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
 +    untested "Couldn't compile test program"
 +    return -1

gdb-test-pid0-core.patch

@@ -6,10 +6,10 @@ http://sourceware.org/ml/gdb-patches/2010-08/msg00085.html
 http://sourceware.org/ml/gdb-cvs/2010-08/msg00026.html
 2e5bcfdef1ec3883d48c3f87a4be5c0dff25e17e
 
-Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/x86_64-pid0-core.core.bz2.uu
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-pid0-core.core.bz2.uu
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/x86_64-pid0-core.core.bz2.uu	2013-08-02 22:14:50.748990883 +0200
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-pid0-core.core.bz2.uu	2016-02-15 23:23:40.772772165 +0100
 @@ -0,0 +1,20 @@
 +begin 600 x86_64-pid0-core.core.bz2
 +M0EIH.3%!629362,CA>P!$/'_____^*#EZ-A!SP36P&_:G0#=14``04A&8,'U
@@ -31,10 +31,10 @@ Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/x86_64-pid0-core.core.bz2.
 +4B.Z!/,0-IZ^W_Q=R13A0D",CA>P`
 +`
 +end
-Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/x86_64-pid0-core.exp
+Index: gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-pid0-core.exp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/x86_64-pid0-core.exp	2013-08-02 22:17:30.575209385 +0200
++++ gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/x86_64-pid0-core.exp	2016-02-15 23:23:55.145875704 +0100
 @@ -0,0 +1,46 @@
 +# This testcase is part of GDB, the GNU debugger.
 +# 
@@ -63,7 +63,7 @@ Index: gdb-7.6.50.20130731-cvs/gdb/testsuite/gdb.arch/x86_64-pid0-core.exp
 +
 +set testfile "x86_64-pid0-core"
 +set corebz2uufile ${srcdir}/${subdir}/${testfile}.core.bz2.uu
-+set corefile ${objdir}/${subdir}/${testfile}.core
++set corefile [standard_output_file ${testfile}.core]
 +
 +if {[catch "system \"uudecode -o - ${corebz2uufile} | bzip2 -dc >${corefile}\""] != 0} {
 +    untested "failed uudecode or bzip2"

gdb-upstream.patch

@@ -0,0 +1,247 @@
+http://sourceware.org/ml/gdb-patches/2016-02/msg00423.html
+Subject: Re: [testsuite 7.11] Regression for i386-biarch-core.exp and others [Re: [PATCH] Always organize test artifacts in a directory hierarchy]
+
+On 16-02-11 04:22 PM, Jan Kratochvil wrote:
+> On Mon, 08 Feb 2016 20:26:41 +0100, Simon Marchi wrote:
+>> Ok, I pushed this patch.  I am now waiting to know what I broke.
+> 
+> Running /home/jkratoch/redhat/gdb-clean/gdb/testsuite/gdb.arch/i386-biarch-core.exp ...
+> PASS: gdb.arch/i386-biarch-core.exp: complete set gnutarget
+> PASS: gdb.arch/i386-biarch-core.exp: core-file
+> PASS: gdb.arch/i386-biarch-core.exp: .text is readable
+> ->
+> Running /home/jkratoch/redhat/gdb-clean/gdb/testsuite/gdb.arch/i386-biarch-core.exp ...
+> PASS: gdb.arch/i386-biarch-core.exp: complete set gnutarget
+> UNTESTED: gdb.arch/i386-biarch-core.exp: failed bzip2
+> 
+> Reproducible with:
+> 	tar xJf gdb-7.10.90.20160211.tar.xz;cd gdb-7.10.90.20160211;./configure;make;make -C gdb check//unix/-m64 RUNTESTFLAGS=gdb.arch/i386-biarch-core.exp
+> 	Running /tmp/gdb-7.10.90.20160211/gdb/testsuite/gdb.arch/i386-biarch-core.exp ...
+> 	sh: /tmp/gdb-7.10.90.20160211/gdb/testsuite.unix.-m64/gdb.arch/i386-biarch-core.core: No such file or directory
+> 			=== gdb Summary ===
+> 	# of expected passes		1
+> 	# of untested testcases		1
+> 
+> I have not debugged it more yet.
+> 
+> 
+> Jan
+
+Hi Jan,
+
+I think this patch should fix it.  It simply makes the test use standard_output_file
+for its output directory.
+
+Simon
+
+
+>From c643fde26ecdc63c399ac4f26fd31920148fae77 Mon Sep 17 00:00:00 2001
+From: Simon Marchi <simon.marchi@ericsson.com>
+Date: Fri, 12 Feb 2016 13:17:32 -0500
+Subject: [PATCH] i386-biarch-core.exp: Use standard_output_file
+Subject: [PATCH] i386-biarch-core.exp: Use standard_output_file
+
+Fix the core file path to use the standard output directory.
+
+gdb/testsuite/ChangeLog:
+
+	* i386-biarch-core.exp: Define corefile using
+	standard_output_file.
+---
+ gdb/testsuite/gdb.arch/i386-biarch-core.exp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdb/testsuite/gdb.arch/i386-biarch-core.exp b/gdb/testsuite/gdb.arch/i386-biarch-core.exp
+index 607b947..4dc5ba6 100644
+--- a/gdb/testsuite/gdb.arch/i386-biarch-core.exp
++++ b/gdb/testsuite/gdb.arch/i386-biarch-core.exp
+@@ -40,7 +40,7 @@ gdb_test_multiple "complete set gnutarget " $test {
+ }
+
+ set corebz2file ${srcdir}/${subdir}/${testfile}.core.bz2
+-set corefile ${objdir}/${subdir}/${testfile}.core
++set corefile [standard_output_file ${testfile}.core]
+ # Entry point of the original executable.
+ set address 0x400078
+
+-- 
+2.5.1
+
+
+
+http://sourceware.org/ml/gdb-patches/2016-02/msg00468.html
+Subject: [testsuite obv+7.11] Fix more testcases with standard_output_file  [Re: [testsuite 7.11] Regression for i386-biarch-core.exp and others]
+
+
+--AhhlLboLdkugWU4S
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+
+On Fri, 12 Feb 2016 19:47:10 +0100, Jan Kratochvil wrote:
+> (gdb.base/corefile.exp gdb.base/execl-update-breakpoints.exp listed there do
+> not reproduce it for me locally now, I will re-check those.)
+
+I have rechecked it and fixed these.
+
+trunk:
+	c99dbb4246fedd500dbdd50514589fc7f95d80c0
+7.11:
+	8b6bd5aca63189590498195a7a2696cde021c9cd
+
+
+Jan
+
+--AhhlLboLdkugWU4S
+Content-Type: message/rfc822
+Content-Disposition: inline
+
+From: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date: Mon, 15 Feb 2016 18:54:03 +0100
+Subject: [PATCH] Fix more testcases with standard_output_file.
+Subject: [PATCH] Fix more testcases with standard_output_file.
+
+Since
+	commit 2151ccc56c74b55a8f0debf0724a495368f92591
+	Author: Simon Marchi <simon.marchi@ericsson.com>
+	Date:   Mon Feb 8 14:02:36 2016 -0500
+	    Always organize test artifacts in a directory hierarchy
+these testfiles could not build.
+
+gdb/testsuite/ChangeLog
+2016-02-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.arch/i386-gnu-cfi.exp: Use standard_output_file.
+	* gdb.arch/i386-prologue.exp: Likewise.
+	* gdb.arch/i386-size.exp: Likewise.
+---
+ gdb/testsuite/ChangeLog                  | 6 ++++++
+ gdb/testsuite/gdb.arch/i386-gnu-cfi.exp  | 2 +-
+ gdb/testsuite/gdb.arch/i386-prologue.exp | 2 +-
+ gdb/testsuite/gdb.arch/i386-size.exp     | 2 +-
+ 4 files changed, 9 insertions(+), 3 deletions(-)
+
+### a/gdb/testsuite/ChangeLog
+### b/gdb/testsuite/ChangeLog
+## -1,3 +1,9 @@
++2016-02-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
++
++	* gdb.arch/i386-gnu-cfi.exp: Use standard_output_file.
++	* gdb.arch/i386-prologue.exp: Likewise.
++	* gdb.arch/i386-size.exp: Likewise.
++
+ 2016-02-15  Simon Marchi  <simon.marchi@ericsson.com>
+ 
+ 	* gdb.base/wrong_frame_bt_full.exp: Use standard_output_file to
+--- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
++++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
+@@ -31,7 +31,7 @@ if { ![is_x86_like_target] } then {
+ set testfile "i386-gnu-cfi"
+ set srcfilec ${testfile}.c
+ set srcfileasm ${testfile}-asm.S
+-set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
+ 
+ # some targets have leading underscores on assembly symbols.
+ set additional_flags [gdb_target_symbol_prefix_flags]
+--- a/gdb/testsuite/gdb.arch/i386-prologue.exp
++++ b/gdb/testsuite/gdb.arch/i386-prologue.exp
+@@ -28,7 +28,7 @@ if { ![is_x86_like_target] } then {
+ 
+ set testfile "i386-prologue"
+ set srcfile ${testfile}.c
+-set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
+ 
+ # some targets have leading underscores on assembly symbols.
+ set additional_flags [gdb_target_symbol_prefix_flags]
+--- a/gdb/testsuite/gdb.arch/i386-size.exp
++++ b/gdb/testsuite/gdb.arch/i386-size.exp
+@@ -27,7 +27,7 @@ if { ![is_x86_like_target] } then {
+ 
+ set testfile "i386-size"
+ set srcfile ${testfile}.c
+-set binfile ${objdir}/${subdir}/${testfile}
++set binfile [standard_output_file ${testfile}]
+ 
+ # some targets have leading underscores on assembly symbols.
+ set additional_flags [gdb_target_symbol_prefix_flags]
+-- 
+2.5.0
+
+--AhhlLboLdkugWU4S--
+
+http://sourceware.org/ml/gdb-patches/2016-02/msg00469.html
+Subject: [testsuite obv+7.11] Add missing gdb.arch/i386-prologue.c prototypes
+
+
+--EVF5PPMfhYS0aIcm
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+
+trunk:
+	a7a0a6a95bc111776129374c46edec3c3c2785cc
+7.11:
+	906c69d06a46cec2f55941f7dc3a5323261796d5
+
+--EVF5PPMfhYS0aIcm
+Content-Type: message/rfc822
+Content-Disposition: inline
+
+From: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date: Mon, 15 Feb 2016 19:01:03 +0100
+Subject: [PATCH] Add missing gdb.arch/i386-prologue.c prototypes
+Subject: [PATCH] Add missing gdb.arch/i386-prologue.c prototypes
+
+The testfile has not ran because:
+gdb.arch/i386-prologue.c:34:3: warning: implicit declaration of function 'standard' [-Wimplicit-function-declaration]
+   standard ();
+   ^
+gdb.arch/i386-prologue.c:35:3: warning: implicit declaration of function 'stack_align_ecx' [-Wimplicit-function-declaration]
+   stack_align_ecx ();
+   ^
+gdb.arch/i386-prologue.c:36:3: warning: implicit declaration of function 'stack_align_edx' [-Wimplicit-function-declaration]
+   stack_align_edx ();
+   ^
+gdb.arch/i386-prologue.c:37:3: warning: implicit declaration of function 'stack_align_eax' [-Wimplicit-function-declaration]
+   stack_align_eax ();
+   ^
+
+gdb/testsuite/ChangeLog
+2016-02-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.arch/i386-prologue.c: Add missing prototypes.
+---
+ gdb/testsuite/ChangeLog                | 4 ++++
+ gdb/testsuite/gdb.arch/i386-prologue.c | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+### a/gdb/testsuite/ChangeLog
+### b/gdb/testsuite/ChangeLog
+## -1,5 +1,9 @@
+ 2016-02-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+ 
++	* gdb.arch/i386-prologue.c: Add missing prototypes.
++
++2016-02-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
++
+ 	* gdb.arch/i386-gnu-cfi.exp: Use standard_output_file.
+ 	* gdb.arch/i386-prologue.exp: Likewise.
+ 	* gdb.arch/i386-size.exp: Likewise.
+--- a/gdb/testsuite/gdb.arch/i386-prologue.c
++++ b/gdb/testsuite/gdb.arch/i386-prologue.c
+@@ -27,6 +27,10 @@ void gdb1253 (void);
+ void gdb1718 (void);
+ void gdb1338 (void);
+ void jump_at_beginning (void);
++void standard (void);
++void stack_align_ecx (void);
++void stack_align_edx (void);
++void stack_align_eax (void);
+ 
+ int
+ main (void)
+-- 
+2.5.0
+
+--EVF5PPMfhYS0aIcm--
+

gdb.spec

@@ -19,15 +19,15 @@ Summary: A GNU source-level debugger for C, C++, Fortran, Go and other languages
 Name: %{?scl_prefix}gdb
 
 # Freeze it when GDB gets branched
-%global snapsrc    20160211
+%global snapsrc    20160210
 # See timestamp of source gnulib installed into gdb/gnulib/ .
 %global snapgnulib 20150822
 %global tarname gdb-%{version}
-Version: 7.10.90.%{snapsrc}
+Version: 7.10.90.20160211
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 52%{?dist}
+Release: 53%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL
 Group: Development/Debuggers
@@ -245,7 +245,7 @@ Patch231: gdb-6.3-bz202689-exec-from-pthread-test.patch
 
 # Backported fixups post the source tarball.
 #Xdrop: Just backports.
-#Patch232: gdb-upstream.patch
+Patch232: gdb-upstream.patch
 
 # Testcase for PPC Power6/DFP instructions disassembly (BZ 230000).
 #=fedoratest+ppc
@@ -555,9 +555,6 @@ Patch1073: gdb-opcodes-clflushopt-test.patch
 # [testsuite] Fix false selftest.exp FAIL from system readline-6.3+ (Patrick Palka).
 Patch1075: gdb-testsuite-readline63-sigint.patch
 
-# [testsuite] Revert testsuite rework into subdirectories.
-Patch1077: gdb-testsuite-subdirs-revert.patch
-
 # [testsuite] Fix false Fortran regressions with recent gcc.
 Patch1078: gdb-testsuite-fortran-gcc5.patch
 
@@ -660,6 +657,7 @@ BuildRequires: prelink
 %endif
 %if 0%{!?rhel:1} || 0%{?rhel} > 7
 BuildRequires: libmpx%{bits_local} libmpx%{bits_other}
+BuildRequires: opencl-headers ocl-icd-devel%{bits_local} ocl-icd-devel%{bits_other}
 %endif
 %if 0%{!?rhel:1}
 # Fedora arm+ppc64le do not yet have fpc built.
@@ -758,8 +756,7 @@ find -name "*.info*"|xargs rm -f
 # Match the Fedora's version info.
 %patch2 -p1
 
-#patch232 -p1
-%patch1077 -p1
+%patch232 -p1
 %patch349 -p1
 %patch1058 -p1
 %patch1059 -p1
@@ -1397,6 +1394,9 @@ then
 fi
 
 %changelog
+* Tue Feb 16 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.10.90.20160211-53.fc24
+- Drop gdb-testsuite-subdirs-revert.patch.
+
 * Sat Feb 13 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.10.90.20160211-52.fc24
 - Rebase to FSF GDB 7.10.90.20160211 (pre-7.11 branch snapshot).