16 files changed, 42 insertions, 2 deletions
diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index b3becf72b7..fe5d497e4b 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -380,6 +380,7 @@ d_memcmp='define'
 d_memcpy='define'
 d_memmem='undef'
 d_memmove='define'
+d_memrchr='undef'
 d_memset='define'
 d_mkdir='define'
 d_mkdtemp='define'
diff --git a/NetWare/config.wc b/NetWare/config.wc
index b4e501b9bd..717d634167 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -369,6 +369,7 @@ d_memcmp='define'
 d_memcpy='define'
 d_memmem='undef'
 d_memmove='define'
+d_memrchr='undef'
 d_memset='define'
 d_mkdir='define'
 d_mkdtemp='undef'
diff --git a/Porting/Glossary b/Porting/Glossary
index af8fc6b69f..58e06e7408 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -1713,6 +1713,12 @@ d_memset (d_memset.U):
 	indicates to the C program that the memset() routine is available
 	to set blocks of memory.
 
+d_memrchr (d_memrchr.U):
+	This variable conditionally defines the HAS_MEMRCHR symbol, which
+	indicates to the C program that the memrchr() routine is available
+	to return a pointer to the last occurrence of a byte in a memory
+	area (or NULL if not found).
+
 d_mkdir (d_mkdir.U):
 	This variable conditionally defines the HAS_MKDIR symbol, which
 	indicates to the C program that the mkdir() routine is available
diff --git a/Porting/config.sh b/Porting/config.sh
index f97abf5af3..04cc4ba9a1 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -390,6 +390,7 @@ d_memcmp='define'
 d_memcpy='define'
 d_memmem='define'
 d_memmove='define'
+d_memrchr='define'
 d_memset='define'
 d_mkdir='define'
 d_mkdtemp='define'
diff --git a/Porting/config_H b/Porting/config_H
index b193b8083d..86d8a53391 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -280,6 +280,13 @@
  */
 #define HAS_MEMMOVE	/**/
 
+/* HAS_MEMRCHR:
+ *	This symbol, if defined, indicates that the memrchr routine is
+ *	available to return a pointer to the last occurrence of a byte in
+ *	a memory area (or NULL if not found).
+ */
+#define HAS_MEMRCHR		/**/
+
 /* HAS_MEMSET:
  *	This symbol, if defined, indicates that the memset routine is available
  *	to set blocks of memory.
diff --git a/config_h.SH b/config_h.SH
index 40df29c4b7..fef81ee110 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -3241,6 +3241,13 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$d_memmem HAS_MEMMEM		/**/
 
+/* HAS_MEMRCHR:
+ *	This symbol, if defined, indicates that the memrchr routine is
+ *	available to return a pointer to the last occurrence of a byte in
+ *	a memory area (or NULL if not found).
+ */
+#$d_memrchr HAS_MEMRCHR		/**/
+
 /* HAS_MKDTEMP:
  *	This symbol, if defined, indicates that the mkdtemp routine is
  *	available to exclusively create a uniquely named temporary directory.
diff --git a/configure.com b/configure.com
index f76d8f752c..2ede7a270b 100644
--- a/configure.com
+++ b/configure.com
@@ -6199,6 +6199,7 @@ $ WC "d_memcmp='define'"
 $ WC "d_memcpy='define'"
 $ WC "d_memmem='undef'"
 $ WC "d_memmove='define'"
+$ WC "d_memrchr='undef'"
 $ WC "d_memset='define'"
 $ WC "d_mkdir='define'"
 $ WC "d_mkdtemp='" + d_mkdtemp + "'"
diff --git a/metaconfig.h b/metaconfig.h
index f19eee8883..bca9adef49 100644
--- a/metaconfig.h
+++ b/metaconfig.h
@@ -12,4 +12,6 @@
  *
  * Symbols should only be here temporarily. Once they are actually used,
  * they should be removed from here.
+ *
+ * HAS_MEMRCHR
  */
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index cb506542a2..fc100a3e05 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -380,6 +380,7 @@ d_memcmp='define'
 d_memcpy='define'
 d_memmem='undef'
 d_memmove='define'
+d_memrchr='undef'
 d_memset='define'
 d_mkdir='define'
 d_mkdtemp='undef'
diff --git a/symbian/config.sh b/symbian/config.sh
index 7ed6bb3de3..9455023404 100644
--- a/symbian/config.sh
+++ b/symbian/config.sh
@@ -326,6 +326,7 @@ d_memcmp='define'
 d_memcpy='define'
 d_memmem='undef'
 d_memmove='define'
+d_memrchr='undef'
 d_memset='define'
 d_mkdir='define'
 d_mkdtemp='undef'
diff --git a/uconfig.h b/uconfig.h
index 4cbadf7cdd..b150d5420d 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -3206,6 +3206,13 @@
  */
 /*#define HAS_MEMMEM		/ **/
 
+/* HAS_MEMRCHR:
+ *	This symbol, if defined, indicates that the memrchr routine is
+ *	available to return a pointer to the last occurrence of a byte in
+ *	a memory area (or NULL if not found).
+ */
+/*#define HAS_MEMRCHR		/ **/
+
 /* HAS_MKDTEMP:
  *	This symbol, if defined, indicates that the mkdtemp routine is
  *	available to exclusively create a uniquely named temporary directory.
@@ -5375,6 +5382,6 @@
 #endif
 
 /* Generated from:
- * 2068b3888dbafff8fe3ae7aa6b8c5fb1f89db5b3931b89068053eb588d023b64 config_h.SH
- * a088a21b0ddb63b48c794da959469ddb98da178e5b2d4ec568331a988d59e146 uconfig.sh
+ * 2de7484af521c1029bb9853f03e27d74d89b7f91d1ce1228865d6c4808d4131d config_h.SH
+ * 7e93e67e8d10f41bf582fd383aa099ab2479b61979a341e2f1bd96f8873442cc uconfig.sh
  * ex: set ro: */
diff --git a/uconfig.sh b/uconfig.sh
index 9ebda12bdc..018ca6c31a 100644
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -319,6 +319,7 @@ d_memcmp='define'
 d_memcpy='define'
 d_memmem='undef'
 d_memmove='undef'
+d_memrchr='undef'
 d_memset='define'
 d_mkdir='undef'
 d_mkdtemp='undef'
diff --git a/uconfig64.sh b/uconfig64.sh
index 40caa1907a..f2c5f711ac 100644
--- a/uconfig64.sh
+++ b/uconfig64.sh
@@ -320,6 +320,7 @@ d_memcmp='define'
 d_memcpy='define'
 d_memmem='undef'
 d_memmove='undef'
+d_memrchr='undef'
 d_memset='define'
 d_mkdir='undef'
 d_mkdtemp='undef'
diff --git a/win32/config.ce b/win32/config.ce
index 9325e57cd6..22f258ae03 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -367,6 +367,7 @@ d_memcmp='define'
 d_memcpy='define'
 d_memmem='undef'
 d_memmove='define'
+d_memrchr='undef'
 d_memset='define'
 d_mkdir='define'
 d_mkdtemp='undef'
diff --git a/win32/config.gc b/win32/config.gc
index 3ad6aa3ecf..8ce638a65d 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -367,6 +367,7 @@ d_memcmp='define'
 d_memcpy='define'
 d_memmem='undef'
 d_memmove='define'
+d_memrchr='undef'
 d_memset='define'
 d_mkdir='define'
 d_mkdtemp='undef'
diff --git a/win32/config.vc b/win32/config.vc
index baa210d140..07718219ce 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -367,6 +367,7 @@ d_memcmp='define'
 d_memcpy='define'
 d_memmem='undef'
 d_memmove='define'
+d_memrchr='undef'
 d_memset='define'
 d_mkdir='define'
 d_mkdtemp='undef'