From c1aec23d1c5ca4a04d2d5c450644733e76c88bf9 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Tue, 2 Feb 2010 14:40:02 -0800 Subject: [PATCH] --- yaml --- r: 199517 b: refs/heads/master c: d0679c730395d0bde9a46939e7ba255b4ba7dd7c h: refs/heads/master i: 199515: 0065f69bdbd14bf95539007aa61905a81ac85c61 v: v3 --- [refs] | 2 +- trunk/Makefile | 3 --- trunk/arch/powerpc/Makefile | 5 +++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fac3d6fcf287..fc80bc757a00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59dde3853e07aaadc2b63abd16c954d5b0606cf1 +refs/heads/master: d0679c730395d0bde9a46939e7ba255b4ba7dd7c diff --git a/trunk/Makefile b/trunk/Makefile index 03053c66bb3a..2e74a68878c7 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -579,9 +579,6 @@ KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,) # disable invalid "can't wrap" optimizations for signed / pointers KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow) -# revert to pre-gcc-4.4 behaviour of .eh_frame -KBUILD_CFLAGS += $(call cc-option,-fno-dwarf2-cfi-asm) - # conserve stack if available KBUILD_CFLAGS += $(call cc-option,-fconserve-stack) diff --git a/trunk/arch/powerpc/Makefile b/trunk/arch/powerpc/Makefile index 1a54a3b3a3fa..42dcd3f4ad7b 100644 --- a/trunk/arch/powerpc/Makefile +++ b/trunk/arch/powerpc/Makefile @@ -112,6 +112,11 @@ KBUILD_CFLAGS += $(call cc-option,-mspe=no) # kernel considerably. KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) +# FIXME: the module load should be taught about the additional relocs +# generated by this. +# revert to pre-gcc-4.4 behaviour of .eh_frame +KBUILD_CFLAGS += $(call cc-option,-fno-dwarf2-cfi-asm) + # Never use string load/store instructions as they are # often slow when they are implemented at all KBUILD_CFLAGS += -mno-string