aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2013-01-31 17:04:12 -0500
committerHelge Deller <deller@gmx.de>2013-02-20 16:46:06 -0500
commit0e39718b988b84860a6c291a2c82c9cb75e3b8a9 (patch)
tree09c7e258d5f80e7709c418df366a48f98c10d024
parent26ad19d8ebdb73869341b1b4159d32c0f0755946 (diff)
parisc: enhance automatic CONFIG_CROSS_COMPILE detection
The current Makefile will only choose the hppa64 cross compiler when running natively on hppa in a 32bit userspace. This patch additionally chooses the correct 32/64 bit hppa compiler even when doing real cross compiling to hppa/hppa64 from another architecture. Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r--arch/parisc/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 5707f1a62341..87f64d6b5dcb 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -32,11 +32,6 @@ ifdef CONFIG_64BIT
32UTS_MACHINE := parisc64 32UTS_MACHINE := parisc64
33CHECKFLAGS += -D__LP64__=1 -m64 33CHECKFLAGS += -D__LP64__=1 -m64
34WIDTH := 64 34WIDTH := 64
35
36# FIXME: if no default set, should really try to locate dynamically
37ifeq ($(CROSS_COMPILE),)
38CROSS_COMPILE := hppa64-linux-gnu-
39endif
40else # 32-bit 35else # 32-bit
41WIDTH := 36WIDTH :=
42endif 37endif
@@ -44,6 +39,10 @@ endif
44# attempt to help out folks who are cross-compiling 39# attempt to help out folks who are cross-compiling
45ifeq ($(NATIVE),1) 40ifeq ($(NATIVE),1)
46CROSS_COMPILE := hppa$(WIDTH)-linux- 41CROSS_COMPILE := hppa$(WIDTH)-linux-
42else
43 ifeq ($(CROSS_COMPILE),)
44 CROSS_COMPILE := hppa$(WIDTH)-linux-gnu-
45 endif
47endif 46endif
48 47
49OBJCOPY_FLAGS =-O binary -R .note -R .comment -S 48OBJCOPY_FLAGS =-O binary -R .note -R .comment -S