From: tip-bot for David Woodhouse <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
tglx@linutronix.de, hpa@linux.intel.com,
David.Woodhouse@intel.com
Subject: [tip:x86/build] x86: Remove duplication of 16-bit CFLAGS
Date: Tue, 21 Jan 2014 18:03:41 -0800 [thread overview]
Message-ID: <tip-01aa3d17aa39991aa62ccd48b3122417bbca4ef3@git.kernel.org> (raw)
In-Reply-To: <1389180083-23249-1-git-send-email-David.Woodhouse@intel.com>
Commit-ID: 01aa3d17aa39991aa62ccd48b3122417bbca4ef3
Gitweb: http://git.kernel.org/tip/01aa3d17aa39991aa62ccd48b3122417bbca4ef3
Author: David Woodhouse <David.Woodhouse@intel.com>
AuthorDate: Wed, 8 Jan 2014 11:21:20 +0000
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Tue, 21 Jan 2014 17:59:27 -0800
x86: Remove duplication of 16-bit CFLAGS
Define them once in arch/x86/Makefile instead of twice.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Link: http://lkml.kernel.org/r/1389180083-23249-1-git-send-email-David.Woodhouse@intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/Makefile | 14 ++++++++++++++
arch/x86/boot/Makefile | 15 +--------------
arch/x86/realmode/rm/Makefile | 17 ++---------------
3 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 13b22e0..9ecbc1c 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -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
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index de70669..878df7e 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -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
diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
index 9cac825..3497f14 100644
--- a/arch/x86/realmode/rm/Makefile
+++ b/arch/x86/realmode/rm/Makefile
@@ -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
next prev parent reply other threads:[~2014-01-22 2:04 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-08 11:21 [PATCH 1/4] " David Woodhouse
2014-01-08 11:21 ` [PATCH 2/4] x86, boot: Use __attribute__((used)) to ensure videocard structs are emitted David Woodhouse
2014-01-22 2:03 ` [tip:x86/build] " tip-bot for David Woodhouse
2014-01-22 12:25 ` tip-bot for David Woodhouse
2014-01-08 11:21 ` [PATCH 3/4] x86: Allow building 16-bit code with -m16 with toolchains that support it David Woodhouse
2014-01-14 19:14 ` [llvmlinux] " Jan-Simon Möller
2014-01-14 23:59 ` Woodhouse, David
2014-01-22 0:54 ` David Woodhouse
2014-01-29 12:11 ` [PATCH] x86: Build 16-bit code with -m16 where possible David Woodhouse
2014-01-29 12:16 ` [PATCH v2] " David Woodhouse
2014-01-29 17:51 ` [tip:x86/build] x86, build: " tip-bot for David Woodhouse
2014-01-29 17:57 ` tip-bot for David Woodhouse
2014-01-30 16:10 ` tip-bot for David Woodhouse
2014-01-31 10:23 ` [PATCH] x86: " Pavel Machek
2014-01-08 11:21 ` [PATCH 4/4] x86, boot: Work around clang PR18415 David Woodhouse
2014-01-08 12:04 ` [llvmlinux] " PaX Team
2014-01-08 13:03 ` [llvmlinux] [PATCH 1/4] x86: Remove duplication of 16-bit CFLAGS Jan-Simon Möller
2014-01-22 2:03 ` tip-bot for David Woodhouse [this message]
2014-01-22 12:25 ` [tip:x86/build] " tip-bot for David Woodhouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-01aa3d17aa39991aa62ccd48b3122417bbca4ef3@git.kernel.org \
--to=tipbot@zytor.com \
--cc=David.Woodhouse@intel.com \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome