diff options
| author | ed <ed@FreeBSD.org> | 2012-01-03 19:41:36 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2012-01-03 19:41:36 +0000 |
| commit | 32180701de4dc720dfc0f25587a6c03c55c06cce (patch) | |
| tree | 5172e845c23d19918e387750b9fc6d46718c1234 /contrib/compiler-rt | |
| parent | cd6e02c9d4f0e31d95ecad94aa0c0e092e40710d (diff) | |
| download | FreeBSD-src-32180701de4dc720dfc0f25587a6c03c55c06cce.zip FreeBSD-src-32180701de4dc720dfc0f25587a6c03c55c06cce.tar.gz | |
Import compiler-rt r147467.
The compiler-rt shipped with FreeBSD is now based on unmodified upstream
sources.
Diffstat (limited to 'contrib/compiler-rt')
| -rw-r--r-- | contrib/compiler-rt/LICENSE.TXT | 4 | ||||
| -rw-r--r-- | contrib/compiler-rt/lib/trampoline_setup.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/compiler-rt/LICENSE.TXT b/contrib/compiler-rt/LICENSE.TXT index 488baf5..c41925e 100644 --- a/contrib/compiler-rt/LICENSE.TXT +++ b/contrib/compiler-rt/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/contrib/compiler-rt/lib/trampoline_setup.c b/contrib/compiler-rt/lib/trampoline_setup.c index 2a22655..e0765b1 100644 --- a/contrib/compiler-rt/lib/trampoline_setup.c +++ b/contrib/compiler-rt/lib/trampoline_setup.c @@ -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__) */ |
