+2018-07-06  Sebastian Huber  <sebastian.huber@embedded-brains.de>
+
+       * config.sub: Sync with upstream version 2018-07-03.
+
 2018-07-05  Sebastian Huber  <sebastian.huber@embedded-brains.de>
 
        * config.guess: Sync with upstream version 2018-06-26.
 
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-07-02'
+timestamp='2018-07-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
        | powerpc | powerpc64 | powerpc64le | powerpcle \
        | pru \
        | pyramid \
-       | riscv32 | riscv64 \
+       | riscv | riscv32 | riscv64 \
        | rl78 | rx \
        | score \
        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
        | pru-* \
        | pyramid-* \
-       | riscv32-* | riscv64-* \
+       | riscv-* | riscv32-* | riscv64-* \
        | rl78-* | romp-* | rs6000-* | rx-* \
        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
        ps2)
                basic_machine=i386-ibm
                ;;
-       riscv)
-               basic_machine=riscv32-unknown
-               ;;
-       riscv-*)
-               basic_machine=`echo "$basic_machine" | sed 's/^riscv/riscv32/'`
-               ;;
        rm[46]00)
                basic_machine=mips-siemens
                ;;