diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 26 | ||||
| -rw-r--r-- | signal/signal.h | 5 | ||||
| -rw-r--r-- | sysdeps/generic/sigpause.c | 4 | ||||
| -rw-r--r-- | sysdeps/posix/sigpause.c | 5 |
5 files changed, 39 insertions, 7 deletions
@@ -1,3 +1,9 @@ +2004-05-09 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/generic/sigpause.c: Prevent sigpause prototype. + * sysdeps/posix/sigpause.c: Likewise. + * signal/signal.h: Don't define sigpause macro unless needed. + 2004-05-08 Jakub Jelinek <jakub@redhat.com> * configure.in (libc_cv_libgcc_s_suffix): New check. @@ -313,7 +313,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow subdirs force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_cc_with_libunwind libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie fno_unit_at_a_time libc_cv_have_initfini libc_cv_cpp_asm_debuginfo no_whole_archive exceptions LIBGD EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow subdirs force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_cc_with_libunwind libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie fno_unit_at_a_time libc_cv_have_initfini libc_cv_cpp_asm_debuginfo no_whole_archive exceptions LIBGD EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -5556,6 +5556,24 @@ echo "$as_me:$LINENO: result: $libc_cv_Bgroup" >&5 echo "${ECHO_T}$libc_cv_Bgroup" >&6 + echo "$as_me:$LINENO: checking for libgcc_s suffix" >&5 +echo $ECHO_N "checking for libgcc_s suffix... $ECHO_C" >&6 +if test "${libc_cv_libgcc_s_suffix+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat > conftest.c <<EOF +int main (void) { return 0; } +EOF + libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \ + -shared -shared-libgcc -o conftest.so \ + conftest.c -v 2>&1 >/dev/null \ + | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'` + rm -f conftest* +fi +echo "$as_me:$LINENO: result: $libc_cv_libgcc_s_suffix" >&5 +echo "${ECHO_T}$libc_cv_libgcc_s_suffix" >&6 + + echo "$as_me:$LINENO: checking for --as-needed option" >&5 echo $ECHO_N "checking for --as-needed option... $ECHO_C" >&6 if test "${libc_cv_as_needed+set}" = set; then @@ -5565,8 +5583,9 @@ else int main (void) { return 0; } EOF if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS - -shared -o conftest.so conftest.c -lgcc_s - -Wl,--as-needed -nostdlib 1>&5' + -shared -o conftest.so conftest.c + -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed + -nostdlib 1>&5' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8244,6 +8263,7 @@ s,@libc_cv_z_nodlopen@,$libc_cv_z_nodlopen,;t t s,@libc_cv_z_initfirst@,$libc_cv_z_initfirst,;t t s,@libc_cv_z_relro@,$libc_cv_z_relro,;t t s,@libc_cv_Bgroup@,$libc_cv_Bgroup,;t t +s,@libc_cv_libgcc_s_suffix@,$libc_cv_libgcc_s_suffix,;t t s,@libc_cv_as_needed@,$libc_cv_as_needed,;t t s,@ASFLAGS_config@,$ASFLAGS_config,;t t s,@libc_cv_z_combreloc@,$libc_cv_z_combreloc,;t t diff --git a/signal/signal.h b/signal/signal.h index 2b57180695..db8b0b571d 100644 --- a/signal/signal.h +++ b/signal/signal.h @@ -157,9 +157,10 @@ extern int sigpause (int __mask) __THROW; # ifdef __USE_XOPEN # ifdef __GNUC__ extern int sigpause (int __sig) __asm__ ("__xpg_sigpause"); -# endif +# else /* Remove a signal from the signal mask and suspend the process. */ -# define sigpause(sig) __sigpause ((sig), 1) +# define sigpause(sig) __sigpause ((sig), 1) +# endif # endif #endif diff --git a/sysdeps/generic/sigpause.c b/sysdeps/generic/sigpause.c index 8f63b87003..bc598d070c 100644 --- a/sysdeps/generic/sigpause.c +++ b/sysdeps/generic/sigpause.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,95,96,2000,02 Free Software Foundation, Inc. +/* Copyright (C) 1991,95,96,2000,02,2004 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 @@ -16,8 +16,10 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#define sigpause __rename_sigpause #include <errno.h> #include <signal.h> +#undef sigpause int __sigpause (sig_or_mask, is_sig) diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c index 98b69d3c98..5ea1b114d3 100644 --- a/sysdeps/posix/sigpause.c +++ b/sysdeps/posix/sigpause.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991,92,94-98,2000,2002,2003 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,94-98,2000,2002,2003,2004 + 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 @@ -16,10 +17,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#define sigpause __rename_sigpause #include <errno.h> #include <signal.h> #include <stddef.h> /* For NULL. */ #include <sysdep-cancel.h> +#undef sigpause #include <sigset-cvt-mask.h> |