X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=dd5587c3b556c31eaa6b2a5887e684d375530e0f;hb=17aa322abd7b785330ab49e348144be940b3d1d8;hp=d1aa5c61a564670e915a6921ee06fd9ec0968817;hpb=54d5123a56011f805500a8d18e178874300be1f7;p=ccan

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index d1aa5c61..dd5587c3 100644
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -117,9 +117,9 @@ static struct test tests[] = {
 	{ "HAVE_BUILTIN_CTZ", INSIDE_MAIN, NULL, NULL,
 	  "return __builtin_ctz(1 << (sizeof(int)*8 - 1)) == (sizeof(int)*8 - 1) ? 0 : 1;" },
 	{ "HAVE_BUILTIN_CTZL", INSIDE_MAIN, NULL, NULL,
-	  "return __builtin_ctzl(1 << (sizeof(long)*8 - 1)) == (sizeof(long)*8 - 1) ? 0 : 1;" },
+	  "return __builtin_ctzl(1UL << (sizeof(long)*8 - 1)) == (sizeof(long)*8 - 1) ? 0 : 1;" },
 	{ "HAVE_BUILTIN_CTZLL", INSIDE_MAIN, NULL, NULL,
-	  "return __builtin_ctzll(1 << (sizeof(long long)*8 - 1) == (sizeof(long long)*8 - 1) ? 0 : 1;" },
+	  "return __builtin_ctzll(1ULL << (sizeof(long long)*8 - 1)) == (sizeof(long long)*8 - 1) ? 0 : 1;" },
 	{ "HAVE_BUILTIN_CONSTANT_P", INSIDE_MAIN, NULL, NULL,
 	  "return __builtin_constant_p(1) ? 0 : 1;" },
 	{ "HAVE_BUILTIN_EXPECT", INSIDE_MAIN, NULL, NULL,
@@ -214,6 +214,12 @@ static struct test tests[] = {
 	  "static void *func(void *h, size_t hl, void *n, size_t nl) {\n"
 	  "return memmem(h, hl, n, nl);"
 	  "}\n", },
+	{ "HAVE_MEMRCHR", DEFINES_FUNC, NULL, NULL,
+	  "#define _GNU_SOURCE\n"
+	  "#include <string.h>\n"
+	  "static void *func(void *s, int c, size_t n) {\n"
+	  "return memrchr(s, c, n);"
+	  "}\n", },
 	{ "HAVE_MMAP", DEFINES_FUNC, NULL, NULL,
 	  "#include <sys/mman.h>\n"
 	  "static void *func(int fd) {\n"