4 files changed, 6 insertions, 6 deletions
diff --git a/sys/boot/i386/efi/ldscript.amd64 b/sys/boot/i386/efi/ldscript.amd64
index 9c5a29b..f99e730 100644
--- a/sys/boot/i386/efi/ldscript.amd64
+++ b/sys/boot/i386/efi/ldscript.amd64
@@ -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
diff --git a/sys/conf/ldscript.amd64 b/sys/conf/ldscript.amd64
index 68ab1a2..5cc4a81 100644
--- a/sys/conf/ldscript.amd64
+++ b/sys/conf/ldscript.amd64
@@ -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");
diff --git a/sys/conf/ldscript.sparc64 b/sys/conf/ldscript.sparc64
index 6f9c021..8b2bb9f 100644
--- a/sys/conf/ldscript.sparc64
+++ b/sys/conf/ldscript.sparc64
@@ -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);
diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
index 5de7519..3775a33 100644
--- a/usr.sbin/ndiscvt/ndiscvt.c
+++ b/usr.sbin/ndiscvt/ndiscvt.c
@@ -190,7 +190,7 @@ bincvt(char *sysfile, char *outfile, void *img, int fsize)
 	    "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);