configurator: add BUILTIN_CTZ*, BUILTIN_FFS, and ICCARM_INTRINSICS

[ccan] / tools / configurator / configurator.c

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 5ba8cb0bb0c780a54849a8137187d22b647a62da..d1aa5c61a564670e915a6921ee06fd9ec0968817 100644 (file)
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -55,6 +55,7 @@ struct test {
        const char *depends;
        const char *link;
        const char *fragment;
+       const char *overrides; /* On success, force this to '1' */
        bool done;
        bool answer;
 };
@@ -79,6 +80,8 @@ static struct test tests[] = {
          "static int __attribute__((cold)) func(int x) { return x; }" },
        { "HAVE_ATTRIBUTE_CONST", DEFINES_FUNC, NULL, NULL,
          "static int __attribute__((const)) func(int x) { return x; }" },
+       { "HAVE_ATTRIBUTE_PURE", DEFINES_FUNC, NULL, NULL,
+         "static int __attribute__((pure)) func(int x) { return x; }" },
        { "HAVE_ATTRIBUTE_MAY_ALIAS", OUTSIDE_MAIN, NULL, NULL,
          "typedef short __attribute__((__may_alias__)) short_a;" },
        { "HAVE_ATTRIBUTE_NORETURN", DEFINES_FUNC, NULL, NULL,
@@ -111,10 +114,18 @@ static struct test tests[] = {
          "return __builtin_clzl(1) == (sizeof(long)*8 - 1) ? 0 : 1;" },
        { "HAVE_BUILTIN_CLZLL", INSIDE_MAIN, NULL, NULL,
          "return __builtin_clzll(1) == (sizeof(long long)*8 - 1) ? 0 : 1;" },
+       { "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;" },
+       { "HAVE_BUILTIN_CTZLL", INSIDE_MAIN, NULL, NULL,
+         "return __builtin_ctzll(1 << (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,
          "return __builtin_expect(argc == 1, 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_FFS", INSIDE_MAIN, NULL, NULL,
+         "return __builtin_ffs(0) == 0 ? 0 : 1;" },
        { "HAVE_BUILTIN_FFSL", INSIDE_MAIN, NULL, NULL,
          "return __builtin_ffsl(0L) == 0 ? 0 : 1;" },
        { "HAVE_BUILTIN_FFSLL", INSIDE_MAIN, NULL, NULL,
@@ -123,6 +134,11 @@ static struct test tests[] = {
          "return __builtin_popcountl(255L) == 8 ? 0 : 1;" },
        { "HAVE_BUILTIN_TYPES_COMPATIBLE_P", INSIDE_MAIN, NULL, NULL,
          "return __builtin_types_compatible_p(char *, int) ? 1 : 0;" },
+       { "HAVE_ICCARM_INTRINSICS", DEFINES_FUNC, NULL, NULL,
+         "#include <intrinsics.h>\n"
+         "int func(int v) {\n"
+         "     return __CLZ(__RBIT(v));\n"
+         "}" },
        { "HAVE_BYTESWAP_H", OUTSIDE_MAIN, NULL, NULL,
          "#include <byteswap.h>\n" },
        { "HAVE_CLOCK_GETTIME",
@@ -142,7 +158,9 @@ static struct test tests[] = {
          "     struct timespec ts;\n"
          "     clock_gettime(CLOCK_REALTIME, &ts);\n"
          "     return ts;\n"
-         "}\n" },
+         "}\n",
+         /* This means HAVE_CLOCK_GETTIME, too */
+         "HAVE_CLOCK_GETTIME" },
        { "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL, NULL,
          "int *foo = (int[]) { 1, 2, 3, 4 };\n"
          "return foo[0] ? 0 : 1;" },
@@ -477,6 +495,12 @@ static bool run_test(const char *cmd, struct test *test)
                test->answer = (status == 0);
        }
        test->done = true;
+
+       if (test->answer && test->overrides) {
+               struct test *override = find_test(test->overrides);
+               override->done = true;
+               override->answer = true;
+       }
        return test->answer;
 }