The package rpms/ghdl.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=2cbed0c878c97...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=1ee9db1e9ec2a...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=9f4d1487f7cd9...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=ac744e6c2d203...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=eceda87d3be23...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=32fef3193425a...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=e14fd70430b3f...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=42f1fd9880816...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=681103f507089...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=0de5c613463a1...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=c8a4aa5be030b...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=b1ce3dd895ad9...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=618179939809c...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=a32fa453eef38...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=4777bcd6d0cc8...
https://src.fedoraproject.org/cgit/rpms/ghdl.git/commit/?id=133173d4a7048....
Change:
-%ifarch mips64 mips64el
-%ifarch %{ix86} x86_64 ia64 ppc64le
-%ifarch %{ix86} x86_64 ppc64le s390x %{arm} aarch64
-%ifarch %{ix86} x86_64 %{arm} alpha ppc ppc64 ppc64le ppc64p7 s390 s390x aarch64
-%ifnarch sparc sparcv9 ppc
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips}
-%ifarch x86_64
-%ifarch ppc64le riscv64 s390x
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
-%ifarch ppc64le s390x
+%ifarch ppc64le %{mips} riscv64 s390x
-%ifarch x86_64
-%ifarch %{ix86} x86_64
-%ifarch x86_64 ppc64le
-%ifarch ia64
-%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit 3e77bd9134cf2f0411736b31ebd00187d3ac8067
Author: Dan Hork <dan(a)danny.cz>
Date: Sat Feb 1 23:25:02 2020 +0100
bump and rebuild
diff --git a/ghdl.spec b/ghdl.spec
index 1a82724..c9fbb4b 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -40,7 +40,7 @@
Summary: A VHDL simulator, using the GCC technology
Name: ghdl
Version: %{ghdlver}
-Release: 11.%{ghdlgitrev}%{?dist}
+Release: 13.%{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
@@ -532,6 +532,9 @@ mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%endif
%changelog
+* Sat Feb 01 2020 Dan Hork <dan[at]danny.cz> - 0.37dev-13.20200201git5428d6e
+- updated to new ghdl snapshot
+
* Wed Jan 29 2020 Dan Hork <dan[at]danny.cz> - 0.37dev-11.20200127gita4fdd19
- updated to new ghdl snapshot
commit a15f5e37d7cea5e9006fba4ffef2abf6aa6ef7ef
Author: Dan Hork <dan(a)danny.cz>
Date: Sat Feb 1 23:23:46 2020 +0100
- updated to new ghdl snapshot
diff --git a/ghdl.spec b/ghdl.spec
index 3a7c5fa..1a82724 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,6 +1,6 @@
%global ghdlver 0.37dev
-%global ghdldate 20200127
-%global ghdlcommit a4fdd199a60ee8bc079a4ac59ef955a210858d04
+%global ghdldate 20200201
+%global ghdlcommit 5428d6e8537dbe4b9533a29b5d8124340471cb4c
%global ghdlshortcommit %(c=%{ghdlcommit}; echo ${c:0:7})
%global ghdlgitrev %{ghdldate}git%{ghdlshortcommit}
diff --git a/sources b/sources
index 1985182..d62cccd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (gcc-9.2.1-20191120.tar.xz) =
cbd156d19afc4d4e752df3aee159906899f229342c314dcb16699e29bb43c0ac63b35ced11fcc50c4017c20e4e0e5609d941d88abcfe16e3903c3e7da6050acd
-SHA512 (ghdl-a4fdd19.tar.gz) =
103bfe8dc0ae5c1b229a126cad44745dc3871bd957c5b1150e5258ade585aa2b79d163d5f03c2d0f8c7f229fdc86d2a121ffc643d4915be6ab8fec5a670a94ce
+SHA512 (ghdl-5428d6e.tar.gz) =
f8a8a148a2fa0d0c9d12bbed9eb849f939c65693565b3f5f82f2ce32721d674b53e01e8a36c93ded16af0a2f3c89090d03d46ed68ce3ce19fbf1ce7a2e6c254f
commit 8d096a71ee10635e5cf51354a280b37aec048a5f
Author: Dan Hork <dan(a)danny.cz>
Date: Sat Feb 1 23:18:59 2020 +0100
lower the requirement on gcc NVR to 9.2.1-1
diff --git a/ghdl.spec b/ghdl.spec
index c2a967f..3a7c5fa 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -28,7 +28,7 @@
%global gcc_major 9
# Note, gcc_release must be integer, if you want to add suffixes to
# %%{release}, append them after %%{gcc_release} on Release: line.
-%global gcc_release 2
+%global gcc_release 1
# Hardening slows the compiler way too much.
%undefine _hardened_build
%if 0%{?fedora} > 27 || 0%{?rhel} > 7
commit 98b02fc588a00e840f9720f25ceb5521f1ed57a4
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Jan 29 17:16:09 2020 +0100
fix include path
diff --git a/ghdl.spec b/ghdl.spec
index 0a8819f..c2a967f 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -225,8 +225,8 @@ mv ghdl-%{ghdlcommit} ghdl
# fix library and include path
pushd ghdl
-sed -i.orig -e 's|\"lib\"|\"%{_lib}\"|' -e
's|\"include\"|\"include/vhdl\"|' src/ghdldrv/ghdlsynth.adb
-sed -i.orig -e 's|\"lib\"|\"%{_lib}\"|' -e
's|\"include\"|\"include/vhdl\"|' src/ghdldrv/ghdlvpi.adb
+sed -i.orig -e 's|\"lib\"|\"%{_lib}\"|' -e
's|\"include\"|\"include/ghdl\"|' src/ghdldrv/ghdlsynth.adb
+sed -i.orig -e 's|\"lib\"|\"%{_lib}\"|' -e
's|\"include\"|\"include/ghdl\"|' src/ghdldrv/ghdlvpi.adb
popd
%if %{without gnatwae}
commit 4b4bbadc5b12fee6db21e6080e549c06cba6d883
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Jan 29 15:56:26 2020 +0100
fix library and include path for vpi
diff --git a/ghdl.spec b/ghdl.spec
index aea866f..0a8819f 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -226,6 +226,7 @@ mv ghdl-%{ghdlcommit} ghdl
# fix library and include path
pushd ghdl
sed -i.orig -e 's|\"lib\"|\"%{_lib}\"|' -e
's|\"include\"|\"include/vhdl\"|' src/ghdldrv/ghdlsynth.adb
+sed -i.orig -e 's|\"lib\"|\"%{_lib}\"|' -e
's|\"include\"|\"include/vhdl\"|' src/ghdldrv/ghdlvpi.adb
popd
%if %{without gnatwae}
commit 246addea225eba8dd7d43beea773ceb6e0a4ff79
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Jan 29 11:57:26 2020 +0100
fix sources
diff --git a/sources b/sources
index 51d3514..1985182 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
SHA512 (gcc-9.2.1-20191120.tar.xz) =
cbd156d19afc4d4e752df3aee159906899f229342c314dcb16699e29bb43c0ac63b35ced11fcc50c4017c20e4e0e5609d941d88abcfe16e3903c3e7da6050acd
-SHA512 (ghdl-38c38e7.tar.gz) =
563700c9b281e3da8d8f23af5dcf45c9e8de7854431e157d0daf87df477f3484806cbcd474a517c734cef2f48b87c71c589e29e2a6375b3a7f50b33e46e03bf2
SHA512 (ghdl-a4fdd19.tar.gz) =
103bfe8dc0ae5c1b229a126cad44745dc3871bd957c5b1150e5258ade585aa2b79d163d5f03c2d0f8c7f229fdc86d2a121ffc643d4915be6ab8fec5a670a94ce
commit 7bf9637523b6affcc91591f6a389425dd0674526
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Jan 29 10:18:33 2020 +0100
- updated to new ghdl snapshot
diff --git a/ghdl-llvmflags.patch b/ghdl-llvmflags.patch
index 2f94e7a..b6b17c5 100644
--- a/ghdl-llvmflags.patch
+++ b/ghdl-llvmflags.patch
@@ -1,7 +1,8 @@
---- ghdl/src/ortho/llvm4-nodebug/Makefile 2019-01-29 17:30:36.024252822 +0100
-+++ ghdl/src/ortho/llvm4-nodebug/Makefile 2019-01-29 17:31:18.958454509 +0100
-@@ -15,7 +15,7 @@
- $(LDFLAGS) `$(LLVM_CONFIG) --ldflags --libs --system-libs`
+diff -up ghdl/src/ortho/llvm4-nodebug/Makefile.llvmflags~
ghdl/src/ortho/llvm4-nodebug/Makefile
+--- ghdl/src/ortho/llvm4-nodebug/Makefile.llvmflags~ 2020-01-29 09:40:38.264921221 +0100
++++ ghdl/src/ortho/llvm4-nodebug/Makefile 2020-01-29 09:42:36.380073411 +0100
+@@ -17,7 +17,7 @@ $(ortho_exec): $(ortho_srcdir)/llvm4-nod
+ $(LDFLAGS) `$(LLVM_LDFLAGS)`
llvm-cbindings.o: $(ortho_srcdir)/llvm4-nodebug/llvm-cbindings.cpp
- $(CXX) -c `$(LLVM_CONFIG) --cxxflags` -o $@ $<
diff --git a/ghdl.spec b/ghdl.spec
index 186187c..aea866f 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,6 +1,6 @@
%global ghdlver 0.37dev
-%global ghdldate 20191224
-%global ghdlcommit 38c38e7f30dbe7f9e51992f399d80c344c72130c
+%global ghdldate 20200127
+%global ghdlcommit a4fdd199a60ee8bc079a4ac59ef955a210858d04
%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: 10.%{ghdlgitrev}%{?dist}
+Release: 11.%{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
@@ -531,6 +531,9 @@ mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%endif
%changelog
+* Wed Jan 29 2020 Dan Hork <dan[at]danny.cz> - 0.37dev-11.20200127gita4fdd19
+- updated to new ghdl snapshot
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.37dev-10.20191224git38c38e7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index fcfb2f1..51d3514 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (gcc-9.2.1-20191120.tar.xz) =
cbd156d19afc4d4e752df3aee159906899f229342c314dcb16699e29bb43c0ac63b35ced11fcc50c4017c20e4e0e5609d941d88abcfe16e3903c3e7da6050acd
SHA512 (ghdl-38c38e7.tar.gz) =
563700c9b281e3da8d8f23af5dcf45c9e8de7854431e157d0daf87df477f3484806cbcd474a517c734cef2f48b87c71c589e29e2a6375b3a7f50b33e46e03bf2
+SHA512 (ghdl-a4fdd19.tar.gz) =
103bfe8dc0ae5c1b229a126cad44745dc3871bd957c5b1150e5258ade585aa2b79d163d5f03c2d0f8c7f229fdc86d2a121ffc643d4915be6ab8fec5a670a94ce
commit b38f67f0a2f7af825076aced55d87e8bc2e3f89e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 28 21:48:06 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/ghdl.spec b/ghdl.spec
index 6594f83..186187c 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -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
@@ -531,6 +531,9 @@ mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%endif
%changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.37dev-10.20191224git38c38e7
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Sat Dec 28 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-9.20191224git38c38e7
- updated to new ghdl snapshot
commit cfb28b7cf29f09039fec80236bc2d4826def176d
Author: Dan Hork <dan(a)danny.cz>
Date: Sat Dec 28 13:23:56 2019 +0100
- updated to new ghdl snapshot
diff --git a/ghdl.spec b/ghdl.spec
index 82161d1..6594f83 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,6 +1,6 @@
%global ghdlver 0.37dev
-%global ghdldate 20191206
-%global ghdlcommit 208f254206590d98834ce92f644f6f9891707a70
+%global ghdldate 20191224
+%global ghdlcommit 38c38e7f30dbe7f9e51992f399d80c344c72130c
%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: 8.%{ghdlgitrev}%{?dist}
+Release: 9.%{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
@@ -531,6 +531,9 @@ mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%endif
%changelog
+* Sat Dec 28 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-9.20191224git38c38e7
+- updated to new ghdl snapshot
+
* Tue Dec 10 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-8.20191206git208f254
- updated to new ghdl snapshot
diff --git a/sources b/sources
index 9d2fad3..fcfb2f1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (gcc-9.2.1-20191120.tar.xz) =
cbd156d19afc4d4e752df3aee159906899f229342c314dcb16699e29bb43c0ac63b35ced11fcc50c4017c20e4e0e5609d941d88abcfe16e3903c3e7da6050acd
-SHA512 (ghdl-208f254.tar.gz) =
783870cf1cece96c5c34cd701c04a4e58dc8c98e93bf62e5b8aa94d216f54b516473781ab6d9fb96af16a33b6adea362fa694310499a559ceeddd8dc412c48ee
+SHA512 (ghdl-38c38e7.tar.gz) =
563700c9b281e3da8d8f23af5dcf45c9e8de7854431e157d0daf87df477f3484806cbcd474a517c734cef2f48b87c71c589e29e2a6375b3a7f50b33e46e03bf2
commit d93bf57f4f79739961637a95ecd08669155472ec
Author: Dan Hork <dan(a)danny.cz>
Date: Tue Dec 10 09:33:11 2019 +0100
spec cleanup
diff --git a/ghdl.spec b/ghdl.spec
index 7d9d6d1..82161d1 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -29,7 +29,6 @@
# Note, gcc_release must be integer, if you want to add suffixes to
# %%{release}, append them after %%{gcc_release} on Release: line.
%global gcc_release 2
-%global _performance_build 1
# Hardening slows the compiler way too much.
%undefine _hardened_build
%if 0%{?fedora} > 27 || 0%{?rhel} > 7
commit 96dbc0dde30e469e131dd8d0310693414b3b8d56
Author: Dan Hork <dan(a)danny.cz>
Date: Tue Dec 10 09:31:25 2019 +0100
- updated to new ghdl snapshot
diff --git a/ghdl.spec b/ghdl.spec
index 389fd86..7d9d6d1 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,6 +1,6 @@
%global ghdlver 0.37dev
-%global ghdldate 20191130
-%global ghdlcommit 3bd9a185da8178e878e8034e04aab2238bab50ff
+%global ghdldate 20191206
+%global ghdlcommit 208f254206590d98834ce92f644f6f9891707a70
%global ghdlshortcommit %(c=%{ghdlcommit}; echo ${c:0:7})
%global ghdlgitrev %{ghdldate}git%{ghdlshortcommit}
@@ -41,7 +41,7 @@
Summary: A VHDL simulator, using the GCC technology
Name: ghdl
Version: %{ghdlver}
-Release: 7.%{ghdlgitrev}%{?dist}
+Release: 8.%{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
@@ -532,6 +532,9 @@ mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%endif
%changelog
+* Tue Dec 10 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-8.20191206git208f254
+- updated to new ghdl snapshot
+
* Sun Dec 01 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-7.20191130git3bd9a18
- updated to new ghdl snapshot
- fix library and include path for synth
diff --git a/sources b/sources
index e29ecf4..9d2fad3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (gcc-9.2.1-20191120.tar.xz) =
cbd156d19afc4d4e752df3aee159906899f229342c314dcb16699e29bb43c0ac63b35ced11fcc50c4017c20e4e0e5609d941d88abcfe16e3903c3e7da6050acd
-SHA512 (ghdl-3bd9a18.tar.gz) =
2fc12f349cfda69530db5bad352a1051f148d3f1541e1ceab6570ba8af490a2cdbb9a9bf3c13909fab29d5e1d4f3fe65bc599db9107d32c0df013ca310f338a4
+SHA512 (ghdl-208f254.tar.gz) =
783870cf1cece96c5c34cd701c04a4e58dc8c98e93bf62e5b8aa94d216f54b516473781ab6d9fb96af16a33b6adea362fa694310499a559ceeddd8dc412c48ee
commit 632663da45bf1e4c7939b63b363afabf43a949e3
Author: Dan Hork <dan(a)danny.cz>
Date: Sun Dec 1 15:00:04 2019 +0100
- updated to new ghdl snapshot
- fix library and include path for synth
diff --git a/ghdl.spec b/ghdl.spec
index ceec632..389fd86 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,6 +1,6 @@
%global ghdlver 0.37dev
-%global ghdldate 20191121
-%global ghdlcommit 03862a4607fd127e6570a3e141a92265a23c2a68
+%global ghdldate 20191130
+%global ghdlcommit 3bd9a185da8178e878e8034e04aab2238bab50ff
%global ghdlshortcommit %(c=%{ghdlcommit}; echo ${c:0:7})
%global ghdlgitrev %{ghdldate}git%{ghdlshortcommit}
@@ -41,7 +41,7 @@
Summary: A VHDL simulator, using the GCC technology
Name: ghdl
Version: %{ghdlver}
-Release: 6.%{ghdlgitrev}%{?dist}
+Release: 7.%{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
@@ -224,6 +224,11 @@ rm -f gcc/testsuite/go.test/test/chan/goroutines.go
mv ghdl-%{ghdlcommit} ghdl
%patch100 -p0 -b .llvmflags~
+# fix library and include path
+pushd ghdl
+sed -i.orig -e 's|\"lib\"|\"%{_lib}\"|' -e
's|\"include\"|\"include/vhdl\"|' src/ghdldrv/ghdlsynth.adb
+popd
+
%if %{without gnatwae}
perl -i -pe 's,-gnatwae,,' ghdl/dist/gcc/Make-lang.in
%endif
@@ -527,6 +532,10 @@ mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%endif
%changelog
+* Sun Dec 01 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-7.20191130git3bd9a18
+- updated to new ghdl snapshot
+- fix library and include path for synth
+
* Thu Nov 21 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-6.20191121git03862a4
- updated to new ghdl snapshot
- rebased to gcc 9.2.1
diff --git a/sources b/sources
index 63866b7..e29ecf4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (gcc-9.2.1-20191120.tar.xz) =
cbd156d19afc4d4e752df3aee159906899f229342c314dcb16699e29bb43c0ac63b35ced11fcc50c4017c20e4e0e5609d941d88abcfe16e3903c3e7da6050acd
-SHA512 (ghdl-03862a4.tar.gz) =
742a5f4ee58e4d0cbfe678f3328c5693c8d1337c9d285d4915ff7d872545020d06586d6dcd1b535ad265475207cc2dc1f167014b606f13c7f6feb935c85b47f7
+SHA512 (ghdl-3bd9a18.tar.gz) =
2fc12f349cfda69530db5bad352a1051f148d3f1541e1ceab6570ba8af490a2cdbb9a9bf3c13909fab29d5e1d4f3fe65bc599db9107d32c0df013ca310f338a4
commit 25eb8f91d2a6ef8844a9a87e2818da918fe322a3
Author: Dan Hork <dan(a)danny.cz>
Date: Thu Nov 21 09:46:42 2019 +0100
fix changelog date
diff --git a/ghdl.spec b/ghdl.spec
index 2235221..ceec632 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -527,7 +527,7 @@ mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%endif
%changelog
-* Tue Nov 19 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-6.20191121git03862a4
+* Thu Nov 21 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-6.20191121git03862a4
- updated to new ghdl snapshot
- rebased to gcc 9.2.1
- many cleanups
commit af662bb21f07aa8a3de7236b40f7445947bc3f45
Author: Dan Hork <dan(a)danny.cz>
Date: Thu Nov 21 09:45:27 2019 +0100
update to new gcc 9.2.1 snapshot
diff --git a/ghdl.spec b/ghdl.spec
index a47bd94..2235221 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -22,13 +22,13 @@
%bcond_with gnatwae
-%global DATE 20190827
-%global SVNREV 274959
+%global DATE 20191120
+%global SVNREV 278493
%global gcc_version 9.2.1
%global gcc_major 9
# Note, gcc_release must be integer, if you want to add suffixes to
# %%{release}, append them after %%{gcc_release} on Release: line.
-%global gcc_release 1
+%global gcc_release 2
%global _performance_build 1
# Hardening slows the compiler way too much.
%undefine _hardened_build
diff --git a/sources b/sources
index 18d8ce2..63866b7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (gcc-9.2.1-20190827.tar.xz) =
211ab74cb6859e171cfcefc199d7f2e67add5405996caef10f04c6e38e78781881c047a6016842edeb29026056510f1a6c6e91bf572ce65bf6741c01c379faf7
+SHA512 (gcc-9.2.1-20191120.tar.xz) =
cbd156d19afc4d4e752df3aee159906899f229342c314dcb16699e29bb43c0ac63b35ced11fcc50c4017c20e4e0e5609d941d88abcfe16e3903c3e7da6050acd
SHA512 (ghdl-03862a4.tar.gz) =
742a5f4ee58e4d0cbfe678f3328c5693c8d1337c9d285d4915ff7d872545020d06586d6dcd1b535ad265475207cc2dc1f167014b606f13c7f6feb935c85b47f7
commit f0be1832451954a5882f4170f46a4d14a73abd99
Author: Dan Hork <dan(a)danny.cz>
Date: Thu Nov 21 09:38:12 2019 +0100
update to new ghdl snapshot
diff --git a/ghdl.spec b/ghdl.spec
index 8851126..a47bd94 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,6 +1,6 @@
%global ghdlver 0.37dev
-%global ghdldate 20191119
-%global ghdlcommit 19c87d08ad5cb06c8f537bbe2306508eebe0978d
+%global ghdldate 20191121
+%global ghdlcommit 03862a4607fd127e6570a3e141a92265a23c2a68
%global ghdlshortcommit %(c=%{ghdlcommit}; echo ${c:0:7})
%global ghdlgitrev %{ghdldate}git%{ghdlshortcommit}
@@ -527,7 +527,7 @@ mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%endif
%changelog
-* Tue Nov 19 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-6.20191118git19c87d0
+* Tue Nov 19 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-6.20191121git03862a4
- updated to new ghdl snapshot
- rebased to gcc 9.2.1
- many cleanups
diff --git a/sources b/sources
index d025ae8..18d8ce2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (gcc-9.2.1-20190827.tar.xz) =
211ab74cb6859e171cfcefc199d7f2e67add5405996caef10f04c6e38e78781881c047a6016842edeb29026056510f1a6c6e91bf572ce65bf6741c01c379faf7
-SHA512 (ghdl-19c87d0.tar.gz) =
072a3ef4aa4d9e8526d4bbe716f14468fc655ce5b06b0c5c186c337e36214fc855b3ed2097b67aeedc099f85920bcb8aeed7b13963b67bb69b78f0bfa24ef526
+SHA512 (ghdl-03862a4.tar.gz) =
742a5f4ee58e4d0cbfe678f3328c5693c8d1337c9d285d4915ff7d872545020d06586d6dcd1b535ad265475207cc2dc1f167014b606f13c7f6feb935c85b47f7
commit deb9e8af98029c96cbfa2aef7c1e04b3556bcd59
Author: Dan Hork <dan(a)danny.cz>
Date: Tue Nov 19 21:16:40 2019 +0100
update to new ghdl snapshot
diff --git a/ghdl.spec b/ghdl.spec
index 6f8cbc2..8851126 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,6 +1,6 @@
%global ghdlver 0.37dev
-%global ghdldate 20191118
-%global ghdlcommit b57c47f3c516d156c046fe162a132b34e8806b7e
+%global ghdldate 20191119
+%global ghdlcommit 19c87d08ad5cb06c8f537bbe2306508eebe0978d
%global ghdlshortcommit %(c=%{ghdlcommit}; echo ${c:0:7})
%global ghdlgitrev %{ghdldate}git%{ghdlshortcommit}
@@ -527,7 +527,7 @@ mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%endif
%changelog
-* Tue Nov 19 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-6.20191118gitb57c47f
+* Tue Nov 19 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-6.20191118git19c87d0
- updated to new ghdl snapshot
- rebased to gcc 9.2.1
- many cleanups
diff --git a/sources b/sources
index 3e76ed1..d025ae8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (gcc-9.2.1-20190827.tar.xz) =
211ab74cb6859e171cfcefc199d7f2e67add5405996caef10f04c6e38e78781881c047a6016842edeb29026056510f1a6c6e91bf572ce65bf6741c01c379faf7
-SHA512 (ghdl-b57c47f.tar.gz) =
2f6365306a5337fb6ef2ea49656040e08cb51012fbcc1166d5ffc5210cb805f506f7c9e451f634d66ede3c8c607f2d7a700eedd78d7d37b0d86641fca09d2c99
+SHA512 (ghdl-19c87d0.tar.gz) =
072a3ef4aa4d9e8526d4bbe716f14468fc655ce5b06b0c5c186c337e36214fc855b3ed2097b67aeedc099f85920bcb8aeed7b13963b67bb69b78f0bfa24ef526
commit ff0bb484d4916b6ba49063e42de2a50f30d014e5
Author: Dan Hork <dan(a)danny.cz>
Date: Tue Nov 19 10:39:02 2019 +0100
update to new ghdl snapshot
diff --git a/ghdl.spec b/ghdl.spec
index 5868b75..6f8cbc2 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,6 +1,6 @@
%global ghdlver 0.37dev
-%global ghdldate 20191102
-%global ghdlcommit 534f39a26135724ceaa81b60de8856b723953f5b
+%global ghdldate 20191118
+%global ghdlcommit b57c47f3c516d156c046fe162a132b34e8806b7e
%global ghdlshortcommit %(c=%{ghdlcommit}; echo ${c:0:7})
%global ghdlgitrev %{ghdldate}git%{ghdlshortcommit}
@@ -41,7 +41,7 @@
Summary: A VHDL simulator, using the GCC technology
Name: ghdl
Version: %{ghdlver}
-Release: 5.%{ghdlgitrev}%{?dist}
+Release: 6.%{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
@@ -527,6 +527,11 @@ mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%endif
%changelog
+* Tue Nov 19 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-6.20191118gitb57c47f
+- updated to new ghdl snapshot
+- rebased to gcc 9.2.1
+- many cleanups
+
* Sun Nov 03 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-5.20191102git534f39a
- updated to new ghdl snapshot
diff --git a/sources b/sources
index 44de800..3e76ed1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (gcc-9.2.1-20190827.tar.xz) =
211ab74cb6859e171cfcefc199d7f2e67add5405996caef10f04c6e38e78781881c047a6016842edeb29026056510f1a6c6e91bf572ce65bf6741c01c379faf7
-SHA512 (ghdl-534f39a.tar.gz) =
a56a4138f1292d3b5b5b439d77034569ea92415f7d6714be5be3027931946b65e389ddb8a31d02b3d6cc486115a20cddd949f7f15d5aa5c1d10a69e7e1f62d31
+SHA512 (ghdl-b57c47f.tar.gz) =
2f6365306a5337fb6ef2ea49656040e08cb51012fbcc1166d5ffc5210cb805f506f7c9e451f634d66ede3c8c607f2d7a700eedd78d7d37b0d86641fca09d2c99
commit 29d1733b66a131d0145e96dff24342b1ec6d98fa
Author: Dan Hork <dan(a)danny.cz>
Date: Mon Nov 18 23:30:51 2019 +0100
rebase to gcc 9.2.1
diff --git a/gcc9-pr90303.patch b/gcc9-pr90303.patch
deleted file mode 100644
index f67c9dd..0000000
--- a/gcc9-pr90303.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-2019-05-03 Jakub Jelinek <jakub(a)redhat.com>
-
- PR tree-optimization/90303
- * ipa-devirt.c (obj_type_ref_class, get_odr_type): Don't use
- TYPE_CANONICAL for TYPE_STRUCTURAL_EQUALITY_P types in !in_lto_p mode.
-
- * g++.target/i386/pr90303.C: New test.
-
---- gcc/ipa-devirt.c (revision 270834)
-+++ gcc/ipa-devirt.c (revision 270835)
-@@ -2020,7 +2020,7 @@ obj_type_ref_class (const_tree ref)
- ref = TREE_VALUE (TYPE_ARG_TYPES (ref));
- gcc_checking_assert (TREE_CODE (ref) == POINTER_TYPE);
- tree ret = TREE_TYPE (ref);
-- if (!in_lto_p)
-+ if (!in_lto_p && !TYPE_STRUCTURAL_EQUALITY_P (ret))
- ret = TYPE_CANONICAL (ret);
- else
- ret = get_odr_type (ret)->type;
-@@ -2042,7 +2042,7 @@ get_odr_type (tree type, bool insert)
- int base_id = -1;
-
- type = TYPE_MAIN_VARIANT (type);
-- if (!in_lto_p)
-+ if (!in_lto_p && !TYPE_STRUCTURAL_EQUALITY_P (type))
- type = TYPE_CANONICAL (type);
-
- gcc_checking_assert (can_be_name_hashed_p (type)
---- gcc/testsuite/g++.target/i386/pr90303.C (nonexistent)
-+++ gcc/testsuite/g++.target/i386/pr90303.C (revision 270835)
-@@ -0,0 +1,8 @@
-+// PR tree-optimization/90303
-+// { dg-do compile { target ia32 } }
-+// { dg-additional-options "-O2" }
-+
-+struct A { virtual void foo (); };
-+template <class> class B : A {};
-+typedef void (__attribute__((fastcall)) F) ();
-+B<F> e;
diff --git a/ghdl.spec b/ghdl.spec
index e5c70a9..5868b75 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -22,9 +22,9 @@
%bcond_with gnatwae
-%global DATE 20190503
-%global SVNREV 267776
-%global gcc_version 9.1.1
+%global DATE 20190827
+%global SVNREV 274959
+%global gcc_version 9.2.1
%global gcc_major 9
# Note, gcc_release must be integer, if you want to add suffixes to
# %%{release}, append them after %%{gcc_release} on Release: line.
@@ -62,7 +62,6 @@ Patch8: gcc9-foffload-default.patch
Patch9: gcc9-Wno-format-security.patch
Patch10: gcc9-rh1574936.patch
Patch11: gcc9-d-shared-libphobos.patch
-Patch12: gcc9-pr90303.patch
Source100:
https://github.com/ghdl/ghdl/archive/%{ghdlcommit}/%{name}-%{ghdlshortcom...
Patch100: ghdl-llvmflags.patch
@@ -207,7 +206,6 @@ that tracks signal updates and schedules processes.
%patch10 -p0 -b .rh1574936~
%endif
%patch11 -p0 -b .d-shared-libphobos~
-%patch12 -p0 -b .pr90303~
echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
diff --git a/sources b/sources
index 427300e..44de800 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (gcc-9.1.1-20190503.tar.xz) =
9787c7f4bc6a2e918cafa5ef0bc21dd29eb88541297168049cffea150d08f50023e6b639bc24fe53daf6f603db286a7a8dd17357d139f0d0cfb3cee2850fee8b
+SHA512 (gcc-9.2.1-20190827.tar.xz) =
211ab74cb6859e171cfcefc199d7f2e67add5405996caef10f04c6e38e78781881c047a6016842edeb29026056510f1a6c6e91bf572ce65bf6741c01c379faf7
SHA512 (ghdl-534f39a.tar.gz) =
a56a4138f1292d3b5b5b439d77034569ea92415f7d6714be5be3027931946b65e389ddb8a31d02b3d6cc486115a20cddd949f7f15d5aa5c1d10a69e7e1f62d31
commit 0de5c613463a164fc8461f8c982a1984fc862c42
Author: Dan Hork <dan(a)danny.cz>
Date: Mon Nov 18 23:23:09 2019 +0100
clean up BR: glibc
diff --git a/ghdl.spec b/ghdl.spec
index 2d0453b..e5c70a9 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -88,10 +88,6 @@ BuildRequires: gdb
BuildRequires: glibc-devel >= 2.4.90-13
BuildRequires: elfutils-devel >= 0.147
BuildRequires: elfutils-libelf-devel >= 0.147
-%ifarch ppc64le s390x
-# Make sure glibc supports TFmode long double
-BuildRequires: glibc >= 2.3.90-35
-%endif
%if %{build_isl}
BuildRequires: isl = %{isl_version}
BuildRequires: isl-devel = %{isl_version}
commit 4777bcd6d0cc82986559a0f477af4f1d1eaf5c52
Author: Dan Hork <dan(a)danny.cz>
Date: Mon Nov 18 23:21:40 2019 +0100
drop ia64 conditional BR
diff --git a/ghdl.spec b/ghdl.spec
index 7a840d7..2d0453b 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -92,9 +92,6 @@ BuildRequires: elfutils-libelf-devel >= 0.147
# Make sure glibc supports TFmode long double
BuildRequires: glibc >= 2.3.90-35
%endif
-%ifarch ia64
-BuildRequires: libunwind >= 0.98
-%endif
%if %{build_isl}
BuildRequires: isl = %{isl_version}
BuildRequires: isl-devel = %{isl_version}
commit 42b323fe4e7f942a83e076debc681563db3e2f63
Author: Dan Hork <dan(a)danny.cz>
Date: Mon Nov 18 23:20:51 2019 +0100
clean up BR/R: binutils
diff --git a/ghdl.spec b/ghdl.spec
index b6a2e9c..7a840d7 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -73,24 +73,7 @@ Patch100: ghdl-llvmflags.patch
Patch106: ghdl-ppc64abort.patch
Requires: gcc
-# Need binutils with -pie support >= 2.14.90.0.4-4
-# Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
-# Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2
-# Need binutils which support .weakref >= 2.16.91.0.3-1
-# Need binutils which support --hash-style=gnu >= 2.17.50.0.2-7
-# Need binutils which support mffgpr and mftgpr >= 2.17.50.0.2-8
-# Need binutils which support --build-id >= 2.17.50.0.17-3
-# Need binutils which support %%gnu_unique_object >= 2.19.51.0.14
-# Need binutils which support .cfi_sections >= 2.19.51.0.14-33
-# Need binutils which support --no-add-needed >= 2.20.51.0.2-12
-# Need binutils which support -plugin
-# Need binutils which support .loc view >= 2.30
-# Need binutils which support --generate-missing-build-notes=yes >= 2.31
-%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
BuildRequires: binutils >= 2.31
-%else
-BuildRequires: binutils >= 2.24
-%endif
BuildRequires: zlib-devel, gettext, bison, flex, sharutils
BuildRequires: texinfo, texinfo-tex, /usr/bin/pod2man
BuildRequires: systemtap-sdt-devel >= 1.3
@@ -121,27 +104,7 @@ Requires: libisl.so.15()(64bit)
Requires: libisl.so.15
%endif
%endif
-# Need .eh_frame ld optimizations
-# Need proper visibility support
-# Need -pie support
-# Need --as-needed/--no-as-needed support
-# On ppc64, need omit dot symbols support and --non-overlapping-opd
-# Need binutils that owns /usr/bin/c++filt
-# Need binutils that support .weakref
-# Need binutils that supports --hash-style=gnu
-# Need binutils that support mffgpr/mftgpr
-# Need binutils that support --build-id
-# Need binutils that support %%gnu_unique_object
-# Need binutils that support .cfi_sections
-# Need binutils that support --no-add-needed
-# Need binutils that support -plugin
-# Need binutils that support .loc view >= 2.30
-# Need binutils which support --generate-missing-build-notes=yes >= 2.31
-%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
Requires: binutils >= 2.31
-%else
-Requires: binutils >= 2.24
-%endif
Requires: libgcc >= %{gcc_version}-%{gcc_release}
BuildRequires: autoconf
commit 133173d4a7048f3886b98319c399940ffc6fec8c
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 23:15:50 2019 +0100
simplify mcode conditions
diff --git a/ghdl.spec b/ghdl.spec
index cf17126..b6a2e9c 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -274,7 +274,6 @@ mv ghdl-%{ghdlcommit} ghdl
perl -i -pe 's,-gnatwae,,' ghdl/dist/gcc/Make-lang.in
%endif
-%ifarch %{ix86} x86_64
%if %{with mcode}
cp -r ghdl ghdl-mcode
pushd ghdl-mcode
@@ -282,7 +281,6 @@ perl -i -pe
's,^libdirsuffix=.*$,libdirsuffix=%{_lib}/ghdl/mcode,' configure
perl -i -pe 's,^libdirreverse=.*$,libdirreverse=../../..,' configure
popd
%endif
-%endif
%if %{with llvm}
cp -r ghdl ghdl-llvm
@@ -304,7 +302,6 @@ popd
%build
# build mcode on x86
-%ifarch %{ix86} x86_64
%if %{with mcode}
pushd ghdl-mcode
./configure \
@@ -315,7 +312,6 @@ pushd ghdl-mcode
make %{?_smp_mflags}
popd
%endif
-%endif
%if %{with llvm}
pushd ghdl-llvm
@@ -455,14 +451,12 @@ popd
%install
# install mcode on x86
-%ifarch %{ix86} x86_64
%if %{with mcode}
pushd ghdl-mcode
make DESTDIR=%{buildroot} install
mv %{buildroot}/%{_bindir}/ghdl %{buildroot}/%{_bindir}/ghdl-mcode
popd
%endif
-%endif
# install llvm
%if %{with llvm}
@@ -559,7 +553,6 @@ mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%{_prefix}/lib/gcc/
%{_prefix}/lib/ghdl/
-%ifarch %{ix86} x86_64
%if %{with mcode}
%files mcode
%{_bindir}/ghdl-mcode
@@ -568,7 +561,6 @@ mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%dir %{_libdir}/ghdl
%{_libdir}/ghdl/mcode
%endif
-%endif
%if %{with llvm}
%files llvm
commit 631bcb2533374aaffe00cf5e5c1bcbc62e725d1a
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 22:41:46 2019 +0100
consistency cleanups
diff --git a/ghdl.spec b/ghdl.spec
index ed062bd..cf17126 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -292,7 +292,6 @@ perl -i -pe 's,^libdirreverse=.*$,libdirreverse=../../..,'
configure
popd
%endif
-sed -i -e 's/4\.9\.3/4.9.2/' gcc/BASE-VER
echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
pushd ghdl
@@ -435,7 +434,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS"
\
$CONFIGURE_OPTS
# workaround for gcc gnat ICE on valid, do not compile trans-chap8 with optimization
-%{__make} || true
+make || true
pushd gcc/vhdl
gnatmake -c -aI%{_builddir}/gcc-%{gcc_version}-%{DATE}/gcc/vhdl ortho_gcc-main \
-cargs -g -Wall -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4
-grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 \
@@ -449,8 +448,8 @@ gnatmake -c -aI%{_builddir}/gcc-%{gcc_version}-%{DATE}/gcc/vhdl
ortho_gcc-main \
#-gnatwae
popd
-#%{__make} %{?_smp_mflags}
-%{__make}
+#make %{?_smp_mflags}
+make
popd
@@ -474,7 +473,7 @@ popd
%endif
# install gcc
-%{__make} -C obj-%{gcc_target_platform} DESTDIR=%{buildroot} install
+make -C obj-%{gcc_target_platform} DESTDIR=%{buildroot} install
PBINDIR=`pwd`/obj-%{gcc_target_platform}/gcc/
@@ -502,7 +501,7 @@ echo "-lgnat-6"
# Remove files not to be packaged
pushd %{buildroot}
-%{__rm} -f \
+rm -f \
.%{_bindir}/{cpp,gcc,gccbug,gcov,gcov-dump,gcov-tool} \
.%{_bindir}/%{gcc_target_platform}-gcc{,-%{gcc_major}} \
.%{_bindir}/{,%{gcc_target_platform}-}gcc-{ar,nm,ranlib} \
@@ -521,26 +520,26 @@ pushd %{buildroot}
.%{_libdir}/32/libiberty.a
# Remove crt/libgcc, as ghdl invokes the native gcc to perform the linking
-%{__rm} -f \
+rm -f \
.%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/*crt* \
.%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgc* \
.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gcc_major}/{cc1,collect2} \
.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gcc_major}/*lto*
# Remove directory hierarchies not to be packaged
-%{__rm} -rf \
+rm -rf \
.%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/{include,include-fixed,plugin,install-tools}
\
.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gcc_major}/install-tools \
.%{_libexecdir}/gcc/%{gcc_target_platform}/%{gcc_major}/plugin \
popd
-%{__install} -d %{buildroot}%{_includedir}/ghdl
-%{__mv} %{buildroot}%{_includedir}/vpi_user.h %{buildroot}%{_includedir}/ghdl
-%{__mv} %{buildroot}%{_includedir}/ghdlsynth*.h %{buildroot}%{_includedir}/ghdl
+install -d %{buildroot}%{_includedir}/ghdl
+mv %{buildroot}%{_includedir}/vpi_user.h %{buildroot}%{_includedir}/ghdl
+mv %{buildroot}%{_includedir}/ghdlsynth*.h %{buildroot}%{_includedir}/ghdl
%if %{_lib} != lib
-%{__mv} %{buildroot}/usr/lib/libghdlvpi.so %{buildroot}%{_libdir}/
-%{__mv} %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
+mv %{buildroot}/usr/lib/libghdlvpi.so %{buildroot}%{_libdir}/
+mv %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
%endif
%files
commit e14fd70430b3fad444fb374054b86bf69bc3bdcf
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 21:44:44 2019 +0100
drop -m32 support for x86_64
diff --git a/ghdl.spec b/ghdl.spec
index 2866f6b..ed062bd 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -20,10 +20,6 @@
%bcond_with llvm
%endif
-%ifarch x86_64
-%bcond_with m32
-%endif
-
%bcond_with gnatwae
%global DATE 20190503
@@ -481,20 +477,8 @@ popd
%{__make} -C obj-%{gcc_target_platform} DESTDIR=%{buildroot} install
PBINDIR=`pwd`/obj-%{gcc_target_platform}/gcc/
-PNATIVE=%{buildroot}/%{_prefix}/lib/ghdl/
-P32=%{buildroot}/%{_prefix}/lib/ghdl/32/
pushd ghdl
-%ifarch x86_64
-%if %{with m32}
-make bindir=${PBINDIR} GHDL1_GCC_BIN="--GHDL1=${PBINDIR}/ghdl1 -m32"
OPT_FLAGS="-g -m32" ghdllib
-make DESTDIR=%{buildroot} install
-%{__install} -d ${P32}
-%{__mv} ${PNATIVE}/grt.* ${PNATIVE}/lib* ${PNATIVE}/src ${PNATIVE}/v08 ${PNATIVE}/v87
${PNATIVE}/v93 ${PNATIVE}/vendors ${P32}
-make clean
-%endif
-%endif
-
make bindir=${PBINDIR} GHDL1_GCC_BIN="--GHDL1=${PBINDIR}/ghdl1" ghdllib
make DESTDIR=%{buildroot} install
popd
commit 9f4d1487f7cd98beb241a5babf83deb780e64e1d
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 21:37:18 2019 +0100
disable ifunc
diff --git a/ghdl.spec b/ghdl.spec
index c1b3ab2..2866f6b 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -41,11 +41,6 @@
%undefine _annotated_build
%endif
%global build_isl 1
-%ifarch %{ix86} x86_64 ppc64le s390x %{arm} aarch64
-%global attr_ifunc 1
-%else
-%global attr_ifunc 0
-%endif
Summary: A VHDL simulator, using the GCC technology
Name: ghdl
@@ -381,11 +376,6 @@ CONFIGURE_OPTS="\
%else
--without-isl \
%endif
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
-%if %{attr_ifunc}
- --enable-gnu-indirect-function \
-%endif
-%endif
%ifarch %{arm}
--disable-sjlj-exceptions \
%endif
commit 42f1fd988081602a505796d7045bdfbc4f2371ac
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 21:35:21 2019 +0100
disable multilib
diff --git a/ghdl.spec b/ghdl.spec
index 2fc9d3c..c1b3ab2 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -40,7 +40,6 @@
# Until annobin is fixed (#1519165).
%undefine _annotated_build
%endif
-%global multilib_64_archs x86_64
%global build_isl 1
%ifarch %{ix86} x86_64 ppc64le s390x %{arm} aarch64
%global attr_ifunc 1
@@ -119,10 +118,6 @@ BuildRequires: elfutils-libelf-devel >= 0.147
# Make sure glibc supports TFmode long double
BuildRequires: glibc >= 2.3.90-35
%endif
-%ifarch %{multilib_64_archs}
-# Ensure glibc{,-devel} is installed for both multilib arches
-BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
-%endif
%ifarch ia64
BuildRequires: libunwind >= 0.98
%endif
@@ -376,11 +371,7 @@ CONFIGURE_OPTS="\
%ifarch ppc64le
--enable-targets=powerpcle-linux \
%endif
-%ifarch ppc64le riscv64 s390x
--disable-multilib \
-%else
- --enable-multilib \
-%endif
--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
--enable-gnu-unique-object --enable-linker-build-id --with-gcc-major-version-only \
--with-linker-hash-style=gnu \
commit 2cbed0c878c97d2762a39c93d4b945740763879c
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 21:32:50 2019 +0100
drop support for obsolete arches, step 2
diff --git a/ghdl.spec b/ghdl.spec
index e1f0459..2fc9d3c 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -42,7 +42,7 @@
%endif
%global multilib_64_archs x86_64
%global build_isl 1
-%ifarch %{ix86} x86_64 ppc64le s390x %{arm} aarch64 %{mips}
+%ifarch %{ix86} x86_64 ppc64le s390x %{arm} aarch64
%global attr_ifunc 1
%else
%global attr_ifunc 0
@@ -376,16 +376,14 @@ CONFIGURE_OPTS="\
%ifarch ppc64le
--enable-targets=powerpcle-linux \
%endif
-%ifarch ppc64le %{mips} riscv64 s390x
+%ifarch ppc64le riscv64 s390x
--disable-multilib \
%else
--enable-multilib \
%endif
--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
--enable-gnu-unique-object --enable-linker-build-id --with-gcc-major-version-only \
-%ifnarch %{mips}
--with-linker-hash-style=gnu \
-%endif
--enable-plugin --enable-initfini-array \
%if %{build_isl}
--with-isl \
@@ -448,12 +446,6 @@ CONFIGURE_OPTS="\
--with-tune=generic-armv7-a --with-arch=armv7-a \
--with-float=hard --with-fpu=vfpv3-d16 --with-abi=aapcs-linux \
%endif
-%ifarch mips mipsel
- --with-arch=mips32r2 --with-fp-32=xx \
-%endif
-%ifarch mips64 mips64el
- --with-arch=mips64r2 --with-abi=64 \
-%endif
--build=%{gcc_target_platform} \
"
commit eceda87d3be235b6b8819d0c19f08d44e1e32198
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 21:31:02 2019 +0100
drop support for obsolete arches
diff --git a/gcc9-sparc-config-detection.patch b/gcc9-sparc-config-detection.patch
deleted file mode 100644
index bb06b35..0000000
--- a/gcc9-sparc-config-detection.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- gcc/config.gcc.jj 2008-04-24 15:42:46.000000000 -0500
-+++ gcc/config.gcc 2008-04-24 15:44:51.000000000 -0500
-@@ -2790,7 +2790,7 @@ sparc-*-rtems*)
- tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h
rtems.h newlib-stdint.h"
- tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems"
- ;;
--sparc-*-linux*)
-+sparc-*-linux* | sparcv9-*-linux*)
- tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h
glibc-stdint.h sparc/tso.h"
- extra_options="${extra_options} sparc/long-double-switch.opt"
- case ${target} in
-@@ -2844,7 +2844,7 @@ sparc64-*-rtems*)
- extra_options="${extra_options}"
- tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems-64"
- ;;
--sparc64-*-linux*)
-+sparc64*-*-linux*)
- tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h
linux.h glibc-stdint.h sparc/default64.h sparc/linux64.h sparc/tso.h"
- extra_options="${extra_options} sparc/long-double-switch.opt"
- tmake_file="${tmake_file} sparc/t-sparc sparc/t-linux64"
---- libgcc/config.host.jj 2008-04-24 15:46:19.000000000 -0500
-+++ libgcc/config.host 2008-04-24 15:46:49.000000000 -0500
-@@ -1002,7 +1002,7 @@ sparc-*-elf*)
- tmake_file="${tmake_file} t-fdpbit t-crtfm"
- extra_parts="$extra_parts crti.o crtn.o crtfastmath.o"
- ;;
--sparc-*-linux*) # SPARC's running GNU/Linux, libc6
-+sparc-*-linux* | sparcv9-*-linux*) # SPARC's running GNU/Linux, libc6
- tmake_file="${tmake_file} t-crtfm"
- if test "${host_address}" = 64; then
- tmake_file="$tmake_file sparc/t-linux64"
-@@ -1050,7 +1050,7 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*
- tmake_file="$tmake_file t-crtfm"
- extra_parts="$extra_parts crtfastmath.o"
- ;;
--sparc64-*-linux*) # 64-bit SPARC's running GNU/Linux
-+sparc64*-*-linux*) # 64-bit SPARC's running GNU/Linux
- extra_parts="$extra_parts crtfastmath.o"
- tmake_file="${tmake_file} t-crtfm sparc/t-linux"
- if test "${host_address}" = 64; then
diff --git a/ghdl.spec b/ghdl.spec
index 3e75271..e1f0459 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -13,8 +13,8 @@
#workaround for another compiler error
#bcond_without llvm
-#ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7
-%ifarch x86_64 ppc ppc64 ppc64le ppc64p7
+#ifarch %{ix86} x86_64 ppc64le
+%ifarch x86_64 ppc64le
%bcond_without llvm
%else
%bcond_with llvm
@@ -40,9 +40,9 @@
# Until annobin is fixed (#1519165).
%undefine _annotated_build
%endif
-%global multilib_64_archs sparc64 ppc64 ppc64p7 x86_64
+%global multilib_64_archs x86_64
%global build_isl 1
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips}
+%ifarch %{ix86} x86_64 ppc64le s390x %{arm} aarch64 %{mips}
%global attr_ifunc 1
%else
%global attr_ifunc 0
@@ -64,7 +64,6 @@ Source0: gcc-%{gcc_version}-%{DATE}.tar.xz
Patch0: gcc9-hack.patch
Patch1: gcc9-i386-libgomp.patch
-Patch2: gcc9-sparc-config-detection.patch
Patch3: gcc9-libgomp-omp_h-multilib.patch
Patch4: gcc9-libtool-no-rpath.patch
Patch5: gcc9-isl-dl.patch
@@ -116,11 +115,11 @@ BuildRequires: gdb
BuildRequires: glibc-devel >= 2.4.90-13
BuildRequires: elfutils-devel >= 0.147
BuildRequires: elfutils-libelf-devel >= 0.147
-%ifarch ppc ppc64 ppc64le ppc64p7 s390 s390x sparc sparcv9 alpha
+%ifarch ppc64le s390x
# Make sure glibc supports TFmode long double
BuildRequires: glibc >= 2.3.90-35
%endif
-%ifarch %{multilib_64_archs} sparcv9 ppc
+%ifarch %{multilib_64_archs}
# Ensure glibc{,-devel} is installed for both multilib arches
BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
%endif
@@ -185,15 +184,7 @@ ExcludeArch: armv7hl
%global _vendor fedora_ghdl
%global _gnu %{nil}
-%ifarch sparc
-%global gcc_target_platform sparc64-%{_vendor}-%{_target_os}
-%endif
-%ifarch ppc
-%global gcc_target_platform ppc64-%{_vendor}-%{_target_os}
-%endif
-%ifnarch sparc ppc
%global gcc_target_platform %{_target_platform}
-%endif
# do not strip libgrt.a -- makes debugging tedious otherwise
%global __os_install_post %(echo '%{__os_install_post}' | sed -e
's#/usr/lib/rpm/redhat/brp-strip-static-archive .*##g')
@@ -262,7 +253,6 @@ that tracks signal updates and schedules processes.
%setup -q -n gcc-%{gcc_version}-%{DATE} -a 100
%patch0 -p0 -b .hack~
%patch1 -p0 -b .i386-libgomp~
-%patch2 -p0 -b .sparc-config-detection~
%patch3 -p0 -b .libgomp-omp_h-multilib~
%patch4 -p0 -b .libtool-no-rpath~
%if %{build_isl}
@@ -287,23 +277,6 @@ LC_ALL=C sed -i -e 's/\xa0/ /' gcc/doc/options.texi
sed -i -e 's/Common Driver Var(flag_report_bug)/& Init(1)/' gcc/common.opt
-%ifarch ppc
-if [ -d libstdc++-v3/config/abi/post/powerpc64-linux-gnu ]; then
- mkdir -p libstdc++-v3/config/abi/post/powerpc64-linux-gnu/64
- mv libstdc++-v3/config/abi/post/powerpc64-linux-gnu/{,64/}baseline_symbols.txt
- mv libstdc++-v3/config/abi/post/powerpc64-linux-gnu/{32/,}baseline_symbols.txt
- rm -rf libstdc++-v3/config/abi/post/powerpc64-linux-gnu/32
-fi
-%endif
-%ifarch sparc
-if [ -d libstdc++-v3/config/abi/post/sparc64-linux-gnu ]; then
- mkdir -p libstdc++-v3/config/abi/post/sparc64-linux-gnu/64
- mv libstdc++-v3/config/abi/post/sparc64-linux-gnu/{,64/}baseline_symbols.txt
- mv libstdc++-v3/config/abi/post/sparc64-linux-gnu/{32/,}baseline_symbols.txt
- rm -rf libstdc++-v3/config/abi/post/sparc64-linux-gnu/32
-fi
-%endif
-
# This test causes fork failures, because it spawns way too many threads
rm -f gcc/testsuite/go.test/test/chan/goroutines.go
@@ -380,9 +353,6 @@ OPT_FLAGS=`echo $OPT_FLAGS|sed -e
's/-m64//g;s/-m32//g;s/-m31//g'`
OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mfpmath=sse/-mfpmath=sse -msse2/g'`
OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/ -pipe / /g'`
OPT_FLAGS=`echo $OPT_FLAGS|sed -e
's/-Werror=format-security/-Wformat-security/g'`
-%ifarch sparc
-OPT_FLAGS=`echo $OPT_FLAGS|sed -e
's/-mcpu=ultrasparc/-mtune=ultrasparc/g;s/-mcpu=v[78]//g'`
-%endif
%ifarch %{ix86}
OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-march=i.86//g'`
%endif
@@ -430,35 +400,15 @@ CONFIGURE_OPTS="\
%ifarch %{arm}
--disable-sjlj-exceptions \
%endif
-%ifarch ppc ppc64 ppc64le ppc64p7
+%ifarch ppc64le
--enable-secureplt \
%endif
-%ifarch sparc sparcv9 sparc64 ppc ppc64 ppc64le ppc64p7 s390 s390x alpha
+%ifarch ppc64le s390x
--with-long-double-128 \
%endif
-%ifarch sparc
- --disable-linux-futex \
-%endif
-%ifarch sparc64
- --with-cpu=ultrasparc \
-%endif
-%ifarch sparc sparcv9
- --host=%{gcc_target_platform} --build=%{gcc_target_platform}
--target=%{gcc_target_platform} --with-cpu=v7
-%endif
-%ifarch ppc ppc64 ppc64p7
-%if 0%{?rhel} >= 7
- --with-cpu-32=power7 --with-tune-32=power7 --with-cpu-64=power7 --with-tune-64=power7 \
-%endif
-%if 0%{?rhel} == 6
- --with-cpu-32=power4 --with-tune-32=power6 --with-cpu-64=power4 --with-tune-64=power6 \
-%endif
-%endif
%ifarch ppc64le
--with-cpu-32=power8 --with-tune-32=power8 --with-cpu-64=power8 --with-tune-64=power8 \
%endif
-%ifarch ppc
- --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32
-%endif
%ifarch %{ix86} x86_64
--enable-cet \
--with-tune=generic \
@@ -504,9 +454,7 @@ CONFIGURE_OPTS="\
%ifarch mips64 mips64el
--with-arch=mips64r2 --with-abi=64 \
%endif
-%ifnarch sparc sparcv9 ppc
--build=%{gcc_target_platform} \
-%endif
"
CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \
@@ -532,12 +480,6 @@ gnatmake -c -aI%{_builddir}/gcc-%{gcc_version}-%{DATE}/gcc/vhdl
ortho_gcc-main \
#-gnatwae
popd
-#%ifarch sparc sparcv9 sparc64
-#make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" bootstrap
-#%else
-#make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" profiledbootstrap
-#%endif
-
#%{__make} %{?_smp_mflags}
%{__make}
commit b1ce3dd895ad9ddef1bc7bf585b02f8bfed54412
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 21:17:58 2019 +0100
drop multilib_32 conditionals, unused
diff --git a/ghdl.spec b/ghdl.spec
index 9d5b320..3e75271 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -47,15 +47,6 @@
%else
%global attr_ifunc 0
%endif
-%ifarch sparc64
-%global multilib_32_arch sparcv9
-%endif
-%ifarch ppc64 ppc64p7
-%global multilib_32_arch ppc
-%endif
-%ifarch x86_64
-%global multilib_32_arch i686
-%endif
Summary: A VHDL simulator, using the GCC technology
Name: ghdl
commit ac744e6c2d203766d958228508d8fa56cc9058c1
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 21:15:30 2019 +0100
drop libitm conditionals, unused
diff --git a/ghdl.spec b/ghdl.spec
index db74a79..9d5b320 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -41,11 +41,6 @@
%undefine _annotated_build
%endif
%global multilib_64_archs sparc64 ppc64 ppc64p7 x86_64
-%ifarch %{ix86} x86_64 %{arm} alpha ppc ppc64 ppc64le ppc64p7 s390 s390x aarch64
-%global build_libitm 1
-%else
-%global build_libitm 0
-%endif
%global build_isl 1
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips}
%global attr_ifunc 1
commit 32fef3193425a42de1b3243c4db59f6a6039f429
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 21:15:09 2019 +0100
drop libatomic conditionals, unused
diff --git a/ghdl.spec b/ghdl.spec
index 0292212..db74a79 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -41,11 +41,6 @@
%undefine _annotated_build
%endif
%global multilib_64_archs sparc64 ppc64 ppc64p7 x86_64
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips}
-%global build_libatomic 1
-%else
-%global build_libatomic 0
-%endif
%ifarch %{ix86} x86_64 %{arm} alpha ppc ppc64 ppc64le ppc64p7 s390 s390x aarch64
%global build_libitm 1
%else
commit 1ee9db1e9ec2a0370f926c63487e79b3bcb1506c
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 21:12:23 2019 +0100
drop libquadmath conditionals, unused
diff --git a/ghdl.spec b/ghdl.spec
index 98abd9d..0292212 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -41,11 +41,6 @@
%undefine _annotated_build
%endif
%global multilib_64_archs sparc64 ppc64 ppc64p7 x86_64
-%ifarch %{ix86} x86_64 ia64 ppc64le
-%global build_libquadmath 1
-%else
-%global build_libquadmath 0
-%endif
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips}
%global build_libatomic 1
%else
@@ -642,7 +637,7 @@ pushd %{buildroot}
.%{_prefix}/lib/libgcc_s.* \
.%{_prefix}/lib/libmudflap.* \
.%{_prefix}/lib/libmudflapth.* \
- .%{_prefix}/lib/{libatomic,libgomp,libquadmath,libssp}* \
+ .%{_prefix}/lib/lib{atomic,gomp,quadmath,ssp}* \
.%{_libdir}/32/libiberty.a
# Remove crt/libgcc, as ghdl invokes the native gcc to perform the linking
commit 618179939809ccdceeb1ab8d094c1933ad86f271
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 21:11:30 2019 +0100
drop libmpx conditionals, unused
diff --git a/ghdl.spec b/ghdl.spec
index f748b95..98abd9d 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -56,15 +56,6 @@
%else
%global build_libitm 0
%endif
-%if 0%{?rhel} > 7
-%global build_libmpx 0
-%else
-%ifarch %{ix86} x86_64
-%global build_libmpx 1
-%else
-%global build_libmpx 0
-%endif
-%endif
%global build_isl 1
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips}
%global attr_ifunc 1
@@ -455,11 +446,6 @@ CONFIGURE_OPTS="\
%else
--without-isl \
%endif
-%if %{build_libmpx}
- --enable-libmpx \
-%else
- --disable-libmpx \
-%endif
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
%if %{attr_ifunc}
--enable-gnu-indirect-function \
commit 681103f50708959b9a66c42396aebef278e932d8
Author: Dan Hork <dan(a)danny.cz>
Date: Wed Nov 6 21:10:59 2019 +0100
drop sanitizer conditionals, unused
diff --git a/ghdl.spec b/ghdl.spec
index ea16ae8..f748b95 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -46,26 +46,6 @@
%else
%global build_libquadmath 0
%endif
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
-%global build_libasan 1
-%else
-%global build_libasan 0
-%endif
-%ifarch x86_64 ppc64 ppc64le aarch64
-%global build_libtsan 1
-%else
-%global build_libtsan 0
-%endif
-%ifarch x86_64 ppc64 ppc64le aarch64
-%global build_liblsan 1
-%else
-%global build_liblsan 0
-%endif
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
-%global build_libubsan 1
-%else
-%global build_libubsan 0
-%endif
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %{mips}
%global build_libatomic 1
%else
commit a32fa453eef382f7549e4e24328246a1f594d1c7
Author: Dan Hork <dan(a)danny.cz>
Date: Tue Nov 5 23:16:15 2019 +0100
drop nvptx offload
diff --git a/ghdl.spec b/ghdl.spec
index 57089e1..ea16ae8 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -33,8 +33,6 @@
# Note, gcc_release must be integer, if you want to add suffixes to
# %%{release}, append them after %%{gcc_release} on Release: line.
%global gcc_release 1
-%global nvptx_tools_gitrev c28050f60193b3b95a18866a96f03334e874e78f
-%global nvptx_newlib_gitrev aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24
%global _performance_build 1
# Hardening slows the compiler way too much.
%undefine _hardened_build
@@ -93,11 +91,6 @@
%else
%global attr_ifunc 0
%endif
-%ifarch x86_64 ppc64le
-%global build_offload_nvptx 1
-%else
-%global build_offload_nvptx 0
-%endif
%ifarch sparc64
%global multilib_32_arch sparcv9
%endif
@@ -120,20 +113,6 @@ URL:
http://ghdl.free.fr/
# svn export
svn://gcc.gnu.org/svn/gcc/branches/redhat/gcc-9-branch@%%{SVNREV}
$GCC_TARNAME
# tar cf - $GCC_TARNAME | xz -9e > $GCC_TARNAME.tar.xz
Source0: gcc-%{gcc_version}-%{DATE}.tar.xz
-# The source for nvptx-tools package was pulled from upstream's vcs. Use the
-# following commands to generate the tarball:
-# git clone
https://github.com/MentorEmbedded/nvptx-tools.git
-# cd nvptx-tools
-# git archive origin/master --prefix=nvptx-tools-%%{nvptx_tools_gitrev}/ | xz -9e >
../nvptx-tools-%%{nvptx_tools_gitrev}.tar.xz
-# cd ..; rm -rf nvptx-tools
-Source1: nvptx-tools-%{nvptx_tools_gitrev}.tar.xz
-# The source for nvptx-newlib package was pulled from upstream's vcs. Use the
-# following commands to generate the tarball:
-# git clone
https://github.com/MentorEmbedded/nvptx-newlib.git
-# cd nvptx-newlib
-# git archive origin/master --prefix=nvptx-newlib-%%{nvptx_newlib_gitrev}/ | xz -9 >
../nvptx-newlib-%%{nvptx_newlib_gitrev}.tar.xz
-# cd ..; rm -rf nvptx-newlib
-Source2: nvptx-newlib-%{nvptx_newlib_gitrev}.tar.xz
%global isl_version 0.16.1
Patch0: gcc9-hack.patch
@@ -149,10 +128,6 @@ Patch10: gcc9-rh1574936.patch
Patch11: gcc9-d-shared-libphobos.patch
Patch12: gcc9-pr90303.patch
-Patch1000: nvptx-tools-no-ptxas.patch
-Patch1001: nvptx-tools-build.patch
-Patch1002: nvptx-tools-glibc.patch
-
Source100:
https://github.com/ghdl/ghdl/archive/%{ghdlcommit}/%{name}-%{ghdlshortcom...
Patch100: ghdl-llvmflags.patch
# From: Thomas Sailer <t.sailer(a)alumni.ethz.ch>
@@ -337,7 +312,7 @@ that tracks signal updates and schedules processes.
%endif
%prep
-%setup -q -n gcc-%{gcc_version}-%{DATE} -a 1 -a 2 -a 100
+%setup -q -n gcc-%{gcc_version}-%{DATE} -a 100
%patch0 -p0 -b .hack~
%patch1 -p0 -b .i386-libgomp~
%patch2 -p0 -b .sparc-config-detection~
@@ -355,12 +330,6 @@ that tracks signal updates and schedules processes.
%patch11 -p0 -b .d-shared-libphobos~
%patch12 -p0 -b .pr90303~
-cd nvptx-tools-%{nvptx_tools_gitrev}
-%patch1000 -p1 -b .nvptx-tools-no-ptxas~
-%patch1001 -p1 -b .nvptx-tools-build~
-%patch1002 -p1 -b .nvptx-tools-glibc~
-cd ..
-
echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
@@ -478,40 +447,6 @@ case "$OPT_FLAGS" in
;;
esac
-%if %{build_offload_nvptx}
-mkdir obji
-IROOT=`pwd`/obji
-cd nvptx-tools-%{nvptx_tools_gitrev}
-rm -rf obj-%{gcc_target_platform}
-mkdir obj-%{gcc_target_platform}
-cd obj-%{gcc_target_platform}
-CC="$CC" CXX="$CXX" CFLAGS="%{optflags}"
CXXFLAGS="%{optflags}" \
-../configure --prefix=%{_prefix}
-make %{?_smp_mflags}
-make install prefix=${IROOT}%{_prefix}
-cd ../..
-
-ln -sf nvptx-newlib-%{nvptx_newlib_gitrev}/newlib newlib
-rm -rf obj-offload-nvptx-none
-mkdir obj-offload-nvptx-none
-
-cd obj-offload-nvptx-none
-CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \
- CXXFLAGS="`echo " $OPT_FLAGS " | sed 's/ -Wall / /g;s/ -fexceptions /
/g' \
- | sed 's/ -Wformat-security / -Wformat -Wformat-security /'`" \
- XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \
- ../configure --disable-bootstrap --disable-sjlj-exceptions \
- --enable-newlib-io-long-long --with-build-time-tools=${IROOT}%{_prefix}/nvptx-none/bin
\
- --target nvptx-none --enable-as-accelerator-for=%{gcc_target_platform} \
- --enable-languages=c,c++,fortran,lto \
- --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
- --with-bugurl=http://bugzilla.redhat.com/bugzilla \
- --enable-checking=release --with-system-zlib \
- --with-gcc-major-version-only --without-isl
-make %{?_smp_mflags}
-cd ..
-rm -f newlib
-%endif
rm -rf obj-%{gcc_target_platform}
mkdir obj-%{gcc_target_platform}
@@ -545,10 +480,6 @@ CONFIGURE_OPTS="\
%else
--disable-libmpx \
%endif
-%if %{build_offload_nvptx}
- --enable-offload-targets=nvptx-none \
- --without-cuda-driver \
-%endif
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
%if %{attr_ifunc}
--enable-gnu-indirect-function \
diff --git a/nvptx-tools-build.patch b/nvptx-tools-build.patch
deleted file mode 100644
index 53d7483..0000000
--- a/nvptx-tools-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nvptx-tools/nvptx-as.c.jj 2017-01-20 12:40:18.000000000 +0100
-+++ nvptx-tools/nvptx-as.c 2017-01-20 12:43:53.864271442 +0100
-@@ -939,7 +939,7 @@ fork_execute (const char *prog, char *co
- fatal_error ("%s: %m", errmsg);
- }
- else
-- fatal_error (errmsg);
-+ fatal_error ("%s", errmsg);
- }
- do_wait (prog, pex);
- }
diff --git a/nvptx-tools-glibc.patch b/nvptx-tools-glibc.patch
deleted file mode 100644
index 4b50114..0000000
--- a/nvptx-tools-glibc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- nvptx-tools/configure.ac.jj 2017-01-13 12:48:31.000000000 +0100
-+++ nvptx-tools/configure.ac 2017-05-03 10:26:57.076092259 +0200
-@@ -66,6 +66,8 @@ CPPFLAGS=$save_CPPFLAGS
- LDFLAGS=$save_LDFLAGS
- LIBS=$save_LIBS
-
-+AC_CHECK_DECLS(getopt)
-+
- AC_CONFIG_SUBDIRS([libiberty])
- AC_CONFIG_FILES([Makefile dejagnu.exp])
- AC_OUTPUT
---- nvptx-tools/configure.jj 2017-01-13 12:48:54.000000000 +0100
-+++ nvptx-tools/configure 2017-05-03 10:27:13.503876809 +0200
-@@ -3963,6 +3963,18 @@ CPPFLAGS=$save_CPPFLAGS
- LDFLAGS=$save_LDFLAGS
- LIBS=$save_LIBS
-
-+ac_fn_c_check_decl "$LINENO" "getopt"
"ac_cv_have_decl_getopt" "$ac_includes_default"
-+if test "x$ac_cv_have_decl_getopt" = x""yes; then :
-+ ac_have_decl=1
-+else
-+ ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_GETOPT $ac_have_decl
-+_ACEOF
-+
-+
-
-
- subdirs="$subdirs libiberty"
diff --git a/nvptx-tools-no-ptxas.patch b/nvptx-tools-no-ptxas.patch
deleted file mode 100644
index 28bc597..0000000
--- a/nvptx-tools-no-ptxas.patch
+++ /dev/null
@@ -1,947 +0,0 @@
---- nvptx-tools/configure.ac
-+++ nvptx-tools/configure.ac
-@@ -51,6 +51,7 @@ LIBS="$LIBS -lcuda"
- AC_CHECK_FUNCS([[cuGetErrorName] [cuGetErrorString]])
- AC_CHECK_DECLS([[cuGetErrorName], [cuGetErrorString]],
- [], [], [[#include <cuda.h>]])
-+AC_CHECK_HEADERS(unistd.h sys/stat.h)
-
- AC_MSG_CHECKING([for extra programs to build requiring -lcuda])
- NVPTX_RUN=
---- nvptx-tools/include/libiberty.h
-+++ nvptx-tools/include/libiberty.h
-@@ -390,6 +390,17 @@ extern void hex_init (void);
- /* Save files used for communication between processes. */
- #define PEX_SAVE_TEMPS 0x4
-
-+/* Max number of alloca bytes per call before we must switch to malloc.
-+
-+ ?? Swiped from gnulib's regex_internal.h header. Is this actually
-+ the case? This number seems arbitrary, though sane.
-+
-+ The OS usually guarantees only one guard page at the bottom of the stack,
-+ and a page size can be as small as 4096 bytes. So we cannot safely
-+ allocate anything larger than 4096 bytes. Also care for the possibility
-+ of a few compiler-allocated temporary stack slots. */
-+#define MAX_ALLOCA_SIZE 4032
-+
- /* Prepare to execute one or more programs, with standard output of
- each program fed to standard input of the next.
- FLAGS As above.
---- nvptx-tools/nvptx-as.c
-+++ nvptx-tools/nvptx-as.c
-@@ -30,6 +30,9 @@
- #include <string.h>
- #include <wait.h>
- #include <unistd.h>
-+#ifdef HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
- #include <errno.h>
- #define obstack_chunk_alloc malloc
- #define obstack_chunk_free free
-@@ -42,6 +45,38 @@
-
- #include "version.h"
-
-+#ifndef R_OK
-+#define R_OK 4
-+#define W_OK 2
-+#define X_OK 1
-+#endif
-+
-+#ifndef DIR_SEPARATOR
-+# define DIR_SEPARATOR '/'
-+#endif
-+
-+#if defined (_WIN32) || defined (__MSDOS__) \
-+ || defined (__DJGPP__) || defined (__OS2__)
-+# define HAVE_DOS_BASED_FILE_SYSTEM
-+# define HAVE_HOST_EXECUTABLE_SUFFIX
-+# define HOST_EXECUTABLE_SUFFIX ".exe"
-+# ifndef DIR_SEPARATOR_2
-+# define DIR_SEPARATOR_2 '\\'
-+# endif
-+# define PATH_SEPARATOR ';'
-+#else
-+# define PATH_SEPARATOR ':'
-+#endif
-+
-+#ifndef DIR_SEPARATOR_2
-+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-+#else
-+# define IS_DIR_SEPARATOR(ch) \
-+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-+#endif
-+
-+#define DIR_UP ".."
-+
- static const char *outname = NULL;
-
- static void __attribute__ ((format (printf, 1, 2)))
-@@ -816,7 +851,7 @@ traverse (void **slot, void *data)
- }
-
- static void
--process (FILE *in, FILE *out)
-+process (FILE *in, FILE *out, int verify, const char *outname)
- {
- symbol_table = htab_create (500, hash_string_hash, hash_string_eq,
- NULL);
-@@ -824,6 +859,18 @@ process (FILE *in, FILE *out)
- const char *input = read_file (in);
- Token *tok = tokenize (input);
-
-+ /* By default, when ptxas is not in PATH, do minimalistic verification,
-+ just require that the first non-comment directive is .version. */
-+ if (verify < 0)
-+ {
-+ size_t i;
-+ for (i = 0; tok[i].kind == K_comment; i++)
-+ ;
-+ if (tok[i].kind != K_dotted || !is_keyword (&tok[i], "version"))
-+ fatal_error ("missing .version directive at start of file '%s'",
-+ outname);
-+ }
-+
- do
- tok = parse_file (tok);
- while (tok->kind);
-@@ -897,9 +944,83 @@ fork_execute (const char *prog, char *const *argv)
- do_wait (prog, pex);
- }
-
-+/* Determine if progname is available in PATH. */
-+static bool
-+program_available (const char *progname)
-+{
-+ char *temp = getenv ("PATH");
-+ if (temp)
-+ {
-+ char *startp, *endp, *nstore, *alloc_ptr = NULL;
-+ size_t prefixlen = strlen (temp) + 1;
-+ size_t len;
-+ if (prefixlen < 2)
-+ prefixlen = 2;
-+
-+ len = prefixlen + strlen (progname) + 1;
-+#ifdef HAVE_HOST_EXECUTABLE_SUFFIX
-+ len += strlen (HOST_EXECUTABLE_SUFFIX);
-+#endif
-+ if (len < MAX_ALLOCA_SIZE)
-+ nstore = (char *) alloca (len);
-+ else
-+ alloc_ptr = nstore = (char *) malloc (len);
-+
-+ startp = endp = temp;
-+ while (1)
-+ {
-+ if (*endp == PATH_SEPARATOR || *endp == 0)
-+ {
-+ if (endp == startp)
-+ {
-+ nstore[0] = '.';
-+ nstore[1] = DIR_SEPARATOR;
-+ nstore[2] = '\0';
-+ }
-+ else
-+ {
-+ memcpy (nstore, startp, endp - startp);
-+ if (! IS_DIR_SEPARATOR (endp[-1]))
-+ {
-+ nstore[endp - startp] = DIR_SEPARATOR;
-+ nstore[endp - startp + 1] = 0;
-+ }
-+ else
-+ nstore[endp - startp] = 0;
-+ }
-+ strcat (nstore, progname);
-+ if (! access (nstore, X_OK)
-+#ifdef HAVE_HOST_EXECUTABLE_SUFFIX
-+ || ! access (strcat (nstore, HOST_EXECUTABLE_SUFFIX), X_OK)
-+#endif
-+ )
-+ {
-+#if defined (HAVE_SYS_STAT_H) && defined (S_ISREG)
-+ struct stat st;
-+ if (stat (nstore, &st) >= 0 && S_ISREG (st.st_mode))
-+#endif
-+ {
-+ free (alloc_ptr);
-+ return true;
-+ }
-+ }
-+
-+ if (*endp == 0)
-+ break;
-+ endp = startp = endp + 1;
-+ }
-+ else
-+ endp++;
-+ }
-+ free (alloc_ptr);
-+ }
-+ return false;
-+}
-+
- static struct option long_options[] = {
- {"traditional-format", no_argument, 0, 0 },
- {"save-temps", no_argument, 0, 0 },
-+ {"verify", no_argument, 0, 0 },
- {"no-verify", no_argument, 0, 0 },
- {"help", no_argument, 0, 'h' },
- {"version", no_argument, 0, 'V' },
-@@ -912,7 +1033,7 @@ main (int argc, char **argv)
- FILE *in = stdin;
- FILE *out = stdout;
- bool verbose __attribute__((unused)) = false;
-- bool verify = true;
-+ int verify = -1;
- const char *smver = "sm_30";
-
- int o;
-@@ -923,7 +1044,9 @@ main (int argc, char **argv)
- {
- case 0:
- if (option_index == 2)
-- verify = false;
-+ verify = 1;
-+ else if (option_index == 3)
-+ verify = 0;
- break;
- case 'v':
- verbose = true;
-@@ -948,7 +1071,8 @@ Usage: nvptx-none-as [option...] [asmfile]\n\
- Options:\n\
- -o FILE Write output to FILE\n\
- -v Be verbose\n\
-+ --verify Do verify output is acceptable to ptxas\n\
- --no-verify Do not verify output is acceptable to ptxas\n\
- --help Print this help and exit\n\
- --version Print version number and exit\n\
- \n\
-@@ -983,11 +1108,17 @@ This program has absolutely no warranty.\n",
- if (!in)
- fatal_error ("cannot open input ptx file");
-
-- process (in, out);
-- if (outname)
-+ if (outname == NULL)
-+ verify = 0;
-+ else if (verify == -1)
-+ if (program_available ("ptxas"))
-+ verify = 1;
-+
-+ process (in, out, verify, outname);
-+ if (outname)
- fclose (out);
-
-- if (verify && outname)
-+ if (verify > 0)
- {
- struct obstack argv_obstack;
- obstack_init (&argv_obstack);
---- nvptx-tools/configure
-+++ nvptx-tools/configure
-@@ -168,7 +168,8 @@ test x\$exitcode = x0 || exit 1"
- as_suggested="
as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested"
as_lineno_1a=\$LINENO
- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested"
as_lineno_2a=\$LINENO
- eval 'test \"x\$as_lineno_1'\$as_run'\" !=
\"x\$as_lineno_2'\$as_run'\" &&
-- test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" =
\"x\$as_lineno_2'\$as_run'\"' || exit 1"
-+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" =
\"x\$as_lineno_2'\$as_run'\"' || exit 1
-+test \$(( 1 + 1 )) = 2 || exit 1"
- if (eval "$as_required") 2>/dev/null; then :
- as_have_required=yes
- else
-@@ -552,11 +553,50 @@ PACKAGE_URL=
-
- ac_unique_file="nvptx-tools"
- ac_unique_file="nvptx-as.c"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
-+# ifdef HAVE_STDLIB_H
-+# include <stdlib.h>
-+# endif
-+#endif
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-+# include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
-+#ifdef HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
-+
- enable_option_checking=no
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- subdirs
- NVPTX_RUN
-+EGREP
-+GREP
-+CPP
- CUDA_DRIVER_LDFLAGS
- CUDA_DRIVER_CPPFLAGS
- AR
-@@ -635,7 +675,8 @@ LIBS
- CPPFLAGS
- CXX
- CXXFLAGS
--CCC'
-+CCC
-+CPP'
- ac_subdirs_all='libiberty'
-
- # Initialize some variables set by options.
-@@ -1267,6 +1308,7 @@ Some influential environment variables:
- you have headers in a nonstandard directory <include dir>
- CXX C++ compiler command
- CXXFLAGS C++ compiler flags
-+ CPP C preprocessor
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -1575,6 +1617,203 @@ $as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=;
unset as_lineno;}
-
- } # ac_fn_c_check_decl
-+
-+# ac_fn_c_try_cpp LINENO
-+# ----------------------
-+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_cpp ()
-+{
-+ as_lineno=${as_lineno-"$1"}
as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ if { { ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-+ ac_status=$?
-+ if test -s conftest.err; then
-+ grep -v '^ *+' conftest.err >conftest.er1
-+ cat conftest.er1 >&5
-+ mv -f conftest.er1 conftest.err
-+ fi
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then :
-+ ac_retval=0
-+else
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_retval=1
-+fi
-+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=;
unset as_lineno;}
-+ return $ac_retval
-+
-+} # ac_fn_c_try_cpp
-+
-+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-+# -------------------------------------------------------
-+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-+# the include files in INCLUDES and setting the cache variable VAR
-+# accordingly.
-+ac_fn_c_check_header_mongrel ()
-+{
-+ as_lineno=${as_lineno-"$1"}
as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+ $as_echo_n "(cached) " >&6
-+fi
-+eval ac_res=\$$3
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+else
-+ # Is the header compilable?
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-+$as_echo_n "checking $2 usability... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+#include <$2>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_header_compiler=yes
-+else
-+ ac_header_compiler=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler"
>&5
-+$as_echo "$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-+$as_echo_n "checking $2 presence... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <$2>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+ ac_header_preproc=yes
-+else
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc"
>&5
-+$as_echo "$ac_header_preproc" >&6; }
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-+ yes:no: )
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler,
rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the
preprocessor!" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the
compiler's result" >&5
-+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result"
>&2;}
-+ ;;
-+ no:yes:* )
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be
compiled" >&5
-+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing
prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?"
>&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf
documentation" >&5
-+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section
\"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be
Compiled\"" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the
compiler's result" >&5
-+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result"
>&2;}
-+ ;;
-+esac
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ eval "$3=\$ac_header_compiler"
-+fi
-+eval ac_res=\$$3
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+fi
-+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=;
unset as_lineno;}
-+
-+} # ac_fn_c_check_header_mongrel
-+
-+# ac_fn_c_try_run LINENO
-+# ----------------------
-+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-+# that executables *can* be run.
-+ac_fn_c_try_run ()
-+{
-+ as_lineno=${as_lineno-"$1"}
as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_link") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-+ { { case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }; then :
-+ ac_retval=0
-+else
-+ $as_echo "$as_me: program exited with status $ac_status" >&5
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_retval=$ac_status
-+fi
-+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=;
unset as_lineno;}
-+ return $ac_retval
-+
-+} # ac_fn_c_try_run
-+
-+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-+# -------------------------------------------------------
-+# Tests whether HEADER exists and can be compiled using the include files in
-+# INCLUDES, setting the cache variable VAR accordingly.
-+ac_fn_c_check_header_compile ()
-+{
-+ as_lineno=${as_lineno-"$1"}
as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+#include <$2>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ eval "$3=yes"
-+else
-+ eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=;
unset as_lineno;}
-+
-+} # ac_fn_c_check_header_compile
- cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-@@ -3284,6 +3523,418 @@ cat >>confdefs.h <<_ACEOF
- #define HAVE_DECL_CUGETERRORSTRING $ac_have_decl
- _ACEOF
-
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
>&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C
preprocessor" >&5
-+$as_echo_n "checking how to run the C preprocessor... " >&6; }
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+ CPP=
-+fi
-+if test -z "$CPP"; then
-+ if test "${ac_cv_prog_CPP+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ # Double quotes because CPP needs to be expanded
-+ for CPP in "$CC -E" "$CC -E -traditional-cpp"
"/lib/cpp"
-+ do
-+ ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
-+ # On the NeXT, cc -E runs the code through the compiler's parser,
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+
-+else
-+ # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+ # OK, works on sane cases. Now check whether nonexistent headers
-+ # can be detected and how.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+ # Broken: success on invalid input.
-+continue
-+else
-+ # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+ break
-+fi
-+
-+ done
-+ ac_cv_prog_CPP=$CPP
-+
-+fi
-+ CPP=$ac_cv_prog_CPP
-+else
-+ ac_cv_prog_CPP=$CPP
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-+$as_echo "$CPP" >&6; }
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
-+ # On the NeXT, cc -E runs the code through the compiler's parser,
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+
-+else
-+ # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+ # OK, works on sane cases. Now check whether nonexistent headers
-+ # can be detected and how.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+ # Broken: success on invalid input.
-+continue
-+else
-+ # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+
-+else
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':"
>&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
>&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines
and -e" >&5
-+$as_echo_n "checking for grep that handles long lines and -e... " >&6;
}
-+if test "${ac_cv_path_GREP+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -z "$GREP"; then
-+ ac_path_GREP_found=false
-+ # Loop through the user's path and test for each of PROGNAME-LIST
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in grep ggrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_GREP" && $as_test_x
"$ac_path_GREP"; } || continue
-+# Check for GNU ac_path_GREP and select it if it is found.
-+ # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+ ac_count=0
-+ $as_echo_n 0123456789 >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ $as_echo 'GREP' >> "conftest.nl"
-+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' <
"conftest.nl" >"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 ||
break
-+ as_fn_arith $ac_count + 1 && ac_count=$as_val
-+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_GREP="$ac_path_GREP"
-+ ac_path_GREP_max=$ac_count
-+ fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+ $ac_path_GREP_found && break 3
-+ done
-+ done
-+ done
-+IFS=$as_save_IFS
-+ if test -z "$ac_cv_path_GREP"; then
-+ as_fn_error "no acceptable grep could be found in
$PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+ fi
-+else
-+ ac_cv_path_GREP=$GREP
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-+$as_echo "$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-+$as_echo_n "checking for egrep... " >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+ then ac_cv_path_EGREP="$GREP -E"
-+ else
-+ if test -z "$EGREP"; then
-+ ac_path_EGREP_found=false
-+ # Loop through the user's path and test for each of PROGNAME-LIST
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in egrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_EGREP" && $as_test_x
"$ac_path_EGREP"; } || continue
-+# Check for GNU ac_path_EGREP and select it if it is found.
-+ # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+ ac_count=0
-+ $as_echo_n 0123456789 >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ $as_echo 'EGREP' >> "conftest.nl"
-+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl"
>"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 ||
break
-+ as_fn_arith $ac_count + 1 && ac_count=$as_val
-+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_EGREP="$ac_path_EGREP"
-+ ac_path_EGREP_max=$ac_count
-+ fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+ $ac_path_EGREP_found && break 3
-+ done
-+ done
-+ done
-+IFS=$as_save_IFS
-+ if test -z "$ac_cv_path_EGREP"; then
-+ as_fn_error "no acceptable egrep could be found in
$PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+ fi
-+else
-+ ac_cv_path_EGREP=$EGREP
-+fi
-+
-+ fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP"
>&5
-+$as_echo "$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files"
>&5
-+$as_echo_n "checking for ANSI C header files... " >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_cv_header_stdc=yes
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test $ac_cv_header_stdc = yes; then
-+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "memchr" >/dev/null 2>&1; then :
-+
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "free" >/dev/null 2>&1; then :
-+
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+ if test "$cross_compiling" = yes; then :
-+ :
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <ctype.h>
-+#include <stdlib.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+ (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+ int i;
-+ for (i = 0; i < 256; i++)
-+ if (XOR (islower (i), ISLOWER (i))
-+ || toupper (i) != TOUPPER (i))
-+ return 2;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc"
>&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-+
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-+
-+fi
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+ inttypes.h stdint.h unistd.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header"
"$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+for ac_header in unistd.h sys/stat.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header"
"$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra programs to build
requiring -lcuda" >&5
- $as_echo_n "checking for extra programs to build requiring -lcuda... "
>&6; }
diff --git a/sources b/sources
index fef1856..427300e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,2 @@
-SHA512 (nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz) =
94f7089365296f7dfa485107b4143bebc850a81586f3460fd896bbbb6ba099a00217d4042133424fd2183b352132f4fd367e6a60599bdae2a26dfd48a77d0e04
-SHA512 (nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz) =
a688cb12cf805950a5abbb13b52f45c81dbee98e310b7ed57ae20e76dbfa5964a16270148374a6426d177db71909d28360490f091c86a5d19d4faa5127beeee1
SHA512 (gcc-9.1.1-20190503.tar.xz) =
9787c7f4bc6a2e918cafa5ef0bc21dd29eb88541297168049cffea150d08f50023e6b639bc24fe53daf6f603db286a7a8dd17357d139f0d0cfb3cee2850fee8b
SHA512 (ghdl-534f39a.tar.gz) =
a56a4138f1292d3b5b5b439d77034569ea92415f7d6714be5be3027931946b65e389ddb8a31d02b3d6cc486115a20cddd949f7f15d5aa5c1d10a69e7e1f62d31
commit 487661d35c123873f747fb400b7246290143b243
Author: Dan Hork <dan(a)danny.cz>
Date: Sun Nov 3 21:14:01 2019 +0100
- updated to new ghdl snapshot
diff --git a/ghdl.spec b/ghdl.spec
index 0741212..57089e1 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,6 +1,6 @@
%global ghdlver 0.37dev
-%global ghdldate 20190923
-%global ghdlcommit 4ec17bb58394a6c03c8a4ac938e4a674a5f33e79
+%global ghdldate 20191102
+%global ghdlcommit 534f39a26135724ceaa81b60de8856b723953f5b
%global ghdlshortcommit %(c=%{ghdlcommit}; echo ${c:0:7})
%global ghdlgitrev %{ghdldate}git%{ghdlshortcommit}
@@ -111,7 +111,7 @@
Summary: A VHDL simulator, using the GCC technology
Name: ghdl
Version: %{ghdlver}
-Release: 4.%{ghdlgitrev}%{?dist}
+Release: 5.%{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
@@ -810,6 +810,9 @@ popd
%endif
%changelog
+* Sun Nov 03 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-5.20191102git534f39a
+- updated to new ghdl snapshot
+
* Wed Oct 9 2019 Jerry James <loganjerry(a)gmail.com> -
0.37dev-4.20190923git4ec17bb
- Rebuild for mpfr 4
- Drop multilib support for s390x as glibc32 and gcc have done
diff --git a/sources b/sources
index d8f6a57..fef1856 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz) =
94f7089365296f7dfa485107b4143bebc850a81586f3460fd896bbbb6ba099a00217d4042133424fd2183b352132f4fd367e6a60599bdae2a26dfd48a77d0e04
SHA512 (nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz) =
a688cb12cf805950a5abbb13b52f45c81dbee98e310b7ed57ae20e76dbfa5964a16270148374a6426d177db71909d28360490f091c86a5d19d4faa5127beeee1
SHA512 (gcc-9.1.1-20190503.tar.xz) =
9787c7f4bc6a2e918cafa5ef0bc21dd29eb88541297168049cffea150d08f50023e6b639bc24fe53daf6f603db286a7a8dd17357d139f0d0cfb3cee2850fee8b
-SHA512 (ghdl-4ec17bb.tar.gz) =
314d178c0dff987b4fd7712ee184308c01999c42516f5f538af47a89bf544cb4e69d3bfcfecbae9c7995283796da138b0b6b1c7cfd095eaed59c06cf73a7874f
+SHA512 (ghdl-534f39a.tar.gz) =
a56a4138f1292d3b5b5b439d77034569ea92415f7d6714be5be3027931946b65e389ddb8a31d02b3d6cc486115a20cddd949f7f15d5aa5c1d10a69e7e1f62d31
commit b25b3d27264388d7e427ab65d471cc5db66fdcd1
Author: Dan Hork <dan(a)danny.cz>
Date: Sat Oct 5 11:44:27 2019 +0200
drop unneeded mcode patch
diff --git a/ghdl-mcode32bit.patch b/ghdl-mcode32bit.patch
deleted file mode 100644
index 3e07117..0000000
--- a/ghdl-mcode32bit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.mcode32 2016-02-16 16:22:12.273051621 +0100
-+++ Makefile.in 2016-02-16 16:23:54.506135640 +0100
-@@ -16,7 +16,7 @@
- # Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- # 02111-1307, USA.
- CC=@CC@
--build=@build@
-+build=i386-redhat-linux
- srcdir=@srcdir@
- GNATMAKE=@GNATMAKE@
- prefix=@prefix@
-@@ -43,7 +43,7 @@
- ADAC=$(CC)
-
- # Debug
--OPT_FLAGS=-g
-+OPT_FLAGS=-g -m32
- ADA_FLAGS=-gnata
- LIB_CFLAGS=
-
commit c8a4aa5be030b12503c21c2a7f6c2c20bef06c57
Author: Jerry James <loganjerry(a)gmail.com>
Date: Fri Oct 11 14:40:48 2019 -0600
Drop multilib support for s390x as glibc32 and gcc have done.
diff --git a/ghdl.spec b/ghdl.spec
index f9bd59a..0741212 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -42,7 +42,7 @@
# Until annobin is fixed (#1519165).
%undefine _annotated_build
%endif
-%global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64
+%global multilib_64_archs sparc64 ppc64 ppc64p7 x86_64
%ifarch %{ix86} x86_64 ia64 ppc64le
%global build_libquadmath 1
%else
@@ -98,9 +98,6 @@
%else
%global build_offload_nvptx 0
%endif
-%ifarch s390x
-%global multilib_32_arch s390
-%endif
%ifarch sparc64
%global multilib_32_arch sparcv9
%endif
@@ -527,7 +524,7 @@ CONFIGURE_OPTS="\
%ifarch ppc64le
--enable-targets=powerpcle-linux \
%endif
-%ifarch ppc64le %{mips} riscv64
+%ifarch ppc64le %{mips} riscv64 s390x
--disable-multilib \
%else
--enable-multilib \
@@ -815,6 +812,7 @@ popd
%changelog
* Wed Oct 9 2019 Jerry James <loganjerry(a)gmail.com> -
0.37dev-4.20190923git4ec17bb
- Rebuild for mpfr 4
+- Drop multilib support for s390x as glibc32 and gcc have done
* Tue Sep 24 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-3.20190923git4ec17bb
- updated to new ghdl snapshot
commit a8e590638e48a4161df828a338b66fd1b36baf1b
Author: Jerry James <loganjerry(a)gmail.com>
Date: Wed Oct 9 19:53:03 2019 -0600
Rebuild for mpfr 4
diff --git a/ghdl.spec b/ghdl.spec
index f945047..f9bd59a 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -114,7 +114,7 @@
Summary: A VHDL simulator, using the GCC technology
Name: ghdl
Version: %{ghdlver}
-Release: 3.%{ghdlgitrev}%{?dist}
+Release: 4.%{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
@@ -813,6 +813,9 @@ popd
%endif
%changelog
+* Wed Oct 9 2019 Jerry James <loganjerry(a)gmail.com> -
0.37dev-4.20190923git4ec17bb
+- Rebuild for mpfr 4
+
* Tue Sep 24 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-3.20190923git4ec17bb
- updated to new ghdl snapshot
commit 4c2cf46e35aa2ca62b9f3a785b4ec12395b20bc7
Author: Dan Hork <dan(a)danny.cz>
Date: Tue Sep 24 09:55:18 2019 +0200
- updated to new ghdl snapshot
diff --git a/ghdl.spec b/ghdl.spec
index 6665cbd..f945047 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,6 +1,6 @@
%global ghdlver 0.37dev
-%global ghdldate 20190907
-%global ghdlcommit cb3468002497ab2090bef31d559e2eaf4747b90a
+%global ghdldate 20190923
+%global ghdlcommit 4ec17bb58394a6c03c8a4ac938e4a674a5f33e79
%global ghdlshortcommit %(c=%{ghdlcommit}; echo ${c:0:7})
%global ghdlgitrev %{ghdldate}git%{ghdlshortcommit}
@@ -114,7 +114,7 @@
Summary: A VHDL simulator, using the GCC technology
Name: ghdl
Version: %{ghdlver}
-Release: 2.%{ghdlgitrev}%{?dist}
+Release: 3.%{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
@@ -813,6 +813,9 @@ popd
%endif
%changelog
+* Tue Sep 24 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-3.20190923git4ec17bb
+- updated to new ghdl snapshot
+
* Tue Sep 10 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-2.20190907gitcb34680
- updated to new ghdl snapshot
diff --git a/sources b/sources
index 9ddac2f..d8f6a57 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz) =
94f7089365296f7dfa485107b4143bebc850a81586f3460fd896bbbb6ba099a00217d4042133424fd2183b352132f4fd367e6a60599bdae2a26dfd48a77d0e04
SHA512 (nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz) =
a688cb12cf805950a5abbb13b52f45c81dbee98e310b7ed57ae20e76dbfa5964a16270148374a6426d177db71909d28360490f091c86a5d19d4faa5127beeee1
SHA512 (gcc-9.1.1-20190503.tar.xz) =
9787c7f4bc6a2e918cafa5ef0bc21dd29eb88541297168049cffea150d08f50023e6b639bc24fe53daf6f603db286a7a8dd17357d139f0d0cfb3cee2850fee8b
-SHA512 (ghdl-cb34680.tar.gz) =
e796548f396ee4df2b8dedfdc9a3c0fae3b0e3e7e1ad960af3abf7c425a5e736af139575880a057cbb8c0e293956f5bdf6c0cb53389bdb33bb71796ed04bf5b5
+SHA512 (ghdl-4ec17bb.tar.gz) =
314d178c0dff987b4fd7712ee184308c01999c42516f5f538af47a89bf544cb4e69d3bfcfecbae9c7995283796da138b0b6b1c7cfd095eaed59c06cf73a7874f
commit 55351b0b4367551fa0b4b22963afbeb97ffde705
Author: Dan Hork <dan(a)danny.cz>
Date: Mon Sep 23 11:06:32 2019 +0200
enable synth and linghdl for mcode too
diff --git a/ghdl.spec b/ghdl.spec
index d935399..6665cbd 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -440,7 +440,7 @@ pushd ghdl-mcode
%if %{without gnatwae}
--disable-werror \
%endif
- --prefix=/usr
+ --prefix=/usr --enable-libghdl --enable-synth
make %{?_smp_mflags}
popd
%endif
commit 5a6f6c6e4cc77bb25c57e34676342c65e90ade37
Author: Dan Hork <dan(a)danny.cz>
Date: Mon Sep 23 11:04:54 2019 +0200
drop unneeded rm
diff --git a/ghdl.spec b/ghdl.spec
index 7888c96..d935399 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -674,8 +674,6 @@ popd
popd
%install
-%{__rm} -rf %{buildroot}
-
# install mcode on x86
%ifarch %{ix86} x86_64
%if %{with mcode}
commit caf3b7d591df4b7cfb907cec1aeaf380ef4ee0c2
Author: Dan Hork <dan(a)danny.cz>
Date: Tue Sep 10 22:28:33 2019 +0200
updated to new ghdl snapshot
diff --git a/ghdl-fix.patch b/ghdl-fix.patch
deleted file mode 100644
index 7ecd1a1..0000000
--- a/ghdl-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit 3c81c6f8fb41058e505c61db0f7d566ffebe2357
-Author: Tristan Gingold <tgingold(a)free.fr>
-Date: Fri Aug 30 07:49:36 2019 +0200
-
- synth: add support for --synth on llvm, link with -lm.
-
-diff --git a/src/ghdldrv/ghdl_llvm.adb b/src/ghdldrv/ghdl_llvm.adb
-index c170c4b5..f18741bd 100644
---- a/src/ghdldrv/ghdl_llvm.adb
-+++ b/src/ghdldrv/ghdl_llvm.adb
-@@ -21,6 +21,7 @@ with Ghdlprint;
- with Ghdldrv;
- with Ghdlvpi;
- with Ghdlxml;
-+with Ghdlsynth_Maybe;
-
- procedure Ghdl_Llvm is
- begin
-@@ -29,6 +30,7 @@ begin
- Ghdlmain.Version_String := new String'("llvm code generator");
- Ghdldrv.Backend := Ghdldrv.Backend_Llvm;
- Ghdldrv.Register_Commands;
-+ Ghdlsynth_Maybe.Register_Commands;
- Ghdllocal.Register_Commands;
- Ghdlprint.Register_Commands;
- Ghdlvpi.Register_Commands;
-diff --git a/src/synth/synth-expr.adb b/src/synth/synth-expr.adb
-index d24486f3..26318bcf 100644
---- a/src/synth/synth-expr.adb
-+++ b/src/synth/synth-expr.adb
-@@ -43,6 +43,10 @@ with Netlists.Builders; use Netlists.Builders;
- with Netlists.Locations; use Netlists.Locations;
-
- package body Synth.Expr is
-+ -- As log2(3m) is directly referenced, the program must be linked with -lm
-+ -- (math library) on unix systems.
-+ pragma Linker_Options ("-lm");
-+
- function Synth_Name (Syn_Inst : Synth_Instance_Acc; Name : Node)
- return Value_Acc;
-
-diff --git a/Makefile.in b/Makefile.in
-index e08e231b..c6941f52 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -300,7 +300,7 @@ oread-gcc$(EXEEXT): force
-
- #################### For llvm backend ##############################
-
--GHDL_LLVM_INCFLAGS=$(GHDL_COMMON_INCFLAGS) -aI$(srcdir)/src/ghdldrv
-aI$(srcdir)/src/ortho -aI$(srcdir)/src/ortho/$(llvm_be)
-+GHDL_LLVM_INCFLAGS=$(GHDL_COMMON_INCFLAGS) -aI$(srcdir)/src/ghdldrv
-aI$(srcdir)/src/ortho -aI$(srcdir)/src/ortho/$(llvm_be) -aI$(srcdir)/src/synth
-
- all.llvm: ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT) grt-all libs.vhdl.llvm all.vpi
-
diff --git a/ghdl.spec b/ghdl.spec
index cd20dc3..7888c96 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,6 +1,6 @@
%global ghdlver 0.37dev
-%global ghdldate 20190820
-%global ghdlcommit f977ba0dd5b152e97619ecfe1d848d83f2e062ff
+%global ghdldate 20190907
+%global ghdlcommit cb3468002497ab2090bef31d559e2eaf4747b90a
%global ghdlshortcommit %(c=%{ghdlcommit}; echo ${c:0:7})
%global ghdlgitrev %{ghdldate}git%{ghdlshortcommit}
@@ -114,7 +114,7 @@
Summary: A VHDL simulator, using the GCC technology
Name: ghdl
Version: %{ghdlver}
-Release: 1.%{ghdlgitrev}%{?dist}
+Release: 2.%{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
@@ -158,9 +158,6 @@ Patch1002: nvptx-tools-glibc.patch
Source100:
https://github.com/ghdl/ghdl/archive/%{ghdlcommit}/%{name}-%{ghdlshortcom...
Patch100: ghdl-llvmflags.patch
-# enable synth on llvm, link with -lm
-#
https://github.com/ghdl/ghdl/commit/3c81c6f8fb41058e505c61db0f7d566ffebe2357
-Patch101: ghdl-fix.patch
# From: Thomas Sailer <t.sailer(a)alumni.ethz.ch>
# To: ghdl-discuss(a)gna.org
# Date: Thu, 02 Apr 2009 15:36:00 +0200
@@ -400,9 +397,6 @@ rm -f gcc/testsuite/go.test/test/chan/goroutines.go
# ghdl
mv ghdl-%{ghdlcommit} ghdl
%patch100 -p0 -b .llvmflags~
-pushd ghdl
-%patch101 -p1
-popd
%if %{without gnatwae}
perl -i -pe 's,-gnatwae,,' ghdl/dist/gcc/Make-lang.in
@@ -821,6 +815,9 @@ popd
%endif
%changelog
+* Tue Sep 10 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-2.20190907gitcb34680
+- updated to new ghdl snapshot
+
* Thu Sep 05 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-1.20190820gitf977ba0
- rebased to 0.37dev
- various cleanups and updates
diff --git a/sources b/sources
index 3be3803..9ddac2f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz) =
94f7089365296f7dfa485107b4143bebc850a81586f3460fd896bbbb6ba099a00217d4042133424fd2183b352132f4fd367e6a60599bdae2a26dfd48a77d0e04
SHA512 (nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz) =
a688cb12cf805950a5abbb13b52f45c81dbee98e310b7ed57ae20e76dbfa5964a16270148374a6426d177db71909d28360490f091c86a5d19d4faa5127beeee1
SHA512 (gcc-9.1.1-20190503.tar.xz) =
9787c7f4bc6a2e918cafa5ef0bc21dd29eb88541297168049cffea150d08f50023e6b639bc24fe53daf6f603db286a7a8dd17357d139f0d0cfb3cee2850fee8b
-SHA512 (ghdl-f977ba0.tar.gz) =
2159e8cbe9722e46eafacc85edb5b20a3533e1fd14e0aae17f17a2fe74ad55300f824d14bd74a220215c9e9227265c431909ef62716276c6c4c24918f6d8c65b
+SHA512 (ghdl-cb34680.tar.gz) =
e796548f396ee4df2b8dedfdc9a3c0fae3b0e3e7e1ad960af3abf7c425a5e736af139575880a057cbb8c0e293956f5bdf6c0cb53389bdb33bb71796ed04bf5b5
commit db8dc7d6fcceeeb7d31dadc2582f38f58378b1cd
Author: Dan Hork <dan(a)danny.cz>
Date: Thu Sep 5 15:51:06 2019 +0200
explicitly list the gcc provided libs for removal, fixes build on 32-bit
diff --git a/ghdl.spec b/ghdl.spec
index 234a200..cd20dc3 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -746,7 +746,7 @@ pushd %{buildroot}
.%{_bindir}/%{gcc_target_platform}-gcc{,-%{gcc_major}} \
.%{_bindir}/{,%{gcc_target_platform}-}gcc-{ar,nm,ranlib} \
.%{_includedir}/mf-runtime.h \
- .%{_libdir}/lib* \
+ .%{_libdir}/lib{atomic,cc1,gcc_s,gomp,quadmath,ssp}* \
.%{_infodir}/dir \
.%{_infodir}/{cpp,cppinternals,gcc,gccinstall,gccint}.info* \
.%{_infodir}/{libgomp,libquadmath}.info* \
commit f12cc89572514ea3609435ccd7b61937d7d6f7aa
Author: Dan Hork <dan(a)danny.cz>
Date: Thu Sep 5 14:37:24 2019 +0200
update release tag and add changelog entry
diff --git a/ghdl.spec b/ghdl.spec
index 944e035..234a200 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -2,7 +2,7 @@
%global ghdldate 20190820
%global ghdlcommit f977ba0dd5b152e97619ecfe1d848d83f2e062ff
%global ghdlshortcommit %(c=%{ghdlcommit}; echo ${c:0:7})
-%global ghdlgitrev .%{ghdldate}git%{ghdlshortcommit}
+%global ghdlgitrev %{ghdldate}git%{ghdlshortcommit}
%ifarch %{ix86} x86_64
%bcond_without mcode
@@ -114,7 +114,7 @@
Summary: A VHDL simulator, using the GCC technology
Name: ghdl
Version: %{ghdlver}
-Release: 5%{ghdlgitrev}.1%{?dist}
+Release: 1.%{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
@@ -821,6 +821,10 @@ popd
%endif
%changelog
+* Thu Sep 05 2019 Dan Hork <dan[at]danny.cz> - 0.37dev-1.20190820gitf977ba0
+- rebased to 0.37dev
+- various cleanups and updates
+
* Fri Aug 23 2019 Dan Hork <dan[at]danny.cz> - 0.35dev-5.20190528git3fafb135.0
- enable ppc64le
commit 1c43f4270d77ff6e4b3e4e0d8133e1b3a065f55a
Author: Dan Hork <dan(a)danny.cz>
Date: Thu Sep 5 14:26:11 2019 +0200
switch to using github snapshot directly as Source100
diff --git a/ghdl.spec b/ghdl.spec
index e23d509..944e035 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,5 +1,8 @@
%global ghdlver 0.37dev
-%global ghdlgitrev .20190820gitf977ba0d
+%global ghdldate 20190820
+%global ghdlcommit f977ba0dd5b152e97619ecfe1d848d83f2e062ff
+%global ghdlshortcommit %(c=%{ghdlcommit}; echo ${c:0:7})
+%global ghdlgitrev .%{ghdldate}git%{ghdlshortcommit}
%ifarch %{ix86} x86_64
%bcond_without mcode
@@ -153,11 +156,7 @@ Patch1000: nvptx-tools-no-ptxas.patch
Patch1001: nvptx-tools-build.patch
Patch1002: nvptx-tools-glibc.patch
-# HOWTO create source files from ghdl git at
github.com
-# check out the git repo
-# git clone
https://github.com/ghdl/ghdl.git
-# tar cvJf ghdl%{ghdlgitrev}.tar.bz2 --exclude-vcs ghdl
-Source100: ghdl%{ghdlgitrev}.tar.bz2
+Source100:
https://github.com/ghdl/ghdl/archive/%{ghdlcommit}/%{name}-%{ghdlshortcom...
Patch100: ghdl-llvmflags.patch
# enable synth on llvm, link with -lm
#
https://github.com/ghdl/ghdl/commit/3c81c6f8fb41058e505c61db0f7d566ffebe2357
@@ -398,6 +397,8 @@ fi
# This test causes fork failures, because it spawns way too many threads
rm -f gcc/testsuite/go.test/test/chan/goroutines.go
+# ghdl
+mv ghdl-%{ghdlcommit} ghdl
%patch100 -p0 -b .llvmflags~
pushd ghdl
%patch101 -p1
diff --git a/sources b/sources
index 86c9bd4..3be3803 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz) =
94f7089365296f7dfa485107b4143bebc850a81586f3460fd896bbbb6ba099a00217d4042133424fd2183b352132f4fd367e6a60599bdae2a26dfd48a77d0e04
SHA512 (nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz) =
a688cb12cf805950a5abbb13b52f45c81dbee98e310b7ed57ae20e76dbfa5964a16270148374a6426d177db71909d28360490f091c86a5d19d4faa5127beeee1
SHA512 (gcc-9.1.1-20190503.tar.xz) =
9787c7f4bc6a2e918cafa5ef0bc21dd29eb88541297168049cffea150d08f50023e6b639bc24fe53daf6f603db286a7a8dd17357d139f0d0cfb3cee2850fee8b
-SHA512 (ghdl.20190820gitf977ba0d.tar.bz2) =
d2152055af86e29119aa6f5ed5dc772ec0acef33b7721ef1567334299319cf39cc6d54b3103c7f77a7ad7832cffc03a7be0b8f5fe92760aa893f5c088f946d36
+SHA512 (ghdl-f977ba0.tar.gz) =
2159e8cbe9722e46eafacc85edb5b20a3533e1fd14e0aae17f17a2fe74ad55300f824d14bd74a220215c9e9227265c431909ef62716276c6c4c24918f6d8c65b
commit dbbfad1259cfba1dd67feef3aadc11d962c3f8b0
Author: 1138-4EB <1138-4EB(a)users.noreply.github.com>
Date: Wed Aug 28 06:55:10 2019 +0200
do not redefine '_unpackaged_files_terminate_build'
diff --git a/ghdl.spec b/ghdl.spec
index 79eb7a8..e23d509 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -32,7 +32,6 @@
%global gcc_release 1
%global nvptx_tools_gitrev c28050f60193b3b95a18866a96f03334e874e78f
%global nvptx_newlib_gitrev aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24
-%global _unpackaged_files_terminate_build 0
%global _performance_build 1
# Hardening slows the compiler way too much.
%undefine _hardened_build
commit 5f02c328e2bb06351b162dc37fee273d44bb4ae5
Author: Dan Hork <dan(a)danny.cz>
Date: Thu Sep 5 11:28:30 2019 +0200
enable synth feature
diff --git a/ghdl-fix.patch b/ghdl-fix.patch
new file mode 100644
index 0000000..7ecd1a1
--- /dev/null
+++ b/ghdl-fix.patch
@@ -0,0 +1,54 @@
+commit 3c81c6f8fb41058e505c61db0f7d566ffebe2357
+Author: Tristan Gingold <tgingold(a)free.fr>
+Date: Fri Aug 30 07:49:36 2019 +0200
+
+ synth: add support for --synth on llvm, link with -lm.
+
+diff --git a/src/ghdldrv/ghdl_llvm.adb b/src/ghdldrv/ghdl_llvm.adb
+index c170c4b5..f18741bd 100644
+--- a/src/ghdldrv/ghdl_llvm.adb
++++ b/src/ghdldrv/ghdl_llvm.adb
+@@ -21,6 +21,7 @@ with Ghdlprint;
+ with Ghdldrv;
+ with Ghdlvpi;
+ with Ghdlxml;
++with Ghdlsynth_Maybe;
+
+ procedure Ghdl_Llvm is
+ begin
+@@ -29,6 +30,7 @@ begin
+ Ghdlmain.Version_String := new String'("llvm code generator");
+ Ghdldrv.Backend := Ghdldrv.Backend_Llvm;
+ Ghdldrv.Register_Commands;
++ Ghdlsynth_Maybe.Register_Commands;
+ Ghdllocal.Register_Commands;
+ Ghdlprint.Register_Commands;
+ Ghdlvpi.Register_Commands;
+diff --git a/src/synth/synth-expr.adb b/src/synth/synth-expr.adb
+index d24486f3..26318bcf 100644
+--- a/src/synth/synth-expr.adb
++++ b/src/synth/synth-expr.adb
+@@ -43,6 +43,10 @@ with Netlists.Builders; use Netlists.Builders;
+ with Netlists.Locations; use Netlists.Locations;
+
+ package body Synth.Expr is
++ -- As log2(3m) is directly referenced, the program must be linked with -lm
++ -- (math library) on unix systems.
++ pragma Linker_Options ("-lm");
++
+ function Synth_Name (Syn_Inst : Synth_Instance_Acc; Name : Node)
+ return Value_Acc;
+
+diff --git a/Makefile.in b/Makefile.in
+index e08e231b..c6941f52 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -300,7 +300,7 @@ oread-gcc$(EXEEXT): force
+
+ #################### For llvm backend ##############################
+
+-GHDL_LLVM_INCFLAGS=$(GHDL_COMMON_INCFLAGS) -aI$(srcdir)/src/ghdldrv
-aI$(srcdir)/src/ortho -aI$(srcdir)/src/ortho/$(llvm_be)
++GHDL_LLVM_INCFLAGS=$(GHDL_COMMON_INCFLAGS) -aI$(srcdir)/src/ghdldrv
-aI$(srcdir)/src/ortho -aI$(srcdir)/src/ortho/$(llvm_be) -aI$(srcdir)/src/synth
+
+ all.llvm: ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT) grt-all libs.vhdl.llvm all.vpi
+
diff --git a/ghdl.spec b/ghdl.spec
index 124b13e..79eb7a8 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -112,7 +112,7 @@
Summary: A VHDL simulator, using the GCC technology
Name: ghdl
Version: %{ghdlver}
-Release: 5%{ghdlgitrev}.0%{?dist}
+Release: 5%{ghdlgitrev}.1%{?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
@@ -160,7 +160,9 @@ Patch1002: nvptx-tools-glibc.patch
# tar cvJf ghdl%{ghdlgitrev}.tar.bz2 --exclude-vcs ghdl
Source100: ghdl%{ghdlgitrev}.tar.bz2
Patch100: ghdl-llvmflags.patch
-# Both following patches have been sent to upstream mailing list:
+# enable synth on llvm, link with -lm
+#
https://github.com/ghdl/ghdl/commit/3c81c6f8fb41058e505c61db0f7d566ffebe2357
+Patch101: ghdl-fix.patch
# From: Thomas Sailer <t.sailer(a)alumni.ethz.ch>
# To: ghdl-discuss(a)gna.org
# Date: Thu, 02 Apr 2009 15:36:00 +0200
@@ -398,6 +400,9 @@ fi
rm -f gcc/testsuite/go.test/test/chan/goroutines.go
%patch100 -p0 -b .llvmflags~
+pushd ghdl
+%patch101 -p1
+popd
%if %{without gnatwae}
perl -i -pe 's,-gnatwae,,' ghdl/dist/gcc/Make-lang.in
@@ -407,11 +412,7 @@ perl -i -pe 's,-gnatwae,,' ghdl/dist/gcc/Make-lang.in
%if %{with mcode}
cp -r ghdl ghdl-mcode
pushd ghdl-mcode
-%if "%{?_lib}" == "lib64"
-perl -i -pe 's,^libdirsuffix=.*$,libdirsuffix=lib64/ghdl/mcode,' configure
-%else
-perl -i -pe 's,^libdirsuffix=.*$,libdirsuffix=lib/ghdl/mcode,' configure
-%endif
+perl -i -pe 's,^libdirsuffix=.*$,libdirsuffix=%{_lib}/ghdl/mcode,' configure
perl -i -pe 's,^libdirreverse=.*$,libdirreverse=../../..,' configure
popd
%endif
@@ -420,11 +421,7 @@ popd
%if %{with llvm}
cp -r ghdl ghdl-llvm
pushd ghdl-llvm
-%if "%{?_lib}" == "lib64"
-perl -i -pe 's,^libdirsuffix=.*$,libdirsuffix=lib64/ghdl/llvm,' configure
-%else
-perl -i -pe 's,^libdirsuffix=.*$,libdirsuffix=lib/ghdl/llvm,' configure
-%endif
+perl -i -pe 's,^libdirsuffix=.*$,libdirsuffix=%{_lib}/ghdl/llvm,' configure
perl -i -pe 's,^libdirreverse=.*$,libdirreverse=../../..,' configure
popd
%endif
@@ -433,7 +430,7 @@ sed -i -e 's/4\.9\.3/4.9.2/' gcc/BASE-VER
echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
pushd ghdl
-./configure --prefix=/usr --with-gcc=..
+./configure --prefix=/usr --with-gcc=.. --enable-libghdl --enable-synth
make copy-sources
popd
@@ -461,7 +458,7 @@ pushd ghdl-llvm
%if %{without gnatwae}
--disable-werror \
%endif
- --with-llvm-config=/usr/bin/llvm-config
+ --with-llvm-config=/usr/bin/llvm-config --enable-libghdl --enable-synth
make %{?_smp_mflags} LDFLAGS=-Wl,--build-id
popd
%endif
commit 078c9c7b8774f3ade8c150e6fad2ea66e1557c0c
Author: 1138-4EB <1138-4EB(a)users.noreply.github.com>
Date: Fri Aug 23 22:54:21 2019 +0200
style: use wildcard to copy libghdl*.so libraries
diff --git a/ghdl.spec b/ghdl.spec
index f249e3d..124b13e 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -794,8 +794,7 @@ popd
%{_mandir}/man1/*
%{_includedir}/ghdl/vpi_user.h
%{_includedir}/ghdl/ghdlsynth*.h
-%{_libdir}/libghdlvpi.so
-%{_libdir}/libghdl-*.so
+%{_libdir}/libghdl*.so
%files grt
# Need to own directory %{_libdir}/gcc even though we only want the
commit d750860dcdc93d070ef6a1020c84c1f7d989e04b
Author: Dan Hork <dan(a)danny.cz>
Date: Sat Aug 24 11:40:40 2019 +0200
update installation
- correctly remove gcc artifacts, now they live in %gcc_major subdir
- package libghdl
diff --git a/ghdl.spec b/ghdl.spec
index fa2852b..f249e3d 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -725,8 +725,6 @@ make bindir=${PBINDIR}
GHDL1_GCC_BIN="--GHDL1=${PBINDIR}/ghdl1" ghdllib
make DESTDIR=%{buildroot} install
popd
-%{__mv} %{buildroot}%{_prefix}/lib/libghdlvpi.so %{buildroot}%{_libdir}/ghdlvpi.so
-
# Add additional libraries to link
(
%if 0%{?fedora} >= 30
@@ -747,8 +745,8 @@ echo "-lgnat-6"
# Remove files not to be packaged
pushd %{buildroot}
%{__rm} -f \
- .%{_bindir}/{cpp,gcc,gccbug,gcov} \
- .%{_bindir}/%{gcc_target_platform}-gcc{,-%{gcc_version}} \
+ .%{_bindir}/{cpp,gcc,gccbug,gcov,gcov-dump,gcov-tool} \
+ .%{_bindir}/%{gcc_target_platform}-gcc{,-%{gcc_major}} \
.%{_bindir}/{,%{gcc_target_platform}-}gcc-{ar,nm,ranlib} \
.%{_includedir}/mf-runtime.h \
.%{_libdir}/lib* \
@@ -766,21 +764,26 @@ pushd %{buildroot}
# Remove crt/libgcc, as ghdl invokes the native gcc to perform the linking
%{__rm} -f \
- .%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/crt* \
- .%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgc* \
- .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gcc_version}/{cc1,collect2}
+ .%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/*crt* \
+ .%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libgc* \
+ .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gcc_major}/{cc1,collect2} \
+ .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gcc_major}/*lto*
# Remove directory hierarchies not to be packaged
%{__rm} -rf \
-
.%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/{include,include-fixed,plugin,install-tools}
\
- .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gcc_version}/install-tools
+
.%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/{include,include-fixed,plugin,install-tools}
\
+ .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gcc_major}/install-tools \
+ .%{_libexecdir}/gcc/%{gcc_target_platform}/%{gcc_major}/plugin \
popd
-%{__mv} %{buildroot}%{_libdir}/ghdlvpi.so %{buildroot}%{_libdir}/libghdlvpi.so
%{__install} -d %{buildroot}%{_includedir}/ghdl
%{__mv} %{buildroot}%{_includedir}/vpi_user.h %{buildroot}%{_includedir}/ghdl
-%{__rm} %{buildroot}%{_bindir}/gcov-tool
+%{__mv} %{buildroot}%{_includedir}/ghdlsynth*.h %{buildroot}%{_includedir}/ghdl
+%if %{_lib} != lib
+%{__mv} %{buildroot}/usr/lib/libghdlvpi.so %{buildroot}%{_libdir}/
+%{__mv} %{buildroot}/usr/lib/libghdl-*.so %{buildroot}%{_libdir}/
+%endif
%files
%{_bindir}/ghdl
@@ -790,7 +793,9 @@ popd
%{_libexecdir}/gcc/
%{_mandir}/man1/*
%{_includedir}/ghdl/vpi_user.h
+%{_includedir}/ghdl/ghdlsynth*.h
%{_libdir}/libghdlvpi.so
+%{_libdir}/libghdl-*.so
%files grt
# Need to own directory %{_libdir}/gcc even though we only want the
commit 542211777d2727b277c1dcba9255838d984231b8
Author: Dan Hork <dan(a)danny.cz>
Date: Fri Aug 23 20:49:59 2019 +0200
let the rs6000 backend understand the 'vhdl' language
diff --git a/ghdl-ppc64abort.patch b/ghdl-ppc64abort.patch
index 46bb40e..c560d60 100644
--- a/ghdl-ppc64abort.patch
+++ b/ghdl-ppc64abort.patch
@@ -1,11 +1,13 @@
---- gcc/config/rs6000/rs6000.c.orig 2009-02-13 19:43:05.000000000 +0100
-+++ gcc/config/rs6000/rs6000.c 2009-02-13 19:45:29.000000000 +0100
-@@ -16946,7 +16946,7 @@
- else if (! strcmp (language_string, "GNU Objective-C"))
- i = 14;
- else
-- gcc_unreachable ();
-+ i = 0;
- fprintf (file, "%d,", i);
-
- /* 8 single bit fields: global linkage (not set for C extern linkage,
+diff -up gcc/config/rs6000/rs6000.c.orig gcc/config/rs6000/rs6000.c
+--- gcc/config/rs6000/rs6000.c.orig 2019-08-23 13:21:47.463294109 +0200
++++ gcc/config/rs6000/rs6000.c 2019-08-23 13:22:10.990328958 +0200
+@@ -29147,7 +29147,8 @@ rs6000_output_function_epilogue (FILE *f
+ || ! strcmp (language_string, "GNU GIMPLE")
+ || ! strcmp (language_string, "GNU Go")
+ || ! strcmp (language_string, "GNU D")
+- || ! strcmp (language_string, "libgccjit"))
++ || ! strcmp (language_string, "libgccjit")
++ || ! strcmp (language_string, "vhdl"))
+ i = 0;
+ else if (! strcmp (language_string, "GNU F77")
+ || lang_GNU_Fortran ())
commit 83043f3fab2de14dc7c2ee7b317062dd6357c4b7
Author: 1138-4EB <1138-4EB(a)users.noreply.github.com>
Date: Fri Aug 23 10:49:15 2019 +0200
update to 0.37dev (20190820gitf977ba0d)
diff --git a/ghdl.spec b/ghdl.spec
index a76acfc..fa2852b 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,5 +1,5 @@
%global ghdlver 0.37dev
-%global ghdlgitrev .20190528git3fafb135
+%global ghdlgitrev .20190820gitf977ba0d
%ifarch %{ix86} x86_64
%bcond_without mcode
@@ -117,8 +117,9 @@ License: GPLv2+ and GPLv3+ and GPLv3+ with exceptions and GPLv2+ with
exceptions
URL:
http://ghdl.free.fr/
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
-# svn export
svn://gcc.gnu.org/svn/gcc/branches/redhat/gcc-9-branch@%%{SVNREV}
gcc-%%{version}-%%{DATE}
-# tar cf - gcc-%%{version}-%%{DATE} | xz -9e > gcc-%%{version}-%%{DATE}.tar.xz
+# GCC_TARNAME="gcc-%%{version}-%%{DATE}"
+# svn export
svn://gcc.gnu.org/svn/gcc/branches/redhat/gcc-9-branch@%%{SVNREV}
$GCC_TARNAME
+# tar cf - $GCC_TARNAME | xz -9e > $GCC_TARNAME.tar.xz
Source0: gcc-%{gcc_version}-%{DATE}.tar.xz
# The source for nvptx-tools package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
diff --git a/sources b/sources
index 5fb0ec2..86c9bd4 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz) =
94f7089365296f7dfa485107b4143bebc850a81586f3460fd896bbbb6ba099a00217d4042133424fd2183b352132f4fd367e6a60599bdae2a26dfd48a77d0e04
SHA512 (nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz) =
a688cb12cf805950a5abbb13b52f45c81dbee98e310b7ed57ae20e76dbfa5964a16270148374a6426d177db71909d28360490f091c86a5d19d4faa5127beeee1
SHA512 (gcc-9.1.1-20190503.tar.xz) =
9787c7f4bc6a2e918cafa5ef0bc21dd29eb88541297168049cffea150d08f50023e6b639bc24fe53daf6f603db286a7a8dd17357d139f0d0cfb3cee2850fee8b
-SHA512 (ghdl.20190528git3fafb135.tar.bz2) =
aad336c1655ecc83be8a2cab628391f7f80ba5ec60d9e81115aa3438438c4e79a398da2744be02e8c92962de2a8f5925c2d6c3fb95bc61af6934a71a3b28dc71
+SHA512 (ghdl.20190820gitf977ba0d.tar.bz2) =
d2152055af86e29119aa6f5ed5dc772ec0acef33b7721ef1567334299319cf39cc6d54b3103c7f77a7ad7832cffc03a7be0b8f5fe92760aa893f5c088f946d36
commit 672bb7ac1a08ad2c055b4fc06cf711e928e8cd59
Author: 1138-4EB <1138-4EB(a)users.noreply.github.com>
Date: Fri Aug 23 09:07:14 2019 +0200
remove upstreamed upf.patch
diff --git a/ghdl.spec b/ghdl.spec
index 6707ceb..a76acfc 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -165,7 +165,6 @@ Patch100: ghdl-llvmflags.patch
# Date: Thu, 02 Apr 2009 15:36:00 +0200
#
https://gna.org/bugs/index.php?13390
Patch106: ghdl-ppc64abort.patch
-Patch200: upf.patch
Requires: gcc
# Need binutils with -pie support >= 2.14.90.0.4-4
@@ -397,8 +396,6 @@ fi
# This test causes fork failures, because it spawns way too many threads
rm -f gcc/testsuite/go.test/test/chan/goroutines.go
-%patch200 -p0 -b .upf~
-
%patch100 -p0 -b .llvmflags~
%if %{without gnatwae}
diff --git a/upf.patch b/upf.patch
deleted file mode 100644
index db55cd7..0000000
--- a/upf.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -urN ghdl/libraries/ieee/upf-body.vhdl ghdl/libraries/ieee/upf-body.vhdl
---- ghdl/libraries/ieee/upf-body.vhdl 1970-01-01 01:00:00.000000000 +0100
-+++ ghdl/libraries/ieee/upf-body.vhdl 2017-09-26 13:05:27.165742285 +0200
-@@ -0,0 +1,26 @@
-+package body upf is
-+
-+ function supply_on (
-+ constant supply_name : string;
-+ constant voltage : real)
-+ return boolean is
-+ begin
-+ return true;
-+ end supply_on;
-+
-+ function supply_partial_on (
-+ constant supply_name : string;
-+ constant voltage : real)
-+ return boolean is
-+ begin
-+ return true;
-+ end supply_partial_on;
-+
-+ function supply_off (
-+ constant supply_name : string)
-+ return boolean is
-+ begin
-+ return true;
-+ end supply_off;
-+
-+end upf;
-diff -urN ghdl/libraries/ieee/upf.vhdl ghdl/libraries/ieee/upf.vhdl
---- ghdl/libraries/ieee/upf.vhdl 1970-01-01 01:00:00.000000000 +0100
-+++ ghdl/libraries/ieee/upf.vhdl 2017-09-26 13:05:22.898825535 +0200
-@@ -0,0 +1,19 @@
-+-- modelled according to IEEE Std 1801-2015, 11.2
-+
-+package upf is
-+
-+ function supply_on (
-+ constant supply_name : string;
-+ constant voltage : real)
-+ return boolean;
-+
-+ function supply_partial_on (
-+ constant supply_name : string;
-+ constant voltage : real)
-+ return boolean;
-+
-+ function supply_off (
-+ constant supply_name : string)
-+ return boolean;
-+
-+end upf;
-diff -urN ghdl/libraries/ieee2008/upf-body.vhdl ghdl/libraries/ieee2008/upf-body.vhdl
---- ghdl/libraries/ieee2008/upf-body.vhdl 1970-01-01 01:00:00.000000000 +0100
-+++ ghdl/libraries/ieee2008/upf-body.vhdl 2017-09-26 12:34:23.680179016 +0200
-@@ -0,0 +1,26 @@
-+package body upf is
-+
-+ function supply_on (
-+ constant supply_name : string;
-+ constant voltage : real)
-+ return boolean is
-+ begin
-+ return true;
-+ end supply_on;
-+
-+ function supply_partial_on (
-+ constant supply_name : string;
-+ constant voltage : real)
-+ return boolean is
-+ begin
-+ return true;
-+ end supply_partial_on;
-+
-+ function supply_off (
-+ constant supply_name : string)
-+ return boolean is
-+ begin
-+ return true;
-+ end supply_off;
-+
-+end package body upf;
-diff -urN ghdl/libraries/ieee2008/upf.vhdl ghdl/libraries/ieee2008/upf.vhdl
---- ghdl/libraries/ieee2008/upf.vhdl 1970-01-01 01:00:00.000000000 +0100
-+++ ghdl/libraries/ieee2008/upf.vhdl 2017-09-26 12:34:23.680179016 +0200
-@@ -0,0 +1,19 @@
-+-- modelled according to IEEE Std 1801-2015, 11.2
-+
-+package upf is
-+
-+ function supply_on (
-+ constant supply_name : string;
-+ constant voltage : real)
-+ return boolean;
-+
-+ function supply_partial_on (
-+ constant supply_name : string;
-+ constant voltage : real)
-+ return boolean;
-+
-+ function supply_off (
-+ constant supply_name : string)
-+ return boolean;
-+
-+end package upf;
-diff -urN ghdl/libraries/Makefile.inc ghdl/libraries/Makefile.inc
---- ghdl/libraries/Makefile.inc 2017-09-26 13:06:15.300803119 +0200
-+++ ghdl/libraries/Makefile.inc 2017-09-26 12:36:18.666917429 +0200
-@@ -54,7 +54,8 @@
- ifeq ($(enable_openieee),false)
- IEEE_SRCS := ieee/std_logic_1164.vhdl ieee/std_logic_1164-body.vhdl \
- ieee/numeric_bit.vhdl ieee/numeric_bit-body.vhdl \
-- ieee/numeric_std.vhdl ieee/numeric_std-body.vhdl
-+ ieee/numeric_std.vhdl ieee/numeric_std-body.vhdl \
-+ ieee/upf.vhdl ieee/upf-body.vhdl
- MATH_SRCS := ieee/math_real.vhdl ieee/math_real-body.vhdl \
- ieee/math_complex.vhdl ieee/math_complex-body.vhdl
- VITAL95_BSRCS := vital95/vital_timing.vhdl vital95/vital_timing-body.vhdl \
-@@ -76,7 +77,8 @@
- ieee2008/fixed_pkg.vhdl \
- ieee2008/float_generic_pkg.vhdl ieee2008/float_generic_pkg-body.vhdl \
- ieee2008/float_pkg.vhdl \
-- ieee2008/ieee_bit_context.vhdl ieee2008/ieee_std_context.vhdl
-+ ieee2008/ieee_bit_context.vhdl ieee2008/ieee_std_context.vhdl \
-+ ieee2008/upf.vhdl ieee2008/upf-body.vhdl
- else
- IEEE_SRCS := openieee/std_logic_1164.vhdl openieee/std_logic_1164-body.vhdl \
- openieee/numeric_bit.vhdl openieee/numeric_bit-body.vhdl \
commit 852d721a6c7c499d59da1927e97060eab9a5c0aa
Author: 1138-4EB <1138-4EB(a)users.noreply.github.com>
Date: Fri Aug 9 09:05:56 2019 +0200
clean: remove ieee-mathreal.patch (see 6dbb897a)
diff --git a/ieee-mathreal.patch b/ieee-mathreal.patch
deleted file mode 100644
index 13c9fc8..0000000
--- a/ieee-mathreal.patch
+++ /dev/null
@@ -1,385 +0,0 @@
---- vhdl/libraries/ieee/math_real.vhdl.orig 2009-04-01 19:21:58.000000000 +0200
-+++ vhdl/libraries/ieee/math_real.vhdl 2009-04-02 12:21:52.000000000 +0200
-@@ -102,16 +102,21 @@
- -- returns integer FLOOR(X + 0.5) if X > 0;
- -- return integer CEIL(X - 0.5) if X < 0
-
-- -- IAC: we are missing the function TRUNC
-- -- IAC: we are missing the function MOD
-- -- IAC: functions FMAX and FMIN should be renamed REALMAX and REALMIN
--
-- function FMAX (X, Y : real ) return real;
-- attribute foreign of fmax : function is "VHPIDIRECT fmax";
-+ function TRUNC (X : real ) return real;
-+ attribute foreign of trunc : function is "VHPIDIRECT trunc";
-+ -- returns integer FLOOR(X) if X > 0;
-+ -- return integer CEIL(X) if X < 0
-+
-+ function "MOD" (X, Y : real ) return real;
-+ attribute foreign of "mod" : function is "VHPIDIRECT fmod";
-+ -- returns the floating point modulus of X/Y
-+
-+ function REALMAX (X, Y : real ) return real;
-+ attribute foreign of realmax : function is "VHPIDIRECT fmax";
- -- returns the algebraically larger of X and Y
-
-- function FMIN (X, Y : real ) return real;
-- attribute foreign of fmin : function is "VHPIDIRECT fmin";
-+ function REALMIN (X, Y : real ) return real;
-+ attribute foreign of realmin : function is "VHPIDIRECT fmin";
- -- returns the algebraically smaller of X and Y
-
- procedure UNIFORM (variable Seed1,Seed2:inout integer; variable X:out real);
-@@ -203,25 +208,17 @@
- -- returns tan X; X in radians
- -- X /= ((2k+1) * PI/2), where k is an integer
-
-- -- IAC: function should be called ARCSIN
--
-- function ASIN (X : real ) return real;
-+ function ARCSIN (X : real ) return real;
- -- returns -PI/2 < asin X < PI/2; | X | <= 1
-
-- -- IAC: function should be called ARCCOS
--
-- function ACOS (X : real ) return real;
-+ function ARCCOS (X : real ) return real;
- -- returns 0 < acos X < PI; | X | <= 1
-
--
-- -- IAC: function should be called ARCTAN
--
-- function ATAN (X : real) return real;
-- attribute foreign of atan : function is "VHPIDIRECT atan";
-+ function ARCTAN (X : real) return real;
-+ attribute foreign of arctan : function is "VHPIDIRECT atan";
- -- returns -PI/2 < atan X < PI/2
-
-- -- IAC: function ATAN2 should not exist
-- function ATAN2 (X : real; Y : real) return real;
-+ function ARCTAN (X : real; Y : real) return real;
- -- returns atan (X/Y); -PI < atan2(X,Y) < PI; Y /= 0.0
-
- function SINH (X : real) return real;
-@@ -236,20 +233,35 @@
- attribute foreign of tanh : function is "VHPIDIRECT tanh";
- -- hyperbolic tangent; -- returns (e**X - e**(-X))/(e**X + e**(-X))
-
-- -- IAC: function should be called ARCSINH
--
-- function ASINH (X : real) return real;
-- attribute foreign of asinh : function is "VHPIDIRECT asinh";
-+ function ARCSINH (X : real) return real;
-+ attribute foreign of arcsinh : function is "VHPIDIRECT asinh";
- -- returns ln( X + sqrt( X**2 + 1))
-
-- -- IAC: function should be called ARCCOSH
--
-- function ACOSH (X : real) return real;
-+ function ARCCOSH (X : real) return real;
- -- returns ln( X + sqrt( X**2 - 1)); X >= 1
-
-- -- IAC: function should be called ARCTANH
--
-- function ATANH (X : real) return real;
-+ function ARCTANH (X : real) return real;
- -- returns (ln( (1 + X)/(1 - X)))/2 ; | X | < 1
-
-+
-+ -- Compatibility; will be removed in the future!
-+ impure function FMAX (X, Y : real ) return real;
-+
-+ impure function FMIN (X, Y : real ) return real;
-+
-+ impure function ASIN (X : real ) return real;
-+
-+ impure function ACOS (X : real ) return real;
-+
-+ impure function ATAN (X : real) return real;
-+
-+ impure function ATAN2 (X : real; Y : real) return real;
-+
-+ impure function ASINH (X : real) return real;
-+
-+ impure function ACOSH (X : real) return real;
-+
-+ impure function ATANH (X : real) return real;
-+
-+
- end MATH_REAL;
---- vhdl/libraries/ieee/math_real-body.vhdl.orig 2009-04-01 19:22:04.000000000 +0200
-+++ vhdl/libraries/ieee/math_real-body.vhdl 2009-04-02 12:27:15.000000000 +0200
-@@ -72,16 +72,41 @@
- begin
- assert false severity failure;
- end ROUND;
--
-- function FMAX (X, Y : real ) return real is
-+
-+ function TRUNC (X : real ) return real is
- begin
- assert false severity failure;
-- end FMAX;
-+ end TRUNC;
-
-- function FMIN (X, Y : real ) return real is
-+ function c_mod (x : real; y : real) return real;
-+ attribute foreign of c_mod : function is "VHPIDIRECT fmod";
-+
-+ function c_mod (x : real; y: real) return real is
- begin
- assert false severity failure;
-- end FMIN;
-+ end c_mod;
-+
-+ function "MOD" (X, Y : real ) return real is
-+ begin
-+ if y = 0.0 then
-+ assert false
-+ report "MOD(X, 0.0) is undefined"
-+ severity ERROR;
-+ return 0.0;
-+ else
-+ return c_mod(x,y);
-+ end if;
-+ end "MOD";
-+
-+ function REALMAX (X, Y : real ) return real is
-+ begin
-+ assert false severity failure;
-+ end REALMAX;
-+
-+ function REALMIN (X, Y : real ) return real is
-+ begin
-+ assert false severity failure;
-+ end REALMIN;
-
- --
- -- Pseudo-random number generators
-@@ -297,18 +322,18 @@
- assert false severity failure;
- end c_asin;
-
-- function ASIN (x : real ) return real is
-+ function ARCSIN (x : real ) return real is
- -- returns -PI/2 < asin X < PI/2; | X | <= 1
- begin
- if abs x > 1.0 then
- assert false
-- report "Out of range parameter passed to ASIN"
-+ report "Out of range parameter passed to ARCSIN"
- severity ERROR;
- return x;
- else
- return c_asin(x);
- end if;
-- end ASIN;
-+ end ARCSIN;
-
- function c_acos (x : real ) return real;
- attribute foreign of c_acos : function is "VHPIDIRECT acos";
-@@ -318,24 +343,24 @@
- assert false severity failure;
- end c_acos;
-
-- function ACOS (x : REAL) return REAL is
-+ function ARCCOS (x : REAL) return REAL is
- -- returns 0 < acos X < PI; | X | <= 1
- begin
- if abs x > 1.0 then
- assert false
-- report "Out of range parameter passed to ACOS"
-+ report "Out of range parameter passed to ARCCOS"
- severity ERROR;
- return x;
- else
- return c_acos(x);
- end if;
-- end ACOS;
-+ end ARCCOS;
-
-- function ATAN (x : REAL) return REAL is
-+ function ARCTAN (x : REAL) return REAL is
- -- returns -PI/2 < atan X < PI/2
-- begin
-+ begin
- assert false severity failure;
-- end ATAN;
-+ end ARCTAN;
-
- function c_atan2 (x : real; y : real) return real;
- attribute foreign of c_atan2 : function is "VHPIDIRECT atan2";
-@@ -345,7 +370,7 @@
- assert false severity failure;
- end c_atan2;
-
-- function ATAN2 (x : REAL; y : REAL) return REAL is
-+ function ARCTAN (x : REAL; y : REAL) return REAL is
- -- returns atan (X/Y); -PI < atan2(X,Y) < PI; Y /= 0.0
- begin
- if y = 0.0 and x = 0.0 then
-@@ -356,7 +381,7 @@
- else
- return c_atan2(x,y);
- end if;
-- end ATAN2;
-+ end ARCTAN;
-
-
- function SINH (X : real) return real is
-@@ -377,11 +402,11 @@
- assert false severity failure;
- end TANH;
-
-- function ASINH (X : real) return real is
-+ function ARCSINH (X : real) return real is
- -- returns ln( X + sqrt( X**2 + 1))
- begin
- assert false severity failure;
-- end ASINH;
-+ end ARCSINH;
-
- function c_acosh (x : real ) return real;
- attribute foreign of c_acosh : function is "VHPIDIRECT acosh";
-@@ -391,16 +416,16 @@
- assert false severity failure;
- end c_acosh;
-
-- function ACOSH (X : real) return real is
-+ function ARCCOSH (X : real) return real is
- -- returns ln( X + sqrt( X**2 - 1)); X >= 1
- begin
- if abs x >= 1.0 then
-- assert false report "Out of range parameter passed to ACOSH"
-+ assert false report "Out of range parameter passed to ARCCOSH"
- severity ERROR;
- return x;
- end if;
- return c_acosh(x);
-- end ACOSH;
-+ end ARCCOSH;
-
- function c_atanh (x : real ) return real;
- attribute foreign of c_atanh : function is "VHPIDIRECT atanh";
-@@ -410,15 +435,107 @@
- assert false severity failure;
- end c_atanh;
-
-- function ATANH (X : real) return real is
-+ function ARCTANH (X : real) return real is
- -- returns (ln( (1 + X)/(1 - X)))/2 ; | X | < 1
- begin
- if abs x < 1.0 then
-- assert false report "Out of range parameter passed to ATANH"
-+ assert false report "Out of range parameter passed to ARCTANH"
- severity ERROR;
- return x;
- end if;
- return c_atanh(x);
-- end ATANH;
-+ end ARCTANH;
-+
-+ -- Compatibility; will be removed in the future!
-+ shared variable fmax_compat_warn : boolean := false;
-+ shared variable fmin_compat_warn : boolean := false;
-+ shared variable asin_compat_warn : boolean := false;
-+ shared variable acos_compat_warn : boolean := false;
-+ shared variable atan_compat_warn : boolean := false;
-+ shared variable atan2_compat_warn : boolean := false;
-+ shared variable asinh_compat_warn : boolean := false;
-+ shared variable acosh_compat_warn : boolean := false;
-+ shared variable atanh_compat_warn : boolean := false;
-+
-+ impure function FMAX (X, Y : real ) return real is
-+ begin
-+ assert fmax_compat_warn
-+ report "MATH_REAL.FMAX is not a standards compliant function and will be
removed in the future; use REALMAX instead"
-+ severity note;
-+ fmax_compat_warn := true;
-+ return REALMAX(X, Y);
-+ end FMAX;
-+
-+ impure function FMIN (X, Y : real ) return real is
-+ begin
-+ assert fmin_compat_warn
-+ report "MATH_REAL.FMIN is not a standards compliant function and will be
removed in the future; use REALMIN instead"
-+ severity note;
-+ fmin_compat_warn := true;
-+ return REALMIN(X, Y);
-+ end FMIN;
-+
-+ impure function ASIN (X : real ) return real is
-+ begin
-+ assert asin_compat_warn
-+ report "MATH_REAL.ASIN is not a standards compliant function and will be
removed in the future; use ARCSIN instead"
-+ severity note;
-+ asin_compat_warn := true;
-+ return ARCSIN(X);
-+ end ASIN;
-+
-+ impure function ACOS (X : real ) return real is
-+ begin
-+ assert acos_compat_warn
-+ report "MATH_REAL.ACOS is not a standards compliant function and will be
removed in the future; use ARCCOS instead"
-+ severity note;
-+ acos_compat_warn := true;
-+ return ARCCOS(X);
-+ end ACOS;
-+
-+ impure function ATAN (X : real) return real is
-+ begin
-+ assert atan_compat_warn
-+ report "MATH_REAL.ATAN is not a standards compliant function and will be
removed in the future; use ARCTAN instead"
-+ severity note;
-+ atan_compat_warn := true;
-+ return ARCTAN(X);
-+ end ATAN;
-+
-+ impure function ATAN2 (X : real; Y : real) return real is
-+ begin
-+ assert atan2_compat_warn
-+ report "MATH_REAL.ATAN2 is not a standards compliant function and will be
removed in the future; use ARCTAN instead"
-+ severity note;
-+ atan2_compat_warn := true;
-+ return ARCTAN(X, Y);
-+ end ATAN2;
-+
-+ impure function ASINH (X : real) return real is
-+ begin
-+ assert asinh_compat_warn
-+ report "MATH_REAL.ASINH is not a standards compliant function and will be
removed in the future; use ARCSINH instead"
-+ severity note;
-+ asinh_compat_warn := true;
-+ return ARCSINH(X);
-+ end ASINH;
-+
-+ impure function ACOSH (X : real) return real is
-+ begin
-+ assert acosh_compat_warn
-+ report "MATH_REAL.ACOSH is not a standards compliant function and will be
removed in the future; use ARCCOSH instead"
-+ severity note;
-+ acosh_compat_warn := true;
-+ return ACOSH(X);
-+ end ACOSH;
-+
-+ impure function ATANH (X : real) return real is
-+ begin
-+ assert atanh_compat_warn
-+ report "MATH_REAL.ATANH is not a standards compliant function and will be
removed in the future; use ARCTANH instead"
-+ severity note;
-+ atanh_compat_warn := true;
-+ return ARCTANH(X);
-+ end ATANH;
-
- end MATH_REAL;
---- vhdl/libraries/ieee/math_complex-body.vhdl.orig 2009-04-02 12:08:47.000000000 +0200
-+++ vhdl/libraries/ieee/math_complex-body.vhdl 2009-04-02 12:09:18.000000000 +0200
-@@ -119,7 +119,7 @@
- function COMPLEX_TO_POLAR(Z: in complex ) return complex_polar is
- -- converts complex to complex_polar
- begin
-- return COMPLEX_POLAR'(sqrt(z.re**2 + z.im**2),atan2(z.re,z.im));
-+ return COMPLEX_POLAR'(sqrt(z.re**2 + z.im**2),ARCTAN(z.re,z.im));
- end COMPLEX_TO_POLAR;
-
- function POLAR_TO_COMPLEX(Z: in complex_polar ) return complex is
commit c3ae61bc671619d1437ab2263bea48a757a92335
Author: 1138-4EB <1138-4EB(a)users.noreply.github.com>
Date: Fri Aug 9 08:41:23 2019 +0200
revert: handle LLVM8 (d46fe9a3)
diff --git a/ghdl-llvm8.patch b/ghdl-llvm8.patch
deleted file mode 100644
index 15ae23d..0000000
--- a/ghdl-llvm8.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ghdl/configure.llvm 2019-03-01 13:57:11.734683842 +0100
-+++ ghdl/configure 2019-03-01 13:57:44.980054706 +0100
-@@ -250,6 +250,7 @@
- check_version 5.0 $llvm_version ||
- check_version 6.0 $llvm_version ||
- check_version 7.0 $llvm_version ||
-+ check_version 8.0 $llvm_version ||
- false; then
- echo "Debugging is not enabled with llvm $llvm_version"
- llvm_be=llvm4-nodebug
diff --git a/ghdl.spec b/ghdl.spec
index 21dbc11..6707ceb 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -159,7 +159,6 @@ Patch1002: nvptx-tools-glibc.patch
# tar cvJf ghdl%{ghdlgitrev}.tar.bz2 --exclude-vcs ghdl
Source100: ghdl%{ghdlgitrev}.tar.bz2
Patch100: ghdl-llvmflags.patch
-Patch101: ghdl-llvm8.patch
# Both following patches have been sent to upstream mailing list:
# From: Thomas Sailer <t.sailer(a)alumni.ethz.ch>
# To: ghdl-discuss(a)gna.org
@@ -401,7 +400,6 @@ rm -f gcc/testsuite/go.test/test/chan/goroutines.go
%patch200 -p0 -b .upf~
%patch100 -p0 -b .llvmflags~
-%patch101 -p0 -b .llvm8~
%if %{without gnatwae}
perl -i -pe 's,-gnatwae,,' ghdl/dist/gcc/Make-lang.in
commit e9755832aaccc4dae5492923e37499da98ae0187
Author: 1138-4EB <1138-4EB(a)users.noreply.github.com>
Date: Fri Aug 9 06:41:41 2019 +0200
fix: update ghdlver to '0.37dev'
diff --git a/ghdl.spec b/ghdl.spec
index 5a155d5..21dbc11 100644
--- a/ghdl.spec
+++ b/ghdl.spec
@@ -1,4 +1,4 @@
-%global ghdlver 0.35dev
+%global ghdlver 0.37dev
%global ghdlgitrev .20190528git3fafb135
%ifarch %{ix86} x86_64