From 588ecbc82e50c2d1c27a8568e6e83f6ad501a2c3 Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Thu, 31 Jan 2013 22:04:12 +0000 Subject: [PATCH] --- yaml --- r: 356300 b: refs/heads/master c: 0e39718b988b84860a6c291a2c82c9cb75e3b8a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/parisc/Makefile | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 05626ab1bb4d..b0d449ea9261 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26ad19d8ebdb73869341b1b4159d32c0f0755946 +refs/heads/master: 0e39718b988b84860a6c291a2c82c9cb75e3b8a9 diff --git a/trunk/arch/parisc/Makefile b/trunk/arch/parisc/Makefile index 5707f1a62341..87f64d6b5dcb 100644 --- a/trunk/arch/parisc/Makefile +++ b/trunk/arch/parisc/Makefile @@ -32,11 +32,6 @@ 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 @@ -44,6 +39,10 @@ endif # attempt to help out folks who are cross-compiling ifeq ($(NATIVE),1) CROSS_COMPILE := hppa$(WIDTH)-linux- +else + ifeq ($(CROSS_COMPILE),) + CROSS_COMPILE := hppa$(WIDTH)-linux-gnu- + endif endif OBJCOPY_FLAGS =-O binary -R .note -R .comment -S