summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2017-07-05 09:13:09 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2017-07-05 09:13:09 +0100
commit7040660528f597c12f8bc49ca87f3697ab3d3653 (patch)
treeeab8f5e155dbe389bfc43d577dee38970474dded
parent9492703a5862ee8623455209e50344cf8c4de077 (diff)
downloadhaskell-7040660528f597c12f8bc49ca87f3697ab3d3653.tar.gz
Revert "rts/sm/Storage.c: tweak __clear_cache proto for clang"
This reverts commit 9492703a5862ee8623455209e50344cf8c4de077. Incomplete patch (missing begin, end assignments).
-rw-r--r--rts/sm/Storage.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c
index f518856842..e2435173c1 100644
--- a/rts/sm/Storage.c
+++ b/rts/sm/Storage.c
@@ -1341,13 +1341,7 @@ StgWord calcTotalCompactW (void)
#include <libkern/OSCacheControl.h>
#endif
-#if defined(__CLANG__)
-/* clang defines __clear_cache as a builtin on some platforms.
- * For example on armv7-linux-androideabi. The type slightly
- * differs from gcc.
- */
-extern void __clear_cache(void * begin, void * end);
-#elif defined(__GNUC__)
+#if defined(__GNUC__)
/* __clear_cache is a libgcc function.
* It existed before __builtin___clear_cache was introduced.
* See Trac #8562.
@@ -1366,16 +1360,11 @@ void flushExec (W_ len, AdjustorExecutable exec_addr)
#elif (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS)
/* On iOS we need to use the special 'sys_icache_invalidate' call. */
sys_icache_invalidate(exec_addr, len);
-#elif defined(__CLANG__)
-# if __has_builtin(__builtin___clear_cache)
- __builtin___clear_cache((void*)begin, (void*)end);
-# else
- __clear_cache((void*)begin, (void*)end);
-# endif
#elif defined(__GNUC__)
/* For all other platforms, fall back to a libgcc builtin. */
unsigned char* begin = (unsigned char*)exec_addr;
unsigned char* end = begin + len;
+
/* __builtin___clear_cache is supported since GNU C 4.3.6.
* We pick 4.4 to simplify condition a bit.
*/