Commit 3faa3f07 authored by NIIBE Yutaka's avatar NIIBE Yutaka

0.9.6-5

Enable debian/patches/42_hppa_libatomic_ops.patch again.
Confirmed that the bug report is wrong, it is not yet merged in
upstream.

Since key in axTLS tests is old, tests fail with newer OpenSSL (>=
1.1.1), openssl is disabled.
parent 170df002
gauche (0.9.6-5) unstable; urgency=medium
* debian/rules: Add ac_cv_prog_OPENSSL="" to disable openssl.
* debian/patches/42_hppa_libatomic_ops.patch: Enable again with update.
-- NIIBE Yutaka <gniibe@fsij.org> Fri, 05 Oct 2018 10:00:04 +0900
gauche (0.9.6-4) unstable; urgency=medium
* debian/control (Build-Depends): Remove libatomic-ops-dev, use internal
......
Description: Fix hppa libatomic_ops
Author: Helge Deller <deller@gmx.de>
Bug-Debian: https://bugs.debian.org/809043
Status: Not yet merged to upstream (as of 7.7.0)
Last-Update: 2018-10-05
Index: gauche/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/hppa.h
===================================================================
--- gauche.orig/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/hppa.h
+++ gauche/gc/libatomic_ops/src/atomic_ops/sysdeps/gcc/hppa.h
@@ -20,6 +20,18 @@
* SOFTWARE.
*/
+
+#define AO_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
+
+#if defined(__GNUC__) && AO_GCC_VERSION_AT_LEAST(4,9)
+
+#include "../test_and_set_t_is_ao_t.h"
+/* We do not want to enable the atomic add/sub functions yet - they are slow */
+#define AO_PREFER_GENERALIZED
+#include "generic.h"
+
+#else
+
#include "../all_atomic_load_store.h"
/* Some architecture set descriptions include special "ordered" memory */
@@ -92,3 +104,5 @@ AO_pa_clear(volatile AO_TS_t * addr)
#undef AO_PA_LDCW_ALIGNMENT
#undef AO_ldcw
#undef AO_ldcw_align
+
+#endif /* __GNUC__ >= 4.9 */
42_hppa_libatomic_ops.patch
43_makedoc_gzip_best.patch
02_linking.patch
03_rm_without_xlink.patch
......
......@@ -14,7 +14,7 @@ override_dh_auto_clean:
# rm -f configure config.sub config.guess
override_dh_auto_configure:
./configure --prefix=/usr \
ac_cv_prog_OPENSSL="" ./configure --prefix=/usr \
--includedir=/usr/include --mandir=/usr/share/man \
--infodir=/usr/share/info --sysconfdir=/etc \
--localstatedir=/var \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment