Module Name: src Committed By: riz Date: Wed May 9 22:47:04 UTC 2012
Modified Files: src/sys/arch/powerpc/include [netbsd-6]: cpu.h Log Message: Pull up following revision(s) (requested by matt in ticket #242): sys/arch/powerpc/include/cpu.h: revision 1.91 Don't use global asm for __clang__ To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.89.2.1 src/sys/arch/powerpc/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/powerpc/include/cpu.h diff -u src/sys/arch/powerpc/include/cpu.h:1.89 src/sys/arch/powerpc/include/cpu.h:1.89.2.1 --- src/sys/arch/powerpc/include/cpu.h:1.89 Tue Dec 13 11:03:52 2011 +++ src/sys/arch/powerpc/include/cpu.h Wed May 9 22:47:03 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.89 2011/12/13 11:03:52 kiyohara Exp $ */ +/* $NetBSD: cpu.h,v 1.89.2.1 2012/05/09 22:47:03 riz Exp $ */ /* * Copyright (C) 1999 Wolfgang Solfrank. @@ -213,8 +213,12 @@ curcpu(void) return ci; } +#ifdef __clang__ +#define curlwp (curcpu()->ci_curlwp) +#else register struct lwp *powerpc_curlwp __asm("r13"); #define curlwp powerpc_curlwp +#endif #define curpcb (curcpu()->ci_curpcb) #define curpm (curcpu()->ci_curpm)