From patchwork Fri Aug 23 18:40:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 269510 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 5514F2C009C for ; Sat, 24 Aug 2013 04:43:51 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7C5998816A; Fri, 23 Aug 2013 18:43:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AUDxbQArVg7Q; Fri, 23 Aug 2013 18:43:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8B51B88377; Fri, 23 Aug 2013 18:43:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 5DA161BF985 for ; Fri, 23 Aug 2013 18:44:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F059E93B9B for ; Fri, 23 Aug 2013 18:44:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lMBFcxrzYzn6 for ; Fri, 23 Aug 2013 18:44:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by hemlock.osuosl.org (Postfix) with ESMTP id 09157939A6 for ; Fri, 23 Aug 2013 18:44:25 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 62332825; Fri, 23 Aug 2013 20:40:27 +0200 (CEST) Received: from localhost (smb-rsycl-04.wifihubtelecom.net [213.174.124.180]) by mail.free-electrons.com (Postfix) with ESMTPSA id D987981A for ; Fri, 23 Aug 2013 20:40:16 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Fri, 23 Aug 2013 20:40:16 +0200 Message-Id: <1377283216-31225-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 Subject: [Buildroot] [PATCH] package/Makefile.in: fix ABI name for EABIhf targets X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net The current code to set ABI on ARM does the following: ifeq ($(BR2_arm)$(BR2_armeb),y) ... set ABI without 'hf' suffix ... else ifeq ($(BR2_ARM_EABIHF),y) ... set ABI with 'hf' suffix ... endif But since $(BR2_arm)$(BR2_armeb) will always be 'y' in the cases where BR2_ARM_EABIHF is 'y', it means that the 'else' part of the condition will never be used. Fix this by appending 'hf' to the ABI variable when BR2_ARM_EABIHF is selected. Signed-off-by: Thomas Petazzoni --- I wondering how the EABIhf stuff could have worked. Is this something I mismerged when rebasing my patch series? Anyway, if my analysis is correct, it's certainly something that should be part of 2013.08. --- package/Makefile.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index e753d6b..e93d3ba 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -46,12 +46,10 @@ ABI=gnueabi else ABI=eabi endif -else ifeq ($(BR2_ARM_EABIHF),y) -ifeq ($(LIBC),uclibc) -ABI=gnueabihf -else -ABI=eabihf endif + +ifeq ($(BR2_ARM_EABIHF),y) +ABI:=$(ABI)hf endif # For FSL PowerPC there's SPE