]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
meson,Makefile: fix build
authorKlaus Jensen <k.jensen@samsung.com>
Thu, 21 Oct 2021 09:59:34 +0000 (11:59 +0200)
committerKlaus Jensen <k.jensen@samsung.com>
Thu, 21 Oct 2021 10:04:45 +0000 (12:04 +0200)
Since libnvme commit 2e3616eaf0ed, the endian helpers are no longer
exported. Instead, use ccan/endian and add it to the build systems.

Meson will always checkout head of libnvme, but for the make-based
building, this requires a bump of libnvme for the submodule.

Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
21 files changed:
.gitignore
Makefile
ccan/ccan/endian/LICENSE [new symlink]
ccan/ccan/endian/_info [new file with mode: 0644]
ccan/ccan/endian/endian.h [new file with mode: 0644]
ccan/ccan/endian/info [new file with mode: 0755]
ccan/licenses/CC0 [new file with mode: 0644]
ccan/tools/configurator/configurator.c [new file with mode: 0644]
common.h
libnvme
meson.build
nvme-print.c
nvme-rpmb.c
nvme.c
plugins/huawei/huawei-nvme.c
plugins/micron/micron-nvme.c
plugins/netapp/netapp-nvme.c
plugins/scaleflux/sfx-nvme.c
plugins/seagate/seagate-nvme.c
plugins/virtium/virtium-nvme.c
plugins/zns/zns.c

index 4158820c40ba17481f9e1e5683c7f954161c4cec..212ede100be33e37fa2625bb14d3cdcc0b83fdd8 100644 (file)
@@ -9,6 +9,9 @@ nvme.spec
 nvme-*.tar.gz
 version
 
+ccan/config.h
+ccan/tools/configurator/configurator
+
 subprojects/libnvme
 
 cscope.*
index 0d45db415895f3d9104d3261c08d33c5538f98f8..4a8e7c0b8af933e73f403c0cf46c841b58ed2a75 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,9 @@ LIBNVMEDIR = libnvme/
 LDFLAGS ?=
 LIB_DEPENDS =
 
+CCANDIR=ccan/
+override CFLAGS += -I$(CCANDIR)
+
 ifeq ($(LIBUUID),0)
        override LDFLAGS += -luuid
        override CFLAGS += -DLIBUUID
@@ -113,16 +116,22 @@ PLUGIN_OBJS :=                                    \
 libnvme:
        $(MAKE) -C $(LIBNVMEDIR)
 
+$(CCANDIR)config.h: $(CCANDIR)tools/configurator/configurator
+       $< > $@
+
+$(CCANDIR)tools/configurator/configurator: $(CCANDIR)tools/configurator/configurator.c
+       $(QUIET_CC)$(CC) -D_GNU_SOURCE $< -o $@
+
 nvme: nvme.o $(LIBNVME_DEPS) $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) NVME-VERSION-FILE
        $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) $< -o $(NVME) $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) $(LDFLAGS)
 
 verify-no-dep: nvme.c nvme.h $(OBJS) $(UTIL_OBJS) NVME-VERSION-FILE
        $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) $< -o $@ $(OBJS) $(UTIL_OBJS) $(LDFLAGS)
 
-nvme.o: nvme.c nvme.h nvme-print.h util/argconfig.h util/suffix.h fabrics.h
+nvme.o: nvme.c nvme.h nvme-print.h util/argconfig.h util/suffix.h fabrics.h $(CCANDIR)config.h
        $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c $<
 
-%.o: %.c
+%.o: %.c $(CCANDIR)config.h
        $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -o $@ -c $<
 
 doc: $(NVME)
@@ -137,6 +146,8 @@ clean:
        $(RM) $(NVME) nvme.o $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) *~ a.out NVME-VERSION-FILE *.tar* nvme.spec version control nvme-*.deb 70-nvmf-autoconnect.conf
        $(MAKE) -C Documentation clean
        -$(MAKE) -C libnvme clean
