Subject: Re: CVS commit: src/sys
To: None <dsl@netbsd.org>
From: KIYOHARA Takashi <kiyohara@kk.iij4u.or.jp>
List: source-changes
Date: 12/24/2007 19:00:53
----Next_Part(Mon_Dec_24_19_00_53_2007_659)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Hi!, David,
From: David Laight <dsl@netbsd.org>
Date: Thu, 20 Dec 2007 23:03:15 +0000 (UTC)
> Module Name: src
> Committed By: dsl
> Date: Thu Dec 20 23:03:15 UTC 2007
>
> Modified Files:
.. snip ..
> src/sys/compat/mach/arch/powerpc/fasttraps: mach_fasttraps_cpu.c
> mach_fasttraps_thread.c
> Log Message:
> Convert all the system call entry points from:
> int foo(struct lwp *l, void *v, register_t *retval)
> to:
> int foo(struct lwp *l, const struct foo_args *uap, register_t *retval)
> Fixup compat code to not write into 'uap' and (in some cases) to actually
> pass a correctly formatted 'uap' structure with the right name to the
> next routine.
> A few 'compat' routines that just call standard ones have been deleted.
> All the 'compat' code compiles (along with the kernels required to test
> build it).
> 98% done by automated scripts.
macppc with COMPAT_MACH fails to build since this commit possibly.
depending the kern library objects
depending the compat library objects
making sure the compat library is up to date...
`libcompat.a' is up to date.
making sure the kern library is up to date...
`libkern.a' is up to date.
# compile HIEROPHANT/mach_fasttraps_thread.o
cc -mno-strict-align -msoft-float -Wa,-maltivec -ffreestanding -fno-zero-initialized-in-bss -O2 -Wreturn-type -Werror -Wall -Wno-main -Wno-format-zero-length -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -Wno-sign-compare -Wno-pointer-sign -Wno-attributes -fno-strict-aliasing -Dmacppc=macppc -I. -I../../../../../common/include -I../../../../arch -I../../../.. -nostdinc -DFORCE_FUNCTION_KEYS -DMAXUSERS=32 -D_KERNEL -D_KERNEL_OPT -I../../../../lib/libkern/../../../common/lib/libc/quad -I../../../../lib/libkern/../../../common/lib/libc/string -I../../../../lib/libkern/../../../common/lib/libc/arch/powerpc/string -c ../../../../compat/mach/arch/powerpc/fasttraps/mach_fasttraps_thread.c
../../../../compat/mach/arch/powerpc/fasttraps/mach_fasttraps_thread.c:57: error: conflicting types for 'mach_sys_cthread_set_self'
../../../../compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscallargs.h:43: error: previous declaration of 'mach_sys_cthread_set_self' was here
cc1: warnings being treated as errors
../../../../compat/mach/arch/powerpc/fasttraps/mach_fasttraps_thread.c: In function 'mach_sys_cthread_set_self':
../../../../compat/mach/arch/powerpc/fasttraps/mach_fasttraps_thread.c:59: warning: initialization discards qualifiers from pointer target type
*** Error code 1
Stop.
make: stopped in /sys/arch/macppc/compile/HIEROPHANT
Plaese fix. ;-)
Thanks,
--
kiyohara
----Next_Part(Mon_Dec_24_19_00_53_2007_659)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename=diff
Index: mach_fasttraps_thread.c
===================================================================
RCS file: /cvsroot/src/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_thread.c,v
retrieving revision 1.10
diff -u -r1.10 mach_fasttraps_thread.c
--- mach_fasttraps_thread.c 20 Dec 2007 23:03:00 -0000 1.10
+++ mach_fasttraps_thread.c 24 Dec 2007 09:46:53 -0000
@@ -53,14 +53,13 @@
#include <compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscallargs.h>
int
-mach_sys_cthread_set_self(struct lwp *l, const void *v, register_t *retval)
+mach_sys_cthread_set_self(struct lwp *l,
+ const struct mach_sys_cthread_set_self_args *v,
+ register_t *retval)
{
struct mach_emuldata *med;
- struct mach_sys_cthread_set_self_args /* {
- syscallarg(mach_cproc_t) p;
- } */ *uap = v;
- l->l_private = (void *)SCARG(uap, p);
+ l->l_private = (void *)SCARG(v, p);
med = l->l_proc->p_emuldata;
med->med_dirty_thid = 0;
----Next_Part(Mon_Dec_24_19_00_53_2007_659)----