Commit a9cfccee authored by H. Peter Anvin's avatar H. Peter Anvin

x86, build: Change code16gcc.h from a C header to an assembly header

By changing code16gcc.h from a C header to an assembly header and use
the -Wa,... option to gcc to force it to be added to the assembly
input, we can avoid the problems with gcc reordering code bits on us.

If we have -m16, we still use it, of course.
Suggested-by: default avatarKevin O'Connor <kevin@koconnor.net>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
Link: http://lkml.kernel.org/n/tip-xw8ibgdemucl9fz3i1bymu6w@git.kernel.org
parent a9358bc3
...@@ -15,12 +15,9 @@ endif ...@@ -15,12 +15,9 @@ endif
# that way we can complain to the user if the CPU is insufficient. # that way we can complain to the user if the CPU is insufficient.
# #
# The -m16 option is supported by GCC >= 4.9 and clang >= 3.5. For # The -m16 option is supported by GCC >= 4.9 and clang >= 3.5. For
# older versions of GCC, we need to play evil and unreliable tricks to # older versions of GCC, include an *assembly* header to make sure that
# attempt to ensure that our asm(".code16gcc") is first in the asm # gcc doesn't play any games behind our back.
# output. CODE16GCC_CFLAGS := -m32 -Wa,$(srctree)/arch/x86/boot/code16gcc.h
CODE16GCC_CFLAGS := -m32 -include $(srctree)/arch/x86/boot/code16gcc.h \
$(call cc-option, -fno-toplevel-reorder,\
$(call cc-option, -fno-unit-at-a-time))
M16_CFLAGS := $(call cc-option, -m16, $(CODE16GCC_CFLAGS)) M16_CFLAGS := $(call cc-option, -m16, $(CODE16GCC_CFLAGS))
REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -D__KERNEL__ \ REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -D__KERNEL__ \
......
/* #
* code16gcc.h # code16gcc.h
* #
* This file is -include'd when compiling 16-bit C code. # This file is added to the assembler via -Wa when compiling 16-bit C code.
* Note: this asm() needs to be emitted before gcc emits any code. # This is done this way instead via asm() to make sure gcc does not reorder
* Depending on gcc version, this requires -fno-unit-at-a-time or # things around us.
* -fno-toplevel-reorder. #
* # gcc 4.9+ has a real -m16 option so we can drop this hack long term.
* Hopefully gcc will eventually have a real -m16 option so we can #
* drop this hack long term.
*/
#ifndef __ASSEMBLY__ .code16gcc
asm(".code16gcc");
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment