diff options
author | Helge Deller <deller@gmx.de> | 2013-01-31 17:04:12 -0500 |
---|---|---|
committer | Helge Deller <deller@gmx.de> | 2013-02-20 16:46:06 -0500 |
commit | 0e39718b988b84860a6c291a2c82c9cb75e3b8a9 (patch) | |
tree | 09c7e258d5f80e7709c418df366a48f98c10d024 | |
parent | 26ad19d8ebdb73869341b1b4159d32c0f0755946 (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/Makefile | 9 |
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 | |||
32 | UTS_MACHINE := parisc64 | 32 | UTS_MACHINE := parisc64 |
33 | CHECKFLAGS += -D__LP64__=1 -m64 | 33 | CHECKFLAGS += -D__LP64__=1 -m64 |
34 | WIDTH := 64 | 34 | WIDTH := 64 |
35 | |||
36 | # FIXME: if no default set, should really try to locate dynamically | ||
37 | ifeq ($(CROSS_COMPILE),) | ||
38 | CROSS_COMPILE := hppa64-linux-gnu- | ||
39 | endif | ||
40 | else # 32-bit | 35 | else # 32-bit |
41 | WIDTH := | 36 | WIDTH := |
42 | endif | 37 | endif |
@@ -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 |
45 | ifeq ($(NATIVE),1) | 40 | ifeq ($(NATIVE),1) |
46 | CROSS_COMPILE := hppa$(WIDTH)-linux- | 41 | CROSS_COMPILE := hppa$(WIDTH)-linux- |
42 | else | ||
43 | ifeq ($(CROSS_COMPILE),) | ||
44 | CROSS_COMPILE := hppa$(WIDTH)-linux-gnu- | ||
45 | endif | ||
47 | endif | 46 | endif |
48 | 47 | ||
49 | OBJCOPY_FLAGS =-O binary -R .note -R .comment -S | 48 | OBJCOPY_FLAGS =-O binary -R .note -R .comment -S |