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

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 837ef8ce..af7955a3 100644
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -20,10 +20,11 @@
 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,
+	EXECUTE			= 0x8000
 };
 
 struct test {
@@ -61,7 +62,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;" },
@@ -91,7 +92,7 @@ static struct test tests[] = {
 	{ "HAVE_BYTESWAP_H", OUTSIDE_MAIN, NULL,
 	  "#include <byteswap.h>\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_FOR_LOOP_DECLARATION", INSIDE_MAIN, NULL,
 	  "for (int i = 0; i < argc; i++) { return 0; };\n"
@@ -101,10 +102,16 @@ static struct test tests[] = {
 	{ "HAVE_GETPAGESIZE", DEFINES_FUNC, NULL,
 	  "#include <unistd.h>\n"
 	  "static int func(void) { return getpagesize(); }" },
-	{ "HAVE_LITTLE_ENDIAN", EXECUTE, NULL,
+	{ "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 <string.h>\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 <sys/mman.h>\n"
 	  "static void *func(int fd) {\n"
@@ -117,6 +124,16 @@ static struct test tests[] = {
 	  "	void add(int val2) { val += val2; }\n"
 	  "	return add;\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,
@@ -197,7 +214,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;
@@ -253,8 +270,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) {
 	case INSIDE_MAIN:
 		fprintf(outf, "%s", MAIN_START_BOILERPLATE);
 		fprintf(outf, "%s", test->fragment);
@@ -273,6 +289,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);
 
@@ -285,7 +307,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)
 			errx(1, "Test for %s did not compile:\n%s",
 			     test->name, output);
 		test->answer = false;
@@ -294,9 +316,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)
@@ -309,11 +331,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) {