binutils: Delete recipes for 2.22

We have 2.23.1 as default now.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

37 files changed, 0 insertions, 25429 deletions

diff --git a/meta/recipes-devtools/binutils/binutils-2.22.inc b/meta/recipes-devtools/binutils/binutils-2.22.inc
deleted file mode 100644
index 9697242379..0000000000
--- a/meta/recipes-devtools/binutils/binutils-2.22.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-PR = "r17"
-
-LIC_FILES_CHKSUM="\
-    file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\
-    file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
-    file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674\
-    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504\
-    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6\
-    file://gas/COPYING;md5=d32239bcb673463ab874e80d47fae504\
-    file://include/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
-    file://include/COPYING3;md5=d32239bcb673463ab874e80d47fae504\
-    file://libiberty/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7\
-    file://bfd/COPYING;md5=d32239bcb673463ab874e80d47fae504\
-    "
-
-SRC_URI = "\
-     ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
-     file://binutils-uclibc-100-uclibc-conf.patch \
-     file://binutils-uclibc-300-001_ld_makefile_patch.patch \
-     file://binutils-uclibc-300-006_better_file_error.patch \
-     file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
-     file://binutils-uclibc-gas-needs-libm.patch \
-     file://binutils-x86_64_i386_biarch.patch \
-     file://libtool-2.4-update.patch \
-     file://binutils-2.19.1-ld-sysroot.patch \
-     file://libiberty_path_fix.patch \
-     file://binutils-poison.patch \
-     file://libtool-rpath-fix.patch \
-     file://clone-shadow.patch \
-     file://binutils-powerpc-e5500.patch \
-     file://binutils-armv5e.patch \
-     file://mips64-default-ld-emulation.patch \
-     file://0001-PR-ld-13470.patch \
-     file://rpath-sysroot.patch \
-     file://0006-mips-dis.c-print_insn_micromips-Rename-local-variabl.patch \
-     file://0019-PR-ld-13468.patch \
-     file://0028-Backport-from-mainline.patch \
-     file://0035-2011-12-19-Chung-Lin-Tang-cltang-codesourcery.com.patch \
-     file://0036-2011-12-19-Chung-Lin-Tang-cltang-codesourcery.com.patch \
-     file://0037-2011-12-19-Chung-Lin-Tang-cltang-codesourcery.com.patch \
-     file://0039-emulparams-elf32bmip.sh-OTHER_SECTIONS-Put-.mdebug.-.patch \
-     file://0052-gas.patch \
-     file://0055-Remove-ABI_64_P-check-on-R_X86_64_PCXX.patch \
-     file://0078-PR-binutils-13622.patch \
-     file://0144-timer.cc-include-unistd.h.patch \
-     file://0166-2012-04-27-Doug-Kwan-dougkwan-google.com.patch \
-     file://0182-PR-ld-13991.patch \
-     "
-
-SRC_URI[md5sum] = "ee0f10756c84979622b992a4a61ea3f5"
-SRC_URI[sha256sum] = "6c7af8ed1c8cf9b4b9d6e6fe09a3e1d3d479fe63984ba8b9b26bf356b6313ca9"
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb
deleted file mode 100644
index 5dbaa03017..0000000000
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require binutils.inc
-require binutils-${PV}.inc
-require binutils-cross-canadian.inc
diff --git a/meta/recipes-devtools/binutils/binutils-cross_2.22.bb b/meta/recipes-devtools/binutils/binutils-cross_2.22.bb
deleted file mode 100644
index fbd1f7d25a..0000000000
--- a/meta/recipes-devtools/binutils/binutils-cross_2.22.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require binutils.inc
-require binutils-${PV}.inc
-require binutils-cross.inc
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
deleted file mode 100644
index c93654992a..0000000000
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require binutils-cross_${PV}.bb
-
-inherit crosssdk
-
-PR = "r1"
-
-PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
-
-
-SRC_URI += "file://relocatable_sdk.patch"
-
-do_configure_prepend () {
-	sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt
-}
diff --git a/meta/recipes-devtools/binutils/binutils/0001-PR-ld-13470.patch b/meta/recipes-devtools/binutils/binutils/0001-PR-ld-13470.patch
deleted file mode 100644
index 0a0e064451..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0001-PR-ld-13470.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 82fdddd1c4e37881db9b4c6a944261521c6f10ac Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@bigpond.net.au>
-Date: Sat, 3 Dec 2011 00:57:59 +0000
-Subject: [PATCH] 	PR ld/13470 	* elf32-ppc.c
- (ppc_elf_copy_indirect_symbol): Revert substantive 
- change in 2011-07-01 commit.  Comment. 	*
- elf64-ppc.c (ppc64_elf_copy_indirect_symbol): Likewise.
-
----
- bfd/ChangeLog   |    7 +++++++
- bfd/elf32-ppc.c |   14 ++++++++++----
- bfd/elf64-ppc.c |   14 ++++++++++----
- 3 files changed, 27 insertions(+), 8 deletions(-)
-
-
-Upstream-Status: Backport
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Index: binutils-2.22/bfd/elf32-ppc.c
-===================================================================
---- binutils-2.22.orig/bfd/elf32-ppc.c	2011-11-21 01:29:21.000000000 -0800
-+++ binutils-2.22/bfd/elf32-ppc.c	2012-05-31 14:28:48.273784929 -0700
-@@ -2987,10 +2987,6 @@
-   edir->elf.needs_plt |= eind->elf.needs_plt;
-   edir->elf.pointer_equality_needed |= eind->elf.pointer_equality_needed;
- 
--  /* If we were called to copy over info for a weak sym, that's all.  */
--  if (eind->elf.root.type != bfd_link_hash_indirect)
--    return;
--
-   if (eind->dyn_relocs != NULL)
-     {
-       if (edir->dyn_relocs != NULL)
-@@ -3022,6 +3018,16 @@
-       eind->dyn_relocs = NULL;
-     }
- 
-+  /* If we were called to copy over info for a weak sym, that's all.
-+     You might think dyn_relocs need not be copied over;  After all,
-+     both syms will be dynamic or both non-dynamic so we're just
-+     moving reloc accounting around.  However, ELIMINATE_COPY_RELOCS 
-+     code in ppc_elf_adjust_dynamic_symbol needs to check for
-+     dyn_relocs in read-only sections, and it does so on what is the
-+     DIR sym here.  */
-+  if (eind->elf.root.type != bfd_link_hash_indirect)
-+    return;
-+
-   /* Copy over the GOT refcount entries that we may have already seen to
-      the symbol which just became indirect.  */
-   edir->elf.got.refcount += eind->elf.got.refcount;
-Index: binutils-2.22/bfd/elf64-ppc.c
-===================================================================
---- binutils-2.22.orig/bfd/elf64-ppc.c	2011-11-21 01:29:24.000000000 -0800
-+++ binutils-2.22/bfd/elf64-ppc.c	2012-05-31 14:28:48.285784951 -0700
-@@ -4435,10 +4435,6 @@
-   edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak;
-   edir->elf.needs_plt |= eind->elf.needs_plt;
- 
--  /* If we were called to copy over info for a weak sym, that's all.  */
--  if (eind->elf.root.type != bfd_link_hash_indirect)
--    return;
--
-   /* Copy over any dynamic relocs we may have on the indirect sym.  */
-   if (eind->dyn_relocs != NULL)
-     {
-@@ -4471,6 +4467,16 @@
-       eind->dyn_relocs = NULL;
-     }
- 
-+  /* If we were called to copy over info for a weak sym, that's all.
-+     You might think dyn_relocs need not be copied over;  After all,
-+     both syms will be dynamic or both non-dynamic so we're just
-+     moving reloc accounting around.  However, ELIMINATE_COPY_RELOCS 
-+     code in ppc64_elf_adjust_dynamic_symbol needs to check for
-+     dyn_relocs in read-only sections, and it does so on what is the
-+     DIR sym here.  */
-+  if (eind->elf.root.type != bfd_link_hash_indirect)
-+    return;
-+
-   /* Copy over got entries that we may have already seen to the
-      symbol which just became indirect.  */
-   if (eind->elf.got.glist != NULL)
diff --git a/meta/recipes-devtools/binutils/binutils/0006-mips-dis.c-print_insn_micromips-Rename-local-variabl.patch b/meta/recipes-devtools/binutils/binutils/0006-mips-dis.c-print_insn_micromips-Rename-local-variabl.patch
deleted file mode 100644
index 1baf1e839a..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0006-mips-dis.c-print_insn_micromips-Rename-local-variabl.patch
+++ /dev/null
@@ -1,634 +0,0 @@
-Upstream-Status: Backport
-
-From f72b2c498bc98f42048a3bf7f7d7891db9cabcfc Mon Sep 17 00:00:00 2001
-From: Pierre Muller <muller@ics.u-strasbg.fr>
-Date: Fri, 25 Nov 2011 16:57:32 +0000
-Subject: [PATCH 006/262] 	* mips-dis.c (print_insn_micromips): Rename
- local variable iprintf 	to infprintf to
- avoid shadow warning.
-
----
- opcodes/ChangeLog  |    5 ++
- opcodes/mips-dis.c |  188 ++++++++++++++++++++++++++--------------------------
- 2 files changed, 99 insertions(+), 94 deletions(-)
-
-2011-11-25  Pierre Muller  <muller@ics.u-strasbg.fr>
-
-	* mips-dis.c (print_insn_micromips): Rename local variable iprintf
-	to infprintf to avoid shadow warning.
-
-diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
-index 4e18d8a..72285de 100644
---- a/opcodes/mips-dis.c
-+++ b/opcodes/mips-dis.c
-@@ -2260,7 +2260,7 @@ print_insn_mips16 (bfd_vma memaddr, struct disassemble_info *info)
- static int
- print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
- {
--  const fprintf_ftype iprintf = info->fprintf_func;
-+  const fprintf_ftype infprintf = info->fprintf_func;
-   const struct mips_opcode *op, *opend;
-   unsigned int lsb, msbd, msb;
-   void *is = info->stream;
-@@ -2307,7 +2307,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
-       status = (*info->read_memory_func) (memaddr + 2, buffer, 2, info);
-       if (status != 0)
- 	{
--	  iprintf (is, "micromips 0x%x", higher);
-+	  infprintf (is, "micromips 0x%x", higher);
- 	  (*info->memory_error_func) (status, memaddr + 2, info);
- 	  return -1;
- 	}
-@@ -2320,7 +2320,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
-       status = (*info->read_memory_func) (memaddr + 4, buffer, 2, info);
-       if (status != 0)
- 	{
--	  iprintf (is, "micromips 0x%x", higher);
-+	  infprintf (is, "micromips 0x%x", higher);
- 	  (*info->memory_error_func) (status, memaddr + 4, info);
- 	  return -1;
- 	}
-@@ -2328,7 +2328,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
- 	insn = bfd_getb16 (buffer);
-       else
- 	insn = bfd_getl16 (buffer);
--      iprintf (is, "0x%x%04x (48-bit insn)", higher, insn);
-+      infprintf (is, "0x%x%04x (48-bit insn)", higher, insn);
- 
-       info->insn_type = dis_noninsn;
-       return 6;
-@@ -2341,7 +2341,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
-       status = (*info->read_memory_func) (memaddr + 2, buffer, 2, info);
-       if (status != 0)
- 	{
--	  iprintf (is, "micromips 0x%x", higher);
-+	  infprintf (is, "micromips 0x%x", higher);
- 	  (*info->memory_error_func) (status, memaddr + 2, info);
- 	  return -1;
- 	}
-@@ -2371,9 +2371,9 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
- 	{
- 	  const char *s;
- 
--	  iprintf (is, "%s", op->name);
-+	  infprintf (is, "%s", op->name);
- 	  if (op->args[0] != '\0')
--	    iprintf (is, "\t");
-+	    infprintf (is, "\t");
- 
- 	  for (s = op->args; *s != '\0'; s++)
- 	    {
-@@ -2382,37 +2382,37 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
- 		case ',':
- 		case '(':
- 		case ')':
--		  iprintf (is, "%c", *s);
-+		  infprintf (is, "%c", *s);
- 		  break;
- 
- 		case '.':
- 		  delta = GET_OP (insn, OFFSET10);
- 		  if (delta & 0x200)
- 		    delta |= ~0x3ff;
--		  iprintf (is, "%d", delta);
-+		  infprintf (is, "%d", delta);
- 		  break;
- 
- 		case '1':
--		  iprintf (is, "0x%lx", GET_OP (insn, STYPE));
-+		  infprintf (is, "0x%lx", GET_OP (insn, STYPE));
- 		  break;
- 
- 		case '<':
--		  iprintf (is, "0x%lx", GET_OP (insn, SHAMT));
-+		  infprintf (is, "0x%lx", GET_OP (insn, SHAMT));
- 		  break;
- 
- 		case '\\':
--		  iprintf (is, "0x%lx", GET_OP (insn, 3BITPOS));
-+		  infprintf (is, "0x%lx", GET_OP (insn, 3BITPOS));
- 		  break;
- 
- 		case '|':
--		  iprintf (is, "0x%lx", GET_OP (insn, TRAP));
-+		  infprintf (is, "0x%lx", GET_OP (insn, TRAP));
- 		  break;
- 
- 		case '~':
- 		  delta = GET_OP (insn, OFFSET12);
- 		  if (delta & 0x800)
- 		    delta |= ~0x7ff;
--		  iprintf (is, "%d", delta);
-+		  infprintf (is, "%d", delta);
- 		  break;
- 
- 		case 'a':
-@@ -2433,34 +2433,34 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
- 		case 'r':
- 		case 's':
- 		case 'v':
--		  iprintf (is, "%s", mips_gpr_names[GET_OP (insn, RS)]);
-+		  infprintf (is, "%s", mips_gpr_names[GET_OP (insn, RS)]);
- 		  break;
- 
- 		case 'c':
--		  iprintf (is, "0x%lx", GET_OP (insn, CODE));
-+		  infprintf (is, "0x%lx", GET_OP (insn, CODE));
- 		  break;
- 
- 		case 'd':
--		  iprintf (is, "%s", mips_gpr_names[GET_OP (insn, RD)]);
-+		  infprintf (is, "%s", mips_gpr_names[GET_OP (insn, RD)]);
- 		  break;
- 
- 		case 'h':
--		  iprintf (is, "0x%lx", GET_OP (insn, PREFX));
-+		  infprintf (is, "0x%lx", GET_OP (insn, PREFX));
- 		  break;
- 
- 		case 'i':
- 		case 'u':
--		  iprintf (is, "0x%lx", GET_OP (insn, IMMEDIATE));
-+		  infprintf (is, "0x%lx", GET_OP (insn, IMMEDIATE));
- 		  break;
- 
- 		case 'j': /* Same as i, but sign-extended.  */
- 		case 'o':
- 		  delta = (GET_OP (insn, DELTA) ^ 0x8000) - 0x8000;
--		  iprintf (is, "%d", delta);
-+		  infprintf (is, "%d", delta);
- 		  break;
- 
- 		case 'k':
--		  iprintf (is, "0x%x", GET_OP (insn, CACHE));
-+		  infprintf (is, "0x%x", GET_OP (insn, CACHE));
- 		  break;
- 
- 		case 'n':
-@@ -2472,26 +2472,26 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
- 		    if (s_reg_encode != 0)
- 		      {
- 			if (s_reg_encode == 1)
--			  iprintf (is, "%s", mips_gpr_names[16]);
-+			  infprintf (is, "%s", mips_gpr_names[16]);
- 			else if (s_reg_encode < 9)
--			  iprintf (is, "%s-%s",
-+			  infprintf (is, "%s-%s",
- 				   mips_gpr_names[16],
- 				   mips_gpr_names[15 + s_reg_encode]);
- 			else if (s_reg_encode == 9)
--			  iprintf (is, "%s-%s,%s",
-+			  infprintf (is, "%s-%s,%s",
- 				   mips_gpr_names[16],
- 				   mips_gpr_names[23],
- 				   mips_gpr_names[30]);
- 			else
--			  iprintf (is, "UNKNOWN");
-+			  infprintf (is, "UNKNOWN");
- 		      }
- 
- 		    if (immed & 0x10) /* For ra.  */
- 		      {
- 			if (s_reg_encode == 0)
--			  iprintf (is, "%s", mips_gpr_names[31]);
-+			  infprintf (is, "%s", mips_gpr_names[31]);
- 			else
--			  iprintf (is, ",%s", mips_gpr_names[31]);
-+			  infprintf (is, ",%s", mips_gpr_names[31]);
- 		      }
- 		    break;
- 		  }
-@@ -2504,32 +2504,32 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
- 		  break;
- 
- 		case 'q':
--		  iprintf (is, "0x%lx", GET_OP (insn, CODE2));
-+		  infprintf (is, "0x%lx", GET_OP (insn, CODE2));
- 		  break;
- 
- 		case 't':
- 		case 'w':
--		  iprintf (is, "%s", mips_gpr_names[GET_OP (insn, RT)]);
-+		  infprintf (is, "%s", mips_gpr_names[GET_OP (insn, RT)]);
- 		  break;
- 
- 		case 'y':
--		  iprintf (is, "%s", mips_gpr_names[GET_OP (insn, RS3)]);
-+		  infprintf (is, "%s", mips_gpr_names[GET_OP (insn, RS3)]);
- 		  break;
- 
- 		case 'z':
--		  iprintf (is, "%s", mips_gpr_names[0]);
-+		  infprintf (is, "%s", mips_gpr_names[0]);
- 		  break;
- 
- 		case 'B':
--		  iprintf (is, "0x%lx", GET_OP (insn, CODE10));
-+		  infprintf (is, "0x%lx", GET_OP (insn, CODE10));
- 		  break;
- 
- 		case 'C':
--		  iprintf (is, "0x%lx", GET_OP (insn, COPZ));
-+		  infprintf (is, "0x%lx", GET_OP (insn, COPZ));
- 		  break;
- 
- 		case 'D':
--		  iprintf (is, "%s", mips_fpr_names[GET_OP (insn, FD)]);
-+		  infprintf (is, "%s", mips_fpr_names[GET_OP (insn, FD)]);
- 		  break;
- 
- 		case 'E':
-@@ -2540,7 +2540,7 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
- 		    'T' format.  Therefore, until we gain understanding of
- 		    cp2 register names, we can simply print the register
- 		    numbers.  */
--		  iprintf (is, "$%ld", GET_OP (insn, RT));
-+		  infprintf (is, "$%ld", GET_OP (insn, RT));
- 		  break;
- 
- 		case 'G':
-@@ -2559,44 +2559,44 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
- 		    case 0x000002fc:				/* mtc0  */
- 		    case 0x580000fc:				/* dmfc0 */
- 		    case 0x580002fc:				/* dmtc0 */
--		      iprintf (is, "%s", mips_cp0_names[GET_OP (insn, RS)]);
-+		      infprintf (is, "%s", mips_cp0_names[GET_OP (insn, RS)]);
- 		      break;
- 		    default:
--		      iprintf (is, "$%ld", GET_OP (insn, RS));
-+		      infprintf (is, "$%ld", GET_OP (insn, RS));
- 		      break;
- 		    }
- 		  break;
- 
- 		case 'H':
--		  iprintf (is, "%ld", GET_OP (insn, SEL));
-+		  infprintf (is, "%ld", GET_OP (insn, SEL));
- 		  break;
- 
- 		case 'K':
--		  iprintf (is, "%s", mips_hwr_names[GET_OP (insn, RS)]);
-+		  infprintf (is, "%s", mips_hwr_names[GET_OP (insn, RS)]);
- 		  break;
- 
- 		case 'M':
--		  iprintf (is, "$fcc%ld", GET_OP (insn, CCC));
-+		  infprintf (is, "$fcc%ld", GET_OP (insn, CCC));
- 		  break;
- 
- 		case 'N':
--		  iprintf (is,
-+		  infprintf (is,
- 			   (op->pinfo & (FP_D | FP_S)) != 0
- 			   ? "$fcc%ld" : "$cc%ld",
- 			   GET_OP (insn, BCC));
- 		  break;
- 
- 		case 'R':
--		  iprintf (is, "%s", mips_fpr_names[GET_OP (insn, FR)]);
-+		  infprintf (is, "%s", mips_fpr_names[GET_OP (insn, FR)]);
- 		  break;
- 
- 		case 'S':
- 		case 'V':
--		  iprintf (is, "%s", mips_fpr_names[GET_OP (insn, FS)]);
-+		  infprintf (is, "%s", mips_fpr_names[GET_OP (insn, FS)]);
- 		  break;
- 
- 		case 'T':
--		  iprintf (is, "%s", mips_fpr_names[GET_OP (insn, FT)]);
-+		  infprintf (is, "%s", mips_fpr_names[GET_OP (insn, FT)]);
- 		  break;
- 
- 		case '+':
-@@ -2606,18 +2606,18 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
- 		    {
- 		    case 'A':
- 		      lsb = GET_OP (insn, EXTLSB);
--		      iprintf (is, "0x%x", lsb);
-+		      infprintf (is, "0x%x", lsb);
- 		      break;
- 
- 		    case 'B':
- 		      msb = GET_OP (insn, INSMSB);
--		      iprintf (is, "0x%x", msb - lsb + 1);
-+		      infprintf (is, "0x%x", msb - lsb + 1);
- 		      break;
- 
- 		    case 'C':
- 		    case 'H':
- 		      msbd = GET_OP (insn, EXTMSBD);
--		      iprintf (is, "0x%x", msbd + 1);
-+		      infprintf (is, "0x%x", msbd + 1);
- 		      break;
- 
- 		    case 'D':
-@@ -2637,30 +2637,30 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
- 						     mips_cp0sel_names_len,
- 						     cp0reg, sel);
- 			if (n != NULL)
--			  iprintf (is, "%s", n->name);
-+			  infprintf (is, "%s", n->name);
- 			else
--			  iprintf (is, "$%d,%d", cp0reg, sel);
-+			  infprintf (is, "$%d,%d", cp0reg, sel);
- 			break;
- 		      }
- 
- 		    case 'E':
- 		      lsb = GET_OP (insn, EXTLSB) + 32;
--		      iprintf (is, "0x%x", lsb);
-+		      infprintf (is, "0x%x", lsb);
- 		      break;
- 
- 		    case 'F':
- 		      msb = GET_OP (insn, INSMSB) + 32;
--		      iprintf (is, "0x%x", msb - lsb + 1);
-+		      infprintf (is, "0x%x", msb - lsb + 1);
- 		      break;
- 
- 		    case 'G':
- 		      msbd = GET_OP (insn, EXTMSBD) + 32;
--		      iprintf (is, "0x%x", msbd + 1);
-+		      infprintf (is, "0x%x", msbd + 1);
- 		      break;
- 
- 		    default:
- 		      /* xgettext:c-format */
--		      iprintf (is,
-+		      infprintf (is,
- 			       _("# internal disassembler error, "
- 				 "unrecognized modifier (+%c)"),
- 			       *s);
-@@ -2674,111 +2674,111 @@ print_insn_micromips (bfd_vma memaddr, struct disassemble_info *info)
- 		  switch (*s)
- 		    {
- 		    case 'a':	/* global pointer.  */
--		      iprintf (is, "%s", mips_gpr_names[28]);
-+		      infprintf (is, "%s", mips_gpr_names[28]);
- 		      break;
- 
- 		    case 'b':
- 		      regno = micromips_to_32_reg_b_map[GET_OP (insn, MB)];
--		      iprintf (is, "%s", mips_gpr_names[regno]);
-+		      infprintf (is, "%s", mips_gpr_names[regno]);
- 		      break;
- 
- 		    case 'c':
- 		      regno = micromips_to_32_reg_c_map[GET_OP (insn, MC)];
--		      iprintf (is, "%s", mips_gpr_names[regno]);
-+		      infprintf (is, "%s", mips_gpr_names[regno]);
- 		      break;
- 
- 		    case 'd':
- 		      regno = micromips_to_32_reg_d_map[GET_OP (insn, MD)];
--		      iprintf (is, "%s", mips_gpr_names[regno]);
-+		      infprintf (is, "%s", mips_gpr_names[regno]);
- 		      break;
- 
- 		    case 'e':
- 		      regno = micromips_to_32_reg_e_map[GET_OP (insn, ME)];
--		      iprintf (is, "%s", mips_gpr_names[regno]);
-+		      infprintf (is, "%s", mips_gpr_names[regno]);
- 		      break;
- 
- 		    case 'f':
- 		      /* Save lastregno for "mt" to print out later.  */
- 		      lastregno = micromips_to_32_reg_f_map[GET_OP (insn, MF)];
--		      iprintf (is, "%s", mips_gpr_names[lastregno]);
-+		      infprintf (is, "%s", mips_gpr_names[lastregno]);
- 		      break;
- 
- 		    case 'g':
- 		      regno = micromips_to_32_reg_g_map[GET_OP (insn, MG)];
--		      iprintf (is, "%s", mips_gpr_names[regno]);
-+		      infprintf (is, "%s", mips_gpr_names[regno]);
- 		      break;
- 
- 		    case 'h':
- 		      regno = micromips_to_32_reg_h_map[GET_OP (insn, MH)];
--		      iprintf (is, "%s", mips_gpr_names[regno]);
-+		      infprintf (is, "%s", mips_gpr_names[regno]);
- 		      break;
- 
- 		    case 'i':
- 		      regno = micromips_to_32_reg_i_map[GET_OP (insn, MI)];
--		      iprintf (is, "%s", mips_gpr_names[regno]);
-+		      infprintf (is, "%s", mips_gpr_names[regno]);
- 		      break;
- 
- 		    case 'j':
--		      iprintf (is, "%s", mips_gpr_names[GET_OP (insn, MJ)]);
-+		      infprintf (is, "%s", mips_gpr_names[GET_OP (insn, MJ)]);
- 		      break;
- 
- 		    case 'l':
- 		      regno = micromips_to_32_reg_l_map[GET_OP (insn, ML)];
--		      iprintf (is, "%s", mips_gpr_names[regno]);
-+		      infprintf (is, "%s", mips_gpr_names[regno]);
- 		      break;
- 
- 		    case 'm':
- 		      regno = micromips_to_32_reg_m_map[GET_OP (insn, MM)];
--		      iprintf (is, "%s", mips_gpr_names[regno]);
-+		      infprintf (is, "%s", mips_gpr_names[regno]);
- 		      break;
- 
- 		    case 'n':
- 		      regno = micromips_to_32_reg_n_map[GET_OP (insn, MN)];
--		      iprintf (is, "%s", mips_gpr_names[regno]);
-+		      infprintf (is, "%s", mips_gpr_names[regno]);
- 		      break;
- 
- 		    case 'p':
- 		      /* Save lastregno for "mt" to print out later.  */
- 		      lastregno = GET_OP (insn, MP);
--		      iprintf (is, "%s", mips_gpr_names[lastregno]);
-+		      infprintf (is, "%s", mips_gpr_names[lastregno]);
- 		      break;
- 
- 		    case 'q':
- 		      regno = micromips_to_32_reg_q_map[GET_OP (insn, MQ)];
--		      iprintf (is, "%s", mips_gpr_names[regno]);
-+		      infprintf (is, "%s", mips_gpr_names[regno]);
- 		      break;
- 
- 		    case 'r':	/* program counter.  */
--