diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:49:38 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:49:38 -0500 |
| commit | b1864e9a1afef41709886072c6e6248def0386f4 (patch) | |
| tree | 2fe749209cf860c1dd10efd1bd2ad8df572bd66e /Makefile | |
| parent | e9c4ffb11f0b19005b5b9dc8481687a3637e5887 (diff) | |
| parent | 7032e8696726354d6180d8a2d17191f958cd93ae (diff) | |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/apic.c
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
| @@ -532,8 +532,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN}) | |||
| 532 | endif | 532 | endif |
| 533 | 533 | ||
| 534 | # Force gcc to behave correct even for buggy distributions | 534 | # Force gcc to behave correct even for buggy distributions |
| 535 | # Arch Makefiles may override this setting | 535 | ifndef CONFIG_CC_STACKPROTECTOR |
| 536 | KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector) | 536 | KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector) |
| 537 | endif | ||
| 537 | 538 | ||
| 538 | ifdef CONFIG_FRAME_POINTER | 539 | ifdef CONFIG_FRAME_POINTER |
| 539 | KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls | 540 | KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls |