From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7479 invoked by alias); 21 May 2003 19:04:27 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 7451 invoked from network); 21 May 2003 19:04:26 -0000 Received: from unknown (HELO localhost.localdomain) (195.113.19.66) by sources.redhat.com with SMTP; 21 May 2003 19:04:26 -0000 Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by localhost.localdomain (8.12.8/8.12.8) with ESMTP id h4LJ4NqO010250; Wed, 21 May 2003 21:04:23 +0200 Received: (from jakub@localhost) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id h4LJ4NZH010246; Wed, 21 May 2003 21:04:23 +0200 Date: Wed, 21 May 2003 19:04:00 -0000 From: Jakub Jelinek To: Ulrich Drepper , Roland McGrath Cc: Glibc hackers Subject: [PATCH] Fix ppc32+ppc64 INTERNAL_SYSCALL/INLINE_SYSCALL Message-ID: <20030521190423.GH16629@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek References: <20030521153053.GF16629@sunsite.ms.mff.cuni.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030521153053.GF16629@sunsite.ms.mff.cuni.cz> User-Agent: Mutt/1.4i X-SW-Source: 2003-05/txt/msg00029.txt.bz2 On Wed, May 21, 2003 at 05:30:53PM +0200, Jakub Jelinek wrote: > Hi! > > ppc32/NPTL doesn't build ATM since nptl/unwind.c (unwind_cleanup) > uses INTERNAL_SYSCALL with string literal. Instead of adding (const char *) > forever to such uses, I think it is better to change ppc sysdep.h. > If an argument is a pointer type, no matter what sizeof tells it fits > into a single word register. Oops, ppc64 needs the same change. 2003-05-21 Jakub Jelinek * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h (LOADARGS_0, LOADARGS_1, LOADARGS_2, LOADARGS_3, LOADARGS_4, LOADARGS_5, LOADARGS_6): Don't error if syscall argument is a string literal. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h (LOADARGS_0, LOADARGS_1, LOADARGS_2, LOADARGS_3, LOADARGS_4, LOADARGS_5, LOADARGS_6): Likewise. --- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h.jj 2003-01-12 14:38:14.000000000 -0500 +++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h 2003-05-21 09:22:43.000000000 -0400 @@ -117,32 +117,38 @@ # define LOADARGS_1(name, arg1) \ LOADARGS_0(name, 0); \ extern void __illegally_sized_syscall_##name##_arg1 (void); \ - if (sizeof (arg1) > 4) __illegally_sized_syscall_##name##_arg1 (); \ + if (__builtin_classify_type (arg1) != 5 && sizeof (arg1) > 4) \ + __illegally_sized_syscall_##name##_arg1 (); \ r3 = (long) (arg1) # define LOADARGS_2(name, arg1, arg2) \ LOADARGS_1(name, arg1); \ extern void __illegally_sized_syscall_##name##_arg2 (void); \ - if (sizeof (arg2) > 4) __illegally_sized_syscall_##name##_arg2 (); \ + if (__builtin_classify_type (arg2) != 5 && sizeof (arg2) > 4) \ + __illegally_sized_syscall_##name##_arg2 (); \ r4 = (long) (arg2) # define LOADARGS_3(name, arg1, arg2, arg3) \ LOADARGS_2(name, arg1, arg2); \ extern void __illegally_sized_syscall_##name##_arg3 (void); \ - if (sizeof (arg3) > 4) __illegally_sized_syscall_##name##_arg3 (); \ + if (__builtin_classify_type (arg3) != 5 && sizeof (arg3) > 4) \ + __illegally_sized_syscall_##name##_arg3 (); \ r5 = (long) (arg3) # define LOADARGS_4(name, arg1, arg2, arg3, arg4) \ LOADARGS_3(name, arg1, arg2, arg3); \ extern void __illegally_sized_syscall_##name##_arg4 (void); \ - if (sizeof (arg4) > 4) __illegally_sized_syscall_##name##_arg4 (); \ + if (__builtin_classify_type (arg4) != 5 && sizeof (arg4) > 4) \ + __illegally_sized_syscall_##name##_arg4 (); \ r6 = (long) (arg4) # define LOADARGS_5(name, arg1, arg2, arg3, arg4, arg5) \ LOADARGS_4(name, arg1, arg2, arg3, arg4); \ extern void __illegally_sized_syscall_##name##_arg5 (void); \ - if (sizeof (arg5) > 4) __illegally_sized_syscall_##name##_arg5 (); \ + if (__builtin_classify_type (arg5) != 5 && sizeof (arg5) > 4) \ + __illegally_sized_syscall_##name##_arg5 (); \ r7 = (long) (arg5) # define LOADARGS_6(name, arg1, arg2, arg3, arg4, arg5, arg6) \ LOADARGS_5(name, arg1, arg2, arg3, arg4, arg5); \ extern void __illegally_sized_syscall_##name##_arg6 (void); \ - if (sizeof (arg6) > 4) __illegally_sized_syscall_##name##_arg6 (); \ + if (__builtin_classify_type (arg6) != 5 && sizeof (arg6) > 4) \ + __illegally_sized_syscall_##name##_arg6 (); \ r8 = (long) (arg6) # define ASM_INPUT_0 "0" (r0) --- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h.jj 2003-01-28 22:15:58.000000000 -0500 +++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h 2003-05-21 13:51:35.000000000 -0400 @@ -130,32 +130,38 @@ #define LOADARGS_1(name, arg1) \ LOADARGS_0(name, 0); \ extern void __illegally_sized_syscall_##name##_arg1 (void); \ - if (sizeof (arg1) > 8) __illegally_sized_syscall_##name##_arg1 (); \ + if (__builtin_classify_type (arg1) != 5 && sizeof (arg1) > 8) \ + __illegally_sized_syscall_##name##_arg1 (); \ r3 = (long) (arg1) #define LOADARGS_2(name, arg1, arg2) \ LOADARGS_1(name, arg1); \ extern void __illegally_sized_syscall_##name##_arg2 (void); \ - if (sizeof (arg2) > 8) __illegally_sized_syscall_##name##_arg2 (); \ + if (__builtin_classify_type (arg2) != 5 && sizeof (arg2) > 8) \ + __illegally_sized_syscall_##name##_arg2 (); \ r4 = (long) (arg2) #define LOADARGS_3(name, arg1, arg2, arg3) \ LOADARGS_2(name, arg1, arg2); \ extern void __illegally_sized_syscall_##name##_arg3 (void); \ - if (sizeof (arg3) > 8) __illegally_sized_syscall_##name##_arg3 (); \ + if (__builtin_classify_type (arg3) != 5 && sizeof (arg3) > 8) \ + __illegally_sized_syscall_##name##_arg3 (); \ r5 = (long) (arg3) #define LOADARGS_4(name, arg1, arg2, arg3, arg4) \ LOADARGS_3(name, arg1, arg2, arg3); \ extern void __illegally_sized_syscall_##name##_arg4 (void); \ - if (sizeof (arg4) > 8) __illegally_sized_syscall_##name##_arg4 (); \ + if (__builtin_classify_type (arg4) != 5 && sizeof (arg4) > 8) \ + __illegally_sized_syscall_##name##_arg4 (); \ r6 = (long) (arg4) #define LOADARGS_5(name, arg1, arg2, arg3, arg4, arg5) \ LOADARGS_4(name, arg1, arg2, arg3, arg4); \ extern void __illegally_sized_syscall_##name##_arg5 (void); \ - if (sizeof (arg5) > 8) __illegally_sized_syscall_##name##_arg5 (); \ + if (__builtin_classify_type (arg5) != 5 && sizeof (arg5) > 8) \ + __illegally_sized_syscall_##name##_arg5 (); \ r7 = (long) (arg5) #define LOADARGS_6(name, arg1, arg2, arg3, arg4, arg5, arg6) \ LOADARGS_5(name, arg1, arg2, arg3, arg4, arg5); \ extern void __illegally_sized_syscall_##name##_arg6 (void); \ - if (sizeof (arg6) > 8) __illegally_sized_syscall_##name##_arg6 (); \ + if (__builtin_classify_type (arg6) != 5 && sizeof (arg6) > 8) \ + __illegally_sized_syscall_##name##_arg6 (); \ r8 = (long) (arg6) #define ASM_INPUT_0 "0" (r0) Jakub