diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
| commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
| tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /Makefile | |
| parent | 1383bdb98c01bbd28d72336d1bf614ce79114d29 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 |