diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-23 11:19:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-23 11:19:09 +1100 |
| commit | f41135a860dde15733847d3e84cb60a50b57d38d (patch) | |
| tree | fc2677fc127be7726ccdb347904076399f748851 /arch | |
| parent | 451f210e169602cf7123ccaa0ac13b18fe559eb7 (diff) | |
| parent | a8bac511c8c18878908eb49f33f7257610b15180 (diff) | |
Merge remote branch 'kbuild/for-next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/scripts/unwcheck.py | 2 | ||||
| -rw-r--r-- | arch/powerpc/Makefile | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/ia64/scripts/unwcheck.py b/arch/ia64/scripts/unwcheck.py index c27849889e19..2bfd941ff7c7 100644 --- a/arch/ia64/scripts/unwcheck.py +++ b/arch/ia64/scripts/unwcheck.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python # # Usage: unwcheck.py FILE # diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 1a54a3b3a3fa..42dcd3f4ad7b 100644 --- a/arch/powerpc/Makefile +++ b/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 |