diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-25 08:41:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-25 08:41:02 -0400 |
| commit | ac48f6cb5f268daff06b636444819e5ffb462611 (patch) | |
| tree | 56bcc8b2de42738764ac65056067a17cb97609f4 /arch/x86/Makefile | |
| parent | e64d07a2dae569fc3c938adac777562a1d6f151e (diff) | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
Merge tag 'v3.6-rc6' into spi-mxs
Linux 3.6-rc6
Conflicts (overlap between moving code that accesses registers around
and factoring the register access out into a SSP layer):
drivers/mmc/host/mxs-mmc.c
Diffstat (limited to 'arch/x86/Makefile')
| -rw-r--r-- | arch/x86/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index b0c5276861ec..682e9c210baa 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile | |||
| @@ -27,6 +27,10 @@ ifeq ($(CONFIG_X86_32),y) | |||
| 27 | 27 | ||
| 28 | KBUILD_CFLAGS += -msoft-float -mregparm=3 -freg-struct-return | 28 | KBUILD_CFLAGS += -msoft-float -mregparm=3 -freg-struct-return |
| 29 | 29 | ||
| 30 | # Never want PIC in a 32-bit kernel, prevent breakage with GCC built | ||
| 31 | # with nonstandard options | ||
| 32 | KBUILD_CFLAGS += -fno-pic | ||
| 33 | |||
| 30 | # prevent gcc from keeping the stack 16 byte aligned | 34 | # prevent gcc from keeping the stack 16 byte aligned |
| 31 | KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2) | 35 | KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2) |
| 32 | 36 | ||