diff --git a/recipes-devtools/riscv-tools/files/0002-Makefile.in-Don-t-specify-a-march-if-one-isn-t-speci.patch b/recipes-devtools/riscv-tools/files/0002-Makefile.in-Don-t-specify-a-march-if-one-isn-t-speci.patch deleted file mode 100644 index a73dd49..0000000 --- a/recipes-devtools/riscv-tools/files/0002-Makefile.in-Don-t-specify-a-march-if-one-isn-t-speci.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4c0651d47ef53edf262c26e486543acb2b353cfb Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Fri, 2 Nov 2018 10:22:09 -0700 -Subject: [PATCH] Makefile.in: Don't specify a march if one isn't specified - -This breaks the build when using the OE toolchain. - -Signed-off-by: Alistair Francis ---- - Makefile.in | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index aeabdc2..ac696fb 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -50,19 +50,6 @@ else - project_ver:=@PACKAGE_VERSION@ - 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. -- --ifeq (@WITH_ARCH@,) -- march := -march=$(shell @CC@ -v 2>&1 | \ -- sed 's/ /\n/g' | grep with-arch | awk -F= '{print $$2}') --else -- march := -march=@WITH_ARCH@ --endif --is_32bit := $(findstring 32,$(march)) --mabi := -mabi=$(if $(is_32bit),ilp32,lp64) -- - # Installation directories - - prefix := @prefix@ --- -2.19.1 - diff --git a/recipes-devtools/riscv-tools/riscv-pk.bb b/recipes-devtools/riscv-tools/riscv-pk.bb index fa5d5bd..2210e4f 100644 --- a/recipes-devtools/riscv-tools/riscv-pk.bb +++ b/recipes-devtools/riscv-tools/riscv-pk.bb @@ -4,10 +4,9 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "7bee30c1ff56975041ffc67cd0170d7477aba865" +SRCREV = "6ebd0f2a46255d0c76dad3c05b16c1d154795d26" SRC_URI = "git://github.com/riscv/riscv-pk.git \ file://0001-add-acinclude.m4.patch \ - file://0002-Makefile.in-Don-t-specify-a-march-if-one-isn-t-speci.patch \ " PACKAGE_ARCH = "${MACHINE_ARCH}"