diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | include/sys/sendfile.h | 1 | ||||
| -rw-r--r-- | nptl/ChangeLog | 8 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread.h | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h | 4 | ||||
| -rwxr-xr-x | scripts/check-local-headers.sh | 38 | ||||
| -rw-r--r-- | time/sys/time.h | 2 |
7 files changed, 56 insertions, 6 deletions
diff --git a/Makefile b/Makefile index f2d0b1bed0..3a20a7fc22 100644 --- a/Makefile +++ b/Makefile @@ -235,7 +235,7 @@ mostlyclean: parent-mostlyclean tests-clean: @$(MAKE) subdir_testclean no_deps=t -tests: $(objpfx)c++-types-check.out +tests: $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out ifneq ($(CXX),no) check-data := $(firstword $(wildcard \ $(foreach M,$(config-machine) $(base-machine),\ @@ -250,6 +250,9 @@ $(objpfx)c++-types-check.out: endif endif +$(objpfx)check-local-headers.out: scripts/check-local-headers.sh + scripts/check-local-headers.sh "$(includedir)" "$(objpfx)" > $@ + ifneq ($(PERL),no) installed-headers = argp/argp.h assert/assert.h catgets/nl_types.h \ crypt/crypt.h ctype/ctype.h debug/execinfo.h \ diff --git a/include/sys/sendfile.h b/include/sys/sendfile.h new file mode 100644 index 0000000000..abe09769cc --- /dev/null +++ b/include/sys/sendfile.h @@ -0,0 +1 @@ +#include <io/sys/sendfile.h> diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 2b76775bcc..c61769a2d3 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,11 @@ +005-11-24 Jakub Jelinek <jakub@redhat.com> + + [BZ #1920] + * sysdeps/pthread/pthread.h (__pthread_unwind_next): Use + __attribute__ instead of __attribute. + * sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h + (__cleanup_fct_attribute): Likewise. + 2005-11-17 Jakub Jelinek <jakub@redhat.com> * sysdeps/pthread/unwind-forcedunwind.c (pthread_cancel_init): Put diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index 92e66f7c72..badadae169 100644 --- a/nptl/sysdeps/pthread/pthread.h +++ b/nptl/sysdeps/pthread/pthread.h @@ -657,9 +657,9 @@ extern void __pthread_unregister_cancel_restore (__pthread_unwind_buf_t *__buf) /* Internal interface to initiate cleanup. */ extern void __pthread_unwind_next (__pthread_unwind_buf_t *__buf) - __cleanup_fct_attribute __attribute ((__noreturn__)) + __cleanup_fct_attribute __attribute__ ((__noreturn__)) # ifndef SHARED - __attribute ((__weak__)) + __attribute__ ((__weak__)) # endif ; #endif diff --git a/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h index 4d1c9450b5..034d11e2ce 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -155,6 +155,6 @@ typedef union /* Extra attributes for the cleanup functions. */ -#define __cleanup_fct_attribute __attribute ((regparm (1))) +#define __cleanup_fct_attribute __attribute__ ((regparm (1))) #endif /* bits/pthreadtypes.h */ diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh new file mode 100755 index 0000000000..88c85f7106 --- /dev/null +++ b/scripts/check-local-headers.sh @@ -0,0 +1,38 @@ +#! /bin/bash +# Copyright (C) 2005 Free Software Foundation, Inc. +# This file is part of the GNU C Library. + +# 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, write to the Free +# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. +# +includedir="$1" +objpfx="$2" + +# To avoid long paths. +cd "$objpfx" + + +# Search all dependency files for file names in the include directory. +# There are a few system headers we are known to use. +if fgrep "$includedir" */*.d | +fgrep -v "$includedir/asm" | +fgrep -v "$includedir/linux" | +fgrep -v "$includedir/selinux" | +fgrep -v "$includedir/gd"; then + # If we found a match something is wrong. + exit 1 +fi + +exit 0 diff --git a/time/sys/time.h b/time/sys/time.h index 199125bff3..96649ffa45 100644 --- a/time/sys/time.h +++ b/time/sys/time.h @@ -153,7 +153,7 @@ extern int futimes (int __fd, __const struct timeval __tvp[2]) __THROW; modification time of FILE to TVP[1]. If TVP is a null pointer, use the current time instead. Returns 0 on success, -1 on errors. */ extern int futimesat (int __fd, __const char *__file, - __const struct timeval __tvp[2]) __THROW __nonnull ((2)); + __const struct timeval __tvp[2]) __THROW; #endif |