X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fconfigurator%2Fconfigurator.c;h=837ef8ce00ee9302605682bb27748287a369a4da;hp=4b2ffe782c7eabf68ce490309cd43de67ce43121;hb=975dff721336d8902d9ae737c360865205100451;hpb=e73b0b37186b158369dc70652edae6706cba8133

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 4b2ffe78..837ef8ce 100644
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -12,7 +12,7 @@
 #include <string.h>
 
 #define DEFAULT_COMPILER "cc"
-#define DEFAULT_FLAGS "-g -Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition -Werror"
+#define DEFAULT_FLAGS "-g -Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition"
 
 #define OUTPUT_FILE "configurator.out"
 #define INPUT_FILE "configuratortest.c"
@@ -38,12 +38,23 @@ struct test {
 static struct test tests[] = {
 	{ "HAVE_ALIGNOF", INSIDE_MAIN, NULL,
 	  "return __alignof__(double) > 0 ? 0 : 1;" },
+	{ "HAVE_ASPRINTF", DEFINES_FUNC, NULL,
+	  "#define _GNU_SOURCE\n"
+	  "#include <stdio.h>\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,
 	  "static int __attribute__((const)) func(int x) { return x; }" },
 	{ "HAVE_ATTRIBUTE_MAY_ALIAS", OUTSIDE_MAIN, NULL,
 	  "typedef short __attribute__((__may_alias__)) short_a;" },
+	{ "HAVE_ATTRIBUTE_NORETURN", DEFINES_FUNC, NULL,
+	  "#include <stdlib.h>\n"
+	  "static void __attribute__((noreturn)) func(int x) { exit(x); }" },
 	{ "HAVE_ATTRIBUTE_PRINTF", DEFINES_FUNC, NULL,
 	  "static void __attribute__((format(__printf__, 1, 2))) func(const char *fmt, ...) { }" },
 	{ "HAVE_ATTRIBUTE_UNUSED", OUTSIDE_MAIN, NULL,
@@ -71,6 +82,8 @@ static struct test tests[] = {
 	  "return __builtin_expect(argc == 1, 1) ? 0 : 1;" },
 	{ "HAVE_BUILTIN_FFSL", INSIDE_MAIN, NULL,
 	  "return __builtin_ffsl(0L) == 0 ? 0 : 1;" },
+	{ "HAVE_BUILTIN_FFSLL", INSIDE_MAIN, NULL,
+	  "return __builtin_ffsll(0LL) == 0 ? 0 : 1;" },
 	{ "HAVE_BUILTIN_POPCOUNTL", INSIDE_MAIN, NULL,
 	  "return __builtin_popcountl(255L) == 8 ? 0 : 1;" },
 	{ "HAVE_BUILTIN_TYPES_COMPATIBLE_P", INSIDE_MAIN, NULL,
@@ -83,6 +96,8 @@ static struct test tests[] = {
 	{ "HAVE_FOR_LOOP_DECLARATION", INSIDE_MAIN, NULL,
 	  "for (int i = 0; i < argc; i++) { return 0; };\n"
 	  "return 1;" },
+	{ "HAVE_FLEXIBLE_ARRAY_MEMBER", OUTSIDE_MAIN, NULL,
+	  "struct foo { unsigned int x; int arr[]; };" },
 	{ "HAVE_GETPAGESIZE", DEFINES_FUNC, NULL,
 	  "#include <unistd.h>\n"
 	  "static int func(void) { return getpagesize(); }" },
@@ -96,12 +111,12 @@ static struct test tests[] = {
 	  "	return mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);\n"
 	  "}" },
 	{ "HAVE_NESTED_FUNCTIONS", DEFINES_FUNC, NULL,
-	  "static int func(int val) {\n"
+	  "void (*func(int val))(int);\n"
+	  "void (*func(int val))(int) {\n"
 	  "	auto void add(int val2);\n"
 	  "	void add(int val2) { val += val2; }\n"
-	  "	add(7);\n"
-	  "	return val;\n"
-	  "}" },
+	  "	return add;\n"
+	  "}\n" },
 	{ "HAVE_STATEMENT_EXPR", INSIDE_MAIN, NULL,
 	  "return ({ int x = argc; x == argc ? 0 : 1; });" },
 	{ "HAVE_TYPEOF", INSIDE_MAIN, NULL,
@@ -265,9 +280,10 @@ static bool run_test(const char *cmd, struct test *test)
 		if (system("cat " INPUT_FILE) == -1);
 
 	output = run(cmd, &status);
-	if (status != 0) {
+	if (status != 0 || strstr(output, "warning")) {
 		if (verbose)
-			printf("Compile fail for %s, status %i: %s\n",
+			printf("Compile %s for %s, status %i: %s\n",
+			       status ? "fail" : "warning",
 			       test->name, status, output);
 		if (test->style == EXECUTE)
 			errx(1, "Test for %s did not compile:\n%s",
@@ -329,10 +345,14 @@ int main(int argc, char *argv[])
 	unlink(INPUT_FILE);
 
 	cmd[strlen(cmd) - strlen(" -o " OUTPUT_FILE " " INPUT_FILE)] = '\0';
-	printf("/* Generated by CCAN configurator */\n");
+	printf("/* Generated by CCAN configurator */\n"
+	       "#ifndef CCAN_CONFIG_H\n"
+	       "#define CCAN_CONFIG_H\n");
+	printf("#define _GNU_SOURCE /* Always use GNU extensions. */\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++)
 		printf("#define %s %u\n", tests[i].name, tests[i].answer);
+	printf("#endif /* CCAN_CONFIG_H */\n");
 	return 0;
 }