+       $(RM) $(CCANDIR)/config.h
+       $(RM) $(CCANDIR)/tools/configurator/configurator
        $(RM) tests/*.pyc
        $(RM) verify-no-dep
 
diff --git a/ccan/ccan/endian/LICENSE b/ccan/ccan/endian/LICENSE
new file mode 120000 (symlink)
index 0000000..b7951da
--- /dev/null
@@ -0,0 +1 @@
+../../licenses/CC0
\ No newline at end of file
diff --git a/ccan/ccan/endian/_info b/ccan/ccan/endian/_info
new file mode 100644 (file)
index 0000000..efe5a8b
--- /dev/null
@@ -0,0 +1,55 @@
+#include "config.h"
+#include <stdio.h>
+#include <string.h>
+
+/**
+ * endian - endian conversion macros for simple types
+ *
+ * Portable protocols (such as on-disk formats, or network protocols)
+ * are often defined to be a particular endian: little-endian (least
+ * significant bytes first) or big-endian (most significant bytes
+ * first).
+ *
+ * Similarly, some CPUs lay out values in memory in little-endian
+ * order (most commonly, Intel's 8086 and derivatives), or big-endian
+ * order (almost everyone else).
+ *
+ * This module provides conversion routines, inspired by the linux kernel.
+ * It also provides leint32_t, beint32_t etc typedefs, which are annotated for
+ * the sparse checker.
+ *
+ * Example:
+ *     #include <stdio.h>
+ *     #include <err.h>
+ *     #include <ccan/endian/endian.h>
+ *
+ *     // 
+ *     int main(int argc, char *argv[])
+ *     {
+ *             uint32_t value;
+ *
+ *             if (argc != 2)
+ *                     errx(1, "Usage: %s <value>", argv[0]);
+ *
+ *             value = atoi(argv[1]);
+ *             printf("native:        %08x\n", value);
+ *             printf("little-endian: %08x\n", cpu_to_le32(value));
+ *             printf("big-endian:    %08x\n", cpu_to_be32(value));
+ *             printf("byte-reversed: %08x\n", bswap_32(value));
+ *             exit(0);
+ *     }
+ *
+ * License: License: CC0 (Public domain)
+ * Author: Rusty Russell <rusty@rustcorp.com.au>
+ */
+int main(int argc, char *argv[])
+{
+       if (argc != 2)
+               return 1;
+
+       if (strcmp(argv[1], "depends") == 0)
+               /* Nothing */
+               return 0;
+
+       return 1;
+}
diff --git a/ccan/ccan/endian/endian.h b/ccan/ccan/endian/endian.h
new file mode 100644 (file)
index 0000000..3753f49
--- /dev/null
@@ -0,0 +1,363 @@
+/* CC0 (Public domain) - see LICENSE file for details */
+#ifndef CCAN_ENDIAN_H
+#define CCAN_ENDIAN_H
+#include <stdint.h>
+#include "config.h"
+
+/**
+ * BSWAP_16 - reverse bytes in a constant uint16_t value.
+ * @val: constant value whose bytes to swap.
+ *
+ * Designed to be usable in constant-requiring initializers.
+ *
+ * Example:
+ *     struct mystruct {
+ *             char buf[BSWAP_16(0x1234)];
+ *     };
+ */
+#define BSWAP_16(val)                          \
+       ((((uint16_t)(val) & 0x00ff) << 8)      \
+        | (((uint16_t)(val) & 0xff00) >> 8))
+
+/**
+ * BSWAP_32 - reverse bytes in a constant uint32_t value.
+ * @val: constant value whose bytes to swap.
+ *
+ * Designed to be usable in constant-requiring initializers.
+ *
+ * Example:
+ *     struct mystruct {
+ *             char buf[BSWAP_32(0xff000000)];
+ *     };
+ */
+#define BSWAP_32(val)                                  \
+       ((((uint32_t)(val) & 0x000000ff) << 24)         \
+        | (((uint32_t)(val) & 0x0000ff00) << 8)                \
+        | (((uint32_t)(val) & 0x00ff0000) >> 8)                \
+        | (((uint32_t)(val) & 0xff000000) >> 24))
+
+/**
+ * BSWAP_64 - reverse bytes in a constant uint64_t value.
+ * @val: constantvalue whose bytes to swap.
+ *
+ * Designed to be usable in constant-requiring initializers.
+ *
+ * Example:
+ *     struct mystruct {
+ *             char buf[BSWAP_64(0xff00000000000000ULL)];
+ *     };
+ */
+#define BSWAP_64(val)                                          \
+       ((((uint64_t)(val) & 0x00000000000000ffULL) << 56)      \
+        | (((uint64_t)(val) & 0x000000000000ff00ULL) << 40)    \
+        | (((uint64_t)(val) & 0x0000000000ff0000ULL) << 24)    \
+        | (((uint64_t)(val) & 0x00000000ff000000ULL) << 8)     \
+        | (((uint64_t)(val) & 0x000000ff00000000ULL) >> 8)     \
+        | (((uint64_t)(val) & 0x0000ff0000000000ULL) >> 24)    \
+        | (((uint64_t)(val) & 0x00ff000000000000ULL) >> 40)    \
+        | (((uint64_t)(val) & 0xff00000000000000ULL) >> 56))
+
+#if HAVE_BYTESWAP_H
+#include <byteswap.h>
+#else
+/**
+ * bswap_16 - reverse bytes in a uint16_t value.
+ * @val: value whose bytes to swap.
+ *
+ * Example:
+ *     // Output contains "1024 is 4 as two bytes reversed"
+ *     printf("1024 is %u as two bytes reversed\n", bswap_16(1024));
+ */
+static inline uint16_t bswap_16(uint16_t val)
+{
+       return BSWAP_16(val);
+}
+
+/**
+ * bswap_32 - reverse bytes in a uint32_t value.
+ * @val: value whose bytes to swap.
+ *
+ * Example:
+ *     // Output contains "1024 is 262144 as four bytes reversed"
+ *     printf("1024 is %u as four bytes reversed\n", bswap_32(1024));
+ */
+static inline uint32_t bswap_32(uint32_t val)
+{
+       return BSWAP_32(val);
+}
+#endif /* !HAVE_BYTESWAP_H */
+
+#if !HAVE_BSWAP_64
+/**
+ * bswap_64 - reverse bytes in a uint64_t value.
+ * @val: value whose bytes to swap.
+ *
+ * Example:
+ *     // Output contains "1024 is 1125899906842624 as eight bytes reversed"
+ *     printf("1024 is %llu as eight bytes reversed\n",
+ *             (unsigned long long)bswap_64(1024));
+ */
+static inline uint64_t bswap_64(uint64_t val)
+{
+       return BSWAP_64(val);
+}
+#endif
+
+/* Needed for Glibc like endiness check */
+#define        __LITTLE_ENDIAN 1234
+#define        __BIG_ENDIAN    4321
+
+/* Sanity check the defines.  We don't handle weird endianness. */
+#if !HAVE_LITTLE_ENDIAN && !HAVE_BIG_ENDIAN
+#error "Unknown endian"
+#elif HAVE_LITTLE_ENDIAN && HAVE_BIG_ENDIAN
+#error "Can't compile for both big and little endian."
+#elif HAVE_LITTLE_ENDIAN
+#ifndef __BYTE_ORDER
+#define __BYTE_ORDER   __LITTLE_ENDIAN
+#elif __BYTE_ORDER != __LITTLE_ENDIAN
+#error "__BYTE_ORDER already defined, but not equal to __LITTLE_ENDIAN"
+#endif
+#elif HAVE_BIG_ENDIAN
+#ifndef __BYTE_ORDER
+#define __BYTE_ORDER   __BIG_ENDIAN
+#elif __BYTE_ORDER != __BIG_ENDIAN
+#error "__BYTE_ORDER already defined, but not equal to __BIG_ENDIAN"
+#endif
+#endif
+
+
+#ifdef __CHECKER__
+/* sparse needs forcing to remove bitwise attribute from ccan/short_types */
+#define ENDIAN_CAST __attribute__((force))
+#define ENDIAN_TYPE __attribute__((bitwise))
+#else
+#define ENDIAN_CAST
+#define ENDIAN_TYPE
+#endif
+
+typedef uint64_t ENDIAN_TYPE leint64_t;
+typedef uint64_t ENDIAN_TYPE beint64_t;
+typedef uint32_t ENDIAN_TYPE leint32_t;
+typedef uint32_t ENDIAN_TYPE beint32_t;
+typedef uint16_t ENDIAN_TYPE leint16_t;
+typedef uint16_t ENDIAN_TYPE beint16_t;
+
+#if HAVE_LITTLE_ENDIAN
+/**
+ * CPU_TO_LE64 - convert a constant uint64_t value to little-endian
+ * @native: constant to convert
+ */
+#define CPU_TO_LE64(native) ((ENDIAN_CAST leint64_t)(native))
+
+/**
+ * CPU_TO_LE32 - convert a constant uint32_t value to little-endian
+ * @native: constant to convert
+ */
+#define CPU_TO_LE32(native) ((ENDIAN_CAST leint32_t)(native))
+
+/**
+ * CPU_TO_LE16 - convert a constant uint16_t value to little-endian
+ * @native: constant to convert
+ */
+#define CPU_TO_LE16(native) ((ENDIAN_CAST leint16_t)(native))
+
+/**
+ * LE64_TO_CPU - convert a little-endian uint64_t constant
+ * @le_val: little-endian constant to convert
+ */
+#define LE64_TO_CPU(le_val) ((ENDIAN_CAST uint64_t)(le_val))
+
+/**
+ * LE32_TO_CPU - convert a little-endian uint32_t constant
+ * @le_val: little-endian constant to convert
+ */
+#define LE32_TO_CPU(le_val) ((ENDIAN_CAST uint32_t)(le_val))
+
+/**
+ * LE16_TO_CPU - convert a little-endian uint16_t constant
+ * @le_val: little-endian constant to convert
+ */
+#define LE16_TO_CPU(le_val) ((ENDIAN_CAST uint16_t)(le_val))
+
+#else /* ... HAVE_BIG_ENDIAN */
+#define CPU_TO_LE64(native) ((ENDIAN_CAST leint64_t)BSWAP_64(native))
+#define CPU_TO_LE32(native) ((ENDIAN_CAST leint32_t)BSWAP_32(native))
+#define CPU_TO_LE16(native) ((ENDIAN_CAST leint16_t)BSWAP_16(native))
+#define LE64_TO_CPU(le_val) BSWAP_64((ENDIAN_CAST uint64_t)le_val)
+#define LE32_TO_CPU(le_val) BSWAP_32((ENDIAN_CAST uint32_t)le_val)
+#define LE16_TO_CPU(le_val) BSWAP_16((ENDIAN_CAST uint16_t)le_val)
+#endif /* HAVE_BIG_ENDIAN */
+
+#if HAVE_BIG_ENDIAN
+/**
+ * CPU_TO_BE64 - convert a constant uint64_t value to big-endian
+ * @native: constant to convert
+ */
+#define CPU_TO_BE64(native) ((ENDIAN_CAST beint64_t)(native))
+
+/**
+ * CPU_TO_BE32 - convert a constant uint32_t value to big-endian
+ * @native: constant to convert
+ */
+#define CPU_TO_BE32(native) ((ENDIAN_CAST beint32_t)(native))
+
+/**
+ * CPU_TO_BE16 - convert a constant uint16_t value to big-endian
+ * @native: constant to convert
+ */
+#define CPU_TO_BE16(native) ((ENDIAN_CAST beint16_t)(native))
+
+/**
+ * BE64_TO_CPU - convert a big-endian uint64_t constant
+ * @le_val: big-endian constant to convert
+ */
+#define BE64_TO_CPU(le_val) ((ENDIAN_CAST uint64_t)(le_val))
+
+/**
+ * BE32_TO_CPU - convert a big-endian uint32_t constant
+ * @le_val: big-endian constant to convert
+ */
+#define BE32_TO_CPU(le_val) ((ENDIAN_CAST uint32_t)(le_val))
+
+/**
+ * BE16_TO_CPU - convert a big-endian uint16_t constant
+ * @le_val: big-endian constant to convert
+ */
+#define BE16_TO_CPU(le_val) ((ENDIAN_CAST uint16_t)(le_val))
+
+#else /* ... HAVE_LITTLE_ENDIAN */
+#define CPU_TO_BE64(native) ((ENDIAN_CAST beint64_t)BSWAP_64(native))
+#define CPU_TO_BE32(native) ((ENDIAN_CAST beint32_t)BSWAP_32(native))
+#define CPU_TO_BE16(native) ((ENDIAN_CAST beint16_t)BSWAP_16(native))
+#define BE64_TO_CPU(le_val) BSWAP_64((ENDIAN_CAST uint64_t)le_val)
+#define BE32_TO_CPU(le_val) BSWAP_32((ENDIAN_CAST uint32_t)le_val)
+#define BE16_TO_CPU(le_val) BSWAP_16((ENDIAN_CAST uint16_t)le_val)
+#endif /* HAVE_LITTE_ENDIAN */
+
+
+/**
+ * cpu_to_le64 - convert a uint64_t value to little-endian
+ * @native: value to convert
+ */
+static inline leint64_t cpu_to_le64(uint64_t native)
+{
+       return CPU_TO_LE64(native);
+}
+
+/**
+ * cpu_to_le32 - convert a uint32_t value to little-endian
+ * @native: value to convert
+ */
+static inline leint32_t cpu_to_le32(uint32_t native)
+{
+       return CPU_TO_LE32(native);
+}
+
+/**
+ * cpu_to_le16 - convert a uint16_t value to little-endian
+ * @native: value to convert
+ */
+static inline leint16_t cpu_to_le16(uint16_t native)
+{
+       return CPU_TO_LE16(native);
+}
+
+/**
+ * le64_to_cpu - convert a little-endian uint64_t value
+ * @le_val: little-endian value to convert
+ */
+static inline uint64_t le64_to_cpu(leint64_t le_val)
+{
+       return LE64_TO_CPU(le_val);
+}
+
+/**
+ * le32_to_cpu - convert a little-endian uint32_t value
+ * @le_val: little-endian value to convert
+ */
+static inline uint32_t le32_to_cpu(leint32_t le_val)
+{
+       return LE32_TO_CPU(le_val);
+}
+
+/**
+ * le16_to_cpu - convert a little-endian uint16_t value
+ * @le_val: little-endian value to convert
+ */
+static inline uint16_t le16_to_cpu(leint16_t le_val)
+{
+       return LE16_TO_CPU(le_val);
+}
+
+/**
+ * cpu_to_be64 - convert a uint64_t value to big endian.
+ * @native: value to convert
+ */
+static inline beint64_t cpu_to_be64(uint64_t native)
+{
+       return CPU_TO_BE64(native);
+}
+
+/**
+ * cpu_to_be32 - convert a uint32_t value to big endian.
+ * @native: value to convert
+ */
+static inline beint32_t cpu_to_be32(uint32_t native)
+{
+       return CPU_TO_BE32(native);
+}
+
+/**
+ * cpu_to_be16 - convert a uint16_t value to big endian.
+ * @native: value to convert
+ */
+static inline beint16_t cpu_to_be16(uint16_t native)
+{
+       return CPU_TO_BE16(native);
+}
+
+/**
+ * be64_to_cpu - convert a big-endian uint64_t value
+ * @be_val: big-endian value to convert
+ */
+static inline uint64_t be64_to_cpu(beint64_t be_val)
+{
+       return BE64_TO_CPU(be_val);
+}
+
+/**
+ * be32_to_cpu - convert a big-endian uint32_t value
+ * @be_val: big-endian value to convert
+ */
+static inline uint32_t be32_to_cpu(beint32_t be_val)
+{
+       return BE32_TO_CPU(be_val);
+}
+
+/**
+ * be16_to_cpu - convert a big-endian uint16_t value
+ * @be_val: big-endian value to convert
+ */
+static inline uint16_t be16_to_cpu(beint16_t be_val)
+{
+       return BE16_TO_CPU(be_val);
+}
+
+/* Whichever they include first, they get these definitions. */
+#ifdef CCAN_SHORT_TYPES_H
+/**
+ * be64/be32/be16 - 64/32/16 bit big-endian representation.
+ */
+typedef beint64_t be64;
+typedef beint32_t be32;
+typedef beint16_t be16;
+
+/**
+ * le64/le32/le16 - 64/32/16 bit little-endian representation.
+ */
+typedef leint64_t le64;
+typedef leint32_t le32;
+typedef leint16_t le16;
+#endif
+#endif /* CCAN_ENDIAN_H */
diff --git a/ccan/ccan/endian/info b/ccan/ccan/endian/info
new file mode 100755 (executable)
index 0000000..c29f6f6
Binary files /dev/null and b/ccan/ccan/endian/info differ
diff --git a/ccan/licenses/CC0 b/ccan/licenses/CC0
new file mode 100644 (file)
index 0000000..feb9b11
--- /dev/null
@@ -0,0 +1,28 @@
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
+
+    the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
+    moral rights retained by the original author(s) and/or performer(s);
+    publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
+    rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
+    rights protecting the extraction, dissemination, use and reuse of data in a Work;
+    database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
+    other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+    No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
+    Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
+    Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
+    Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
diff --git a/ccan/tools/configurator/configurator.c b/ccan/tools/configurator/configurator.c
new file mode 100644 (file)
index 0000000..9487e69
--- /dev/null
@@ -0,0 +1,1074 @@
+/* Simple tool to create config.h.
+ * Would be much easier with ccan modules, but deliberately standalone.
+ *
+ * Copyright 2011 Rusty Russell <rusty@rustcorp.com.au>.  MIT license.
+ *
+ * c12r_err, c12r_errx functions copied from ccan/err/err.c
+ * Copyright Rusty Russell <rusty@rustcorp.com.au>. CC0 (Public domain) 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.
+ */
+#define _POSIX_C_SOURCE 200809L                /* For pclose, popen, strdup */
+
+#define EXIT_BAD_USAGE           1
+#define EXIT_TROUBLE_RUNNING     2
+#define EXIT_BAD_TEST            3
+#define EXIT_BAD_INPUT           4
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifdef _MSC_VER
+#define popen _popen
+#define pclose _pclose
+#endif
+
+#ifdef _MSC_VER
+#define DEFAULT_COMPILER "cl"
+/* Note:  Dash options avoid POSIX path conversion when used under msys bash
+ *        and are therefore preferred to slash (e.g. -nologo over /nologo)
+ * Note:  Disable Warning 4200 "nonstandard extension used : zero-sized array
+ *        in struct/union" for flexible array members.
+ */
+#define DEFAULT_FLAGS "-nologo -Zi -W4 -wd4200 " \
+       "-D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS"
+#define DEFAULT_OUTPUT_EXE_FLAG "-Fe:"
+#else
+#define DEFAULT_COMPILER "cc"
+#define DEFAULT_FLAGS "-g3 -ggdb -Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition"
+#define DEFAULT_OUTPUT_EXE_FLAG "-o"
+#endif
+
+#define OUTPUT_FILE "configurator.out"
+#define INPUT_FILE "configuratortest.c"
+
+#ifdef _WIN32
+#define DIR_SEP   "\\"
+#else
+#define DIR_SEP   "/"
+#endif
+
+static const char *progname = "";
+static int verbose;
+static bool like_a_libtool = false;
+
+struct test {
+       const char *name;
+       const char *desc;
+       /*
+        * Template style flags (pick one):
+        * OUTSIDE_MAIN:
+        * - put a simple boilerplate main below it.
+        * DEFINES_FUNC:
+        * - defines a static function called func; adds ref to avoid warnings
+        * INSIDE_MAIN:
+        * - put this inside main().
+        * DEFINES_EVERYTHING:
+        * - don't add any boilerplate at all.
+        *
+        * Execution flags:
+        * EXECUTE:
+        * - a runtime test; must compile, exit 0 means flag is set.
+        * MAY_NOT_COMPILE:
+        * - Only useful with EXECUTE: don't get upset if it doesn't compile.
+        * <nothing>:
+        * - a compile test, if it compiles must run and exit 0.
+        */
+       const char *style;
+       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;
+};
+
+/* Terminated by a NULL name */
+static struct test *tests;
+
+static const struct test base_tests[] = {
+       { "HAVE_32BIT_OFF_T", "off_t is 32 bits",
+         "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL,
+         "#include <sys/types.h>\n"
+         "int main(void) {\n"
+         "     return sizeof(off_t) == 4 ? 0 : 1;\n"
+         "}\n" },
+       { "HAVE_ALIGNOF", "__alignof__ support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __alignof__(double) > 0 ? 0 : 1;" },
+       { "HAVE_ASPRINTF", "asprintf() declaration",
+         "DEFINES_FUNC", NULL, NULL,
+         "#ifndef _GNU_SOURCE\n"
+         "#define _GNU_SOURCE\n"
+         "#endif\n"
+         "#include <stdio.h>\n"
+         "static char *func(int x) {"
+         "     char *p;\n"
+         "     if (asprintf(&p, \"%u\", x) == -1) \n"
+         "             p = NULL;\n"
+         "     return p;\n"
+         "}" },
+       { "HAVE_ATTRIBUTE_COLD", "__attribute__((cold)) support",
+         "DEFINES_FUNC", NULL, NULL,
+         "static int __attribute__((cold)) func(int x) { return x; }" },
+       { "HAVE_ATTRIBUTE_CONST", "__attribute__((const)) support",
+         "DEFINES_FUNC", NULL, NULL,
+         "static int __attribute__((const)) func(int x) { return x; }" },
+       { "HAVE_ATTRIBUTE_DEPRECATED", "__attribute__((deprecated)) support",
+         "DEFINES_FUNC", NULL, NULL,
+         "static int __attribute__((deprecated)) func(int x) { return x; }" },
+       { "HAVE_ATTRIBUTE_NONNULL", "__attribute__((nonnull)) support",
+         "DEFINES_FUNC", NULL, NULL,
+         "static char *__attribute__((nonnull)) func(char *p) { return p; }" },
+       { "HAVE_ATTRIBUTE_RETURNS_NONNULL", "__attribute__((returns_nonnull)) support",
+         "DEFINES_FUNC", NULL, NULL,
+         "static const char *__attribute__((returns_nonnull)) func(void) { return \"hi\"; }" },
+       { "HAVE_ATTRIBUTE_SENTINEL", "__attribute__((sentinel)) support",
+         "DEFINES_FUNC", NULL, NULL,
+         "static int __attribute__((sentinel)) func(int i, ...) { return i; }" },
+       { "HAVE_ATTRIBUTE_PURE", "__attribute__((pure)) support",
+         "DEFINES_FUNC", NULL, NULL,
+         "static int __attribute__((pure)) func(int x) { return x; }" },
+       { "HAVE_ATTRIBUTE_MAY_ALIAS", "__attribute__((may_alias)) support",
+         "OUTSIDE_MAIN", NULL, NULL,
+         "typedef short __attribute__((__may_alias__)) short_a;" },
+       { "HAVE_ATTRIBUTE_NORETURN", "__attribute__((noreturn)) support",
+         "DEFINES_FUNC", NULL, NULL,
+         "#include <stdlib.h>\n"
+         "static void __attribute__((noreturn)) func(int x) { exit(x); }" },
+       { "HAVE_ATTRIBUTE_PRINTF", "__attribute__ format printf support",
+         "DEFINES_FUNC", NULL, NULL,
+         "static void __attribute__((format(__printf__, 1, 2))) func(const char *fmt, ...) { (void)fmt; }" },
+       { "HAVE_ATTRIBUTE_UNUSED", "__attribute__((unused)) support",
+         "OUTSIDE_MAIN", NULL, NULL,
+         "static int __attribute__((unused)) func(int x) { return x; }" },
+       { "HAVE_ATTRIBUTE_USED", "__attribute__((used)) support",
+         "OUTSIDE_MAIN", NULL, NULL,
+         "static int __attribute__((used)) func(int x) { return x; }" },
+       { "HAVE_BACKTRACE", "backtrace() in <execinfo.h>",
+         "DEFINES_FUNC", NULL, NULL,
+         "#include <execinfo.h>\n"
+         "static int func(int x) {"
+         "     void *bt[10];\n"
+         "     return backtrace(bt, 10) < x;\n"
+         "}" },
+       { "HAVE_BIG_ENDIAN", "big endian",
+         "INSIDE_MAIN|EXECUTE", NULL, 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;" },
+       { "HAVE_BSWAP_64", "bswap64 in byteswap.h",
+         "DEFINES_FUNC", "HAVE_BYTESWAP_H", NULL,
+         "#include <byteswap.h>\n"
+         "static int func(int x) { return bswap_64(x); }" },
+       { "HAVE_BUILTIN_CHOOSE_EXPR", "__builtin_choose_expr support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_choose_expr(1, 0, \"garbage\");" },
+       { "HAVE_BUILTIN_CLZ", "__builtin_clz support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_clz(1) == (sizeof(int)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CLZL", "__builtin_clzl support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_clzl(1) == (sizeof(long)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CLZLL", "__builtin_clzll support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_clzll(1) == (sizeof(long long)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CTZ", "__builtin_ctz support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_ctz(1 << (sizeof(int)*8 - 1)) == (sizeof(int)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CTZL", "__builtin_ctzl support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_ctzl(1UL << (sizeof(long)*8 - 1)) == (sizeof(long)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CTZLL", "__builtin_ctzll support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_ctzll(1ULL << (sizeof(long long)*8 - 1)) == (sizeof(long long)*8 - 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_CONSTANT_P", "__builtin_constant_p support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_constant_p(1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_EXPECT", "__builtin_expect support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_expect(argc == 1, 1) ? 0 : 1;" },
+       { "HAVE_BUILTIN_FFS", "__builtin_ffs support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_ffs(0) == 0 ? 0 : 1;" },
+       { "HAVE_BUILTIN_FFSL", "__builtin_ffsl support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_ffsl(0L) == 0 ? 0 : 1;" },
+       { "HAVE_BUILTIN_FFSLL", "__builtin_ffsll support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_ffsll(0LL) == 0 ? 0 : 1;" },
+       { "HAVE_BUILTIN_POPCOUNT", "__builtin_popcount support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_popcount(255) == 8 ? 0 : 1;" },
+       { "HAVE_BUILTIN_POPCOUNTL",  "__builtin_popcountl support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_popcountl(255L) == 8 ? 0 : 1;" },
+       { "HAVE_BUILTIN_POPCOUNTLL", "__builtin_popcountll support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_popcountll(255LL) == 8 ? 0 : 1;" },
+       { "HAVE_BUILTIN_TYPES_COMPATIBLE_P", "__builtin_types_compatible_p support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return __builtin_types_compatible_p(char *, int) ? 1 : 0;" },
+       { "HAVE_ICCARM_INTRINSICS", "<intrinsics.h>",
+         "DEFINES_FUNC", NULL, NULL,
+         "#include <intrinsics.h>\n"
+         "int func(int v) {\n"
+         "     return __CLZ(__RBIT(v));\n"
+         "}" },
+       { "HAVE_BYTESWAP_H", "<byteswap.h>",
+         "OUTSIDE_MAIN", NULL, NULL,
+         "#include <byteswap.h>\n" },
+       { "HAVE_CLOCK_GETTIME", "clock_gettime() declaration",
+         "DEFINES_FUNC", "HAVE_STRUCT_TIMESPEC", NULL,
+         "#include <time.h>\n"
+         "static struct timespec func(void) {\n"
+         "     struct timespec ts;\n"
+         "     clock_gettime(CLOCK_REALTIME, &ts);\n"
+         "     return ts;\n"
+         "}\n" },
+       { "HAVE_CLOCK_GETTIME_IN_LIBRT", "clock_gettime() in librt",
+         "DEFINES_FUNC",
+         "HAVE_STRUCT_TIMESPEC !HAVE_CLOCK_GETTIME",
+         "-lrt",
+         "#include <time.h>\n"
+         "static struct timespec func(void) {\n"
+         "     struct timespec ts;\n"
+         "     clock_gettime(CLOCK_REALTIME, &ts);\n"
+         "     return ts;\n"
+         "}\n",
+         /* This means HAVE_CLOCK_GETTIME, too */
+         "HAVE_CLOCK_GETTIME" },
+       { "HAVE_COMPOUND_LITERALS", "compound literal support",
+         "INSIDE_MAIN", NULL, NULL,
+         "int *foo = (int[]) { 1, 2, 3, 4 };\n"
+         "return foo[0] ? 0 : 1;" },
+       { "HAVE_FCHDIR", "fchdir support",
+         "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL,
+         "#include <sys/types.h>\n"
+         "#include <sys/stat.h>\n"
+         "#include <fcntl.h>\n"
+         "#include <unistd.h>\n"
+         "int main(void) {\n"
+         "     int fd = open(\"..\", O_RDONLY);\n"
+         "     return fchdir(fd) == 0 ? 0 : 1;\n"
+         "}\n" },
+       { "HAVE_ERR_H", "<err.h>",
+         "DEFINES_FUNC", NULL, NULL,
+         "#include <err.h>\n"
+         "static void func(int arg) {\n"
+         "     if (arg == 0)\n"
+         "             err(1, \"err %u\", arg);\n"
+         "     if (arg == 1)\n"
+         "             errx(1, \"err %u\", arg);\n"
+         "     if (arg == 3)\n"
+         "             warn(\"warn %u\", arg);\n"
+         "     if (arg == 4)\n"
+         "             warnx(\"warn %u\", arg);\n"
+         "}\n" },
+       { "HAVE_FILE_OFFSET_BITS", "_FILE_OFFSET_BITS to get 64-bit offsets",
+         "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE",
+         "HAVE_32BIT_OFF_T", NULL,
+         "#define _FILE_OFFSET_BITS 64\n"
+         "#include <sys/types.h>\n"
+         "int main(void) {\n"
+         "     return sizeof(off_t) == 8 ? 0 : 1;\n"
+         "}\n" },
+       { "HAVE_FOR_LOOP_DECLARATION", "for loop declaration support",
+         "INSIDE_MAIN", NULL, NULL,
+         "int ret = 1;\n"
+         "for (int i = 0; i < argc; i++) { ret = 0; };\n"
+         "return ret;" },
+       { "HAVE_FLEXIBLE_ARRAY_MEMBER", "flexible array member support",
+         "OUTSIDE_MAIN", NULL, NULL,
+         "struct foo { unsigned int x; int arr[]; };" },
+       { "HAVE_GETPAGESIZE", "getpagesize() in <unistd.h>",
+         "DEFINES_FUNC", NULL, NULL,
+         "#include <unistd.h>\n"
+         "static int func(void) { return getpagesize(); }" },
+       { "HAVE_ISBLANK", "isblank() in <ctype.h>",
+         "DEFINES_FUNC", NULL, NULL,
+         "#ifndef _GNU_SOURCE\n"
+         "#define _GNU_SOURCE\n"
+         "#endif\n"
+         "#include <ctype.h>\n"
+         "static int func(void) { return isblank(' '); }" },
+       { "HAVE_LITTLE_ENDIAN", "little endian",
+         "INSIDE_MAIN|EXECUTE", NULL, 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", "memmem in <string.h>",
+         "DEFINES_FUNC", NULL, NULL,
+         "#ifndef _GNU_SOURCE\n"
+         "#define _GNU_SOURCE\n"
+         "#endif\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_MEMRCHR", "memrchr in <string.h>",
+         "DEFINES_FUNC", NULL, NULL,
+         "#ifndef _GNU_SOURCE\n"
+         "#define _GNU_SOURCE\n"
+         "#endif\n"
+         "#include <string.h>\n"
+         "static void *func(void *s, int c, size_t n) {\n"
+         "return memrchr(s, c, n);"
+         "}\n", },
+       { "HAVE_MMAP", "mmap() declaration",
+         "DEFINES_FUNC", NULL, NULL,
+         "#include <sys/mman.h>\n"
+         "static void *func(int fd) {\n"
+         "     return mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);\n"
+         "}" },
+       { "HAVE_PROC_SELF_MAPS", "/proc/self/maps exists",
+         "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, 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", "qsort_r cmp takes trailing arg",
+         "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL,
+         "#ifndef _GNU_SOURCE\n"
+         "#define _GNU_SOURCE\n"
+         "#endif\n"
+         "#include <stdlib.h>\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_STRUCT_TIMESPEC", "struct timespec declaration",
+         "DEFINES_FUNC", NULL, NULL,
+         "#include <time.h>\n"
+         "static void func(void) {\n"
+         "     struct timespec ts;\n"
+         "     ts.tv_sec = ts.tv_nsec = 1;\n"
+         "}\n" },
+       { "HAVE_SECTION_START_STOP", "__attribute__((section)) and __start/__stop",
+         "DEFINES_FUNC", NULL, 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", "stack grows upwards",
+         "DEFINES_EVERYTHING|EXECUTE", NULL, NULL,
+         "#include <stddef.h>\n"
+         "static ptrdiff_t 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"
+         "     (void)argv;\n"
+         "     return (nest(&argc, argc) > 0) ? 0 : 1;\n"
+         "}\n" },
+       { "HAVE_STATEMENT_EXPR", "statement expression support",
+         "INSIDE_MAIN", NULL, NULL,
+         "return ({ int x = argc; x == argc ? 0 : 1; });" },
+       { "HAVE_SYS_FILIO_H", "<sys/filio.h>",
+         "OUTSIDE_MAIN", NULL, NULL, /* Solaris needs this for FIONREAD */
+         "#include <sys/filio.h>\n" },
+       { "HAVE_SYS_TERMIOS_H", "<sys/termios.h>",
+         "OUTSIDE_MAIN", NULL, NULL,
+         "#include <sys/termios.h>\n" },
+       { "HAVE_SYS_UNISTD_H", "<sys/unistd.h>",
+         "OUTSIDE_MAIN", NULL, NULL,
+         "#include <sys/unistd.h>\n" },
+       { "HAVE_TYPEOF", "__typeof__ support",
+         "INSIDE_MAIN", NULL, NULL,
+         "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" },
+       { "HAVE_UNALIGNED_ACCESS", "unaligned access to int",
+         "DEFINES_EVERYTHING|EXECUTE", NULL, NULL,
+         "#include <string.h>\n"
+         "int main(int argc, char *argv[]) {\n"
+         "     (void)argc;\n"
+         "     char pad[sizeof(int *) * 1];\n"
+         "     memcpy(pad, argv[0], sizeof(pad));\n"
+         "     int *x = (int *)pad, *y = (int *)(pad + 1);\n"
+         "     return *x == *y;\n"
+         "}\n" },
+       { "HAVE_UTIME", "utime() declaration",
+         "DEFINES_FUNC", NULL, NULL,
+         "#include <sys/types.h>\n"
+         "#include <utime.h>\n"
+         "static int func(const char *filename) {\n"
+         "     struct utimbuf times = { 0 };\n"
+         "     return utime(filename, &times);\n"
+         "}" },
+       { "HAVE_WARN_UNUSED_RESULT", "__attribute__((warn_unused_result))",
+         "DEFINES_FUNC", NULL, NULL,
+         "#include <sys/types.h>\n"
+         "#include <utime.h>\n"
+         "static __attribute__((warn_unused_result)) int func(int i) {\n"
+         "     return i + 1;\n"
+         "}" },
+       { "HAVE_OPENMP", "#pragma omp and -fopenmp support",
+         "INSIDE_MAIN|EXECUTE|MAY_NOT_COMPILE", 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", "<valgrind/memcheck.h>",
+         "OUTSIDE_MAIN", NULL, NULL,
+         "#include <valgrind/memcheck.h>\n" },
+       { "HAVE_UCONTEXT", "working <ucontext.h",
+         "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE",
+         NULL, NULL,
+         "#include <ucontext.h>\n"
+         "static int x = 0;\n"
+         "static char stack[2048];\n"
+         "static ucontext_t a, b;\n"
+         "static void fn(void) {\n"
+         "     x |= 2;\n"
+         "     setcontext(&b);\n"
+         "     x |= 4;\n"
+         "}\n"
+         "int main(void) {\n"
+         "     x |= 1;\n"
+         "     getcontext(&a);\n"
+         "     a.uc_stack.ss_sp = stack;\n"
+         "     a.uc_stack.ss_size = sizeof(stack);\n"
+         "     makecontext(&a, fn, 0);\n"
+         "     swapcontext(&b, &a);\n"
+         "     return (x == 3) ? 0 : 1;\n"
+         "}\n"
+       },
+       { "HAVE_POINTER_SAFE_MAKECONTEXT", "passing pointers via makecontext()",
+         "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE",
+         "HAVE_UCONTEXT", NULL,
+         "#include <stddef.h>\n"
+         "#include <ucontext.h>\n"
+         "static int worked = 0;\n"
+         "static char stack[1024];\n"
+         "static ucontext_t a, b;\n"
+         "static void fn(void *p, void *q) {\n"
+         "     void *cp = &worked;\n"
+         "     void *cq = (void *)(~((ptrdiff_t)cp));\n"
+         "     if ((p == cp) && (q == cq))\n"
+         "             worked = 1;\n"
+         "     setcontext(&b);\n"
+         "}\n"
+         "int main(void) {\n"
+         "     void *ap = &worked;\n"
+         "     void *aq = (void *)(~((ptrdiff_t)ap));\n"
+         "     getcontext(&a);\n"
+         "     a.uc_stack.ss_sp = stack;\n"
+         "     a.uc_stack.ss_size = sizeof(stack);\n"
+         "     makecontext(&a, (void (*)(void))fn, 2, ap, aq);\n"
+         "     swapcontext(&b, &a);\n"
+         "     return worked ? 0 : 1;\n"
+         "}\n"
+       },
+       { "HAVE_BUILTIN_CPU_SUPPORTS", "__builtin_cpu_supports()",
+         "DEFINES_FUNC", NULL, NULL,
+         "#include <stdbool.h>\n"
+         "static bool func(void) {\n"
+         "     return __builtin_cpu_supports(\"mmx\");\n"
+         "}"
+       },
+};
+
+static void c12r_err(int eval, const char *fmt, ...)
+{
+       int err_errno = errno;
+       va_list ap;
+
+       fprintf(stderr, "%s: ", progname);
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);
+       fprintf(stderr, ": %s\n", strerror(err_errno));
+       exit(eval);
+}
+
+static void c12r_errx(int eval, const char *fmt, ...)
+{
+       va_list ap;
+
+       fprintf(stderr, "%s: ", progname);
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);
+       fprintf(stderr, "\n");
+       exit(eval);
+}
+
+static void start_test(const char *what, const char *why)
+{
+       if (like_a_libtool) {
+               printf("%s%s... ", what, why);
+               fflush(stdout);
+       }
+}
+
+static void end_test(bool result)
+{
+       if (like_a_libtool)
+               printf("%s\n", result ? "yes" : "no");
+}
+
+static size_t fcopy(FILE *fsrc, FILE *fdst)
+{
+       char buffer[BUFSIZ];
+       size_t rsize, wsize;
+       size_t copied = 0;
+
+       while ((rsize = fread(buffer, 1, BUFSIZ, fsrc)) > 0) {
+               wsize = fwrite(buffer, 1, rsize, fdst);
+               copied += wsize;
+               if (wsize != rsize)
+                       break;
+       }
+
+       return copied;
+}
+
+static char *grab_stream(FILE *file)
+{
+       size_t max, ret, size = 0;
+       char *buffer;
+
+       max = BUFSIZ;
+       buffer = malloc(max);
+       while ((ret = fread(buffer+size, 1, max - size, file)) == max - size) {
+               size += ret;
+               buffer = realloc(buffer, max *= 2);
+       }
+       size += ret;
+       if (ferror(file))
+               c12r_err(EXIT_TROUBLE_RUNNING, "reading from command");
+       buffer[size] = '\0';
+       return buffer;
+}
+
+static char *run(const char *cmd, int *exitstatus)
+{
+       static const char redir[] = " 2>&1";
+       size_t cmdlen;
+       char *cmdredir;
+       FILE *cmdout;
+       char *ret;
+
+       cmdlen = strlen(cmd);
+       cmdredir = malloc(cmdlen + sizeof(redir));
+       memcpy(cmdredir, cmd, cmdlen);
+       memcpy(cmdredir + cmdlen, redir, sizeof(redir));
+
+       cmdout = popen(cmdredir, "r");
+       if (!cmdout)
+               c12r_err(EXIT_TROUBLE_RUNNING, "popen \"%s\"", cmdredir);
+
+       free(cmdredir);
+
+       ret = grab_stream(cmdout);
+       *exitstatus = pclose(cmdout);
+       return ret;
+}
+
+static char *connect_args(const char *argv[], const char *outflag,
+               const char *files)
+{
+       unsigned int i;
+       char *ret;
+       size_t len = strlen(outflag) + strlen(files) + 1;
+
+       for (i = 1; argv[i]; i++)
+               len += 1 + strlen(argv[i]);
+
+       ret = malloc(len);
+       len = 0;
+       for (i = 1; argv[i]; i++) {
+               strcpy(ret + len, argv[i]);
+               len += strlen(argv[i]);
+               if (argv[i+1] || *outflag)
+                       ret[len++] = ' ';
+       }
+       strcpy(ret + len, outflag);
+       len += strlen(outflag);
+       strcpy(ret + len, files);
+       return ret;
+}
+
+static struct test *find_test(const char *name)
+{
+       unsigned int i;
+
+       for (i = 0; tests[i].name; i++) {
+               if (strcmp(tests[i].name, name) == 0)
+                       return &tests[i];
+       }
+       c12r_errx(EXIT_BAD_TEST, "Unknown test %s", name);
+       abort();
+}
+
+#define PRE_BOILERPLATE "/* Test program generated by configurator. */\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, const char *wrapper, struct test *test)
+{
+       char *output, *newcmd;
+       FILE *outf;
+       int status;
+
+       if (test->done)
+               return test->answer;
+
+       if (test->depends) {
+               size_t len;
+               const char *deps = test->depends;
+               char *dep;
+
+               /* Space-separated dependencies, could be ! for inverse. */
+               while ((len = strcspn(deps, " ")) != 0) {
+                       bool positive = true;
+                       if (deps[len]) {
+                               dep = strdup(deps);
+                               dep[len] = '\0';
+                       } else {
+                               dep = (char *)deps;
+                       }
+
+                       if (dep[0] == '!') {
+                               dep++;
+                               positive = false;
+                       }
+                       if (run_test(cmd, wrapper, find_test(dep)) != positive) {
+                               test->answer = false;
+                               test->done = true;
+                               return test->answer;
+                       }
+                       if (deps[len])
+                               free(dep);
+
+                       deps += len;
+                       deps += strspn(deps, " ");
+               }
+       }
+
+       outf = fopen(INPUT_FILE, verbose > 1 ? "w+" : "w");
+       if (!outf)
+               c12r_err(EXIT_TROUBLE_RUNNING, "creating %s", INPUT_FILE);
+
+       fprintf(outf, "%s", PRE_BOILERPLATE);
+
+       if (strstr(test->style, "INSIDE_MAIN")) {
+               fprintf(outf, "%s", MAIN_START_BOILERPLATE);
+               fprintf(outf, "%s", test->fragment);
+               fprintf(outf, "%s", MAIN_END_BOILERPLATE);
+       } else if (strstr(test->style, "OUTSIDE_MAIN")) {
+               fprintf(outf, "%s", test->fragment);
+               fprintf(outf, "%s", MAIN_START_BOILERPLATE);
+               fprintf(outf, "%s", MAIN_BODY_BOILERPLATE);
+               fprintf(outf, "%s", MAIN_END_BOILERPLATE);
+       } else if (strstr(test->style, "DEFINES_FUNC")) {
+               fprintf(outf, "%s", test->fragment);
+               fprintf(outf, "%s", MAIN_START_BOILERPLATE);
+               fprintf(outf, "%s", USE_FUNC_BOILERPLATE);
+               fprintf(outf, "%s", MAIN_BODY_BOILERPLATE);
+               fprintf(outf, "%s", MAIN_END_BOILERPLATE);
+       } else if (strstr(test->style, "DEFINES_EVERYTHING")) {
+               fprintf(outf, "%s", test->fragment);
+       } else
+               c12r_errx(EXIT_BAD_TEST, "Unknown style for test %s: %s",
+                         test->name, test->style);
+
+       if (verbose > 1) {
+               fseek(outf, 0, SEEK_SET);
+               fcopy(outf, stdout);
+       }
+
+       fclose(outf);
+
+       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) {
+               newcmd = realloc(newcmd, strlen(newcmd) + strlen(" ")
+                               + strlen(test->link) + 1);
+               strcat(newcmd, " ");
+               strcat(newcmd, test->link);
+               if (verbose > 1)
+                       printf("Extra link line: %s", newcmd);
+       }
+
+       start_test("checking for ", test->desc);
+       output = run(newcmd, &status);
+
+       free(newcmd);
+
+       if (status != 0 || strstr(output, "warning")) {
+               if (verbose)
+                       printf("Compile %s for %s, status %i: %s\n",
+                              status ? "fail" : "warning",
+                              test->name, status, output);
+               if (strstr(test->style, "EXECUTE")
+                   && !strstr(test->style, "MAY_NOT_COMPILE"))
+                       c12r_errx(EXIT_BAD_TEST,
+                                 "Test for %s did not compile:\n%s",
+                                 test->name, output);
+               test->answer = false;
+               free(output);
+       } else {
+               /* Compile succeeded. */
+               free(output);
+               /* We run INSIDE_MAIN tests for sanity checking. */
+               if (strstr(test->style, "EXECUTE")
+                   || strstr(test->style, "INSIDE_MAIN")) {
+                       char *cmd = malloc(strlen(wrapper) + strlen(" ." DIR_SEP OUTPUT_FILE) + 1);
+
+                       strcpy(cmd, wrapper);
+                       strcat(cmd, " ." DIR_SEP OUTPUT_FILE);
+                       output = run(cmd, &status);
+                       if (wrapper) {
+                               free(cmd);
+                       }
+                       if (!strstr(test->style, "EXECUTE") && status != 0)
+                               c12r_errx(EXIT_BAD_TEST,
+                                         "Test for %s failed with %i:\n%s",
+                                         test->name, status, output);
+                       if (verbose && status)
+                               printf("%s exited %i\n", test->name, status);
+                       free(output);
+               }
+               test->answer = (status == 0);
+       }
+       test->done = true;
+       end_test(test->answer);
+
+       if (test->answer && test->overrides) {
+               struct test *override = find_test(test->overrides);
+               override->done = true;
+               override->answer = true;
+       }
+       return test->answer;
+}
+
+static char *any_field(char **fieldname)
+{
+       char buf[1000];
+       for (;;) {
+               char *p, *eq;
+
+               if (!fgets(buf, sizeof(buf), stdin))
+                       return NULL;
+
+               p = buf;
+               /* Ignore whitespace, lines starting with # */
+               while (*p == ' ' || *p == '\t')
+                       p++;
+               if (*p == '#' || *p == '\n')
+                       continue;
+
+               eq = strchr(p, '=');
+               if (!eq)
+                       c12r_errx(EXIT_BAD_INPUT, "no = in line: %s", p);
+               *eq = '\0';
+               *fieldname = strdup(p);
+               p = eq + 1;
+               if (strlen(p) && p[strlen(p)-1] == '\n')
+                       p[strlen(p)-1] = '\0';
+               return strdup(p);
+       }
+}
+
+static char *read_field(const char *name, bool compulsory)
+{
+       char *fieldname, *value;
+
+       value = any_field(&fieldname);
+       if (!value) {
+               if (!compulsory)
+                       return NULL;
+               c12r_errx(EXIT_BAD_INPUT, "Could not read field %s", name);
+       }
+       if (strcmp(fieldname, name) != 0)
+               c12r_errx(EXIT_BAD_INPUT,
+                         "Expected field %s not %s", name, fieldname);
+       return value;
+}
+
+/* Test descriptions from stdin:
+ * Lines starting with # or whitespace-only are ignored.
+ *
+ * First three non-ignored lines must be:
+ *  var=<varname>
+ *  desc=<description-for-autotools-style>
+ *  style=OUTSIDE_MAIN DEFINES_FUNC INSIDE_MAIN DEFINES_EVERYTHING EXECUTE MAY_NOT_COMPILE
+ *
+ * Followed by optional lines:
+ *  depends=<space-separated-testnames, ! to invert>
+ *  link=<extra args for link line>
+ *  flags=<extra args for compile line>
+ *  overrides=<testname-to-force>
+ *
+ * Finally a code line, either:
+ *  code=<oneline> OR
+ *  code=
+ *  <lines of code>
+ *  <end-comment>
+ *
+ * And <end-comment> looks like this next comment: */
+/*END*/
+static bool read_test(struct test *test)
+{
+       char *field, *value;
+       char buf[1000];
+
+       memset(test, 0, sizeof(*test));
+       test->name = read_field("var", false);
+       if (!test->name)
+               return false;
+       test->desc = read_field("desc", true);
+       test->style = read_field("style", true);
+       /* Read any optional fields. */
+       while ((value = any_field(&field)) != NULL) {
+               if (strcmp(field, "depends") == 0)
+                       test->depends = value;
+               else if (strcmp(field, "link") == 0)
+                       test->link = value;
+               else if (strcmp(field, "flags") == 0)
+                       test->flags = value;
+               else if (strcmp(field, "overrides") == 0)
+                       test->overrides = value;
+               else if (strcmp(field, "code") == 0)
+                       break;
+               else
+                       c12r_errx(EXIT_BAD_INPUT, "Unknown field %s in %s",
+                                 field, test->name);
+       }
+       if (!value)
+               c12r_errx(EXIT_BAD_INPUT, "Missing code in %s", test->name);
+
+       if (strlen(value) == 0) {
+               /* Multiline program, read to END comment */
+               while (fgets(buf, sizeof(buf), stdin) != 0) {
+                       size_t n;
+                       if (strncmp(buf, "/*END*/", 7) == 0)
+                               break;
+                       n = strlen(value);
+                       value = realloc(value, n + strlen(buf) + 1);
+                       strcpy(value + n, buf);
+                       n += strlen(buf);
+               }
+       }
+       test->fragment = value;
+       return true;
+}
+
+static void read_tests(size_t num_tests)
+{
+       while (read_test(tests + num_tests)) {
+               num_tests++;
+               tests = realloc(tests, (num_tests + 1) * sizeof(tests[0]));
+               tests[num_tests].name = NULL;
+       }
+}
+
+int main(int argc, const char *argv[])
+{
+       char *cmd;
+       unsigned int i;
+       const char *default_args[]
+               = { "", DEFAULT_COMPILER, DEFAULT_FLAGS, NULL };
+       const char *outflag = DEFAULT_OUTPUT_EXE_FLAG;
+       const char *configurator_cc = NULL;
+       const char *wrapper = "";
+       const char *orig_cc;
+       const char *varfile = NULL;
+       const char *headerfile = NULL;
+       bool extra_tests = false;
+       FILE *outf;
+
+       if (argc > 0)
+               progname = argv[0];
+
+       while (argc > 1) {
+               if (strcmp(argv[1], "--help") == 0) {
+                       printf("Usage: configurator [-v] [--var-file=<filename>] [-O<outflag>] [--configurator-cc=<compiler-for-tests>] [--wrapper=<wrapper-for-tests>] [--autotools-style] [--extra-tests] [<compiler> <flags>...]\n"
+                              "  <compiler> <flags> will have \"<outflag> <outfile> <infile.c>\" appended\n"
+                              "Default: %s %s %s\n",
+                              DEFAULT_COMPILER, DEFAULT_FLAGS,
+                              DEFAULT_OUTPUT_EXE_FLAG);
+                       exit(0);
+               }
+               if (strncmp(argv[1], "-O", 2) == 0) {
+                       argc--;
+                       argv++;
+                       outflag = argv[1] + 2;
+                       if (!*outflag) {
+                               fprintf(stderr,
+                                       "%s: option requires an argument -- O\n",
+                                       argv[0]);
+                               exit(EXIT_BAD_USAGE);
+                       }
+               } else if (strcmp(argv[1], "-v") == 0) {
+                       argc--;
+                       argv++;
+                       verbose++;
+               } else if (strcmp(argv[1], "-vv") == 0) {
+                       argc--;
+                       argv++;
+                       verbose += 2;
+               } else if (strncmp(argv[1], "--configurator-cc=", 18) == 0) {
+                       configurator_cc = argv[1] + 18;
+                       argc--;
+                       argv++;
+               } else if (strncmp(argv[1], "--wrapper=", 10) == 0) {
+                       wrapper = argv[1] + 10;
+                       argc--;
+                       argv++;
+               } else if (strncmp(argv[1], "--var-file=", 11) == 0) {
+                       varfile = argv[1] + 11;
+                       argc--;
+                       argv++;
+               } else if (strcmp(argv[1], "--autotools-style") == 0) {
+                       like_a_libtool = true;
+                       argc--;
+                       argv++;
+               } else if (strncmp(argv[1], "--header-file=", 14) == 0) {
+                       headerfile = argv[1] + 14;
+                       argc--;
+                       argv++;
+               } else if (strcmp(argv[1], "--extra-tests") == 0) {
+                       extra_tests = true;
+                       argc--;
+                       argv++;
+               } else if (strcmp(argv[1], "--") == 0) {
+                       break;
+               } else if (argv[1][0] == '-') {
+                       c12r_errx(EXIT_BAD_USAGE, "Unknown option %s", argv[1]);
+               } else {
+                       break;
+               }
+       }
+
+       if (argc == 1)
+               argv = default_args;
+
+       /* Copy with NULL entry at end */
+       tests = calloc(sizeof(base_tests)/sizeof(base_tests[0]) + 1,
+                      sizeof(base_tests[0]));
+       memcpy(tests, base_tests, sizeof(base_tests));
+
+       if (extra_tests)
+               read_tests(sizeof(base_tests)/sizeof(base_tests[0]));
+
+       orig_cc = argv[1];
+       if (configurator_cc)
+               argv[1] = configurator_cc;
+
+       cmd = connect_args(argv, outflag, OUTPUT_FILE " " INPUT_FILE);
+       if (like_a_libtool) {
+               start_test("Making autoconf users comfortable", "");
+               sleep(1);
+               end_test(1);
+       }
+       for (i = 0; tests[i].name; i++)
+               run_test(cmd, wrapper, &tests[i]);
+       free(cmd);
+
+       remove(OUTPUT_FILE);
+       remove(INPUT_FILE);
+
+       if (varfile) {
+               FILE *vars;
+
+               if (strcmp(varfile, "-") == 0)
+                       vars = stdout;
+               else {
+                       start_test("Writing variables to ", varfile);
+                       vars = fopen(varfile, "a");
+                       if (!vars)
+                               c12r_err(EXIT_TROUBLE_RUNNING,
+                                        "Could not open %s", varfile);
+               }
+               for (i = 0; tests[i].name; i++)
+                       fprintf(vars, "%s=%u\n", tests[i].name, tests[i].answer);
+               if (vars != stdout) {
+                       if (fclose(vars) != 0)
+                               c12r_err(EXIT_TROUBLE_RUNNING,
+                                        "Closing %s", varfile);
+                       end_test(1);
+               }
+       }
+
+       if (headerfile) {
+               start_test("Writing header to ", headerfile);
+               outf = fopen(headerfile, "w");
+               if (!outf)
+                       c12r_err(EXIT_TROUBLE_RUNNING,
+                                "Could not open %s", headerfile);
+       } else
+               outf = stdout;
+
+       fprintf(outf, "/* Generated by CCAN configurator */\n"
+              "#ifndef CCAN_CONFIG_H\n"
+              "#define CCAN_CONFIG_H\n");
+       fprintf(outf, "#ifndef _GNU_SOURCE\n");
+       fprintf(outf, "#define _GNU_SOURCE /* Always use GNU extensions. */\n");
+       fprintf(outf, "#endif\n");
+       fprintf(outf, "#define CCAN_COMPILER \"%s\"\n", orig_cc);
+       cmd = connect_args(argv + 1, "", "");
+       fprintf(outf, "#define CCAN_CFLAGS \"%s\"\n", cmd);
+       free(cmd);
+       fprintf(outf, "#define CCAN_OUTPUT_EXE_CFLAG \"%s\"\n\n", outflag);
+       /* This one implies "#include <ccan/..." works, eg. for tdb2.h */
+       fprintf(outf, "#define HAVE_CCAN 1\n");
+       for (i = 0; tests[i].name; i++)
+               fprintf(outf, "#define %s %u\n", tests[i].name, tests[i].answer);
+       fprintf(outf, "#endif /* CCAN_CONFIG_H */\n");
+
+       if (headerfile) {
+               if (fclose(outf) != 0)
+                       c12r_err(EXIT_TROUBLE_RUNNING, "Closing %s", headerfile);
+               end_test(1);
+       }
+
+       return 0;
+}
index 1c214a447fd36cb393f08b84317ac23312fc6184..8d382070f1a53a82b48bb385f59788cb1c9b33cc 100644 (file)
--- a/common.h
+++ b/common.h
@@ -1,6 +1,8 @@
 #ifndef _COMMON_H
 #define _COMMON_H
 
