4 files changed, 11 insertions, 4 deletions

diff --git a/build-aux/config.guess b/build-aux/config.guess
index 18f8edc0ff5..47d7bed50c5 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-08-29'
+timestamp='2018-11-28'
 
 # 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
@@ -1424,6 +1424,9 @@ EOF
     amd64:Isilon\ OneFS:*:*)
         echo x86_64-unknown-onefs
         exit ;;
+    *:Unleashed:*:*)
+        echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
+        exit ;;
 esac
 
 echo "$0: unable to guess system type" >&2
diff --git a/build-aux/config.sub b/build-aux/config.sub
index f208558ec21..46708056af3 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-08-29'
+timestamp='2018-11-28'
 
 # 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
@@ -1161,6 +1161,7 @@ case $cpu-$vendor in
                         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
                         | alphapca5[67] | alpha64pca5[67] \
                         | am33_2.0 \
+                        | amdgcn \
                         | arc | arceb \
                         | arm  | arm[lb]e | arme[lb] | armv* \
                         | avr | avr32 \
@@ -1360,7 +1361,7 @@ case $os in
              | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
              | skyos* | haiku* | rdos* | toppers* | drops* | es* \
              | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-             | midnightbsd*)
+             | midnightbsd* | amdhsa* | unleashed*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
         qnx*)
diff --git a/lib/memrchr.c b/lib/memrchr.c
index 99acfd9c56d..2efc7cb9752 100644
--- a/lib/memrchr.c
+++ b/lib/memrchr.c
@@ -68,7 +68,7 @@ __memrchr (void const *s, int c_in, size_t n)
     if (*--char_ptr == c)
       return (void *) char_ptr;
 
-  longword_ptr = (const longword *) char_ptr;
+  longword_ptr = (const void *) char_ptr;
 
   /* All these elucidatory comments refer to 4-byte longwords,
      but the theory applies equally well to any size longwords.  */
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index 5618befebf8..a4dddbad738 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -650,6 +650,9 @@ AC_DEFUN([gl_INIT],
   if test $NEED_LOCALTIME_BUFFER = 1; then
     func_gl_gnulib_m4code_2049e887c7e5308faad27b3f894bb8c9
   fi
+  if test $REPLACE_MKTIME = 1; then
+    func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467
+  fi
   if test $HAVE_READLINKAT = 0; then
     func_gl_gnulib_m4code_260941c0e5dc67ec9e87d1fb321c300b
   fi