[ghdl] gnat/gcc5 work arounds

sailer sailer at fedoraproject.org
Thu Mar 12 14:48:44 UTC 2015


commit 60c6495a9cb692175ff503911c709d8d1eb94b46
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Thu Mar 12 15:23:51 2015 +0100

    gnat/gcc5 work arounds

 ghdl-gcc5.patch    |  22 ++++++++
 ghdl-hgreorg.patch | 163 -----------------------------------------------------
 ghdl.spec          |   4 +-
 3 files changed, 24 insertions(+), 165 deletions(-)
---
diff --git a/ghdl-gcc5.patch b/ghdl-gcc5.patch
new file mode 100644
index 0000000..43bed45
--- /dev/null
+++ b/ghdl-gcc5.patch
@@ -0,0 +1,22 @@
+--- src/vhdl/evaluation.adb.orig	2015-03-12 15:10:19.489526836 +0100
++++ src/vhdl/evaluation.adb	2015-03-12 15:22:13.476472857 +0100
+@@ -2564,6 +2564,9 @@
+             if Right < Left then
+                --  Null range.
+                return 0;
++            elsif Right = 9223372036854775807
++              and then Left = -9223372036854775808 then
++               return 0;
+             else
+                Res := Right - Left + 1;
+             end if;
+@@ -2571,6 +2574,9 @@
+             if Left < Right then
+                --  Null range
+                return 0;
++            elsif Left = 9223372036854775807
++              and then Right = -9223372036854775808 then
++               return 0;
+             else
+                Res := Left - Right + 1;
+             end if;
diff --git a/ghdl.spec b/ghdl.spec
index 90a4afe..b953c33 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -67,9 +67,9 @@ Patch105: ghdl-grtadac.patch
 # https://gna.org/bugs/index.php?13390
 Patch106: ghdl-ppc64abort.patch
 # http://gcc.gnu.org/ml/gcc-patches/2012-10/msg02505.html
+Patch110: ghdl-gcc5.patch
 Patch111: gcc47-texinfo.patch
 Patch112: ghdl-mcode32bit.patch
-Patch113: ghdl-hgreorg.patch
 Patch114: ghdl-llvmlib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
@@ -277,7 +277,7 @@ rm -f libgo/go/crypto/elliptic/p224{,_test}.go
 %patch19 -p0 -b .pr63659~
 
 pushd ghdl-updates-code
-#patch113 -p0 -b .reorg
+%patch110 -p0 -b .gcc5
 %patch114 -p0 -b .llvm
 popd
 %ifarch %{ix86} x86_64


More information about the scm-commits mailing list