[llvm-commits] [compiler-rt] r153779 - in /compiler-rt/trunk: SDKs/darwin/usr/include/string.h SDKs/linux/usr/include/string.h lib/atomic.c

[Benjamin Kramer]

Author: d0k
Date: Fri Mar 30 16:37:08 2012
New Revision: 153779

URL: http://llvm.org/viewvc/llvm-project?rev=153779&view=rev
Log:
Fix the build on 32 bit hosts.

- Add memcpy and memcmp to the stub headers.
- __uint128_t is not available on 32 bit platforms. It's also unused so just
  comment it out for now.

Modified:
    compiler-rt/trunk/SDKs/darwin/usr/include/string.h
    compiler-rt/trunk/SDKs/linux/usr/include/string.h
    compiler-rt/trunk/lib/atomic.c

Modified: compiler-rt/trunk/SDKs/darwin/usr/include/string.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/SDKs/darwin/usr/include/string.h?rev=153779&r1=153778&r2=153779&view=diff
==============================================================================
--- compiler-rt/trunk/SDKs/darwin/usr/include/string.h (original)
+++ compiler-rt/trunk/SDKs/darwin/usr/include/string.h Fri Mar 30 16:37:08 2012
@@ -19,6 +19,8 @@
 
 typedef __SIZE_TYPE__ size_t;
 
+int memcmp(const void *, const void *, size_t);
+void *memcpy(void *, const void *, size_t);
 char *strcat(char *, const char *);
 char *strcpy(char *, const char *);
 char *strdup(const char *);

Modified: compiler-rt/trunk/SDKs/linux/usr/include/string.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/SDKs/linux/usr/include/string.h?rev=153779&r1=153778&r2=153779&view=diff
==============================================================================
--- compiler-rt/trunk/SDKs/linux/usr/include/string.h (original)
+++ compiler-rt/trunk/SDKs/linux/usr/include/string.h Fri Mar 30 16:37:08 2012
@@ -19,6 +19,8 @@
 
 typedef __SIZE_TYPE__ size_t;
 
+int memcmp(const void *, const void *, size_t);
+void *memcpy(void *, const void *, size_t);
 char *strcat(char *, const char *);
 char *strcpy(char *, const char *);
 char *strdup(const char *);

Modified: compiler-rt/trunk/lib/atomic.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/atomic.c?rev=153779&r1=153778&r2=153779&view=diff
==============================================================================
--- compiler-rt/trunk/lib/atomic.c (original)
+++ compiler-rt/trunk/lib/atomic.c Fri Mar 30 16:37:08 2012
@@ -134,7 +134,8 @@
       }\
     case 16:\
       if (IS_LOCK_FREE_16) {\
-        LOCK_FREE_ACTION(__uint128_t);\
+        /* FIXME: __uint128_t isn't available on 32 bit platforms.
+        LOCK_FREE_ACTION(__uint128_t);*/\
       }\
   }\
   } while (0)
@@ -217,7 +218,8 @@
   OPTIMISED_CASE(2, IS_LOCK_FREE_2, uint16_t)\
   OPTIMISED_CASE(4, IS_LOCK_FREE_4, uint32_t)\
   OPTIMISED_CASE(8, IS_LOCK_FREE_8, uint64_t)\
-  OPTIMISED_CASE(16, IS_LOCK_FREE_16, __uint128_t)\
+  /* FIXME: __uint128_t isn't available on 32 bit platforms.
+  OPTIMISED_CASE(16, IS_LOCK_FREE_16, __uint128_t)*/\
 
 #define OPTIMISED_CASE(n, lockfree, type)\
 type __atomic_load_##n(type *src, int model) {\