+#include "ccan/endian/endian.h"
+
 #define __round_mask(x, y) ((__typeof__(x))((y)-1))
 #define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
 
 #define __stringify_1(x...) #x
 #define __stringify(x...)  __stringify_1(x)
 
+static inline uint32_t mmio_read32(void *addr)
+{
+       leint32_t *p = addr;
+
+       return le32_to_cpu(*p);
+}
+
+/* Access 64-bit registers as 2 32-bit; Some devices fail 64-bit MMIO. */
+static inline uint64_t mmio_read64(void *addr)
+{
+       const volatile uint32_t *p = addr;
+       uint32_t low, high;
+
+       low = le32_to_cpu(*p);
+       high = le32_to_cpu(*(p + 1));
+
+       return ((uint64_t) high << 32) | low;
+}
+
 #endif
diff --git a/libnvme b/libnvme
index b03923892d217f8beecfeaac31e16e1e39cb68b2..bc3a7d0203daeeb1d9274f48c2686afedc2b521e 160000 (submodule)
--- a/libnvme
+++ b/libnvme
@@ -1 +1 @@
-Subproject commit b03923892d217f8beecfeaac31e16e1e39cb68b2
+Subproject commit bc3a7d0203daeeb1d9274f48c2686afedc2b521e
index 2d418356918bbd6e7e36b524d269f04a93431a0d..669ee7d851d627cae39e35e344d5d5586d6661ca 100644 (file)
@@ -41,6 +41,37 @@ conf.set('LIBHUGETLBFS', libhugetlbfs.found(), description: 'Is libhugetlbfs req
 # Set the nvme-cli version
 conf.set('NVME_VERSION', '"' + meson.project_version() + '"')
 
+conf.set10(
+    'HAVE_BYTESWAP_H',
+    cc.compiles(
+        '''#include <byteswap.h>''',
+        name: 'byteswap.h'
+    ),
+    description: 'Is byteswap.h include-able?'
+)
+conf.set10(
+    'HAVE_BSWAP_64',
+    cc.links(
+        '''#include <byteswap.h>
+            int main(void) {
+                return bswap_64(0);
+            }
+        ''',
+        name: 'bswap64'
+    ),
+    description: 'Is bswap_64 available?'
+)
+conf.set10(
+    'HAVE_LITTLE_ENDIAN',
+    build_machine.endian() == 'little',
+    description: 'Building for little-endian'
+)
+conf.set10(
+    'HAVE_BIG_ENDIAN',
+    build_machine.endian() == 'big',
+    description: 'Building for big-endian'
+)
+
 configure_file(
     output: 'config-host.h',
     configuration: conf
@@ -60,6 +91,7 @@ configure_file(
 ################################################################################
 add_project_arguments(['-fomit-frame-pointer', '-D_GNU_SOURCE',
                        '-include', 'config-host.h'], language : 'c')
+incdir = include_directories(['ccan'])
 
 ################################################################################
 sources = [
@@ -79,4 +111,5 @@ executable(
     'nvme',
     sources,
     dependencies: [ libnvme_dep, libuuid, json_c ],
+    include_directories: incdir,
 )
index 0867476151182f682d58375c5a20c2979644c665..a2ecc0ffc461b5439ce9558ec5ce343851dd111e 100644 (file)
@@ -2285,25 +2285,6 @@ static void nvme_show_registers_pmrmscu(uint32_t pmrmscu)
                pmrmscu);
 }
 
-static inline uint32_t mmio_read32(void *addr)
-{
-       __le32 *p = addr;
-
-       return le32_to_cpu(*p);
-}
-
-/* Access 64-bit registers as 2 32-bit; Some devices fail 64-bit MMIO. */
-static inline __u64 mmio_read64(void *addr)
-{
-       const volatile __u32 *p = addr;
-       __u32 low, high;
-
-       low = le32_to_cpu(*p);
-       high = le32_to_cpu(*(p + 1));
-
-       return ((__u64) high << 32) | low;
-}
-
 static void json_ctrl_registers(void *bar)
 {
        uint64_t cap, asq, acq, bpmbl, cmbmsc;
index 5ad99258558a544a9b34b4698cde2cf308c8f71c..d92bbd670f81cc861e731c9a490761534a8ccb47 100644 (file)
@@ -27,6 +27,7 @@
 #include <linux/socket.h>
 #include <limits.h>
 
+#include "common.h"
 #include "nvme.h"
 #include "libnvme.h"
 
diff --git a/nvme.c b/nvme.c
index 67fcf472378c3d7f79771f8b9cc7424334b9b5b1..f40b47e69438b48179fef7ad9227abc0bb12c7b8 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -587,7 +587,7 @@ static int get_effects_log(int argc, char **argv, struct command *cmd, struct pl
                if (!bar) {
                        goto close_fd;
                }
-               cap_value = nvme_mmio_read64(bar + NVME_REG_CAP);
+               cap_value = mmio_read64(bar + NVME_REG_CAP);
                munmap(bar, getpagesize());
 
                nvme_command_set_supported = (cap_value & (1UL << 37)) != 0;
index 679578f7d69f2b00d71e4925650d149f4b2cb0a3..e9e9145bbc4f7bbf4729d627d1eefc16b1754631 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <sys/stat.h>
 
+#include "common.h"
 #include "nvme.h"
 #include "libnvme.h"
 #include "plugin.h"
index b9abd446540e971014f7f4e4c9517bd23c83179b..2f63b3fd3a1ca66034e432afa5148b020cc5f1d7 100644 (file)
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <libgen.h>
 #include <sys/stat.h>
+#include "common.h"
 #include "nvme.h"
 #include "libnvme.h"
 #include <limits.h>
index 377b5410c13d2c24001ac3bea81320923676f6a1..766c0d3c2c87056312691346dfb2e552a45e264b 100644 (file)
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <uuid/uuid.h>
 
+#include "common.h"
 #include "nvme.h"
 #include "libnvme.h"
 
index 3753cec541ee2bd67d490c1f5a4459ae837483ac..8cc0469a16fd527c538df53f180d5f2a364ea006 100644 (file)
@@ -10,6 +10,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "common.h"
 #include "nvme.h"
 #include "libnvme.h"
 #include "plugin.h"
index cf14571c4ea3f01213d279b4a6f660f81a95641b..5720585521cf7b4b44d72143108849e400b4e102 100644 (file)
@@ -28,6 +28,7 @@
 #include <inttypes.h>
 #include <sys/stat.h>
 #include <ctype.h>
+#include "common.h"
 #include "nvme.h"
 #include "libnvme.h"
 #include "plugin.h"
index 50a4e2e021a8e9d8dbe7091fe1101af02ad67ce0..a8f1ba6f54ac3f058c8ef10592dfc268062fe284 100644 (file)
@@ -9,6 +9,7 @@
 #include <time.h>
 #include <locale.h>
 
+#include "common.h"
 #include "nvme.h"
 #include "libnvme.h"
 #include "plugin.h"
index df9df3fe10461e1dde511b443df09e8fa37a1dcb..ba0c3e42cfbb80f3091c123f9c00c8967deeec22 100644 (file)
@@ -7,6 +7,7 @@
 #include <linux/fs.h>
 #include <sys/stat.h>
 
+#include "common.h"
 #include "nvme.h"
 #include "libnvme.h"
 #include "nvme-print.h"