X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=d46a147ada14e3c8b16f53bb354be47a4491d229;hp=4972e9e198bb56a4ed5bc910722a9d9b8625ce7c;hb=08c05da588018c6b76834e57b66d525546643708;hpb=590d63376591791869b58743d3eca9c452d705e6 diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c index 4972e9e1..d46a147a 100644 --- a/tools/configurator/configurator.c +++ b/tools/configurator/configurator.c @@ -1,5 +1,26 @@ /* Simple tool to create config.h. - * Would be much easier with ccan modules, but deliberately standalone. */ + * Would be much easier with ccan modules, but deliberately standalone. + * + * Copyright 2011 Rusty Russell . MIT license. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ #include #include #include @@ -20,10 +41,12 @@ static int verbose; enum test_style { - EXECUTE, - OUTSIDE_MAIN, - DEFINES_FUNC, - INSIDE_MAIN + OUTSIDE_MAIN = 0x1, + DEFINES_FUNC = 0x2, + INSIDE_MAIN = 0x4, + DEFINES_EVERYTHING = 0x8, + MAY_NOT_COMPILE = 0x10, + EXECUTE = 0x8000 }; struct test { @@ -36,8 +59,21 @@ struct test { }; static struct test tests[] = { + { "HAVE_32BIT_OFF_T", DEFINES_EVERYTHING|EXECUTE, NULL, + "#include \n" + "int main(int argc, char *argv[]) {\n" + " return sizeof(off_t) == 4 ? 0 : 1;\n" + "}\n" }, { "HAVE_ALIGNOF", INSIDE_MAIN, NULL, "return __alignof__(double) > 0 ? 0 : 1;" }, + { "HAVE_ASPRINTF", DEFINES_FUNC, NULL, + "#define _GNU_SOURCE\n" + "#include \n" + "static char *func(int x) {" + " char *p;\n" + " if (asprintf(&p, \"%u\", x) == -1) p = NULL;" + " return p;\n" + "}" }, { "HAVE_ATTRIBUTE_COLD", DEFINES_FUNC, NULL, "static int __attribute__((cold)) func(int x) { return x; }" }, { "HAVE_ATTRIBUTE_CONST", DEFINES_FUNC, NULL, @@ -53,7 +89,7 @@ static struct test tests[] = { "static int __attribute__((unused)) func(int x) { return x; }" }, { "HAVE_ATTRIBUTE_USED", OUTSIDE_MAIN, NULL, "static int __attribute__((used)) func(int x) { return x; }" }, - { "HAVE_BIG_ENDIAN", EXECUTE, NULL, + { "HAVE_BIG_ENDIAN", INSIDE_MAIN|EXECUTE, NULL, "union { int i; char c[sizeof(int)]; } u;\n" "u.i = 0x01020304;\n" "return u.c[0] == 0x01 && u.c[1] == 0x02 && u.c[2] == 0x03 && u.c[3] == 0x04 ? 0 : 1;" }, @@ -83,8 +119,15 @@ static struct test tests[] = { { "HAVE_BYTESWAP_H", OUTSIDE_MAIN, NULL, "#include \n" }, { "HAVE_COMPOUND_LITERALS", INSIDE_MAIN, NULL, - "char **foo = (char *[]) { \"x\", \"y\", \"z\" };\n" + "int *foo = (int[]) { 1, 2, 3, 4 };\n" "return foo[0] ? 0 : 1;" }, + { "HAVE_FILE_OFFSET_BITS", DEFINES_EVERYTHING|EXECUTE, + "HAVE_32BIT_OFF_T", + "#define _FILE_OFFSET_BITS 64\n" + "#include \n" + "int main(int argc, char *argv[]) {\n" + " return sizeof(off_t) == 8 ? 0 : 1;\n" + "}\n" }, { "HAVE_FOR_LOOP_DECLARATION", INSIDE_MAIN, NULL, "for (int i = 0; i < argc; i++) { return 0; };\n" "return 1;" }, @@ -93,22 +136,48 @@ static struct test tests[] = { { "HAVE_GETPAGESIZE", DEFINES_FUNC, NULL, "#include \n" "static int func(void) { return getpagesize(); }" }, - { "HAVE_LITTLE_ENDIAN", EXECUTE, NULL, + { "HAVE_ISBLANK", DEFINES_FUNC, NULL, + "#define _GNU_SOURCE\n" + "#include \n" + "static int func(void) { return isblank(' '); }" }, + { "HAVE_LITTLE_ENDIAN", INSIDE_MAIN|EXECUTE, NULL, "union { int i; char c[sizeof(int)]; } u;\n" "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, + "#define _GNU_SOURCE\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_MMAP", DEFINES_FUNC, NULL, "#include \n" "static void *func(int fd) {\n" " return mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);\n" "}" }, - { "HAVE_NESTED_FUNCTIONS", DEFINES_FUNC, NULL, - "static int func(int val) {\n" - " auto void add(int val2);\n" - " void add(int val2) { val += val2; }\n" - " add(7);\n" - " return val;\n" - "}" }, + { "HAVE_QSORT_R_PRIVATE_LAST", + DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL, + "#define _GNU_SOURCE 1\n" + "#include \n" + "static int cmp(const void *lp, const void *rp, void *priv) {\n" + " *(unsigned int *)priv = 1;\n" + " return *(const int *)lp - *(const int *)rp; }\n" + "int main(void) {\n" + " int array[] = { 9, 2, 5 };\n" + " unsigned int called = 0;\n" + " qsort_r(array, 3, sizeof(int), cmp, &called);\n" + " return called && array[0] == 2 && array[1] == 5 && array[2] == 9 ? 0 : 1;\n" + "}\n" }, + { "HAVE_STACK_GROWS_UPWARDS", DEFINES_EVERYTHING|EXECUTE, NULL, + "static long nest(const void *base, unsigned int i)\n" + "{\n" + " if (i == 0)\n" + " return (const char *)&i - (const char *)base;\n" + " return nest(base, i-1);\n" + "}\n" + "int main(int argc, char *argv[]) {\n" + " return (nest(&argc, argc) > 0) ? 0 : 1\n;" + "}\n" }, { "HAVE_STATEMENT_EXPR", INSIDE_MAIN, NULL, "return ({ int x = argc; x == argc ? 0 : 1; });" }, { "HAVE_TYPEOF", INSIDE_MAIN, NULL, @@ -189,7 +258,7 @@ static char *run(const char *cmd, int *exitstatus) return ret; } -static char *connect_args(char *argv[], const char *extra) +static char *connect_args(const char *argv[], const char *extra) { unsigned int i, len = strlen(extra) + 1; char *ret; @@ -245,8 +314,7 @@ static bool run_test(const char *cmd, struct test *test) err(1, "creating %s", INPUT_FILE); fprintf(outf, "%s", PRE_BOILERPLATE); - switch (test->style) { - case EXECUTE: + switch (test->style & ~(EXECUTE|MAY_NOT_COMPILE)) { case INSIDE_MAIN: fprintf(outf, "%s", MAIN_START_BOILERPLATE); fprintf(outf, "%s", test->fragment); @@ -265,6 +333,12 @@ static bool run_test(const char *cmd, struct test *test) fprintf(outf, "%s", MAIN_BODY_BOILERPLATE); fprintf(outf, "%s", MAIN_END_BOILERPLATE); break; + case DEFINES_EVERYTHING: + fprintf(outf, "%s", test->fragment); + break; + default: + abort(); + } fclose(outf); @@ -277,7 +351,7 @@ static bool run_test(const char *cmd, struct test *test) printf("Compile %s for %s, status %i: %s\n", status ? "fail" : "warning", test->name, status, output); - if (test->style == EXECUTE) + if ((test->style & EXECUTE) && !(test->style & MAY_NOT_COMPILE)) errx(1, "Test for %s did not compile:\n%s", test->name, output); test->answer = false; @@ -286,9 +360,9 @@ static bool run_test(const char *cmd, struct test *test) /* Compile succeeded. */ free(output); /* We run INSIDE_MAIN tests for sanity checking. */ - if (test->style == EXECUTE || test->style == INSIDE_MAIN) { + if ((test->style & EXECUTE) || (test->style & INSIDE_MAIN)) { output = run("./" OUTPUT_FILE, &status); - if (test->style == INSIDE_MAIN && status != 0) + if (!(test->style & EXECUTE) && status != 0) errx(1, "Test for %s failed with %i:\n%s", test->name, status, output); if (verbose && status) @@ -301,11 +375,12 @@ static bool run_test(const char *cmd, struct test *test) return test->answer; } -int main(int argc, char *argv[]) +int main(int argc, const char *argv[]) { char *cmd; - char *default_args[] = { "", DEFAULT_COMPILER, DEFAULT_FLAGS, NULL }; unsigned int i; + const char *default_args[] + = { "", DEFAULT_COMPILER, DEFAULT_FLAGS, NULL }; if (argc > 1) { if (strcmp(argv[1], "--help") == 0) { @@ -340,7 +415,9 @@ int main(int argc, char *argv[]) printf("/* Generated by CCAN configurator */\n" "#ifndef CCAN_CONFIG_H\n" "#define CCAN_CONFIG_H\n"); + printf("#ifndef _GNU_SOURCE\n"); 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", cmd + strlen(argv[1]) + 1); for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)