Author: ed
Date: Tue Jan 3 19:41:36 2012
New Revision: 229413
URL: http://svn.freebsd.org/changeset/base/229413
Log:
Import compiler-rt r147467.
The compiler-rt shipped with FreeBSD is now based on unmodified upstream
sources.
Modified:
head/contrib/compiler-rt/LICENSE.TXT
head/contrib/compiler-rt/lib/trampoline_setup.c
Directory Properties:
head/contrib/compiler-rt/ (props changed)
Modified: head/contrib/compiler-rt/LICENSE.TXT
==============================================================================
--- head/contrib/compiler-rt/LICENSE.TXT Tue Jan 3 19:39:27 2012
(r229412)
+++ head/contrib/compiler-rt/LICENSE.TXT Tue Jan 3 19:41:36 2012
(r229413)
@@ -14,7 +14,7 @@ Full text of the relevant licenses is in
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
Modified: head/contrib/compiler-rt/lib/trampoline_setup.c
==============================================================================
--- head/contrib/compiler-rt/lib/trampoline_setup.c Tue Jan 3 19:39:27
2012 (r229412)
+++ head/contrib/compiler-rt/lib/trampoline_setup.c Tue Jan 3 19:41:36
2012 (r229413)
@@ -44,4 +44,4 @@ void __trampoline_setup(uint32_t* trampO
/* clear instruction cache */
__clear_cache(trampOnStack, &trampOnStack[10]);
}
-#endif /* __ppc__ */
+#endif /* __ppc__ && !defined(__powerpc64__) */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
