From a1ffb367a0a1f92f8128da1c00ce6697bf2d1ff7d294ebe72a7f4d3038326488 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Mon, 11 Aug 2014 14:15:14 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=103

---
 gdb-6.6-bfd-vdso8k.patch     | 119 ----------
 gdb-python-stacksmash.patch  |  65 ------
 gdb-rhel5-gcc44.patch        | 431 -----------------------------------
 gdb-testsuite-nohostid.patch |  50 ----
 4 files changed, 665 deletions(-)
 delete mode 100644 gdb-6.6-bfd-vdso8k.patch
 delete mode 100644 gdb-python-stacksmash.patch
 delete mode 100644 gdb-rhel5-gcc44.patch
 delete mode 100644 gdb-testsuite-nohostid.patch

diff --git a/gdb-6.6-bfd-vdso8k.patch b/gdb-6.6-bfd-vdso8k.patch
deleted file mode 100644
index b4d445e..0000000
--- a/gdb-6.6-bfd-vdso8k.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-2007-09-23  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	* elfcode.h (NAME(_bfd_elf,bfd_from_remote_memory)): New variables
-	X_SHDR_SHSTRTAB and I_SHDR_SHSTRTAB.  Fixed the CONTENTS_SIZE trimming
-	check for its aligned size between the last segment and still before
-	the section header end.  Added variables check to cover also the
-	section header string table.
-
---- gdb-7.4.50.20120120-orig/bfd/elfcode.h	2012-02-29 09:17:08.000000000 +0100
-+++ gdb-7.4.50.20120120/bfd/elfcode.h	2012-02-29 10:23:03.000000000 +0100
-@@ -1621,6 +1621,8 @@ NAME(_bfd_elf,bfd_from_remote_memory)
-   Elf_Internal_Ehdr i_ehdr;	/* Elf file header, internal form */
-   Elf_External_Phdr *x_phdrs;
-   Elf_Internal_Phdr *i_phdrs, *last_phdr;
-+  Elf_External_Shdr *x_shdrs;
-+  Elf_Internal_Shdr *i_shdrs;
-   bfd *nbfd;
-   struct bfd_in_memory *bim;
-   int contents_size;
-@@ -1740,24 +1742,46 @@ NAME(_bfd_elf,bfd_from_remote_memory)
- 
-   /* Trim the last segment so we don't bother with zeros in the last page
-      that are off the end of the file.  However, if the extra bit in that
--     page includes the section headers, keep them.  */
--  if ((bfd_vma) contents_size > last_phdr->p_offset + last_phdr->p_filesz
--      && (bfd_vma) contents_size >= (i_ehdr.e_shoff
--				     + i_ehdr.e_shnum * i_ehdr.e_shentsize))
-+     page includes the section headers os the section header string table,
-+     keep them.  */
-+  if ((bfd_vma) contents_size > last_phdr->p_offset + last_phdr->p_filesz)
-+    contents_size = last_phdr->p_offset + last_phdr->p_filesz;
-+
-+  if ((bfd_vma) contents_size < i_ehdr.e_shoff
-+				+ i_ehdr.e_shnum * i_ehdr.e_shentsize)
-+    contents_size = i_ehdr.e_shoff + i_ehdr.e_shnum * i_ehdr.e_shentsize;
-+
-+  /* Verify also all the sections fit into CONTENTS_SIZE.  */
-+
-+  x_shdrs = bfd_malloc (i_ehdr.e_shnum * (sizeof *x_shdrs + sizeof *i_shdrs));
-+  if (x_shdrs == NULL)
-     {
--      contents_size = last_phdr->p_offset + last_phdr->p_filesz;
--      if ((bfd_vma) contents_size < (i_ehdr.e_shoff
--				     + i_ehdr.e_shnum * i_ehdr.e_shentsize))
--	contents_size = i_ehdr.e_shoff + i_ehdr.e_shnum * i_ehdr.e_shentsize;
-+      free (x_phdrs);
-+      bfd_set_error (bfd_error_no_memory);
-+      return NULL;
-     }
-+  err = target_read_memory (ehdr_vma + i_ehdr.e_shoff, (bfd_byte *) x_shdrs,
-+			    i_ehdr.e_shnum * sizeof *x_shdrs);
-+  if (err)
-+    i_shdrs = NULL;
-   else
--    contents_size = last_phdr->p_offset + last_phdr->p_filesz;
-+    {
-+      i_shdrs = (Elf_Internal_Shdr *) &x_shdrs[i_ehdr.e_shnum];
-+      for (i = 0; i < i_ehdr.e_shnum; ++i)
-+	{
-+	  elf_swap_shdr_in (templ, &x_shdrs[i], &i_shdrs[i]);
-+
-+	  if ((bfd_vma) contents_size < i_shdrs[i].sh_offset + i_shdrs[i].sh_size)
-+	    contents_size = i_shdrs[i].sh_offset + i_shdrs[i].sh_size;
-+	}
-+    }
- 
-   /* Now we know the size of the whole image we want read in.  */
-   contents = (bfd_byte *) bfd_zmalloc (contents_size);
-   if (contents == NULL)
-     {
-       free (x_phdrs);
-+      free (x_shdrs);
-       bfd_set_error (bfd_error_no_memory);
-       return NULL;
-     }
-@@ -1776,6 +1800,7 @@ NAME(_bfd_elf,bfd_from_remote_memory)
- 	if (err)
- 	  {
- 	    free (x_phdrs);
-+	    free (x_shdrs);
- 	    free (contents);
- 	    bfd_set_error (bfd_error_system_call);
- 	    errno = err;
-@@ -1784,10 +1809,32 @@ NAME(_bfd_elf,bfd_from_remote_memory)
-       }
-   free (x_phdrs);
- 
--  /* If the segments visible in memory didn't include the section headers,
-+  if (i_shdrs)
-+    {
-+      memcpy (contents + i_ehdr.e_shoff, x_shdrs,
-+	      i_ehdr.e_shnum * sizeof *x_shdrs);
-+
-+      for (i = 0; i < i_ehdr.e_shnum; ++i)
-+	{
-+	  bfd_vma start = i_shdrs[i].sh_offset;
-+	  bfd_vma end = i_shdrs[i].sh_offset + i_shdrs[i].sh_size;
-+
-+	  if (end > (bfd_vma) contents_size)
-+	    end = contents_size;
-+	  err = target_read_memory (ehdr_vma + start, contents + start,
-+				    end - start);
-+	  if (err)
-+	    {
-+	      i_shdrs = NULL;
-+	      break;
-+	    }
-+	}
-+    }
-+  free (x_shdrs);
-+
-+  /* If the segments readable in memory didn't include the section headers,
-      then clear them from the file header.  */
--  if ((bfd_vma) contents_size < (i_ehdr.e_shoff
--				 + i_ehdr.e_shnum * i_ehdr.e_shentsize))
-+  if (i_shdrs == NULL)
-     {
-       memset (&x_ehdr.e_shoff, 0, sizeof x_ehdr.e_shoff);
-       memset (&x_ehdr.e_shnum, 0, sizeof x_ehdr.e_shnum);
diff --git a/gdb-python-stacksmash.patch b/gdb-python-stacksmash.patch
deleted file mode 100644
index de241c8..0000000
--- a/gdb-python-stacksmash.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-http://sourceware.org/ml/gdb-patches/2014-02/msg00216.html
-Subject: [patch] [python] Re: GDB crashing on gdb.python/py-linetable.exp
-
-
---7AUc2qLy4jB3hD7Z
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-
-On Fri, 07 Feb 2014 11:45:04 +0100, Phil Muldoon wrote:
-> I've tried most of the morning to reproduce this on Fedora 19, with
-> -lmcheck and after several thousand test runs I can't reproduce.
-
-Due to the requirement of specific stack layout I found it is reproducible for
-me on Fedora 20 x86_64 with (it sure could be reduced):
-
-CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches  -m64 -mtune=generic" LDFLAGS="-static-libstdc++ -static-libgcc -Wl,-z,relro" ./configure --with-system-readline;make
-(ulimit -c unlimited;/usr/bin/runtest gdb.python/py-linetable.exp)
-
-The fix is obvious, I will check it in.
-
--  int py_line;
-+  gdb_py_longest py_line;
-[...]
-
-
-
-Regards,
-Jan
-
---7AUc2qLy4jB3hD7Z
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline; filename=1
-
-gdb/
-2014-02-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	Fix Python stack corruption.
-	* python/py-linetable.c (ltpy_get_pcs_for_line, ltpy_has_line): Use
-	gdb_py_longest.
-
-diff --git a/gdb/python/py-linetable.c b/gdb/python/py-linetable.c
-index e83d46d..8b5362b 100644
---- a/gdb/python/py-linetable.c
-+++ b/gdb/python/py-linetable.c
-@@ -168,7 +168,7 @@ static PyObject *
- ltpy_get_pcs_for_line (PyObject *self, PyObject *args)
- {
-   struct symtab *symtab;
--  int py_line;
-+  gdb_py_longest py_line;
-   struct linetable_entry *best_entry = NULL;
-   linetable_entry_object *result;
-   VEC (CORE_ADDR) *pcs = NULL;
-@@ -200,7 +200,7 @@ static PyObject *
- ltpy_has_line (PyObject *self, PyObject *args)
- {
-   struct symtab *symtab;
--  int py_line;
-+  gdb_py_longest py_line;
-   int index;
- 
-   LTPY_REQUIRE_VALID (self, symtab);
-
---7AUc2qLy4jB3hD7Z--
-
diff --git a/gdb-rhel5-gcc44.patch b/gdb-rhel5-gcc44.patch
deleted file mode 100644
index 79f1fcd..0000000
--- a/gdb-rhel5-gcc44.patch
+++ /dev/null
@@ -1,431 +0,0 @@
-Some functionality is available on RHEL-5.4+ only with gcc44 and gfortran44 as
-the default gcc and gfortran binaries are from gcc-4.1.
-
-Index: gdb-7.6.90.20140127/gdb/testsuite/gdb.base/vla.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/gdb.base/vla.exp	2014-02-06 18:26:05.115083077 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/gdb.base/vla.exp	2014-02-06 18:26:06.689084765 +0100
-@@ -16,7 +16,25 @@
- set testfile vla
- set srcfile ${testfile}.c
- set binfile ${objdir}/${subdir}/${testfile}
--if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-+# Temporarily provide compiler=gcc44 saving the original value around.
-+
-+set board [target_info name]
-+if [board_info $board exists compiler] {
-+    set old_compiler [board_info $board compiler]
-+    unset_board_info compiler
-+} elseif [info exists old_compiler] {
-+    unset old_compiler
-+}
-+set_board_info compiler gcc44
-+
-+set err [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug quiet}]
-+
-+unset_board_info compiler
-+if [info exists old_compiler] {
-+    set_board_info compiler $old_compiler
-+}
-+
-+if  { $err != "" } {
-     untested "Couldn't compile test program"
-     return -1
- }
-Index: gdb-7.6.90.20140127/gdb/testsuite/gdb.base/break-interp.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/gdb.base/break-interp.exp	2014-02-06 18:26:05.116083078 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/gdb.base/break-interp.exp	2014-02-06 18:26:06.689084765 +0100
-@@ -34,9 +34,29 @@ if [get_compiler_info] {
-     return -1
- }
- 
-+# Temporarily provide compiler=gcc44 saving the original value around.
-+# RHEL-5 workaround of its:
-+#   gcc: -soname: linker input file unused because linking not done
-+
-+set board [target_info name]
-+if [board_info $board exists compiler] {
-+    set old_compiler [board_info $board compiler]
-+    unset_board_info compiler
-+} elseif [info exists old_compiler] {
-+    unset old_compiler
-+}
-+set_board_info compiler gcc44
-+
- # Use -soname so that the new library gets copied by build_executable_own_libs.
- 
--if {[gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} [list debug ldflags=-Wl,-soname,${test}.so]] != ""} {
-+set err [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} [list debug ldflags=-Wl,-soname,${test}.so]]
-+
-+unset_board_info compiler
-+if [info exists old_compiler] {
-+    set_board_info compiler $old_compiler
-+}
-+
-+if { $err != "" } {
-     return -1
- }
- 
-Index: gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/common-block.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/gdb.fortran/common-block.exp	2014-02-06 18:26:05.116083078 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/common-block.exp	2014-02-06 18:26:06.690084760 +0100
-@@ -22,8 +22,25 @@ if {[skip_fortran_tests]} {
- 
- standard_testfile .f90
- 
--if {[prepare_for_testing ${testfile}.exp ${testfile} \
--	 $srcfile {debug f90 quiet}]} {
-+# Temporarily provide f90compiler=gfortran44 saving the original value around.
-+
-+set board [target_info name]
-+if [board_info $board exists f90compiler] {
-+    set old_f90compiler [board_info $board f90compiler]
-+    unset_board_info f90compiler
-+} elseif [info exists old_f90compiler] {
-+    unset old_f90compiler
-+}
-+set_board_info f90compiler gfortran44
-+
-+set err [prepare_for_testing ${testfile}.exp ${testfile} $srcfile {debug f90 quiet}]
-+
-+unset_board_info f90compiler
-+if [info exists old_f90compiler] {
-+    set_board_info f90compiler $old_f90compiler
-+}
-+
-+if {$err} {
-     return -1
- }
- 
-Index: gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/dwarf-stride.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/gdb.fortran/dwarf-stride.exp	2014-02-06 18:26:05.117083079 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/dwarf-stride.exp	2014-02-06 18:26:06.690084760 +0100
-@@ -27,7 +27,25 @@
- set testfile dwarf-stride
- set srcfile ${testfile}.f90
- 
--if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}] } {
-+# Temporarily provide f90compiler=gfortran44 saving the original value around.
-+
-+set board [target_info name]
-+if [board_info $board exists f90compiler] {
-+    set old_f90compiler [board_info $board f90compiler]
-+    unset_board_info f90compiler 
-+} elseif [info exists old_f90compiler] {
-+    unset old_f90compiler
-+} 
-+set_board_info f90compiler gfortran44
-+
-+set err [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90}]
-+
-+unset_board_info f90compiler
-+if [info exists old_f90compiler] {
-+    set_board_info f90compiler $old_f90compiler
-+}
-+
-+if $err {
-     return -1
- }
- 
-Index: gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/dynamic.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/gdb.fortran/dynamic.exp	2014-02-06 18:26:05.117083079 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/dynamic.exp	2014-02-06 18:26:06.690084760 +0100
-@@ -25,7 +25,25 @@ set testfile "dynamic"
- set srcfile ${testfile}.f90
- set binfile ${objdir}/${subdir}/${testfile}
- 
--if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f90 quiet}] != "" } {
-+# Temporarily provide f90compiler=gfortran44 saving the original value around.
-+
-+set board [target_info name]
-+if [board_info $board exists f90compiler] {
-+    set old_f90compiler [board_info $board f90compiler]
-+    unset_board_info f90compiler
-+} elseif [info exists old_f90compiler] {
-+    unset old_f90compiler
-+}
-+set_board_info f90compiler gfortran44
-+
-+set err [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f90 quiet}]
-+
-+unset_board_info f90compiler
-+if [info exists old_f90compiler] {
-+    set_board_info f90compiler $old_f90compiler
-+}
-+
-+if  { $err != "" } {
-     untested "Couldn't compile ${srcfile}"
-     return -1
- }
-Index: gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/library-module.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/gdb.fortran/library-module.exp	2014-02-06 18:26:05.117083079 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/library-module.exp	2014-02-06 18:26:06.690084760 +0100
-@@ -23,16 +23,34 @@ if [get_compiler_info] {
-    return -1
- }
- 
--if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $libfile {debug f90}] != "" } {
--    untested "Couldn't compile ${srclibfile}"
--    return -1
-+# Temporarily provide f90compiler=gfortran44 saving the original value around.
-+
-+set board [target_info name]
-+if [board_info $board exists f90compiler] {
-+    set old_f90compiler [board_info $board f90compiler]
-+    unset_board_info f90compiler
-+} elseif [info exists old_f90compiler] {
-+    unset old_f90compiler
- }
-+set_board_info f90compiler gfortran44
- 
- # prepare_for_testing cannot be used as linking with $libfile cannot be passed
- # just for the linking phase (and not the source compilation phase).  And any
- # warnings on ignored $libfile abort the process.
- 
--if  { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debug f90 shlib=$libfile]] != "" } {
-+set err1 [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $libfile {debug f90}]
-+set err2 [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debug f90 shlib=$libfile]]
-+
-+unset_board_info f90compiler
-+if [info exists old_f90compiler] {
-+    set_board_info f90compiler $old_f90compiler
-+}
-+
-+if  { $err1 != "" } {
-+    untested "Couldn't compile ${srclibfile}"
-+    return -1
-+}
-+if  { $err2 != "" } {
-     untested "Couldn't compile ${srcfile}"
-     return -1
- }
-Index: gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/module.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/gdb.fortran/module.exp	2014-02-06 18:26:05.118083080 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/module.exp	2014-02-06 18:26:06.690084760 +0100
-@@ -15,7 +15,25 @@
- 
- standard_testfile .f90
- 
--if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}] } {
-+# Temporarily provide f90compiler=gfortran44 saving the original value around.
-+
-+set board [target_info name]
-+if [board_info $board exists f90compiler] {
-+    set old_f90compiler [board_info $board f90compiler]
-+    unset_board_info f90compiler
-+} elseif [info exists old_f90compiler] {
-+    unset old_f90compiler
-+}
-+set_board_info f90compiler gfortran44
-+
-+set err [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]
-+
-+unset_board_info f90compiler
-+if [info exists old_f90compiler] {
-+    set_board_info f90compiler $old_f90compiler
-+}
-+
-+if $err {
-     return -1
- }
- 
-Index: gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/string.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/gdb.fortran/string.exp	2014-02-06 18:26:05.118083080 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/string.exp	2014-02-06 18:26:06.691084763 +0100
-@@ -23,7 +23,25 @@ set testfile "string"
- set srcfile ${testfile}.f90
- set binfile ${objdir}/${subdir}/${testfile}
- 
--if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f90 quiet}] != "" } {
-+# Temporarily provide f90compiler=gfortran44 saving the original value around.
-+
-+set board [target_info name]
-+if [board_info $board exists f90compiler] {
-+    set old_f90compiler [board_info $board f90compiler]
-+    unset_board_info f90compiler
-+} elseif [info exists old_f90compiler] {
-+    unset old_f90compiler
-+}
-+set_board_info f90compiler gfortran44
-+
-+set err [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug f90 quiet}]
-+
-+unset_board_info f90compiler
-+if [info exists old_f90compiler] {
-+    set_board_info f90compiler $old_f90compiler
-+}
-+
-+if { $err != "" } {
-     untested "Couldn't compile ${srcfile}"
-     return -1
- }
-Index: gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/omp-step.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/gdb.fortran/omp-step.exp	2014-02-06 18:26:05.118083080 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/omp-step.exp	2014-02-06 18:26:06.691084763 +0100
-@@ -15,7 +15,26 @@
- 
- set testfile "omp-step"
- set srcfile ${testfile}.f90
--if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90 additional_flags=-fopenmp}] } {
-+
-+# Temporarily provide f90compiler=gfortran44 saving the original value around.
-+
-+set board [target_info name]
-+if [board_info $board exists f90compiler] {
-+    set old_f90compiler [board_info $board f90compiler]
-+    unset_board_info f90compiler 
-+} elseif [info exists old_f90compiler] {
-+    unset old_f90compiler
-+} 
-+set_board_info f90compiler gfortran44
-+
-+set err [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug f90 additional_flags=-fopenmp}]
-+
-+unset_board_info f90compiler
-+if [info exists old_f90compiler] {
-+    set_board_info f90compiler $old_f90compiler
-+}
-+
-+if $err {
-     return -1
- }
- 
-Index: gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/derived-type.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/gdb.fortran/derived-type.exp	2014-02-06 18:26:05.119083082 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/derived-type.exp	2014-02-06 18:26:06.691084763 +0100
-@@ -22,7 +22,25 @@ if { [skip_fortran_tests] } { return -1
- 
- standard_testfile .f90
- 
--if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
-+# Temporarily provide f90compiler=gfortran44 saving the original value around.
-+
-+set board [target_info name]
-+if [board_info $board exists f90compiler] {
-+    set old_f90compiler [board_info $board f90compiler]
-+    unset_board_info f90compiler
-+} elseif [info exists old_f90compiler] {
-+    unset old_f90compiler
-+}
-+set_board_info f90compiler gfortran44
-+
-+set err [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]
-+
-+unset_board_info f90compiler
-+if [info exists old_f90compiler] {
-+    set_board_info f90compiler $old_f90compiler
-+}
-+
-+if $err {
-     return -1
- }
- 
-Index: gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/subarray.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/gdb.fortran/subarray.exp	2014-02-06 18:26:05.119083082 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/gdb.fortran/subarray.exp	2014-02-06 18:26:06.691084763 +0100
-@@ -22,7 +22,25 @@ if { [skip_fortran_tests] } { return -1
- 
- standard_testfile .f
- 
--if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]} {
-+# Temporarily provide f90compiler=gfortran44 saving the original value around.
-+
-+set board [target_info name]
-+if [board_info $board exists f90compiler] {
-+    set old_f90compiler [board_info $board f90compiler]
-+    unset_board_info f90compiler
-+} elseif [info exists old_f90compiler] {
-+    unset old_f90compiler
-+}
-+set_board_info f90compiler gfortran44
-+
-+set err [prepare_for_testing $testfile.exp $testfile $srcfile {debug f90}]
-+
-+unset_board_info f90compiler
-+if [info exists old_f90compiler] {
-+    set_board_info f90compiler $old_f90compiler
-+}
-+
-+if $err {
-     return -1
- }
- 
-Index: gdb-7.6.90.20140127/gdb/testsuite/gdb.threads/tls-sepdebug.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/gdb.threads/tls-sepdebug.exp	2014-02-06 18:26:05.119083082 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/gdb.threads/tls-sepdebug.exp	2014-02-06 18:26:06.691084763 +0100
-@@ -32,7 +32,25 @@ set binshareddebugfile ${objdir}/${subdi
- 
- # FIXME: gcc dependency (-Wl,-soname).
- 
--if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srcsharedfile}" "${binsharedfile}" [list debug additional_flags=-Wl,-soname=${binsharedbase}]] != "" } {
-+# Temporarily provide compiler=gcc44 saving the original value around.
-+
-+set board [target_info name]
-+if [board_info $board exists compiler] {
-+    set old_compiler [board_info $board compiler]
-+    unset_board_info compiler
-+} elseif [info exists old_compiler] {
-+    unset old_compiler
-+}
-+set_board_info compiler gcc44
-+
-+set err [gdb_compile_shlib "${srcdir}/${subdir}/${srcsharedfile}" "${binsharedfile}" [list debug additional_flags=-Wl,-soname=${binsharedbase}]]
-+
-+unset_board_info compiler
-+if [info exists old_compiler] {
-+    set_board_info compiler $old_compiler
-+}
-+
-+if { $err != "" } {
-     untested "Couldn't compile test library"
-     return -1
- }
-Index: gdb-7.6.90.20140127/gdb/testsuite/lib/prelink-support.exp
-===================================================================
---- gdb-7.6.90.20140127.orig/gdb/testsuite/lib/prelink-support.exp	2014-02-06 18:26:06.692084767 +0100
-+++ gdb-7.6.90.20140127/gdb/testsuite/lib/prelink-support.exp	2014-02-06 18:27:44.960190192 +0100
-@@ -118,9 +118,31 @@ proc file_copy {src dest} {
- proc build_executable_own_libs {testname executable sources options {interp ""} {dir ""}} {
-     global subdir
- 
--    if {[build_executable $testname $executable $sources $options] == -1} {
--	return ""
-+    # Temporarily provide compiler=gcc44 saving the original value around.
-+    # RHEL-5 workaround of its:
-+    #   gcc: -rpath: linker input file unused because linking not done
-+    #   gcc: --dynamic-linker: linker input file unused because linking not done
-+
-+    set board [target_info name]
-+    if [board_info $board exists compiler] {
-+	set old_compiler [board_info $board compiler]
-+	unset_board_info compiler
-+    } elseif [info exists old_compiler] {
-+	unset old_compiler
-+    }
-+    set_board_info compiler gcc44
-+
-+    set err [build_executable $testname $executable $sources $options]
-+
-+    unset_board_info compiler
-+    if [info exists old_compiler] {
-+	set_board_info compiler $old_compiler
-     }
-+
-+    if { $err == -1 } {
-+	return ""   
-+    }
-+
-     set binfile [standard_output_file ${executable}]
- 
-     set ldd [gdb_find_ldd]
diff --git a/gdb-testsuite-nohostid.patch b/gdb-testsuite-nohostid.patch
deleted file mode 100644
index 6e02a47..0000000
--- a/gdb-testsuite-nohostid.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-http://sourceware.org/ml/gdb-patches/2014-02/msg00158.html
-Subject: [patch] testsuite: Fix "ERROR: no fileid for"
-
-
---azLHFNyN32YCQGCU
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-
-Hi,
-
-a35cfb4007cee8cb84106412cd17f4e12f13345b is the first bad commit
-commit a35cfb4007cee8cb84106412cd17f4e12f13345b
-Author: Maciej W. Rozycki <macro@codesourcery.com>
-Date:   Thu Oct 24 23:32:30 2013 +0100
-
-$ runtest gdb.base/solib-disc.exp
-Running ./gdb.base/solib-disc.exp ...
-ERROR: no fileid for host1
-[...]
-
-
-Jan
-
---azLHFNyN32YCQGCU
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline; filename="gdbfinish.patch"
-
-gdb/testsuite/
-2014-02-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
-
-	Fix "ERROR: no fileid for" in the testsuite.
-	* lib/gdb.exp (gdb_finish): Check gdb_spawn_id.
-
-diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
-index 533b81b..5c53cdf 100644
---- a/gdb/testsuite/lib/gdb.exp
-+++ b/gdb/testsuite/lib/gdb.exp
-@@ -3708,7 +3708,8 @@ proc gdb_finish { } {
-     global cleanfiles
- 
-     # Give persistent gdbserver a chance to terminate before GDB is killed.
--    if {[info exists gdbserver_reconnect_p] && $gdbserver_reconnect_p} {
-+    if {[info exists gdbserver_reconnect_p] && $gdbserver_reconnect_p
-+	&& [info exists gdb_spawn_id]} {
- 	send_gdb "kill\n";
- 	gdb_expect 10 {
- 	    -re "y or n" {
-
---azLHFNyN32YCQGCU--
-