[src/trunk]: src/sys/arch Don't need to specify OUTPUT_FORMAT/OUTPUT_ARCH in ...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fb60a9f7b747
branches:  trunk
changeset: 340085:fb60a9f7b747
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sat Aug 22 02:23:58 2015 +0000

description:
Don't need to specify OUTPUT_FORMAT/OUTPUT_ARCH in linker scripts.

diffstat:

 sys/arch/amd64/conf/kern.ldscript     |  5 +----
 sys/arch/amd64/conf/kern.ldscript.2MB |  5 +----
 sys/arch/amd64/conf/kern.ldscript.Xen |  5 +----
 sys/arch/i386/conf/kern.ldscript      |  5 +----
 sys/arch/i386/conf/kern.ldscript.4MB  |  5 +----
 sys/arch/i386/conf/kern.ldscript.Xen  |  5 +----
 sys/arch/i386/conf/stand.ldscript     |  5 +----
 7 files changed, 7 insertions(+), 28 deletions(-)

diffs (91 lines):

diff -r 9ef255913282 -r fb60a9f7b747 sys/arch/amd64/conf/kern.ldscript
--- a/sys/arch/amd64/conf/kern.ldscript Fri Aug 21 20:52:47 2015 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript Sat Aug 22 02:23:58 2015 +0000
@@ -1,8 +1,5 @@
-/*     $NetBSD: kern.ldscript,v 1.12 2015/08/20 08:51:01 uebayasi Exp $        */
+/*     $NetBSD: kern.ldscript,v 1.13 2015/08/22 02:23:58 uebayasi Exp $        */
 
-OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
-             "elf64-x86-64")
-OUTPUT_ARCH(i386:x86-64)
 ENTRY(_start)
 SECTIONS
 {
diff -r 9ef255913282 -r fb60a9f7b747 sys/arch/amd64/conf/kern.ldscript.2MB
--- a/sys/arch/amd64/conf/kern.ldscript.2MB     Fri Aug 21 20:52:47 2015 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript.2MB     Sat Aug 22 02:23:58 2015 +0000
@@ -1,8 +1,5 @@
-/*     $NetBSD: kern.ldscript.2MB,v 1.8 2015/08/20 08:53:31 uebayasi Exp $     */
+/*     $NetBSD: kern.ldscript.2MB,v 1.9 2015/08/22 02:23:58 uebayasi Exp $     */
 
-OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
-             "elf64-x86-64")
-OUTPUT_ARCH(i386:x86-64)
 ENTRY(_start)
 SECTIONS
 {
diff -r 9ef255913282 -r fb60a9f7b747 sys/arch/amd64/conf/kern.ldscript.Xen
--- a/sys/arch/amd64/conf/kern.ldscript.Xen     Fri Aug 21 20:52:47 2015 +0000
+++ b/sys/arch/amd64/conf/kern.ldscript.Xen     Sat Aug 22 02:23:58 2015 +0000
@@ -1,8 +1,5 @@
-/*     $NetBSD: kern.ldscript.Xen,v 1.7 2015/08/20 08:53:31 uebayasi Exp $     */
+/*     $NetBSD: kern.ldscript.Xen,v 1.8 2015/08/22 02:23:58 uebayasi Exp $     */
 
-OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64",
-             "elf64-x86-64")
-OUTPUT_ARCH(i386:x86-64)
 ENTRY(_start)
 SECTIONS
 {
diff -r 9ef255913282 -r fb60a9f7b747 sys/arch/i386/conf/kern.ldscript
--- a/sys/arch/i386/conf/kern.ldscript  Fri Aug 21 20:52:47 2015 +0000
+++ b/sys/arch/i386/conf/kern.ldscript  Sat Aug 22 02:23:58 2015 +0000
@@ -1,8 +1,5 @@
-/*     $NetBSD: kern.ldscript,v 1.13 2015/08/20 09:34:54 uebayasi Exp $        */
+/*     $NetBSD: kern.ldscript,v 1.14 2015/08/22 02:23:58 uebayasi Exp $        */
 
-OUTPUT_FORMAT("elf32-i386", "elf32-i386",
-             "elf32-i386")
-OUTPUT_ARCH(i386)
 ENTRY(_start)
 SECTIONS
 {
diff -r 9ef255913282 -r fb60a9f7b747 sys/arch/i386/conf/kern.ldscript.4MB
--- a/sys/arch/i386/conf/kern.ldscript.4MB      Fri Aug 21 20:52:47 2015 +0000
+++ b/sys/arch/i386/conf/kern.ldscript.4MB      Sat Aug 22 02:23:58 2015 +0000
@@ -1,8 +1,5 @@
-/*     $NetBSD: kern.ldscript.4MB,v 1.14 2015/08/20 09:34:54 uebayasi Exp $    */
+/*     $NetBSD: kern.ldscript.4MB,v 1.15 2015/08/22 02:23:58 uebayasi Exp $    */
 
-OUTPUT_FORMAT("elf32-i386", "elf32-i386",
-             "elf32-i386")
-OUTPUT_ARCH(i386)
 ENTRY(_start)
 SECTIONS
 {
diff -r 9ef255913282 -r fb60a9f7b747 sys/arch/i386/conf/kern.ldscript.Xen
--- a/sys/arch/i386/conf/kern.ldscript.Xen      Fri Aug 21 20:52:47 2015 +0000
+++ b/sys/arch/i386/conf/kern.ldscript.Xen      Sat Aug 22 02:23:58 2015 +0000
@@ -1,8 +1,5 @@
-/*     $NetBSD: kern.ldscript.Xen,v 1.8 2015/08/20 09:34:54 uebayasi Exp $     */
+/*     $NetBSD: kern.ldscript.Xen,v 1.9 2015/08/22 02:23:58 uebayasi Exp $     */
 
-OUTPUT_FORMAT("elf32-i386", "elf32-i386",
-             "elf32-i386")
-OUTPUT_ARCH(i386)
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff -r 9ef255913282 -r fb60a9f7b747 sys/arch/i386/conf/stand.ldscript
--- a/sys/arch/i386/conf/stand.ldscript Fri Aug 21 20:52:47 2015 +0000
+++ b/sys/arch/i386/conf/stand.ldscript Sat Aug 22 02:23:58 2015 +0000
@@ -1,8 +1,5 @@
-/*     $NetBSD: stand.ldscript,v 1.3 2015/08/20 11:42:56 uebayasi Exp $        */
+/*     $NetBSD: stand.ldscript,v 1.4 2015/08/22 02:23:58 uebayasi Exp $        */
 
-OUTPUT_FORMAT("elf32-i386", "elf32-i386",
-             "elf32-i386")
-OUTPUT_ARCH(i386)
 ENTRY(_start)
 SECTIONS
 {