From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11966 invoked by alias); 27 Jan 2013 23:42:57 -0000 Received: (qmail 11949 invoked by uid 22791); 27 Jan 2013 23:42:56 -0000 X-SWARE-Spam-Status: No, hits=0.1 required=5.0 tests=AWL,BAYES_50,KAM_STOCKTIP,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,TW_TR X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 27 Jan 2013 23:42:46 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1Tzbs5-0002om-FH from joseph_myers@mentor.com ; Sun, 27 Jan 2013 15:42:45 -0800 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Sun, 27 Jan 2013 15:42:45 -0800 Received: from digraph.polyomino.org.uk (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.1.289.1; Sun, 27 Jan 2013 23:42:43 +0000 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.76) (envelope-from ) id 1Tzbs2-0003X3-DJ; Sun, 27 Jan 2013 23:42:42 +0000 Date: Sun, 27 Jan 2013 23:42:00 -0000 From: "Joseph S. Myers" To: CC: Subject: Remove bp-semctl.h and CHECK_SEMCTL Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2013-01/txt/msg00064.txt.bz2 Continuing the removal of the bitrotten bounded-pointers code, this patch removes bp-semctl.h and CHECK_SEMCTL. Tested x86_64 (in a tree with (pending review) applied, but the two patches should in fact be independent). 2013-01-27 Joseph Myers [BZ #13550] * sysdeps/generic/bp-semctl.h: Remove file. * sysdeps/unix/sysv/linux/i386/semctl.c: Don't include and . (__old_semctl): Don't use CHECK_SEMCTL. (__new_semctl): Likewise. * sysdeps/unix/sysv/linux/semctl.c: Don't include and . (__old_semctl): Don't use CHECK_SEMCTL. (__new_semctl): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c: Don't include and . (__old_semctl): Don't use CHECK_SEMCTL. (__new_semctl): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c: Don't include and . (semctl): Don't use CHECK_SEMCTL. ports/ChangeLog.alpha: 2013-01-27 Joseph Myers [BZ #13550] * sysdeps/unix/sysv/linux/alpha/semctl.c: Don't include and . (__new_semctl): Don't use CHECK_SEMCTL. ports/ChangeLog.mips: 2013-01-27 Joseph Myers [BZ #13550] * sysdeps/unix/sysv/linux/mips/mips64/semctl.c: Don't include and . (__semctl): Don't use CHECK_SEMCTL. diff --git a/ports/sysdeps/unix/sysv/linux/alpha/semctl.c b/ports/sysdeps/unix/sysv/linux/alpha/semctl.c index c18c695..31278a0 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/semctl.c +++ b/ports/sysdeps/unix/sysv/linux/alpha/semctl.c @@ -33,10 +33,6 @@ union semun struct seminfo *__buf; /* buffer for IPC_INFO */ }; -#include -#include - - int __new_semctl (int semid, int semnum, int cmd, ...) { @@ -51,7 +47,7 @@ __new_semctl (int semid, int semnum, int cmd, ...) va_end (ap); return INLINE_SYSCALL (semctl, 4, semid, semnum, cmd | __IPC_64, - CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)->array); + arg.array); } #include diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/semctl.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/semctl.c index 7e5488d..e43e893 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips64/semctl.c +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/semctl.c @@ -30,9 +30,6 @@ union semun struct seminfo *__buf; /* buffer for IPC_INFO */ }; -#include -#include /* definition of CHECK_SEMCTL needs union semum */ - int __semctl (int semid, int semnum, int cmd, ...); int @@ -49,7 +46,7 @@ __semctl (int semid, int semnum, int cmd, ...) va_end (ap); return INLINE_SYSCALL (semctl, 4, semid, semnum, cmd | __IPC_64, - CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)->array); + arg.array); } #include diff --git a/sysdeps/generic/bp-semctl.h b/sysdeps/generic/bp-semctl.h deleted file mode 100644 index 1f3ab92..0000000 --- a/sysdeps/generic/bp-semctl.h +++ /dev/null @@ -1,66 +0,0 @@ -/* Bounded-pointer checking macros for C. - Copyright (C) 2000-2013 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Greg McGary - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _bp_semctl_h_ -#define _bp_semctl_h_ 1 - -#if __BOUNDED_POINTERS__ - -# define CHECK_SEMCTL(ARGP, SEMID, CMD) check_semctl (ARGP, SEMID, CMD) - -union semun *__unbounded -check_semctl (union semun *arg, int semid, int cmd) -{ - int ipc64 = (cmd & __IPC_64); - - switch (cmd & ~__IPC_64) - { - case IPC_STAT: - case IPC_SET: - (void) CHECK_1 (arg->buf); - break; - - case GETALL: - case SETALL: - { - struct semid_ds ds; - union semun un = { .buf = &ds }; - unsigned int length = ~0; - - /* It's unfortunate that we need to make a recursive - system call to get the size of the semaphore set... */ - if (semctl (semid, 0, IPC_STAT | ipc64, un) == 0) - length = ds.sem_nsems; - (void) CHECK_N (arg->array, length); - break; - } - - case IPC_INFO: - (void) CHECK_1 (arg->__buf); - break; - } - - return __ptrvalue (arg); -} - -#else -# define CHECK_SEMCTL(ARGP, SEMID, CMD) (ARGP) -#endif - -#endif /* _bp_semctl_h_ */ diff --git a/sysdeps/unix/sysv/linux/i386/semctl.c b/sysdeps/unix/sysv/linux/i386/semctl.c index f3299ea..67e75a1 100644 --- a/sysdeps/unix/sysv/linux/i386/semctl.c +++ b/sysdeps/unix/sysv/linux/i386/semctl.c @@ -49,9 +49,6 @@ union semun struct __old_semid_ds *__old_buf; }; -#include -#include /* definition of CHECK_SEMCTL needs union semum */ - /* Return identifier for array of NSEMS semaphores associated with KEY. */ #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) @@ -75,7 +72,7 @@ __old_semctl (int semid, int semnum, int cmd, ...) va_end (ap); return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, - CHECK_SEMCTL (&arg, semid, cmd)); + &arg); } compat_symbol (libc, __old_semctl, semctl, GLIBC_2_0); #endif @@ -94,7 +91,7 @@ __new_semctl (int semid, int semnum, int cmd, ...) va_end (ap); return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64, - CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)); + &arg); } versioned_symbol (libc, __new_semctl, semctl, GLIBC_2_2); diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c index 40d31f9..6c5c51e 100644 --- a/sysdeps/unix/sysv/linux/semctl.c +++ b/sysdeps/unix/sysv/linux/semctl.c @@ -50,9 +50,6 @@ union semun struct __old_semid_ds *__old_buf; }; -#include -#include /* definition of CHECK_SEMCTL needs union semum */ - /* Return identifier for array of NSEMS semaphores associated with KEY. */ #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) @@ -91,7 +88,7 @@ __old_semctl (int semid, int semnum, int cmd, ...) va_end (ap); return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, - CHECK_SEMCTL (&arg, semid, cmd)); + &arg); } compat_symbol (libc, __old_semctl, semctl, GLIBC_2_0); #endif @@ -126,7 +123,7 @@ __new_semctl (int semid, int semnum, int cmd, ...) #if __ASSUME_IPC64 > 0 return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64, - CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)); + &arg); #else switch (cmd) { @@ -136,7 +133,7 @@ __new_semctl (int semid, int semnum, int cmd, ...) break; default: return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, - CHECK_SEMCTL (&arg, semid, cmd)); + &arg); } { @@ -147,7 +144,7 @@ __new_semctl (int semid, int semnum, int cmd, ...) /* Unfortunately there is no way how to find out for sure whether we should use old or new semctl. */ result = INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64, - CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)); + &arg); if (result != -1 || errno != EINVAL) return result; @@ -167,7 +164,7 @@ __new_semctl (int semid, int semnum, int cmd, ...) } } result = INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, - CHECK_SEMCTL (&arg, semid, cmd)); + &arg); if (result != -1 && cmd != IPC_SET) { memset(buf, 0, sizeof(*buf)); diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c b/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c index ef93f8c..1a4bbac 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c @@ -50,9 +50,6 @@ union semun struct __old_semid_ds *__old_buf; }; -#include -#include /* definition of CHECK_SEMCTL needs union semum */ - /* Return identifier for array of NSEMS semaphores associated with KEY. */ #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) @@ -87,7 +84,7 @@ __old_semctl (int semid, int semnum, int cmd, ...) } return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, - CHECK_SEMCTL (&arg, semid, cmd)); + &arg); } compat_symbol (libc, __old_semctl, semctl, GLIBC_2_0); #endif @@ -117,7 +114,7 @@ __new_semctl (int semid, int semnum, int cmd, ...) } return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64, - CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)); + &arg); } versioned_symbol (libc, __new_semctl, semctl, GLIBC_2_2); diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c b/sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c index 4303d10..9ada8e8 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c @@ -33,9 +33,6 @@ union semun struct seminfo *__buf; /* buffer for IPC_INFO */ }; -#include -#include /* definition of CHECK_SEMCTL needs union semum */ - /* Return identifier for array of NSEMS semaphores associated with KEY. */ @@ -53,5 +50,5 @@ semctl (int semid, int semnum, int cmd, ...) va_end (ap); return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, - CHECK_SEMCTL (&arg, semid, cmd)->array); + arg.array); } -- Joseph S. Myers joseph@codesourcery.com