From patchwork Sun Apr 28 14:49:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Corbin X-Patchwork-Id: 1092267 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.b="EuTzqgHY"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44sW402ldyz9s9N for ; Mon, 29 Apr 2019 00:52:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9D91A84E7C; Sun, 28 Apr 2019 14:52:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wAU6sr7p-wOK; Sun, 28 Apr 2019 14:52:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6132884B60; Sun, 28 Apr 2019 14:52:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B680E1BF3E9 for ; Sun, 28 Apr 2019 14:50:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B0A4585C92 for ; Sun, 28 Apr 2019 14:50:39 +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 WqFO9fwCPHHQ for ; Sun, 28 Apr 2019 14:50:37 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2C95885C90 for ; Sun, 28 Apr 2019 14:50:37 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id a12so11869500wrq.10 for ; Sun, 28 Apr 2019 07:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/EbXK9suZLEVuOLsXfdA8dfGv3kFMpPmp1wF61VT6vE=; b=EuTzqgHYOvBoqxhutblPsvwCSYzw0+xE669LTJEsMzeGP+qjpmQnxRXCCIV4SAX64a DIQ+jz7KsPPJvuf4n88w9c76j3IhHIbhBbIw1cCcIH7xGuoh9cCg3dNfbexBi7CYWs2F BVUj5hA02yH+KRK7hJsK+WnJ0Ij68vDdYgWbmC/TFk2zDdoRRhBBSztqFZ8+8tdlVBVG XVgV+1dfuIN6gFUxh1Uv4XtkF16mjojAu4/w9V4iEWp875oLJLvutX1lVGehtiWwaUUB S1lNU1R1DCKWaKGSHFjA76CMOyhWvqUXRc9TTWBwZBJgg0G8BQ4SFQiNf307iDNh3blj Mmew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/EbXK9suZLEVuOLsXfdA8dfGv3kFMpPmp1wF61VT6vE=; b=obz0OtagX73NTmXKWY6WF0ABEn2rbOAG3efUUw5983wzeD+4poWbQLckolxy1SOIpR DG6l+7DG3MS5BO251ATABuE19K5XY+Xbm2ioY0Dd3K3yMYttP+llgWLIMF8rSJNHrO3N H/8dNTDL6L9jnqQVadAOFQxAaVHPoSJh/f9IrYNErf6CDlrkCFNA+l8KQYNFz3pHlKdB gkpv8CVAao8oUBhEd1u0qRvEbJMIiN4grlJIbf/LgYELzO0Qv64wb9Cg8vUIcQENvK8z iNxHawNuoEWWZaNuvbtGIhAgfyxCWcmaUqjVhKZYdolmaH79GT0F1IPmhWK3opW2Xjov A9GA== X-Gm-Message-State: APjAAAUEJWq/DiWgd87yU/WrY5SUv0GciGzaA5DToPwl0PPqqeUPQXkz nohpX2C8dYv6Z/obkw41f/nLPOcTYz5OMg== X-Google-Smtp-Source: APXvYqxB+4AoyKb8MH79jXPYhLYeR9cVY+hhGEcqpSt2wLCffr5aAI0qU8mR6NNtFuw8pHsBzsfnDw== X-Received: by 2002:adf:f40d:: with SMTP id g13mr3098765wro.158.1556463035567; Sun, 28 Apr 2019 07:50:35 -0700 (PDT) Received: from godzilla.lym.embecosm-corp.com (cust64-dsl91-135-5.idnet.net. [91.135.5.64]) by smtp.gmail.com with ESMTPSA id u2sm26678185wru.36.2019.04.28.07.50.34 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 28 Apr 2019 07:50:35 -0700 (PDT) From: Mark Corbin To: buildroot@buildroot.org Date: Sun, 28 Apr 2019 15:49:38 +0100 Message-Id: <20190428144939.28964-3-mark.corbin@embecosm.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190428144939.28964-1-mark.corbin@embecosm.com> References: <20190428144939.28964-1-mark.corbin@embecosm.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/3] boot/riscv-pk: remove hardcoding of the ABI X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Francis , Mark Corbin Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The riscv-pk package is currently hardcoded to always use the softfloat ABI when compiling, i.e. ilp32 for 32-bit and lp64 for 64-bit. The SiFive HiFive Unleashed board has hardware floating point support, so we need to be able to build riscv-pk with both softfloat and hardfloat toolchains. This patch adds the ability to specify the ABI via --with-abi when configuring riscv-pk. If this option is not provided then the compiler default ABI setting will be used instead. Signed-off-by: Mark Corbin --- ...-specify-ABI-or-use-compiler-default.patch | 72 +++++++++++++++++++ boot/riscv-pk/riscv-pk.mk | 5 +- 2 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 boot/riscv-pk/0001-Add-ability-to-specify-ABI-or-use-compiler-default.patch diff --git a/boot/riscv-pk/0001-Add-ability-to-specify-ABI-or-use-compiler-default.patch b/boot/riscv-pk/0001-Add-ability-to-specify-ABI-or-use-compiler-default.patch new file mode 100644 index 0000000000..3cee9a4fd6 --- /dev/null +++ b/boot/riscv-pk/0001-Add-ability-to-specify-ABI-or-use-compiler-default.patch @@ -0,0 +1,72 @@ +From 0f7e2c2f61c6bb36a33733e89ec8d79f89d618ae Mon Sep 17 00:00:00 2001 +From: Mark Corbin +Date: Thu, 18 Apr 2019 12:07:02 +0100 +Subject: [PATCH] Add ability to specify ABI or use compiler default + +Allow the ABI to be defined using --with-abi. If this option is +not provided then the compiler default ABI setting will be used. + +Signed-off-by: Mark Corbin +--- + Makefile.in | 15 +++++++++++---- + configure.ac | 4 ++++ + 2 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index aeabdc2..d6b988f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -51,8 +51,7 @@ else + endif + + # If --with-arch is not specified, it defaults to whatever the compiler's +-# default is. The -with-abi is not necessary for this project. Unconditionally +-# compile it with a no-float ABI. i.e., ilp32 for 32-bit and lp64 for 64-bit. ++# default is. + + ifeq (@WITH_ARCH@,) + march := -march=$(shell @CC@ -v 2>&1 | \ +@@ -60,8 +59,16 @@ ifeq (@WITH_ARCH@,) + else + march := -march=@WITH_ARCH@ + endif +-is_32bit := $(findstring 32,$(march)) +-mabi := -mabi=$(if $(is_32bit),ilp32,lp64) ++ ++# If --with-abi is not specified, it defaults to whatever the compiler's ++# default is. ++ ++ifeq (@WITH_ABI@,) ++ mabi := -mabi=$(shell @CC@ -v 2>&1 | \ ++ sed 's/ /\n/g' | grep with-abi | awk -F= '{print $$2}') ++else ++ mabi := -mabi=@WITH_ABI@ ++endif + + # Installation directories + +diff --git a/configure.ac b/configure.ac +index 917179f..180a8db 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -83,6 +83,9 @@ AC_ARG_VAR(RISCV, [top-level RISC-V install directory]) + AC_ARG_WITH([arch], AS_HELP_STRING([--with-arch], [Set the RISC-V architecture]), + [AC_SUBST([WITH_ARCH], $with_arch, [Specify architecture to build the project])]) + ++AC_ARG_WITH([abi], AS_HELP_STRING([--with-abi], [Set the RISC-V ABI]), ++ [AC_SUBST([WITH_ABI], $with_abi, [Specify ABI to build the project])]) ++ + AC_ARG_ENABLE([print-device-tree], AS_HELP_STRING([--enable-print-device-tree], [Print DTS when booting])) + AS_IF([test "x$enable_print_device_tree" == "xyes"], [ + AC_DEFINE([PK_PRINT_DEVICE_TREE],,[Define if the DTS is to be displayed]) +@@ -95,6 +98,7 @@ AC_SUBST(CFLAGS) + AC_SUBST(LDFLAGS) + AC_SUBST([LIBS], ["-lgcc"]) + AC_SUBST(WITH_ARCH) ++AC_SUBST(WITH_ABI) + AC_SUBST(host_alias) + + #------------------------------------------------------------------------- +-- +2.19.1 + diff --git a/boot/riscv-pk/riscv-pk.mk b/boot/riscv-pk/riscv-pk.mk index 8386dfe168..f82520d221 100644 --- a/boot/riscv-pk/riscv-pk.mk +++ b/boot/riscv-pk/riscv-pk.mk @@ -9,8 +9,9 @@ RISCV_PK_SITE = git://github.com/riscv/riscv-pk.git RISCV_PK_LICENSE = BSD-3-Clause RISCV_PK_LICENSE_FILES = LICENSE RISCV_PK_DEPENDENCIES = linux -RISCV_PK_SUBDIR = build +RISCV_PK_INSTALL_TARGET = NO RISCV_PK_INSTALL_IMAGES = YES +RISCV_PK_AUTORECONF = YES define RISCV_PK_CONFIGURE_CMDS mkdir -p $(@D)/build @@ -31,4 +32,4 @@ define RISCV_PK_INSTALL_IMAGES_CMDS $(INSTALL) -D -m 0755 $(@D)/build/bbl.bin $(BINARIES_DIR)/bbl.bin endef -$(eval $(generic-package)) +$(eval $(autotools-package))