Your message dated Wed, 29 Apr 2020 21:50:15 +0000
with message-id <[email protected]>
and subject line Bug#932893: fixed in mozjs68 68.7.0-1
has caused the Debian Bug report #932893,
regarding mozjs60: please add support for riscv64
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
932893: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=932893
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: mozjs60
Version: 60.2.3-3
Severity: normal
Tags: patch upstream
User: [email protected]
Usertags: riscv64
Hi,
mozjs60 currently fails to build on the riscv64 architecture as it can
be seen on the following build log excerpt:
| Reexecuting in the virtualenv
| checking for vcs source checkout... no
| checking for a shell... /bin/sh
| checking for host system type...
| ERROR: Unknown CPU type: riscv64
| make[1]: *** [debian/rules:99: override_dh_auto_configure] Error 1
| make[1]: Leaving directory '/<<PKGBUILDDIR>>'
| make: *** [debian/rules:68: binary-arch] Error 2
| dpkg-buildpackage: error: debian/rules binary-arch subprocess returned exit
status 2
The full build log is available there:
https://buildd.debian.org/status/fetch.php?pkg=mozjs60&arch=riscv64&ver=60.2.3-3&stamp=1555195397&raw=0
The attached patch adds the missing support for riscv64. It would be
nice if you can include it in the next upload.
Thanks,
Aurelien
diff -Nru mozjs60-60.2.3/debian/patches/riscv64-support.patch
mozjs60-60.2.3/debian/patches/riscv64-support.patch
--- mozjs60-60.2.3/debian/patches/riscv64-support.patch 1970-01-01
01:00:00.000000000 +0100
+++ mozjs60-60.2.3/debian/patches/riscv64-support.patch 2019-07-23
23:42:00.000000000 +0200
@@ -0,0 +1,75 @@
+--- a/build/moz.configure/init.configure
++++ b/build/moz.configure/init.configure
+@@ -676,6 +676,9 @@
+ elif cpu == 'sh4':
+ canonical_cpu = 'sh4'
+ endianness = 'little'
++ elif cpu.startswith('riscv64'):
++ canonical_cpu = 'riscv64'
++ endianness = 'little'
+ elif allow_unknown:
+ canonical_cpu = cpu
+ endianness = 'unknown'
+--- a/mfbt/tests/TestPoisonArea.cpp
++++ b/mfbt/tests/TestPoisonArea.cpp
+@@ -160,6 +160,14 @@
+ #elif defined __aarch64__
+ #define RETURN_INSTR 0xd65f03c0 /* ret */
+
++#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
++#if defined(__riscv_compressed)
++#define RETURN_INSTR 0x8082 /* ret */
++#define RETURN_INSTR_TYPE uint16_t
++#else
++#define RETURN_INSTR 0x00008067 /* ret */
++#endif
++
+ #elif defined __ia64
+ struct ia64_instr { uint32_t mI[4]; };
+ static const ia64_instr _return_instr =
+--- a/python/mozbuild/mozbuild/configure/constants.py
++++ b/python/mozbuild/mozbuild/configure/constants.py
+@@ -50,6 +50,7 @@
+ 'mips64': 64,
+ 'ppc': 32,
+ 'ppc64': 64,
++ 'riscv64': 64,
+ 's390': 32,
+ 's390x': 64,
+ 'sh4': 32,
+@@ -89,6 +90,7 @@
+ ('mips64', '__mips64'),
+ ('mips32', '__mips__'),
+ ('sh4', '__sh__'),
++ ('riscv64', 'defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen ==
64'),
+ ))
+
+ assert sorted(CPU_preprocessor_checks.keys()) == sorted(CPU.POSSIBLE_VALUES)
+--- a/js/src/jit/AtomicOperations.h
++++ b/js/src/jit/AtomicOperations.h
+@@ -387,6 +387,8 @@
+ # include "jit/none/AtomicOperations-feeling-lucky.h"
+ #elif defined(__s390__) || defined(__s390x__)
+ # include "jit/none/AtomicOperations-feeling-lucky.h"
++#elif defined(__riscv)
++# include "jit/none/AtomicOperations-feeling-lucky.h"
+ #else
+ # error "No AtomicOperations support provided for this platform"
+ #endif
+--- a/js/src/jit/none/AtomicOperations-feeling-lucky.h
++++ b/js/src/jit/none/AtomicOperations-feeling-lucky.h
+@@ -79,6 +79,14 @@
+ # define GNUC_COMPATIBLE
+ #endif
+
++#ifdef __riscv
++# define GNUC_COMPATIBLE
++# ifdef __riscv_xlen == 64
++# define HAS_64BIT_ATOMICS
++# define HAS_64BIT_LOCKFREE
++# endif
++#endif
++
+ // The default implementation tactic for gcc/clang is to use the newer
+ // __atomic intrinsics added for use in C++11 <atomic>. Where that
+ // isn't available, we use GCC's older __sync functions instead.
diff -Nru mozjs60-60.2.3/debian/patches/series
mozjs60-60.2.3/debian/patches/series
--- mozjs60-60.2.3/debian/patches/series 2019-04-13 20:40:04.000000000
+0200
+++ mozjs60-60.2.3/debian/patches/series 2019-07-23 23:42:00.000000000
+0200
@@ -22,3 +22,4 @@
enddianness.patch
jsproperty-endian.patch
tests-Skip-a-test-on-s390x.patch
+riscv64-support.patch
--- End Message ---
--- Begin Message ---
Source: mozjs68
Source-Version: 68.7.0-1
Done: Jeremy Bicha <[email protected]>
We believe that the bug you reported is fixed in the latest version of
mozjs68, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jeremy Bicha <[email protected]> (supplier of updated mozjs68 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 28 Apr 2020 21:12:05 -0400
Source: mozjs68
Architecture: source
Version: 68.7.0-1
Distribution: unstable
Urgency: medium
Maintainer: Debian GNOME Maintainers
<[email protected]>
Changed-By: Jeremy Bicha <[email protected]>
Closes: 932893
Changes:
mozjs68 (68.7.0-1) unstable; urgency=medium
.
[ Marco Trevisan (Treviño) ]
* New upstream release
.
[ William Grant ]
* Add riscv64 support (Closes: #932893)
Checksums-Sha1:
1535376285167b8299dc7d10ce695ca79ac78d42 2302 mozjs68_68.7.0-1.dsc
957c4cc42705b9bab356873d20e6749865e63717 75252344 mozjs68_68.7.0.orig.tar.xz
918b7d552616014e12cf3ae9bdace6bc428eb340 44276 mozjs68_68.7.0-1.debian.tar.xz
88b9795e5bfa95aa0443f2f5df6cd80a59b75a7b 13961
mozjs68_68.7.0-1_source.buildinfo
Checksums-Sha256:
dbe03a0d31a6a469cbce1277274f201e6d3b15a9144df00673bd3f8be3a6abf9 2302
mozjs68_68.7.0-1.dsc
5087cdcbae5c3ee60756c8aa1f7d005dd88a6c6786f2abee620904bf38d965c8 75252344
mozjs68_68.7.0.orig.tar.xz
084cbc561e1f8581114b0f66d603f56e9281b6c34b4ecde51b3bde5444925cdb 44276
mozjs68_68.7.0-1.debian.tar.xz
e2d3a2e41c4bd9951c66372832e0e4fd7623b3239a08c5c5cf3b09630c9dc384 13961
mozjs68_68.7.0-1_source.buildinfo
Files:
6cbca1d757b2a8d7ac371235bad1ea51 2302 libs optional mozjs68_68.7.0-1.dsc
6b4c54825b37f4c83deaebae227fe441 75252344 libs optional
mozjs68_68.7.0.orig.tar.xz
e358fb1f913af8ebaee96ece50664a59 44276 libs optional
mozjs68_68.7.0-1.debian.tar.xz
ab83cb5984c423dba85b68f8bb178d0c 13961 libs optional
mozjs68_68.7.0-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEETQvhLw5HdtiqzpaW5mx3Wuv+bH0FAl6p8ocACgkQ5mx3Wuv+
bH1DFxAArEyS/2/35wNDLt/eh4FDAxWzQHs9rBs3PvZIIgEhG7sMyXprahldSk4Z
dylLHwbgP3HFGd3lrqC0CPjDHAOJ8NX05nV7PCJ3iuiVvVOPgv4Xur9GxqUCapAq
hHWVMcQ3leIa3Lh0SfMD5iU+6VYvFDKAAcQ3iX7DbyPTQ0CJ4qEOf603EPh2219m
4oEgDj2Iw0PQwL9zOyQH3W4do+c+X0iysz2pMmEAif7nNlzf9VK6TXnueCxnOVrZ
YR374KGMDmKruJqhv81CH0+RjV9W1OGup3HkZppjbkigKWVVbotZnidunw3ZU/uu
CSh+t4s7vWGKDuZMmf8ILN/WcQX41SRA2hMeB6IlB/eRcp+HTzURNFjnbOvER30Y
tDddZwJBRe3gME1clcHV9hpoZJkZhQLLGXjL7cnEhSiTz8ulskm42TYQr8WfFSE3
Nq33bPkJDfCKbKijlS9mASn/0D0bmZt9XEYLATlFW6zWYGqJX6gi7QNLr3KPDFdX
JkIR1cpENeRpljI2iNH8GtvL4LkX5i6pkPhCek2kDk5Jn+bG5KREv+j3xiHAFpT0
EVrlgFIn3uXo7HqOHEtodGvmm8qDTsGGiie7WqW1RGX9HOqRShKQaM3eXP+rV41F
SV6C6C72rfmNZQRml+oxUIOBqirYmz/56ulaaDtXhaM7Fyr+VX4=
=4XDI
-----END PGP SIGNATURE-----
--- End Message ---
