diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-06 10:44:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 10:45:01 -0500 |
| commit | f0ef03985130287c6c84ebe69416cf790e6cc00e (patch) | |
| tree | 3ecb04cc4d82e5fc3ae5f1747e6da172ae8cbcb7 /Makefile | |
| parent | 16097439703bcd38e9fe5608c12add6dacb825ea (diff) | |
| parent | 31bbed527e7039203920c51c9fb48c27aed0820c (diff) | |
Merge branch 'x86/core' into tracing/textedit
Conflicts:
arch/x86/Kconfig
block/blktrace.c
kernel/irq/handle.c
Semantic conflict:
kernel/trace/blktrace.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
| @@ -533,8 +533,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN}) | |||
| 533 | endif | 533 | endif |
| 534 | 534 | ||
| 535 | # Force gcc to behave correct even for buggy distributions | 535 | # Force gcc to behave correct even for buggy distributions |
| 536 | # Arch Makefiles may override this setting | 536 | ifndef CONFIG_CC_STACKPROTECTOR |
| 537 | KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector) | 537 | KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector) |
| 538 | endif | ||
| 538 | 539 | ||
| 539 | ifdef CONFIG_FRAME_POINTER | 540 | ifdef CONFIG_FRAME_POINTER |
| 540 | KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls | 541 | KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls |