[commit: ghc] master: aclocal.m4: narrow down 'riscv*' to 'riscv-*' and 'riscv32*' (5e63a25)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5e63a25249f3cb07300258e115af9ff55079d2ea/ghc

>---------------------------------------------------------------

commit 5e63a25249f3cb07300258e115af9ff55079d2ea
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Tue Jul 17 20:01:44 2018 +0100

    aclocal.m4: narrow down 'riscv*' to 'riscv-*' and 'riscv32*'
    
    Two minor changes:
    - 32-bit CPU macro is called riscv32_HOST_ARCH (was riscv_HOST_ARCH)
    - shrink understood tuples from riscv* to riscv-* and riscv32*-* as
      a tiny safeguard against riscv128*- in future.
    
    Suggested-by: James Clarke <jrtc27 at jrtc27.com>
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>


>---------------------------------------------------------------

5e63a25249f3cb07300258e115af9ff55079d2ea
 aclocal.m4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index ce621b8..eef4dc7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -217,7 +217,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
         mipsel)
             test -z "[$]2" || eval "[$]2=ArchMipsel"
             ;;
-        hppa|hppa1_1|ia64|m68k|nios2|riscv|riscv64|rs6000|s390|s390x|sh4|vax)
+        hppa|hppa1_1|ia64|m68k|nios2|riscv32|riscv64|rs6000|s390|s390x|sh4|vax)
             test -z "[$]2" || eval "[$]2=ArchUnknown"
             ;;
         *)
@@ -1881,8 +1881,8 @@ case "$1" in
   riscv64*)
     $2="riscv64"
     ;;
-  riscv*)
-    $2="riscv"
+  riscv|riscv32*)
+    $2="riscv32"
     ;;
   rs6000)
     $2="rs6000"