From patchwork Mon Jun 9 00:21:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 4317341 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B16729F357 for ; Mon, 9 Jun 2014 00:21:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E188420171 for ; Mon, 9 Jun 2014 00:21:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3420920170 for ; Mon, 9 Jun 2014 00:21:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753618AbaFIAVq (ORCPT ); Sun, 8 Jun 2014 20:21:46 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:41718 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753604AbaFIAVp (ORCPT ); Sun, 8 Jun 2014 20:21:45 -0400 Received: from deadeye.wl.decadent.org.uk ([192.168.4.249]) by shadbolt.decadent.org.uk with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1WtnLL-0001Bs-TR; Mon, 09 Jun 2014 01:21:43 +0100 Received: from ben by deadeye.wl.decadent.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1WtnLH-00030C-5H; Mon, 09 Jun 2014 01:21:39 +0100 Message-ID: <1402273294.23860.59.camel@deadeye.wl.decadent.org.uk> Subject: [PATCH v2 1/2] deb-pkg: Add automatic support for armhf architecture From: Ben Hutchings To: linux-kbuild Cc: maximilian attems , Michal Marek , Fathi Boudra , debian-arm@lists.debian.org, Hector Oron Date: Mon, 09 Jun 2014 01:21:34 +0100 X-Mailer: Evolution 3.12.2-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.4.249 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Debian armhf architecture uses the ARM EABI hard-float variant, whereas armel uses the soft-float variant. Although the kernel doesn't use FP itself, CONFIG_VFP must be enabled to support hard-float userland and will probably be disabled when supporting a soft-float userland. So set the architecture to armhf by default when CONFIG_AEABI and CONFIG_VFP are both enabled. Signed-off-by: Ben Hutchings Acked-by: Fathi Boudra --- v2: rebased After discussion with Hector, we agreed this would be a worthwhile change. Hector may later improve this by using gcc specs. Ben. scripts/package/builddeb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index f46e4dd..6756ed6 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -43,7 +43,16 @@ create_package() { mips*) debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;; arm*) - debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;; + if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then + if grep -q CONFIG_VFP=y $KCONFIG_CONFIG; then + debarch=armhf + else + debarch=armel + fi + else + debarch=arm + fi + ;; *) echo "" >&2 echo "** ** ** WARNING ** ** **" >&2