summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:56 -0700
commitd1b0164c4d2cfc6ed1fca9343e9458143bfcd89f (patch)
tree72e2f7220f9f71c076b4240f3bcf007ae467d121
parentMerge branch 'rs/parse-opt-lithelp' (diff)
parentsha1dc: update from upstream (diff)
downloadtgif-d1b0164c4d2cfc6ed1fca9343e9458143bfcd89f.tar.xz
Merge branch 'ab/sha1dc'
AIX portability update for the SHA1DC hash, imported from upstream. * ab/sha1dc: sha1dc: update from upstream
m---------sha1collisiondetection0
-rw-r--r--sha1dc/sha1.c12
2 files changed, 11 insertions, 1 deletions
diff --git a/sha1collisiondetection b/sha1collisiondetection
-Subproject 19d97bf5af05312267c2e874ee6bcf584d9e968
+Subproject 232357eb2ea0397388254a4b188333a227bf5b1
diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c
index 25eded1399..df0630bc6d 100644
--- a/sha1dc/sha1.c
+++ b/sha1dc/sha1.c
@@ -93,13 +93,23 @@
#define SHA1DC_BIGENDIAN
/* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> */
+#elif (defined(_AIX))
+
+/*
+ * Defines Big Endian on a whitelist of OSs that are known to be Big
+ * Endian-only. See
+ * https://public-inbox.org/git/93056823-2740-d072-1ebd-46b440b33d7e@felt.demon.nl/
+ */
+#define SHA1DC_BIGENDIAN
+
+/* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> or <os whitelist> */
#elif defined(SHA1DC_ON_INTEL_LIKE_PROCESSOR)
/*
* As a last resort before we do anything else we're not 100% sure
* about below, we blacklist specific processors here. We could add
* more, see e.g. https://wiki.debian.org/ArchitectureSpecificsMemo
*/
-#else /* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> or <processor blacklist> */
+#else /* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> or <os whitelist> or <processor blacklist> */
/* We do nothing more here for now */
/*#error "Uncomment this to see if you fall through all the detection"*/