2 files changed, 240 insertions, 0 deletions

diff --git a/emulators/psim-freebsd/files/patch-bfd-archures.c b/emulators/psim-freebsd/files/patch-bfd-archures.c
new file mode 100644
index 000000000000..7740d1c83ce9
--- /dev/null
+++ b/emulators/psim-freebsd/files/patch-bfd-archures.c
@@ -0,0 +1,38 @@
+--- bfd.orig/archures.c	Sun May 12 10:57:05 2002
++++ bfd/archures.c	Sun May 12 10:58:13 2002
+@@ -288,7 +288,9 @@
+ .  const char *arch_name;
+ .  const char *printable_name;
+ .  unsigned int section_align_power;
+-.  {* True if this is the default machine for the architecture.  *}
++.  {* True if this is the default machine for the architecture.
++.     The default arch should be the first entry for an arch so that
++.     all the entries for that arch can be accessed via <<next>>.  *}
+ .  boolean the_default;
+ .  const struct bfd_arch_info * (*compatible)
+ .	PARAMS ((const struct bfd_arch_info *a,
+@@ -604,21 +606,9 @@
+      enum bfd_architecture arch;
+      unsigned long mach;
+ {
+-  const bfd_arch_info_type * const *app, *ap;
+-
+-  for (app = bfd_archures_list; *app != NULL; app++)
+-    {
+-      for (ap = *app; ap != NULL; ap = ap->next)
+-	{
+-	  if (ap->arch == arch
+-	      && (ap->mach == mach
+-		  || (mach == 0 && ap->the_default)))
+-	    {
+-	      abfd->arch_info = ap;
+-	      return true;
+-	    }
+-	}
+-    }
++  abfd->arch_info = bfd_lookup_arch (arch, mach);
++  if (abfd->arch_info != NULL)
++    return true;
+ 
+   abfd->arch_info = &bfd_default_arch_struct;
+   bfd_set_error (bfd_error_bad_value);
diff --git a/emulators/psim-freebsd/files/patch-bfd-cpu-powerpc.c b/emulators/psim-freebsd/files/patch-bfd-cpu-powerpc.c
new file mode 100644
index 000000000000..1e4f96666d51
--- /dev/null
+++ b/emulators/psim-freebsd/files/patch-bfd-cpu-powerpc.c
@@ -0,0 +1,202 @@
+--- bfd.orig/cpu-powerpc.c	Sun May 12 10:57:07 2002
++++ bfd/cpu-powerpc.c	Sun May 12 10:57:17 2002
+@@ -50,6 +50,65 @@
+ 
+ const bfd_arch_info_type bfd_powerpc_archs[] =
+ {
++#if BFD_DEFAULT_TARGET_SIZE == 64 /* default arch must come first.  */
++  {
++    64,	/* 64 bits in a word */
++    64,	/* 64 bits in an address */
++    8,	/* 8 bits in a byte */
++    bfd_arch_powerpc,
++    bfd_mach_ppc64,
++    "powerpc",
++    "powerpc:common64",
++    3,
++    true, /* default for 64 bit target */
++    powerpc_compatible,
++    bfd_default_scan,
++    &bfd_powerpc_archs[1]
++  },
++  {
++    32,	/* 32 bits in a word */
++    32,	/* 32 bits in an address */
++    8,	/* 8 bits in a byte */
++    bfd_arch_powerpc,
++    bfd_mach_ppc, /* for the POWER/PowerPC common architecture */
++    "powerpc",
++    "powerpc:common",
++    3,
++    false,
++    powerpc_compatible,
++    bfd_default_scan,
++    &bfd_powerpc_archs[2],
++  },
++#else
++  {
++    32,	/* 32 bits in a word */
++    32,	/* 32 bits in an address */
++    8,	/* 8 bits in a byte */
++    bfd_arch_powerpc,
++    bfd_mach_ppc, /* for the POWER/PowerPC common architecture */
++    "powerpc",
++    "powerpc:common",
++    3,
++    true, /* default for 32 bit target */
++    powerpc_compatible,
++    bfd_default_scan,
++    &bfd_powerpc_archs[1],
++  },
++  {
++    64,	/* 64 bits in a word */
++    64,	/* 64 bits in an address */
++    8,	/* 8 bits in a byte */
++    bfd_arch_powerpc,
++    bfd_mach_ppc64,
++    "powerpc",
++    "powerpc:common64",
++    3,
++    false,
++    powerpc_compatible,
++    bfd_default_scan,
++    &bfd_powerpc_archs[2]
++  },
++#endif
+   {
+     32,	/* 32 bits in a word */
+     32,	/* 32 bits in an address */
+@@ -62,7 +121,7 @@
+     false, /* not the default */
+     powerpc_compatible,
+     bfd_default_scan,
+-    &bfd_powerpc_archs[1]
++    &bfd_powerpc_archs[3]
+   },
+   {
+     32,	/* 32 bits in a word */
+@@ -76,7 +135,7 @@
+     false, /* not the default */
+     powerpc_compatible,
+     bfd_default_scan,
+-    &bfd_powerpc_archs[2]
++    &bfd_powerpc_archs[4]
+   },
+   {
+     32,	/* 32 bits in a word */
+@@ -90,7 +149,7 @@
+     false, /* not the default */
+     powerpc_compatible,
+     bfd_default_scan,
+-    &bfd_powerpc_archs[3]
++    &bfd_powerpc_archs[5]
+   },
+   {
+     32,	/* 32 bits in a word */
+@@ -104,7 +163,7 @@
+     false, /* not the default */
+     powerpc_compatible,
+     bfd_default_scan,
+-    &bfd_powerpc_archs[4]
++    &bfd_powerpc_archs[6]
+   },
+   {
+     32,	/* 32 bits in a word */
+@@ -118,7 +177,7 @@
+     false, /* not the default */
+     powerpc_compatible,
+     bfd_default_scan,
+-    &bfd_powerpc_archs[5]
++    &bfd_powerpc_archs[7]
+   },
+   {
+     64,	/* 64 bits in a word */
+@@ -132,7 +191,7 @@
+     false, /* not the default */
+     powerpc_compatible,
+     bfd_default_scan,
+-    &bfd_powerpc_archs[6]
++    &bfd_powerpc_archs[8]
+   },
+   {
+     64,	/* 64 bits in a word */
+@@ -146,7 +205,7 @@
+     false, /* not the default */
+     powerpc_compatible,
+     bfd_default_scan,
+-    &bfd_powerpc_archs[7]
++    &bfd_powerpc_archs[9]
+   },
+   {
+     64,	/* 64 bits in a word */
+@@ -160,7 +219,7 @@
+     false, /* not the default */
+     powerpc_compatible,
+     bfd_default_scan,
+-    &bfd_powerpc_archs[8]
++    &bfd_powerpc_archs[10]
+   },
+   {
+     64,	/* 64 bits in a word */
+@@ -174,7 +233,7 @@
+     false, /* not the default */
+     powerpc_compatible,
+     bfd_default_scan,
+-    &bfd_powerpc_archs[9]
++    &bfd_powerpc_archs[11]
+   },
+   {
+     64,	/* 64 bits in a word */
+@@ -188,7 +247,7 @@
+     false, /* not the default */
+     powerpc_compatible,
+     bfd_default_scan,
+-    &bfd_powerpc_archs[10]
++    &bfd_powerpc_archs[12]
+   },
+   {
+     32,	/* 32 bits in a word */
+@@ -202,7 +261,7 @@
+     false, /* not the default */
+     powerpc_compatible,
+     bfd_default_scan,
+-    &bfd_powerpc_archs[11]
++    &bfd_powerpc_archs[13]
+   },
+   {
+     32,       /* 32 bits in a word */
+@@ -214,34 +273,6 @@
+     "powerpc:MPC8XX",
+     3,
+     false, /* not the default */
+-    powerpc_compatible,
+-    bfd_default_scan,
+-    &bfd_powerpc_archs[12]
+-  },
+-  {
+-    64,	/* 64 bits in a word */
+-    64,	/* 64 bits in an address */
+-    8,	/* 8 bits in a byte */
+-    bfd_arch_powerpc,
+-    bfd_mach_ppc64,
+-    "powerpc",
+-    "powerpc:common64",
+-    3,
+-    BFD_DEFAULT_TARGET_SIZE == 64, /* default for 64 bit target */
+-    powerpc_compatible,
+-    bfd_default_scan,
+-    &bfd_powerpc_archs[13]
+-  },
+-  {
+-    32,	/* 32 bits in a word */
+-    32,	/* 32 bits in an address */
+-    8,	/* 8 bits in a byte */
+-    bfd_arch_powerpc,
+-    bfd_mach_ppc, /* for the POWER/PowerPC common architecture */
+-    "powerpc",
+-    "powerpc:common",
+-    3,
+-    BFD_DEFAULT_TARGET_SIZE != 64, /* default for 32 bit target */
+     powerpc_compatible,
+     bfd_default_scan,
+     0