svn commit: r214647 - in projects/binutils-2.17: sys/boot/i386/efi sys/conf usr.sbin/ndiscvt

[Dimitry Andric]

Author: dim
Date: Mon Nov  1 20:20:31 2010
New Revision: 214647
URL: http://svn.freebsd.org/changeset/base/214647

Log:
  Use new output format 'elf64-x86-64-freebsd' instead of 'elf64-x86-64',
  and similarly 'elf64-sparc-freebsd' instead of 'elf64-sparc'.

Modified:
  projects/binutils-2.17/sys/boot/i386/efi/ldscript.amd64
  projects/binutils-2.17/sys/conf/ldscript.amd64
  projects/binutils-2.17/sys/conf/ldscript.sparc64
  projects/binutils-2.17/usr.sbin/ndiscvt/ndiscvt.c

Modified: projects/binutils-2.17/sys/boot/i386/efi/ldscript.amd64
==============================================================================
--- projects/binutils-2.17/sys/boot/i386/efi/ldscript.amd64	Mon Nov  1 20:19:25 2010	(r214646)
+++ projects/binutils-2.17/sys/boot/i386/efi/ldscript.amd64	Mon Nov  1 20:20:31 2010	(r214647)
@@ -1,5 +1,5 @@
 /* $FreeBSD$ */
-OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
+OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
 OUTPUT_ARCH(i386:x86-64)
 ENTRY(_start)
 SECTIONS

Modified: projects/binutils-2.17/sys/conf/ldscript.amd64
==============================================================================
--- projects/binutils-2.17/sys/conf/ldscript.amd64	Mon Nov  1 20:19:25 2010	(r214646)
+++ projects/binutils-2.17/sys/conf/ldscript.amd64	Mon Nov  1 20:20:31 2010	(r214647)
@@ -1,5 +1,5 @@
 /* $FreeBSD$ */
-OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
+OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
 OUTPUT_ARCH(i386:x86-64)
 ENTRY(btext)
 SEARCH_DIR("/usr/lib");

Modified: projects/binutils-2.17/sys/conf/ldscript.sparc64
==============================================================================
--- projects/binutils-2.17/sys/conf/ldscript.sparc64	Mon Nov  1 20:19:25 2010	(r214646)
+++ projects/binutils-2.17/sys/conf/ldscript.sparc64	Mon Nov  1 20:20:31 2010	(r214647)
@@ -1,6 +1,6 @@
 /* $FreeBSD$ */
-OUTPUT_FORMAT("elf64-sparc", "elf64-sparc",
-	      "elf64-sparc")
+OUTPUT_FORMAT("elf64-sparc-freebsd", "elf64-sparc-freebsd",
+	      "elf64-sparc-freebsd")
 OUTPUT_ARCH(sparc:v9)
 ENTRY(_start)
 SEARCH_DIR(/usr/lib);

Modified: projects/binutils-2.17/usr.sbin/ndiscvt/ndiscvt.c
==============================================================================
--- projects/binutils-2.17/usr.sbin/ndiscvt/ndiscvt.c	Mon Nov  1 20:19:25 2010	(r214646)
+++ projects/binutils-2.17/usr.sbin/ndiscvt/ndiscvt.c	Mon Nov  1 20:20:31 2010	(r214647)
@@ -190,7 +190,7 @@ bincvt(char *sysfile, char *outfile, voi
 	    "objcopy -I binary -O elf32-i386-freebsd -B i386 %s %s.o\n",
 #endif
 #ifdef __amd64__
-	    "objcopy -I binary -O elf64-x86-64 -B i386 %s %s.o\n",
+	    "objcopy -I binary -O elf64-x86-64-freebsd -B i386 %s %s.o\n",
 #endif
 	    tname, outfile);
 	printf("%s", sysbuf);
@@ -229,7 +229,7 @@ firmcvt(char *firmfile)
 	    "objcopy -I binary -O elf32-i386-freebsd -B i386 %s %s.o\n",
 #endif
 #ifdef __amd64__
-	    "objcopy -I binary -O elf64-x86-64 -B i386 %s %s.o\n",
+	    "objcopy -I binary -O elf64-x86-64-freebsd -B i386 %s %s.o\n",
 #endif
 	    firmfile, outfile);
 	printf("%s", sysbuf);