diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2012-03-13 16:34:48 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-03-13 16:35:16 +0100 |
commit | df8d291f28aa1e8437c8f7816328a6516379c71b (patch) | |
tree | 26ae585aa259584ddd0d9088933547c065c37086 /arch/parisc/Makefile | |
parent | 5234ffb9f74cfa8993d174782bc861dd9b7b5bfb (diff) | |
parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) |
Merge branch 'linus' into irq/core
Reason: Get upstream fixes integrated before further modifications.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/parisc/Makefile')
-rw-r--r-- | arch/parisc/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index 55cca1dac43..19ab7b2ea1c 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile @@ -31,7 +31,11 @@ ifdef CONFIG_64BIT UTS_MACHINE := parisc64 CHECKFLAGS += -D__LP64__=1 -m64 WIDTH := 64 + +# FIXME: if no default set, should really try to locate dynamically +ifeq ($(CROSS_COMPILE),) CROSS_COMPILE := hppa64-linux-gnu- +endif else # 32-bit WIDTH := endif |