Date: Fri, 25 May 2012 17:56:27 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r236018 - in stable/9/contrib/compiler-rt: . lib Message-ID: <201205251756.q4PHuRYX025222@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Fri May 25 17:56:27 2012 New Revision: 236018 URL: http://svn.freebsd.org/changeset/base/236018 Log: MFC: r229413 Import compiler-rt r147467. Modified: stable/9/contrib/compiler-rt/LICENSE.TXT stable/9/contrib/compiler-rt/lib/trampoline_setup.c Directory Properties: stable/9/contrib/compiler-rt/ (props changed) Modified: stable/9/contrib/compiler-rt/LICENSE.TXT ============================================================================== --- stable/9/contrib/compiler-rt/LICENSE.TXT Fri May 25 17:53:57 2012 (r236017) +++ stable/9/contrib/compiler-rt/LICENSE.TXT Fri May 25 17:56:27 2012 (r236018) @@ -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: stable/9/contrib/compiler-rt/lib/trampoline_setup.c ============================================================================== --- stable/9/contrib/compiler-rt/lib/trampoline_setup.c Fri May 25 17:53:57 2012 (r236017) +++ stable/9/contrib/compiler-rt/lib/trampoline_setup.c Fri May 25 17:56:27 2012 (r236018) @@ -44,4 +44,4 @@ void __trampoline_setup(uint32_t* trampO /* clear instruction cache */ __clear_cache(trampOnStack, &trampOnStack[10]); } -#endif /* __ppc__ */ +#endif /* __ppc__ && !defined(__powerpc64__) */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205251756.q4PHuRYX025222>