Use the new architecture functions

2 files changed, 8 insertions, 4 deletions

diff --git a/binutils/copy.c b/binutils/copy.c
index 7d4e4e3..3abe5a6 100644
--- a/binutils/copy.c
+++ b/binutils/copy.c
@@ -104,11 +104,11 @@ bfd *obfd;
     }
 
     /* Copy architecture of input file to output file */
-    if (!bfd_set_arch_mach(obfd, bfd_get_architecture(ibfd),
-			   bfd_get_machine(ibfd))) {
+    if (!bfd_set_arch_mach(obfd, bfd_get_arch(ibfd),
+			   bfd_get_mach(ibfd))) {
 	fprintf(stderr, "Output file cannot represent architecture %s\n",
-		bfd_printable_arch_mach(bfd_get_architecture(ibfd),
-					bfd_get_machine(ibfd)));
+		bfd_printable_arch_mach(bfd_get_arch(ibfd),
+					bfd_get_mach(ibfd)));
     }
     if (!bfd_set_format(obfd, bfd_get_format(ibfd)))
 	{
@@ -357,6 +357,8 @@ main(argc, argv)
 
   program_name = argv[0];
 
+  bfd_init();
+
   if (strcmp(program_name,"strip") == 0) {
     strip = true;
   }
diff --git a/binutils/strip.c b/binutils/strip.c
index cd0f3af..6dd2eab 100755
--- a/binutils/strip.c
+++ b/binutils/strip.c
@@ -83,6 +83,8 @@ main (argc, argv)
   int c;
   program_name = argv[0];
 	
+  bfd_init();
+
   strip_symbols = strip_undef;	/* default is to strip everything.  */
   discard_locals = locals_undef;