diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 13:38:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 13:38:11 -0800 |
| commit | 86ed4aa457f9c832856156a2ee6477d108825855 (patch) | |
| tree | 5a7250b526079a9fe2656eac58fbacf5f7d07da4 /arch/x86/Makefile_32.cpu | |
| parent | 830cd2ac6ecce6b027d947fcdc724dd27a33813a (diff) | |
| parent | fe5ed91ddce85a0ed0e4f92c10b099873ef62167 (diff) | |
| download | op-kernel-dev-86ed4aa457f9c832856156a2ee6477d108825855.zip op-kernel-dev-86ed4aa457f9c832856156a2ee6477d108825855.tar.gz | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mce: don't restart timer if disabled
x86: Use -maccumulate-outgoing-args for sane mcount prologues
x86: Prevent GCC 4.4.x (pentium-mmx et al) function prologue wreckage
x86: AMD Northbridge: Verify NB's node is online
x86 VSDO: Fix Kconfig help
x86: Fix typo in Intel CPU cache size descriptor
x86: Add new Intel CPU cache size descriptors
Diffstat (limited to 'arch/x86/Makefile_32.cpu')
| -rw-r--r-- | arch/x86/Makefile_32.cpu | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/Makefile_32.cpu b/arch/x86/Makefile_32.cpu index cbf0776..1255d95 100644 --- a/arch/x86/Makefile_32.cpu +++ b/arch/x86/Makefile_32.cpu @@ -46,6 +46,13 @@ cflags-$(CONFIG_MGEODE_LX) += $(call cc-option,-march=geode,-march=pentium-mmx) # cpu entries cflags-$(CONFIG_X86_GENERIC) += $(call tune,generic,$(call tune,i686)) +# Work around the pentium-mmx code generator madness of gcc4.4.x which +# does stack alignment by generating horrible code _before_ the mcount +# prologue (push %ebp, mov %esp, %ebp) which breaks the function graph +# tracer assumptions. For i686, generic, core2 this is set by the +# compiler anyway +cflags-$(CONFIG_FUNCTION_GRAPH_TRACER) += $(call cc-option,-maccumulate-outgoing-args) + # Bug fix for binutils: this option is required in order to keep # binutils from generating NOPL instructions against our will. ifneq ($(CONFIG_X86_P6_NOP),y) |
