iscsi: use <sys/filio.h> on Solaris.

[ccan] / tools / configurator / configurator.c

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index d46a147ada14e3c8b16f53bb354be47a4491d229..63fa46fa9a3e3240d6b271099aff1cdd429ce535 100644 (file)
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -33,7 +33,7 @@
 #include <string.h>
 
 #define DEFAULT_COMPILER "cc"
-#define DEFAULT_FLAGS "-g -Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition"
+#define DEFAULT_FLAGS "-g3 -ggdb -Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition"
 
 #define OUTPUT_FILE "configurator.out"
 #define INPUT_FILE "configuratortest.c"
@@ -89,6 +89,12 @@ 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_BACKTRACE", DEFINES_FUNC, NULL,
+         "#include <execinfo.h>\n"
+         "static int func(int x) {"
+         "     void *bt[10];\n"
+         "     return backtrace(bt, 10) < x;\n"
+         "}" },
        { "HAVE_BIG_ENDIAN", INSIDE_MAIN|EXECUTE, NULL,
          "union { int i; char c[sizeof(int)]; } u;\n"
          "u.i = 0x01020304;\n"
@@ -155,6 +161,13 @@ static struct test tests[] = {
          "static void *func(int fd) {\n"
          "     return mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);\n"
          "}" },
+       { "HAVE_PROC_SELF_MAPS", DEFINES_EVERYTHING|EXECUTE, NULL,
+         "#include <sys/types.h>\n"
+         "#include <sys/stat.h>\n"
+         "#include <fcntl.h>\n"
+         "int main(void) {\n"
+         "     return open(\"/proc/self/maps\", O_RDONLY) != -1 ? 0 : 1;\n"
+         "}\n" },
        { "HAVE_QSORT_R_PRIVATE_LAST",
          DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE, NULL,
          "#define _GNU_SOURCE 1\n"
@@ -168,6 +181,13 @@ static struct test tests[] = {
          " 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_SECTION_START_STOP",
+         DEFINES_FUNC, NULL,
+         "static void *__attribute__((__section__(\"mysec\"))) p = &p;\n"
+         "static int func(void) {\n"
+         "     extern void *__start_mysec[], *__stop_mysec[];\n"
+         "     return __stop_mysec - __start_mysec;\n"
+         "}\n" },
        { "HAVE_STACK_GROWS_UPWARDS", DEFINES_EVERYTHING|EXECUTE, NULL,
          "static long nest(const void *base, unsigned int i)\n"
          "{\n"
@@ -180,6 +200,8 @@ static struct test tests[] = {
          "}\n" },
        { "HAVE_STATEMENT_EXPR", INSIDE_MAIN, NULL,
          "return ({ int x = argc; x == argc ? 0 : 1; });" },
+       { "HAVE_SYS_FILIO_H", OUTSIDE_MAIN, NULL, /* Solaris needs this for FIONREAD */
+         "#include <sys/filio.h>\n" },
        { "HAVE_TYPEOF", INSIDE_MAIN, NULL,
          "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" },
        { "HAVE_UTIME", DEFINES_FUNC, NULL,
@@ -420,6 +442,8 @@ int main(int argc, const char *argv[])
        printf("#endif\n");
        printf("#define CCAN_COMPILER \"%s\"\n", argv[1]);
        printf("#define CCAN_CFLAGS \"%s\"\n\n", cmd + strlen(argv[1]) + 1);
+       /* This one implies "#include <ccan/..." works, eg. for tdb2.h */
+       printf("#define HAVE_CCAN 1\n");
        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");