diff --git a/README.md b/README.md index ad27513a..be138024 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,10 @@ armv7m, armv7em, armv8, arm64, arm64v8, i386, x86_64 and x86_64h. `Clang 3.2+ or gcc/g++/gcc-objc 4.5+`, `automake`, `autogen` and `libtool`. -On non-Mac OS X systems you also need to install: +Optional, but recommended: -`uuid-devel` and `openssl-devel`. - -Optional, but recommended deps: - -`llvm-devel` (Enables Link Time Optimization) +`llvm-devel` (For Link Time Optimization Support) +`uuid-devel` (For ld64 `-random_uuid` Support) ## INSTALLATION ## diff --git a/cctools/configure.ac b/cctools/configure.ac index 04e3d54d..768712b2 100644 --- a/cctools/configure.ac +++ b/cctools/configure.ac @@ -212,17 +212,6 @@ AM_PROG_AS([clang]) AC_CHECK_TOOL([HOST_RANLIB], [ranlib], :) AC_CHECK_TOOL([HOST_AR], [ar], :) -if test "x$isdarwin" != "xyes"; then - AC_CHECK_HEADERS([openssl/md5.h], [], [AC_MSG_ERROR([*** md5.h not found, please install ssl dev packages according to your system])]) - CRYPTO_LIB=-lcrypto - SSL_LIB=-lssl - AC_SUBST([CRYPTO_LIB]) - AC_SUBST([SSL_LIB]) -fi - -AC_CHECK_HEADERS([uuid/uuid.h], [], [AC_MSG_ERROR([*** uuid.h not found, please install uuid dev packages according to your system])]) - - #for libstuff emulated.c case $target_cpu in powerpc) @@ -273,14 +262,13 @@ AC_SUBST(DL_LIB) AC_CHECK_LIB([pthread],[pthread_create],[PTHREAD_FLAGS=-pthread]) AC_SUBST(PTHREAD_FLAGS) -if test "x$isdarwin" = "xno"; then - AC_CHECK_LIB([uuid],[uuid_generate_random],[UUID_LIB=-luuid],[exit 1]) - AC_SUBST(UUID_LIB) -fi - AC_CHECK_LIB([execinfo],[backtrace],[DL_LIB=-lexecinfo]) AC_SUBST(EXECINFO_LIB) +AC_CHECK_HEADERS([uuid/uuid.h], [ + AC_CHECK_LIB([uuid],[uuid_generate_random],[UUID_LIB=-luuid])], []) +AC_SUBST(UUID_LIB) + AC_CHECK_FUNCS([strmode]) ### Check for __cxa_demangle in various C++ ABI libs ### diff --git a/cctools/include/foreign/CommonCrypto/CommonDigest.h b/cctools/include/foreign/CommonCrypto/CommonDigest.h deleted file mode 100644 index 4845ce02..00000000 --- a/cctools/include/foreign/CommonCrypto/CommonDigest.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifdef __APPLE__ - -#include_next <CommonCrypto/CommonDigest.h> - -#else - -#include <openssl/md5.h> - -#define CC_MD5_DIGEST_LENGTH MD5_DIGEST_LENGTH -#define CC_MD5_Init MD5_Init -#define CC_MD5_Update MD5_Update -#define CC_MD5_Final MD5_Final -#define CC_MD5 MD5 -#define CC_MD5_Transform MD5_Transform -#define CC_MD5_CTX MD5_CTX - -#endif /* __APPLE__ */ diff --git a/cctools/ld64/src/3rd/Makefile.am b/cctools/ld64/src/3rd/Makefile.am index 63bdd771..3c7993f0 100644 --- a/cctools/ld64/src/3rd/Makefile.am +++ b/cctools/ld64/src/3rd/Makefile.am @@ -8,4 +8,5 @@ libhelper_la_SOURCES = \ qsort_r.c \ strlcat.c \ strlcpy.c \ - eprintf.c + eprintf.c \ + md5.c diff --git a/cctools/ld64/src/3rd/include/CommonCrypto/CommonDigest.h b/cctools/ld64/src/3rd/include/CommonCrypto/CommonDigest.h new file mode 100644 index 00000000..67050b43 --- /dev/null +++ b/cctools/ld64/src/3rd/include/CommonCrypto/CommonDigest.h @@ -0,0 +1,48 @@ +#ifdef __APPLE__ + +#include_next <CommonCrypto/CommonDigest.h> + +#else + +#include "md5.h" +#include "assert.h" + +#define CC_MD5_DIGEST_LENGTH 16 +#define CC_MD5_CTX md5_state_t + +static int CC_MD5_Init(CC_MD5_CTX *c) { + md5_init(c); + return 1; +} + +static int CC_MD5_Update(CC_MD5_CTX *c, const unsigned char *data, + unsigned long nbytes) { + assert(nbytes <= 0x7fffffff && "would overflow"); + md5_append(c, data, nbytes); + return 1; +} + +static int CC_MD5_Final(unsigned char digest[CC_MD5_DIGEST_LENGTH], + CC_MD5_CTX *c) { + md5_finish(c, digest); + return 1; +} + +static unsigned char *CC_MD5(const unsigned char *data, + unsigned long nbytes, unsigned char *md) { + static unsigned char smd[CC_MD5_DIGEST_LENGTH]; + + if (!md) + md = smd; + + assert(nbytes <= 0x7fffffff && "would overflow"); + + CC_MD5_CTX c; + CC_MD5_Init(&c); + CC_MD5_Update(&c, data, nbytes); + CC_MD5_Final(md, &c); + + return md; +} + +#endif /* __APPLE__ */ diff --git a/cctools/ld64/src/3rd/md5.c b/cctools/ld64/src/3rd/md5.c new file mode 100644 index 00000000..dcc9782a --- /dev/null +++ b/cctools/ld64/src/3rd/md5.c @@ -0,0 +1,396 @@ +/* + Copyright (C) 1999 Aladdin Enterprises. All rights reserved. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + L. Peter Deutsch + ghost@aladdin.com + + */ +/*$Id: md5.c,v 1.1.1.4 2002/12/23 18:59:38 jlovell Exp $ */ +/* + Independent implementation of MD5 (RFC 1321). + + This code implements the MD5 Algorithm defined in RFC 1321. + It is derived directly from the text of the RFC and not from the + reference implementation. + + The original and principal author of md5.c is L. Peter Deutsch + <ghost@aladdin.com>. Other authors are noted in the change history + that follows (in reverse chronological order): + + 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. + 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5). + 1999-05-03 lpd Original version. + */ + +#ifndef __APPLE__ + +#include "md5.h" +#include "string.h" + +#ifdef TEST +/* + * Compile with -DTEST to create a self-contained executable test program. + * The test program should print out the same values as given in section + * A.5 of RFC 1321, reproduced below. + */ +main() +{ + static const char *const test[7] = { + "", /*d41d8cd98f00b204e9800998ecf8427e*/ + "a", /*0cc175b9c0f1b6a831c399e269772661*/ + "abc", /*900150983cd24fb0d6963f7d28e17f72*/ + "message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/ + "abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/ + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", + /*d174ab98d277d9f5a5611c2c9f419d9f*/ + "12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/ + }; + int i; + + for (i = 0; i < 7; ++i) { + md5_state_t state; + md5_byte_t digest[16]; + int di; + + md5_init(&state); + md5_append(&state, (const md5_byte_t *)test[i], strlen(test[i])); + md5_finish(&state, digest); + printf("MD5 (\"%s\") = ", test[i]); + for (di = 0; di < 16; ++di) + printf("%02x", digest[di]); + printf("\n"); + } + return 0; +} +#endif /* TEST */ + + +/* + * For reference, here is the program that computed the T values. + */ +#if 0 +#include <math.h> +main() +{ + int i; + for (i = 1; i <= 64; ++i) { + unsigned long v = (unsigned long)(4294967296.0 * fabs(sin((double)i))); + printf("#define T%d 0x%08lx\n", i, v); + } + return 0; +} +#endif +/* + * End of T computation program. + */ +#define T1 0xd76aa478 +#define T2 0xe8c7b756 +#define T3 0x242070db +#define T4 0xc1bdceee +#define T5 0xf57c0faf +#define T6 0x4787c62a +#define T7 0xa8304613 +#define T8 0xfd469501 +#define T9 0x698098d8 +#define T10 0x8b44f7af +#define T11 0xffff5bb1 +#define T12 0x895cd7be +#define T13 0x6b901122 +#define T14 0xfd987193 +#define T15 0xa679438e +#define T16 0x49b40821 +#define T17 0xf61e2562 +#define T18 0xc040b340 +#define T19 0x265e5a51 +#define T20 0xe9b6c7aa +#define T21 0xd62f105d +#define T22 0x02441453 +#define T23 0xd8a1e681 +#define T24 0xe7d3fbc8 +#define T25 0x21e1cde6 +#define T26 0xc33707d6 +#define T27 0xf4d50d87 +#define T28 0x455a14ed +#define T29 0xa9e3e905 +#define T30 0xfcefa3f8 +#define T31 0x676f02d9 +#define T32 0x8d2a4c8a +#define T33 0xfffa3942 +#define T34 0x8771f681 +#define T35 0x6d9d6122 +#define T36 0xfde5380c +#define T37 0xa4beea44 +#define T38 0x4bdecfa9 +#define T39 0xf6bb4b60 +#define T40 0xbebfbc70 +#define T41 0x289b7ec6 +#define T42 0xeaa127fa +#define T43 0xd4ef3085 +#define T44 0x04881d05 +#define T45 0xd9d4d039 +#define T46 0xe6db99e5 +#define T47 0x1fa27cf8 +#define T48 0xc4ac5665 +#define T49 0xf4292244 +#define T50 0x432aff97 +#define T51 0xab9423a7 +#define T52 0xfc93a039 +#define T53 0x655b59c3 +#define T54 0x8f0ccc92 +#define T55 0xffeff47d +#define T56 0x85845dd1 +#define T57 0x6fa87e4f +#define T58 0xfe2ce6e0 +#define T59 0xa3014314 +#define T60 0x4e0811a1 +#define T61 0xf7537e82 +#define T62 0xbd3af235 +#define T63 0x2ad7d2bb +#define T64 0xeb86d391 + +static void +md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/) +{ + md5_word_t + a = pms->abcd[0], b = pms->abcd[1], + c = pms->abcd[2], d = pms->abcd[3]; + md5_word_t t; + +#ifndef ARCH_IS_BIG_ENDIAN +# define ARCH_IS_BIG_ENDIAN 1 /* slower, default implementation */ +#endif +#if ARCH_IS_BIG_ENDIAN + + /* + * On big-endian machines, we must arrange the bytes in the right + * order. (This also works on machines of unknown byte order.) + */ + md5_word_t X[16]; + const md5_byte_t *xp = data; + int i; + + for (i = 0; i < 16; ++i, xp += 4) + X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24); + +#else /* !ARCH_IS_BIG_ENDIAN */ + + /* + * On little-endian machines, we can process properly aligned data + * without copying it. + */ + md5_word_t xbuf[16]; + const md5_word_t *X; + + if (!((data - (const md5_byte_t *)0) & 3)) { + /* data are properly aligned */ + X = (const md5_word_t *)data; + } else { + /* not aligned */ + memcpy(xbuf, data, 64); + X = xbuf; + } +#endif + +#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n)))) + + /* Round 1. */ + /* Let [abcd k s i] denote the operation + a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */ +#define F(x, y, z) (((x) & (y)) | (~(x) & (z))) +#define SET(a, b, c, d, k, s, Ti)\ + t = a + F(b,c,d) + X[k] + Ti;\ + a = ROTATE_LEFT(t, s) + b + /* Do the following 16 operations. */ + SET(a, b, c, d, 0, 7, T1); + SET(d, a, b, c, 1, 12, T2); + SET(c, d, a, b, 2, 17, T3); + SET(b, c, d, a, 3, 22, T4); + SET(a, b, c, d, 4, 7, T5); + SET(d, a, b, c, 5, 12, T6); + SET(c, d, a, b, 6, 17, T7); + SET(b, c, d, a, 7, 22, T8); + SET(a, b, c, d, 8, 7, T9); + SET(d, a, b, c, 9, 12, T10); + SET(c, d, a, b, 10, 17, T11); + SET(b, c, d, a, 11, 22, T12); + SET(a, b, c, d, 12, 7, T13); + SET(d, a, b, c, 13, 12, T14); + SET(c, d, a, b, 14, 17, T15); + SET(b, c, d, a, 15, 22, T16); +#undef SET + + /* Round 2. */ + /* Let [abcd k s i] denote the operation + a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */ +#define G(x, y, z) (((x) & (z)) | ((y) & ~(z))) +#define SET(a, b, c, d, k, s, Ti)\ + t = a + G(b,c,d) + X[k] + Ti;\ + a = ROTATE_LEFT(t, s) + b + /* Do the following 16 operations. */ + SET(a, b, c, d, 1, 5, T17); + SET(d, a, b, c, 6, 9, T18); + SET(c, d, a, b, 11, 14, T19); + SET(b, c, d, a, 0, 20, T20); + SET(a, b, c, d, 5, 5, T21); + SET(d, a, b, c, 10, 9, T22); + SET(c, d, a, b, 15, 14, T23); + SET(b, c, d, a, 4, 20, T24); + SET(a, b, c, d, 9, 5, T25); + SET(d, a, b, c, 14, 9, T26); + SET(c, d, a, b, 3, 14, T27); + SET(b, c, d, a, 8, 20, T28); + SET(a, b, c, d, 13, 5, T29); + SET(d, a, b, c, 2, 9, T30); + SET(c, d, a, b, 7, 14, T31); + SET(b, c, d, a, 12, 20, T32); +#undef SET + + /* Round 3. */ + /* Let [abcd k s t] denote the operation + a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */ +#define H(x, y, z) ((x) ^ (y) ^ (z)) +#define SET(a, b, c, d, k, s, Ti)\ + t = a + H(b,c,d) + X[k] + Ti;\ + a = ROTATE_LEFT(t, s) + b + /* Do the following 16 operations. */ + SET(a, b, c, d, 5, 4, T33); + SET(d, a, b, c, 8, 11, T34); + SET(c, d, a, b, 11, 16, T35); + SET(b, c, d, a, 14, 23, T36); + SET(a, b, c, d, 1, 4, T37); + SET(d, a, b, c, 4, 11, T38); + SET(c, d, a, b, 7, 16, T39); + SET(b, c, d, a, 10, 23, T40); + SET(a, b, c, d, 13, 4, T41); + SET(d, a, b, c, 0, 11, T42); + SET(c, d, a, b, 3, 16, T43); + SET(b, c, d, a, 6, 23, T44); + SET(a, b, c, d, 9, 4, T45); + SET(d, a, b, c, 12, 11, T46); + SET(c, d, a, b, 15, 16, T47); + SET(b, c, d, a, 2, 23, T48); +#undef SET + + /* Round 4. */ + /* Let [abcd k s t] denote the operation + a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */ +#define I(x, y, z) ((y) ^ ((x) | ~(z))) +#define SET(a, b, c, d, k, s, Ti)\ + t = a + I(b,c,d) + X[k] + Ti;\ + a = ROTATE_LEFT(t, s) + b + /* Do the following 16 operations. */ + SET(a, b, c, d, 0, 6, T49); + SET(d, a, b, c, 7, 10, T50); + SET(c, d, a, b, 14, 15, T51); + SET(b, c, d, a, 5, 21, T52); + SET(a, b, c, d, 12, 6, T53); + SET(d, a, b, c, 3, 10, T54); + SET(c, d, a, b, 10, 15, T55); + SET(b, c, d, a, 1, 21, T56); + SET(a, b, c, d, 8, 6, T57); + SET(d, a, b, c, 15, 10, T58); + SET(c, d, a, b, 6, 15, T59); + SET(b, c, d, a, 13, 21, T60); + SET(a, b, c, d, 4, 6, T61); + SET(d, a, b, c, 11, 10, T62); + SET(c, d, a, b, 2, 15, T63); + SET(b, c, d, a, 9, 21, T64); +#undef SET + + /* Then perform the following additions. (That is increment each + of the four registers by the value it had before this block + was started.) */ + pms->abcd[0] += a; + pms->abcd[1] += b; + pms->abcd[2] += c; + pms->abcd[3] += d; +} + +void +md5_init(md5_state_t *pms) +{ + pms->count[0] = pms->count[1] = 0; + pms->abcd[0] = 0x67452301; + pms->abcd[1] = 0xefcdab89; + pms->abcd[2] = 0x98badcfe; + pms->abcd[3] = 0x10325476; +} + +void +md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes) +{ + const md5_byte_t *p = data; + int left = nbytes; + int offset = (pms->count[0] >> 3) & 63; + md5_word_t nbits = (md5_word_t)(nbytes << 3); + + if (nbytes <= 0) + return; + + /* Update the message length. */ + pms->count[1] += nbytes >> 29; + pms->count[0] += nbits; + if (pms->count[0] < nbits) + pms->count[1]++; + + /* Process an initial partial block. */ + if (offset) { + int copy = (offset + nbytes > 64 ? 64 - offset : nbytes); + + memcpy(pms->buf + offset, p, copy); + if (offset + copy < 64) + return; + p += copy; + left -= copy; + md5_process(pms, pms->buf); + } + + /* Process full blocks. */ + for (; left >= 64; p += 64, left -= 64) + md5_process(pms, p); + + /* Process a final partial block. */ + if (left) + memcpy(pms->buf, p, left); +} + +void +md5_finish(md5_state_t *pms, md5_byte_t digest[16]) +{ + static const md5_byte_t pad[64] = { + 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + md5_byte_t data[8]; + int i; + + /* Save the length before padding. */ + for (i = 0; i < 8; ++i) + data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3)); + /* Pad to 56 bytes mod 64. */ + md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1); + /* Append the length. */ + md5_append(pms, data, 8); + for (i = 0; i < 16; ++i) + digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3)); +} + +#endif /* ! __APPLE__ */ diff --git a/cctools/ld64/src/3rd/md5.h b/cctools/ld64/src/3rd/md5.h new file mode 100644 index 00000000..4e531dc0 --- /dev/null +++ b/cctools/ld64/src/3rd/md5.h @@ -0,0 +1,95 @@ +/* + Copyright (C) 1999 Aladdin Enterprises. All rights reserved. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + L. Peter Deutsch + ghost@aladdin.com + + */ +/*$Id: md5.h,v 1.1.1.4 2002/12/23 18:59:38 jlovell Exp $ */ +/* + Independent implementation of MD5 (RFC 1321). + + This code implements the MD5 Algorithm defined in RFC 1321. + It is derived directly from the text of the RFC and not from the + reference implementation. + + The original and principal author of md5.h is L. Peter Deutsch + <ghost@aladdin.com>. Other authors are noted in the change history + that follows (in reverse chronological order): + + 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. + 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5); + added conditionalization for C++ compilation from Martin + Purschke <purschke@bnl.gov>. + 1999-05-03 lpd Original version. + */ + +#ifndef md5_INCLUDED +# define md5_INCLUDED + +/* + * This code has some adaptations for the Ghostscript environment, but it + * will compile and run correctly in any environment with 8-bit chars and + * 32-bit ints. Specifically, it assumes that if the following are + * defined, they have the same meaning as in Ghostscript: P1, P2, P3, + * ARCH_IS_BIG_ENDIAN. + */ + +typedef unsigned char md5_byte_t; /* 8-bit byte */ +typedef unsigned int md5_word_t; /* 32-bit word */ + +/* Define the state of the MD5 Algorithm. */ +typedef struct md5_state_s { + md5_word_t count[2]; /* message length in bits, lsw first */ + md5_word_t abcd[4]; /* digest buffer */ + md5_byte_t buf[64]; /* accumulate block */ +} md5_state_t; + +#ifdef __cplusplus +extern "C" +{ +#endif + +/* Initialize the algorithm. */ +#ifdef P1 +void md5_init(P1(md5_state_t *pms)); +#else +void md5_init(md5_state_t *pms); +#endif + +/* Append a string to the message. */ +#ifdef P3 +void md5_append(P3(md5_state_t *pms, const md5_byte_t *data, int nbytes)); +#else +void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes); +#endif + +/* Finish the message and return the digest. */ +#ifdef P2 +void md5_finish(P2(md5_state_t *pms, md5_byte_t digest[16])); +#else +void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); +#endif + +#ifdef __cplusplus +} /* end extern "C" */ +#endif + +#endif /* md5_INCLUDED */ + diff --git a/cctools/ld64/src/ld/Makefile.am b/cctools/ld64/src/ld/Makefile.am index a600d906..5803c914 100644 --- a/cctools/ld64/src/ld/Makefile.am +++ b/cctools/ld64/src/ld/Makefile.am @@ -7,11 +7,10 @@ ld_LDADD = \ $(top_srcdir)/ld64/src/ld/parsers/libParsers.la \ $(top_srcdir)/ld64/src/ld/passes/libPasses.la \ $(DL_LIB) \ - $(CRYPTO_LIB) \ $(UUID_LIB) \ $(LTO_LIB) -ld_LDFLAGS = $(PTHREAD_FLAGS) $(SSL_LIB) $(EXECINFO_LIB) +ld_LDFLAGS = $(PTHREAD_FLAGS) $(EXECINFO_LIB) ld_CXXFLAGS = \ -D__DARWIN_UNIX03 \ @@ -24,6 +23,7 @@ ld_CXXFLAGS = \ -I$(top_srcdir)/ld64/src/abstraction \ -I$(top_srcdir)/ld64/src/3rd \ -I$(top_srcdir)/ld64/src/3rd/BlocksRuntime \ + -I$(top_srcdir)/ld64/src/3rd/include \ -I$(top_srcdir)/ld64/src/ld \ -I$(top_srcdir)/ld64/src/ld/parsers \ -I$(top_srcdir)/ld64/src/ld/passes \ @@ -39,7 +39,7 @@ ld_CFLAGS = \ -I$(top_srcdir)/ld64/src \ -I$(top_srcdir)/ld64/src/abstraction \ -I$(top_srcdir)/ld64/src/3rd \ - -I$(top_srcdir)/ld64/src/3rd/BlocksRuntime \ + -I$(top_srcdir)/ld64/src/3rd/BlocksRuntime \ -I$(top_srcdir)/ld64/src/ld \ -I$(top_srcdir)/ld64/src/ld/parsers \ -I$(top_srcdir)/ld64/src/ld/passes \ diff --git a/cctools/ld64/src/ld/OutputFile.cpp b/cctools/ld64/src/ld/OutputFile.cpp index 6ef148db..12bb19d4 100644 --- a/cctools/ld64/src/ld/OutputFile.cpp +++ b/cctools/ld64/src/ld/OutputFile.cpp @@ -38,7 +38,9 @@ #include <mach/vm_statistics.h> #include <mach/mach_init.h> #include <mach/mach_host.h> +#ifdef HAVE_UUID_UUID_H // ld64-port #include <uuid/uuid.h> +#endif #include <dlfcn.h> #include <mach-o/dyld.h> #include <mach-o/fat.h> @@ -2769,9 +2771,13 @@ void OutputFile::writeOutputFile(ld::Internal& state) } if ( _options.UUIDMode() == Options::kUUIDRandom ) { +#ifdef HAVE_UUID_UUID_H // ld64-port uint8_t bits[16]; ::uuid_generate_random(bits); _headersAndLoadCommandAtom->setUUID(bits); +#else + throwf("random uuid support via libuuid not compiled in"); +#endif } writeAtoms(state, wholeBuffer);