X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=a590a8d4f947c402b086e90adef3e23414b1da66;hp=dd5587c3b556c31eaa6b2a5887e684d375530e0f;hb=1b7100ad101992adeaeb5c4ab85ee9a1b368b842;hpb=40b45c4cfbf110a8e790366302ff43fa94dc8daa diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c index dd5587c3..a590a8d4 100644 --- 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 *flags; const char *overrides; /* On success, force this to '1' */ bool done; bool answer; @@ -63,13 +64,15 @@ struct test { static struct test tests[] = { { "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE, NULL, NULL, "#include \n" - "int main(int argc, char *argv[]) {\n" + "int main(void) {\n" " return sizeof(off_t) == 4 ? 0 : 1;\n" "}\n" }, { "HAVE_ALIGNOF", INSIDE_MAIN, NULL, NULL, "return __alignof__(double) > 0 ? 0 : 1;" }, { "HAVE_ASPRINTF", DEFINES_FUNC, NULL, NULL, + "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" + "#endif\n" "#include \n" "static char *func(int x) {" " char *p;\n" @@ -88,7 +91,7 @@ static struct test tests[] = { "#include \n" "static void __attribute__((noreturn)) func(int x) { exit(x); }" }, { "HAVE_ATTRIBUTE_PRINTF", DEFINES_FUNC, NULL, NULL, - "static void __attribute__((format(__printf__, 1, 2))) func(const char *fmt, ...) { }" }, + "static void __attribute__((format(__printf__, 1, 2))) func(const char *fmt, ...) { (void)fmt; }" }, { "HAVE_ATTRIBUTE_UNUSED", OUTSIDE_MAIN, NULL, NULL, "static int __attribute__((unused)) func(int x) { return x; }" }, { "HAVE_ATTRIBUTE_USED", OUTSIDE_MAIN, NULL, NULL, @@ -189,7 +192,7 @@ static struct test tests[] = { "HAVE_32BIT_OFF_T", NULL, "#define _FILE_OFFSET_BITS 64\n" "#include \n" - "int main(int argc, char *argv[]) {\n" + "int main(void) {\n" " return sizeof(off_t) == 8 ? 0 : 1;\n" "}\n" }, { "HAVE_FOR_LOOP_DECLARATION", INSIDE_MAIN, NULL, NULL, @@ -201,7 +204,9 @@ static struct test tests[] = { "#include \n" "static int func(void) { return getpagesize(); }" }, { "HAVE_ISBLANK", DEFINES_FUNC, NULL, NULL, + "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" + "#endif\n" "#include \n" "static int func(void) { return isblank(' '); }" }, { "HAVE_LITTLE_ENDIAN", INSIDE_MAIN|EXECUTE, NULL, NULL, @@ -209,13 +214,17 @@ static struct test tests[] = { "u.i = 0x01020304;\n" "return u.c[0] == 0x04 && u.c[1] == 0x03 && u.c[2] == 0x02 && u.c[3] == 0x01 ? 0 : 1;" }, { "HAVE_MEMMEM", DEFINES_FUNC, NULL, NULL, + "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" + "#endif\n" "#include \n" "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, + "#ifndef _GNU_SOURCE\n" "#define _GNU_SOURCE\n" + "#endif\n" "#include \n" "static void *func(void *s, int c, size_t n) {\n" "return memrchr(s, c, n);" @@ -234,7 +243,9 @@ static struct test tests[] = { "}\n" }, { "HAVE_QSORT_R_PRIVATE_LAST", DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL, NULL, - "#define _GNU_SOURCE 1\n" + "#ifndef _GNU_SOURCE\n" + "#define _GNU_SOURCE\n" + "#endif\n" "#include \n" "static int cmp(const void *lp, const void *rp, void *priv) {\n" " *(unsigned int *)priv = 1;\n" @@ -267,7 +278,8 @@ static struct test tests[] = { " return nest(base, i-1);\n" "}\n" "int main(int argc, char *argv[]) {\n" - " return (nest(&argc, argc) > 0) ? 0 : 1\n;" + " (void)argv;\n" + " return (nest(&argc, argc) > 0) ? 0 : 1;\n" "}\n" }, { "HAVE_STATEMENT_EXPR", INSIDE_MAIN, NULL, NULL, "return ({ int x = argc; x == argc ? 0 : 1; });" }, @@ -277,6 +289,15 @@ static struct test tests[] = { "#include \n" }, { "HAVE_TYPEOF", INSIDE_MAIN, NULL, NULL, "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" }, + { "HAVE_UNALIGNED_ACCESS", DEFINES_EVERYTHING|EXECUTE, NULL, NULL, + "#include \n" + "int main(int argc, char *argv[]) {\n" + " (void)argc;\n" + " char pad[sizeof(int *) * 1];\n" + " strncpy(pad, argv[0], sizeof(pad));\n" + " int *x = (int *)pad, *y = (int *)(pad + 1);\n" + " return *x == *y;\n" + "}\n" }, { "HAVE_UTIME", DEFINES_FUNC, NULL, NULL, "#include \n" "#include \n" @@ -290,6 +311,14 @@ static struct test tests[] = { "static __attribute__((warn_unused_result)) int func(int i) {\n" " return i + 1;\n" "}" }, + { "HAVE_OPENMP", INSIDE_MAIN, NULL, NULL, + "int i;\n" + "#pragma omp parallel for\n" + "for(i = 0; i < 0; i++) {};\n" + "return 0;\n", + "-Werror -fopenmp" }, + { "HAVE_VALGRIND_MEMCHECK_H", OUTSIDE_MAIN, NULL, NULL, + "#include \n" }, }; static char *grab_fd(int fd) @@ -385,14 +414,17 @@ static struct test *find_test(const char *name) } #define PRE_BOILERPLATE "/* Test program generated by configurator. */\n" -#define MAIN_START_BOILERPLATE "int main(int argc, char *argv[]) {\n" +#define MAIN_START_BOILERPLATE \ + "int main(int argc, char *argv[]) {\n" \ + " (void)argc;\n" \ + " (void)argv;\n" #define USE_FUNC_BOILERPLATE "(void)func;\n" #define MAIN_BODY_BOILERPLATE "return 0;\n" #define MAIN_END_BOILERPLATE "}\n" static bool run_test(const char *cmd, struct test *test) { - char *output; + char *output, *newcmd; FILE *outf; int status; @@ -423,6 +455,9 @@ static bool run_test(const char *cmd, struct test *test) test->done = true; return test->answer; } + if (deps[len]) + free(dep); + deps += len; deps += strspn(deps, " "); } @@ -464,17 +499,30 @@ static bool run_test(const char *cmd, struct test *test) if (verbose > 1) if (system("cat " INPUT_FILE) == -1); + newcmd = strdup(cmd); + + if (test->flags) { + newcmd = realloc(newcmd, strlen(newcmd) + strlen(" ") + + strlen(test->flags) + 1); + strcat(newcmd, " "); + strcat(newcmd, test->flags); + if (verbose > 1) + printf("Extra flags line: %s", newcmd); + } + if (test->link) { - char *newcmd; - newcmd = malloc(strlen(cmd) + strlen(" ") + newcmd = realloc(newcmd, strlen(newcmd) + strlen(" ") + strlen(test->link) + 1); - sprintf(newcmd, "%s %s", cmd, test->link); + strcat(newcmd, " "); + strcat(newcmd, test->link); if (verbose > 1) printf("Extra link line: %s", newcmd); - cmd = newcmd; } - output = run(cmd, &status); + output = run(newcmd, &status); + + free(newcmd); + if (status != 0 || strstr(output, "warning")) { if (verbose) printf("Compile %s for %s, status %i: %s\n", @@ -542,6 +590,7 @@ int main(int argc, const char *argv[]) cmd = connect_args(argv, " -o " OUTPUT_FILE " " INPUT_FILE); for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) run_test(cmd, &tests[i]); + free(cmd); unlink(OUTPUT_FILE); unlink(INPUT_FILE); @@ -553,7 +602,9 @@ int main(int argc, const char *argv[]) printf("#define _GNU_SOURCE /* Always use GNU extensions. */\n"); printf("#endif\n"); printf("#define CCAN_COMPILER \"%s\"\n", argv[1]); - printf("#define CCAN_CFLAGS \"%s\"\n\n", connect_args(argv+1, "")); + cmd = connect_args(argv+1, ""); + printf("#define CCAN_CFLAGS \"%s\"\n\n", cmd); + free(cmd); /* This one implies "#include