Commit 1c678da3 authored by David Woodhouse's avatar David Woodhouse Committed by H. Peter Anvin
Browse files

x86: Remove duplication of 16-bit CFLAGS 



Define them once in arch/x86/Makefile instead of twice.

Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Link: http://lkml.kernel.org/r/1389180083-23249-1-git-send-email-David.Woodhouse@intel.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 214a8876

arch/x86/Makefile

+14 −0
Original line number Diff line number Diff line
@@ -11,6 +11,20 @@ else 
        KBUILD_DEFCONFIG := $(ARCH)_defconfig

endif



# How to compile the 16-bit code.  Note we always compile for -march=i386;

# that way we can complain to the user if the CPU is insufficient.

REALMODE_CFLAGS	:= -m32 -g -Os -D__KERNEL__ -DDISABLE_BRANCH_PROFILING \

		   -Wall -Wstrict-prototypes -march=i386 -mregparm=3 \

		   -include $(srctree)/arch/x86/boot/code16gcc.h \

		   -fno-strict-aliasing -fomit-frame-pointer -fno-pic \

		   -mno-mmx -mno-sse \

		   $(call cc-option, -ffreestanding) \

		   $(call cc-option, -fno-toplevel-reorder,\

		   $(call cc-option, -fno-unit-at-a-time)) \

		   $(call cc-option, -fno-stack-protector) \

		   $(call cc-option, -mpreferred-stack-boundary=2)

export REALMODE_CFLAGS



# BITS is used as extension for files which are available in a 32 bit

# and a 64 bit version to simplify shared Makefiles.

# e.g.: obj-y += foo_$(BITS).o

arch/x86/boot/Makefile

+1 −14
Original line number Diff line number Diff line
@@ -51,20 +51,7 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE 


# ---------------------------------------------------------------------------



# How to compile the 16-bit code.  Note we always compile for -march=i386,

# that way we can complain to the user if the CPU is insufficient.

KBUILD_CFLAGS	:= $(USERINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ \

		   -DDISABLE_BRANCH_PROFILING \

		   -Wall -Wstrict-prototypes \

		   -march=i386 -mregparm=3 \

		   -include $(srctree)/$(src)/code16gcc.h \

		   -fno-strict-aliasing -fomit-frame-pointer -fno-pic \

		   -mno-mmx -mno-sse \

		   $(call cc-option, -ffreestanding) \

		   $(call cc-option, -fno-toplevel-reorder,\

		   $(call cc-option, -fno-unit-at-a-time)) \

		   $(call cc-option, -fno-stack-protector) \

		   $(call cc-option, -mpreferred-stack-boundary=2)

KBUILD_CFLAGS	:= $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP

KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__

GCOV_PROFILE := n

arch/x86/realmode/rm/Makefile

+2 −15
Original line number Diff line number Diff line
@@ -64,20 +64,7 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE 


# ---------------------------------------------------------------------------



# How to compile the 16-bit code.  Note we always compile for -march=i386,

# that way we can complain to the user if the CPU is insufficient.

KBUILD_CFLAGS	:= $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \

		   -I$(srctree)/arch/x86/boot \

		   -DDISABLE_BRANCH_PROFILING \

		   -Wall -Wstrict-prototypes \

		   -march=i386 -mregparm=3 \

		   -include $(srctree)/$(src)/../../boot/code16gcc.h \

		   -fno-strict-aliasing -fomit-frame-pointer -fno-pic \

		   -mno-mmx -mno-sse \

		   $(call cc-option, -ffreestanding) \

		   $(call cc-option, -fno-toplevel-reorder,\

		   $(call cc-option, -fno-unit-at-a-time)) \

		   $(call cc-option, -fno-stack-protector) \

		   $(call cc-option, -mpreferred-stack-boundary=2)

KBUILD_CFLAGS	:= $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \

		   -I$(srctree)/arch/x86/boot

KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__

GCOV_PROFILE := n