diff options
author | Andreas Schwab <schwab@redhat.com> | 2009-08-03 11:00:03 +0200 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2009-08-03 11:00:03 +0200 |
commit | 2b7f0f786d1348729e0ce8a2784b48f67e116d2a (patch) | |
tree | c7f83f9d90e48d772855d2198e3b5001052126a6 /nptl | |
parent | 50f823e4993cf6853caaa74fb1a6cd65b93688aa (diff) | |
parent | 4a1377672ca5472fac9096b4da72d26226b4aa59 (diff) |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'nptl')
-rw-r--r-- | nptl/ChangeLog | 4 | ||||
-rw-r--r-- | nptl/descr.h | 16 | ||||
-rwxr-xr-x[-rw-r--r--] | nptl/sysdeps/x86_64/configure | 48 |
3 files changed, 52 insertions, 16 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 0046b20608..83d0dda46c 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2009-07-31 Ulrich Drepper <drepper@redhat.com> + + * descr.h: Better definition of *_BITMASK macros for cancellation. + 2009-07-29 Ulrich Drepper <drepper@redhat.com> * sysdeps/x86_64/tls.h (TLS_TCB_ALIGN): Define explicitly to 32. diff --git a/nptl/descr.h b/nptl/descr.h index 22e774ab7e..9c366e7400 100644 --- a/nptl/descr.h +++ b/nptl/descr.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2006, 2007, 2008 Free Software Foundation, Inc. +/* Copyright (C) 2002-2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -243,25 +243,25 @@ struct pthread int cancelhandling; /* Bit set if cancellation is disabled. */ #define CANCELSTATE_BIT 0 -#define CANCELSTATE_BITMASK 0x01 +#define CANCELSTATE_BITMASK (0x01 << CANCELSTATE_BIT) /* Bit set if asynchronous cancellation mode is selected. */ #define CANCELTYPE_BIT 1 -#define CANCELTYPE_BITMASK 0x02 +#define CANCELTYPE_BITMASK (0x01 << CANCELTYPE_BIT) /* Bit set if canceling has been initiated. */ #define CANCELING_BIT 2 -#define CANCELING_BITMASK 0x04 +#define CANCELING_BITMASK (0x01 << CANCELING_BIT) /* Bit set if canceled. */ #define CANCELED_BIT 3 -#define CANCELED_BITMASK 0x08 +#define CANCELED_BITMASK (0x01 << CANCELED_BIT) /* Bit set if thread is exiting. */ #define EXITING_BIT 4 -#define EXITING_BITMASK 0x10 +#define EXITING_BITMASK (0x01 << EXITING_BIT) /* Bit set if thread terminated and TCB is freed. */ #define TERMINATED_BIT 5 -#define TERMINATED_BITMASK 0x20 +#define TERMINATED_BITMASK (0x01 << TERMINATED_BIT) /* Bit set if thread is supposed to change XID. */ #define SETXID_BIT 6 -#define SETXID_BITMASK 0x40 +#define SETXID_BITMASK (0x01 << SETXID_BIT) /* Mask for the rest. Helps the compiler to optimize. */ #define CANCEL_RESTMASK 0xffffff80 diff --git a/nptl/sysdeps/x86_64/configure b/nptl/sysdeps/x86_64/configure index b959168843..424118a0e8 100644..100755 --- a/nptl/sysdeps/x86_64/configure +++ b/nptl/sysdeps/x86_64/configure @@ -1,10 +1,42 @@ +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + # This file is generated from configure.in by Autoconf. DO NOT EDIT! # Local configure fragment for sysdeps/i386. -{ echo "$as_me:$LINENO: checking for .cfi_personality and .cfi_lsda pseudo-ops" >&5 -echo $ECHO_N "checking for .cfi_personality and .cfi_lsda pseudo-ops... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for .cfi_personality and .cfi_lsda pseudo-ops" >&5 +$as_echo_n "checking for .cfi_personality and .cfi_lsda pseudo-ops... " >&6; } if test "${libc_cv_asm_cfi_personality+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat > conftest.s <<EOF ${libc_cv_dot_text} @@ -18,7 +50,7 @@ EOF { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then libc_cv_asm_cfi_personality=yes else @@ -27,10 +59,10 @@ EOF rm -f conftest* fi -{ echo "$as_me:$LINENO: result: $libc_cv_asm_cfi_personality" >&5 -echo "${ECHO_T}$libc_cv_asm_cfi_personality" >&6; } +{ $as_echo "$as_me:$LINENO: result: $libc_cv_asm_cfi_personality" >&5 +$as_echo "$libc_cv_asm_cfi_personality" >&6; } if test x"$libc_cv_asm_cfi_personality" != xyes; then - { { echo "$as_me:$LINENO: error: assembler too old, .cfi_personality support missing" >&5 -echo "$as_me: error: assembler too old, .cfi_personality support missing" >&2;} + { { $as_echo "$as_me:$LINENO: error: assembler too old, .cfi_personality support missing" >&5 +$as_echo "$as_me: error: assembler too old, .cfi_personality support missing" >&2;} { (exit 1); exit 1; }; } fi |