Skip to contentSkip to conversation

x86/build: Use the single-argument OUTPUT_FORMAT() linker script command

PATCH New Borislav Petkov 2 participants 2 messages Jan 9, 2019 – Jan 16, 2019 x86

lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 x86/build: Use the single-argument OUTPUT_FORMAT() linker script command

From: Borislav Petkov <[email protected]>

The various x86 linker scripts use the three-argument linker script command variant OUTPUT_FORMAT(DEFAULT, BIG, LITTLE) which specifies three object file formats when the -EL and -EB linker command line options are used. When -EB is specified, OUTPUT_FORMAT issues the BIG object file format, when -EL, LITTLE, respectively, and when neither is specified, DEFAULT.

However, those -E[LB] options are not used by arch/x86/ so switch to the simple OUTPUT_FORMAT(BFDNAME) macro variant.

No functional changes.

---
 arch/x86/boot/compressed/vmlinux.lds.S | 2 +-
 arch/x86/boot/setup.ld                 | 2 +-
 arch/x86/kernel/vmlinux.lds.S          | 2 +-
 arch/x86/realmode/rm/realmode.lds.S    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/boot/compressed/vmlinux.lds.S +1 -1
index f491bbde8493..508cfa6828c5 100644
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/vmlinux.lds.h>
 
-OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
+OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT)
 
 #undef i386
 
arch/x86/boot/setup.ld +1 -1
index 96a6c7563538..0149e41d42c2 100644
@@ -3,7 +3,7 @@
  *
  * Linker script for the i386 setup code
  */
-OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+OUTPUT_FORMAT("elf32-i386")
 OUTPUT_ARCH(i386)
 ENTRY(_start)
 
arch/x86/kernel/vmlinux.lds.S +1 -1
index ee3b5c7d662e..bad8c51fee6e 100644
@@ -31,7 +31,7 @@
 
 #undef i386     /* in case the preprocessor is a 32bit one */
 
-OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
+OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT)
 
 #ifdef CONFIG_X86_32
 OUTPUT_ARCH(i386)
arch/x86/realmode/rm/realmode.lds.S +1 -1
index df8e11e26bc3..3bb980800c58 100644
@@ -9,7 +9,7 @@
 
 #undef i386
 
-OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+OUTPUT_FORMAT("elf32-i386")
 OUTPUT_ARCH(i386)
 
 SECTIONS
Signature · 1 line
2.19.1
#1 lore raw
x86/build: Use the single-argument OUTPUT_FORMAT() linker script command
Commit-ID:  e6d7bc0bdf4155e896c48cf6f8fb7ef76b504058
Gitweb:     https://git.kernel.org/tip/e6d7bc0bdf4155e896c48cf6f8fb7ef76b504058
Author:     Borislav Petkov <[email protected]>
AuthorDate: Wed, 9 Jan 2019 17:32:10 +0100
Committer:  Borislav Petkov <[email protected]>
CommitDate: Wed, 16 Jan 2019 12:21:53 +0100

x86/build: Use the single-argument OUTPUT_FORMAT() linker script command

The various x86 linker scripts use the three-argument linker script command variant OUTPUT_FORMAT(DEFAULT, BIG, LITTLE) which specifies three object file formats when the -EL and -EB linker command line options are used. When -EB is specified, OUTPUT_FORMAT issues the BIG object file format, when -EL, LITTLE, respectively, and when neither is specified, DEFAULT.

However, those -E[LB] options are not used by arch/x86/ so switch to the simple OUTPUT_FORMAT(BFDNAME) macro variant.

No functional changes.

---
 arch/x86/boot/compressed/vmlinux.lds.S | 2 +-
 arch/x86/boot/setup.ld                 | 2 +-
 arch/x86/kernel/vmlinux.lds.S          | 2 +-
 arch/x86/realmode/rm/realmode.lds.S    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/boot/compressed/vmlinux.lds.S +1 -1
index f491bbde8493..508cfa6828c5 100644
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/vmlinux.lds.h>
 
-OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
+OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT)
 
 #undef i386
 
arch/x86/boot/setup.ld +1 -1
index 96a6c7563538..0149e41d42c2 100644
@@ -3,7 +3,7 @@
  *
  * Linker script for the i386 setup code
  */
-OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+OUTPUT_FORMAT("elf32-i386")
 OUTPUT_ARCH(i386)
 ENTRY(_start)
 
arch/x86/kernel/vmlinux.lds.S +1 -1
index ee3b5c7d662e..bad8c51fee6e 100644
@@ -31,7 +31,7 @@
 
 #undef i386     /* in case the preprocessor is a 32bit one */
 
-OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
+OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT)
 
 #ifdef CONFIG_X86_32
 OUTPUT_ARCH(i386)
arch/x86/realmode/rm/realmode.lds.S +1 -1
index df8e11e26bc3..3bb980800c58 100644
@@ -9,7 +9,7 @@
 
 #undef i386
 
-OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+OUTPUT_FORMAT("elf32-i386")
 OUTPUT_ARCH(i386)
 
 SECTIONS