aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Schouten <ed@FreeBSD.org>2012-01-03 19:38:56 +0000
committerEd Schouten <ed@FreeBSD.org>2012-01-03 19:38:56 +0000
commit864a7b98b54e1f984c248f3be83dfcc082a382ea (patch)
treeaa0caac956e3db37007baf3e0e66b6dfe8630fd6
parent219fb0488994a289f1087f7b3da18789e068da12 (diff)
downloadsrc-864a7b98b54e1f984c248f3be83dfcc082a382ea.tar.gz
src-864a7b98b54e1f984c248f3be83dfcc082a382ea.zip
Import compiler-rt r147467.vendor/compiler-rt/compiler-rt-r147467
Notes
Notes: svn path=/vendor/compiler-rt/dist/; revision=229411 svn path=/vendor/compiler-rt/compiler-rt-r147467/; revision=229412; tag=vendor/compiler-rt/compiler-rt-r147467
-rw-r--r--LICENSE.TXT4
-rw-r--r--lib/clear_cache.c2
-rw-r--r--lib/trampoline_setup.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/LICENSE.TXT b/LICENSE.TXT
index 488baf5e3a4e..c41925e7340f 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -14,7 +14,7 @@ Full text of the relevant licenses is included below.
University of Illinois/NCSA
Open Source License
-Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT
+Copyright (c) 2009-2012 by the contributors listed in CREDITS.TXT
All rights reserved.
@@ -55,7 +55,7 @@ SOFTWARE.
==============================================================================
-Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT
+Copyright (c) 2009-2012 by the contributors listed in CREDITS.TXT
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/clear_cache.c b/lib/clear_cache.c
index fdd331633669..b934fd4bdf69 100644
--- a/lib/clear_cache.c
+++ b/lib/clear_cache.c
@@ -8,6 +8,8 @@
* ===----------------------------------------------------------------------===
*/
+#include "int_lib.h"
+
#if __APPLE__
#include <libkern/OSCacheControl.h>
#endif
diff --git a/lib/trampoline_setup.c b/lib/trampoline_setup.c
index 1b139767d46e..e0765b16b0b0 100644
--- a/lib/trampoline_setup.c
+++ b/lib/trampoline_setup.c
@@ -20,7 +20,7 @@ extern void __clear_cache(void* start, void* end);
* and then jumps to the target nested function.
*/
-#if __ppc__
+#if __ppc__ && !defined(__powerpc64__)
void __trampoline_setup(uint32_t* trampOnStack, int trampSizeAllocated,
const void* realFunc, void* localsPtr)
{
@@ -44,4 +44,4 @@ void __trampoline_setup(uint32_t* trampOnStack, int trampSizeAllocated,
/* clear instruction cache */
__clear_cache(trampOnStack, &trampOnStack[10]);
}
-#endif /* __ppc__ */
+#endif /* __ppc__ && !defined(__powerpc64__) */