Fix cmake detection of risc-v (32 and 64 bit)

[Civil]

Add a case to detect risc-v architectures.

Fixes #941

[nmoinvaz]

LGTM

[codecov]

Codecov Report

Merging #942 (ad38bc7) into develop (fc7719d) will decrease coverage by 0.50%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop     #942      +/-   ##
===========================================
- Coverage    77.42%   76.92%   -0.51%     
===========================================
  Files           74       74              
  Lines         8307     8306       -1     
  Branches      1374     1374              
===========================================
- Hits          6432     6389      -43     
- Misses        1346     1384      +38     
- Partials       529      533       +4     

Flag	Coverage Δ
macos_clang	68.55% <ø> (ø)
macos_gcc	67.45% <ø> (ø)
ubuntu_clang	73.61% <ø> (+0.19%)	⬆️
ubuntu_clang_debug	73.65% <ø> (-0.07%)	⬇️
ubuntu_clang_inflate_allow_invalid_dist	73.34% <ø> (+0.19%)	⬆️
ubuntu_clang_inflate_strict	73.60% <ø> (+0.19%)	⬆️
ubuntu_clang_mmap	73.31% <ø> (+0.19%)	⬆️
ubuntu_clang_msan	73.61% <ø> (+0.19%)	⬆️
ubuntu_gcc	73.00% <ø> (+0.03%)	⬆️
ubuntu_gcc_aarch64	73.82% <ø> (-0.44%)	⬇️
ubuntu_gcc_aarch64_compat_no_opt	73.32% <ø> (-0.46%)	⬇️
ubuntu_gcc_aarch64_no_acle	73.64% <ø> (-0.44%)	⬇️
ubuntu_gcc_aarch64_no_neon	73.38% <ø> (-0.45%)	⬇️
ubuntu_gcc_armhf	71.76% <ø> (-0.44%)	⬇️
ubuntu_gcc_armhf_compat_no_opt	73.31% <ø> (-0.49%)	⬇️
ubuntu_gcc_armhf_no_acle	72.50% <ø> (-0.45%)	⬇️
ubuntu_gcc_armhf_no_neon	74.49% <ø> (-0.45%)	⬇️
ubuntu_gcc_armsf	71.74% <ø> (-0.44%)	⬇️
ubuntu_gcc_armsf_compat_no_opt	73.31% <ø> (-0.49%)	⬇️
ubuntu_gcc_compat_no_opt	74.42% <ø> (-0.46%)	⬇️
ubuntu_gcc_mingw_i686	0.00% <ø> (ø)
ubuntu_gcc_mingw_x86_64	0.00% <ø> (ø)
ubuntu_gcc_no_avx2	74.52% <ø> (-0.42%)	⬇️
ubuntu_gcc_no_pclmulqdq	71.46% <ø> (+0.05%)	⬆️
ubuntu_gcc_no_sse2	72.54% <ø> (-1.37%)	⬇️
ubuntu_gcc_no_sse4	71.42% <ø> (+0.05%)	⬆️
ubuntu_gcc_o3	73.79% <ø> (+0.94%)	⬆️
ubuntu_gcc_osb	75.98% <ø> (+0.15%)	⬆️
ubuntu_gcc_ppc	74.80% <ø> (-0.46%)	⬇️
ubuntu_gcc_ppc64	75.56% <ø> (-0.46%)	⬇️
ubuntu_gcc_ppc64le	74.32% <ø> (-0.46%)	⬇️
ubuntu_gcc_s390x	73.23% <ø> (-0.42%)	⬇️
ubuntu_gcc_sparc64	76.03% <ø> (-0.46%)	⬇️
win64_gcc	70.39% <ø> (ø)
win64_gcc_compat_no_opt	73.88% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
match_tpl.h	71.42% <0.00%> (-28.58%)	⬇️
zutil_p.h	66.66% <0.00%> (-19.05%)	⬇️
inftrees.c	81.29% <0.00%> (-16.55%)	⬇️
chunkset_tpl.h	99.02% <0.00%> (+3.88%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fc7719d...ad38bc7. Read the comment docs.

[Dead2]

Detection of the architecture as 32- or 64-bit is still useful, so I really didn't want you to remove that (from the .c file). Only basearch should be the common for the two.
Would you please revert the change to the .c file (and modify the if in .cmake)? 👍

You can have a look at how the x86 detection is done, with differing arches but also having a common basearch. Both are used in CMakeLists.txt for different things.

[Civil]

@Dead2 done.

I've also modified it a bit, as after a second thought, detecting riscv64 by pointer size seems to be wrong, and by https://github.com/riscv/riscv-toolchain-conventions correct way should be to check for __riscv_xlen

[Dead2]

@Civil Are you sure you pushed the update? It looks unchanged to me. But not entirely sure whether github is messing with me or not.

[Civil]

@Dead2 indeed, sorry about that.