6 files changed, 91 insertions, 34 deletions

diff --git a/devel/gdb/files/patch-bfd-coffcode.h b/devel/gdb/files/patch-bfd-coffcode.h
new file mode 100644
index 000000000000..5a6fcf04de5a
--- /dev/null
+++ b/devel/gdb/files/patch-bfd-coffcode.h
@@ -0,0 +1,11 @@
+--- bfd/coffcode.h.orig	2012-12-18 14:22:56.000000000 +0100
++++ bfd/coffcode.h	2012-12-18 14:23:11.000000000 +0100
+@@ -3442,7 +3442,7 @@
+ 	 incremented in coff_set_section_contents.  This is right for
+ 	 SVR3.2.  */
+       if (strcmp (current->name, _LIB) == 0)
+-	bfd_set_section_vma (abfd, current, 0);
++	(void)bfd_set_section_vma (abfd, current, 0);
+ #endif
+ 
+ #ifdef ALIGN_SECTIONS_IN_FILE
diff --git a/devel/gdb/files/patch-bfd-configure b/devel/gdb/files/patch-bfd-configure
deleted file mode 100644
index ed62a66ac0d8..000000000000
--- a/devel/gdb/files/patch-bfd-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- bfd/configure.orig	2011-03-28 13:18:25.000000000 +0200
-+++ bfd/configure	2012-01-12 16:58:05.000000000 +0100
-@@ -12177,7 +12177,13 @@
- 
- # Enable -Werror by default when using gcc
- if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
--    ERROR_ON_WARNING=yes
-+    if test "${CC}" = clang ; then
-+	echo "clang compiler - disabling -Werror"
-+	ERROR_ON_WARNING=no
-+    else
-+	echo "gcc compiler - enabling -Werror"
-+	ERROR_ON_WARNING=yes
-+    fi
- fi
- 
- NO_WERROR=
diff --git a/devel/gdb/files/patch-bfd-opncls.c b/devel/gdb/files/patch-bfd-opncls.c
new file mode 100644
index 000000000000..16930b80441d
--- /dev/null
+++ b/devel/gdb/files/patch-bfd-opncls.c
@@ -0,0 +1,11 @@
+--- bfd/opncls.c.orig	2012-12-18 14:18:47.000000000 +0100
++++ bfd/opncls.c	2012-12-18 14:19:18.000000000 +0100
+@@ -254,7 +254,7 @@
+      then it may have been opened with special flags that make it
+      unsafe to close and reopen the file.  */
+   if (fd == -1)
+-    bfd_set_cacheable (nbfd, TRUE);
++    (void)bfd_set_cacheable (nbfd, TRUE);
+ 
+   return nbfd;
+ }
diff --git a/devel/gdb/files/patch-bfd-peicode.h b/devel/gdb/files/patch-bfd-peicode.h
new file mode 100644
index 000000000000..3e2413016643
--- /dev/null
+++ b/devel/gdb/files/patch-bfd-peicode.h
@@ -0,0 +1,11 @@
+--- bfd/peicode.h.orig	2012-12-18 14:22:02.000000000 +0100
++++ bfd/peicode.h	2012-12-18 14:22:21.000000000 +0100
+@@ -602,7 +602,7 @@
+ 
+   bfd_set_section_flags (vars->abfd, sec, flags | extra_flags);
+ 
+-  bfd_set_section_alignment (vars->abfd, sec, 2);
++  (void)bfd_set_section_alignment (vars->abfd, sec, 2);
+ 
+   /* Check that we will not run out of space.  */
+   BFD_ASSERT (vars->data + size < vars->bim->buffer + vars->bim->size);
diff --git a/devel/gdb/files/patch-opcodes-configure b/devel/gdb/files/patch-opcodes-configure
deleted file mode 100644
index a244a6bf4355..000000000000
--- a/devel/gdb/files/patch-opcodes-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- opcodes/configure.orig	2012-04-27 10:20:25.000000000 +0200
-+++ opcodes/configure	2012-04-27 10:24:01.000000000 +0200
-@@ -11525,7 +11525,13 @@
- 
- # Enable -Werror by default when using gcc
- if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
--    ERROR_ON_WARNING=yes
-+    if test "${CC}" = clang ; then
-+	echo "clang compiler - disabling -Werror"
-+	ERROR_ON_WARNING=no
-+    else
-+	echo "gcc compiler - enabling -Werror"
-+    	ERROR_ON_WARNING=yes
-+    fi
- fi
- 
- NO_WERROR=
diff --git a/devel/gdb/files/patch-opcodes-i386-dis.c b/devel/gdb/files/patch-opcodes-i386-dis.c
new file mode 100644
index 000000000000..49f4588f24b7
--- /dev/null
+++ b/devel/gdb/files/patch-opcodes-i386-dis.c
@@ -0,0 +1,58 @@
+--- opcodes/i386-dis.c.orig	2012-07-16 14:58:29.000000000 +0200
++++ opcodes/i386-dis.c	2012-12-18 15:22:10.000000000 +0100
+@@ -11991,7 +11991,7 @@
+ static void
+ OP_ST (int bytemode ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
+ {
+-  oappend ("%st" + intel_syntax);
++  oappend (&"%st"[(short)intel_syntax]);
+ }
+ 
+ static void
+@@ -12520,32 +12520,32 @@
+   if (prefixes & PREFIX_CS)
+     {
+       used_prefixes |= PREFIX_CS;
+-      oappend ("%cs:" + intel_syntax);
++      oappend (&"%cs:"[(short)intel_syntax]);
+     }
+   if (prefixes & PREFIX_DS)
+     {
+       used_prefixes |= PREFIX_DS;
+-      oappend ("%ds:" + intel_syntax);
++      oappend (&"%ds:"[(short)intel_syntax]);
+     }
+   if (prefixes & PREFIX_SS)
+     {
+       used_prefixes |= PREFIX_SS;
+-      oappend ("%ss:" + intel_syntax);
++      oappend (&"%ss:"[(short)intel_syntax]);
+     }
+   if (prefixes & PREFIX_ES)
+     {
+       used_prefixes |= PREFIX_ES;
+-      oappend ("%es:" + intel_syntax);
++      oappend (&"%es:"[(short)intel_syntax]);
+     }
+   if (prefixes & PREFIX_FS)
+     {
+       used_prefixes |= PREFIX_FS;
+-      oappend ("%fs:" + intel_syntax);
++      oappend (&"%fs:"[(short)intel_syntax]);
+     }
+   if (prefixes & PREFIX_GS)
+     {
+       used_prefixes |= PREFIX_GS;
+-      oappend ("%gs:" + intel_syntax);
++      oappend (&"%gs:"[(short)intel_syntax]);
+     }
+ }
+ 
+@@ -13876,7 +13876,7 @@
+ 	  intel_operand_size (b_mode, sizeflag);
+ 	}
+     }
+-  oappend ("%es:" + intel_syntax);
++  oappend (&"%es:"[(short)intel_syntax]);
+   ptr_reg (code, sizeflag);
+ }