Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6d7bc0b authored by Borislav Petkov's avatar Borislav Petkov
Browse files

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.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Link: https://lkml.kernel.org/r/20190109181531.27513-1-bp@alien8.de
parent 927185c1

arch/x86/boot/compressed/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line 
/* 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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


#undef i386



OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")

OUTPUT_FORMAT("elf32-i386")

OUTPUT_ARCH(i386)



SECTIONS