From af2b61014536d0c3861825398b3e1f9cee71e4f6 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Dec 10 2020 20:35:29 +0000 Subject: - updated to new ghdl snapshot - adapt for gcc/gnat11 --- diff --git a/ghdl-gcc11.patch b/ghdl-gcc11.patch new file mode 100644 index 0000000..c7d765c --- /dev/null +++ b/ghdl-gcc11.patch @@ -0,0 +1,11 @@ +diff -up ghdl/src/synth/synth-insts.adb.orig ghdl/src/synth/synth-insts.adb +--- ghdl/src/synth/synth-insts.adb.orig 2020-12-10 21:10:21.730105052 +0100 ++++ ghdl/src/synth/synth-insts.adb 2020-12-10 21:10:34.538536693 +0100 +@@ -248,7 +248,6 @@ package body Synth.Insts is + use Name_Table; + Id_Len : constant Natural := Get_Name_Length (Id); + Str_Len : constant Natural := Id_Len + 512; +- pragma Assert (GNAT.SHA1.Hash_Length = 20); + Str : String (1 .. Str_Len + 41); + Len : Natural; + diff --git a/ghdl-llvm11.patch b/ghdl-llvm11.patch deleted file mode 100644 index 7947b34..0000000 --- a/ghdl-llvm11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git ghdl/configure ghdl/configure -index 1cac4c53..10dd73ce 100755 ---- ghdl/configure -+++ ghdl/configure -@@ -276,6 +276,7 @@ if test $backend = llvm; then - check_version 8.0 $llvm_version || - check_version 9.0 $llvm_version || - check_version 10.0 $llvm_version || -+ check_version 11.0 $llvm_version || - false; then - echo "Debugging is not enabled with llvm $llvm_version" - else diff --git a/ghdl.spec b/ghdl.spec index f1817c3..f9bde24 100644 --- a/ghdl.spec +++ b/ghdl.spec @@ -1,6 +1,6 @@ %global ghdlver 0.38~dev -%global ghdldate 20200827 -%global ghdlcommit 4ce9925590a96055dabfdd8646055dd378d33650 +%global ghdldate 20201208 +%global ghdlcommit 83dfd49481603fc894652a4191c6787cbc319898 %global ghdlshortcommit %(c=%{ghdlcommit}; echo ${c:0:7}) %global ghdlgitrev %{ghdldate}git%{ghdlshortcommit} @@ -40,7 +40,7 @@ Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: %{ghdlver} -Release: 9.%{ghdlgitrev}%{?dist} +Release: 10.%{ghdlgitrev}%{?dist} License: GPLv2+ and GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD URL: http://ghdl.free.fr/ # The source for this package was pulled from upstream's vcs. Use the @@ -67,7 +67,7 @@ Patch14: gcc10-pr96690.patch Source100: https://github.com/ghdl/ghdl/archive/%{ghdlcommit}/%{name}-%{ghdlshortcommit}.tar.gz Patch100: ghdl-llvmflags.patch -Patch101: ghdl-llvm11.patch +Patch101: ghdl-gcc11.patch # From: Thomas Sailer # To: ghdl-discuss@gna.org # Date: Thu, 02 Apr 2009 15:36:00 +0200 @@ -235,7 +235,7 @@ rm -f gcc/testsuite/go.test/test/chan/goroutines.go # ghdl mv ghdl-%{ghdlcommit} ghdl %patch100 -p0 -b .llvmflags~ -%patch101 -p0 -b .llvm11~ +%patch101 -p0 -b .gcc11~ # fix library and include path pushd ghdl @@ -535,6 +535,10 @@ rm %{buildroot}/usr/lib/libghdl.{a,link} %endif %changelog +* Thu Dec 10 2020 Dan Horák - 0.38~dev-10.20201208git83dfd49 +- updated to new ghdl snapshot +- adapt for gcc/gnat11 + * Fri Aug 28 2020 Dan Horák - 0.38~dev-9.20200827git4ce9925 - updated to new ghdl snapshot - updated to gcc 10.2.1-3 diff --git a/sources b/sources index 4ded889..fdd76a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (gcc-10.2.1-20200826.tar.xz) = b6949ea780618400dec06b8fc7b2728414d46e5972970ed70949ce16100547e4a9a6a5ce84ae1f47309a0610607b5454b0acc5fe5ecbb2889c84346bcdbdc8ab -SHA512 (ghdl-4ce9925.tar.gz) = ed8238cc19927a29727f83fa1c014be1dcb8608a9575f76c24d6d43e355e8547b7aee5674873423910856c635cb86d42bf153067ca5badb8ca1ffb0a1557e7dc +SHA512 (ghdl-83dfd49.tar.gz) = 23588bef5786ae8b62f1d938532d40973760ae37f8a22ddc578826cf133781e250500d292ca61925fa33d84c2701e159e7d0aae8a96780ac2d88cd0a9655bdeb