diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-07-27 10:51:39 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-07-27 10:51:39 +0200 |
| commit | e1a51361e3ac137c56adc6083d095c68e9471795 (patch) | |
| tree | bfec41199e84a74265d8e77b0e8444b06bc9ff00 /nptl/sysdeps | |
| parent | 9285e82ab3a0d1bdaa63fc740165d6a300ad0cc5 (diff) | |
| parent | 16d2ea4c821502948d193a152c8b151f5497a0d3 (diff) | |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'nptl/sysdeps')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/configure | 36 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/configure.in | 23 |
3 files changed, 61 insertions, 2 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S index e12790cb96..7486825d5f 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -551,12 +551,12 @@ __pthread_cond_timedwait: jne 53b cmpq 24(%rsp), %r9 - jbe 45b + jbe 15f cmpq %rax, %r9 ja 39b - cmpq $-ETIMEDOUT, %r14 +15: cmpq $-ETIMEDOUT, %r14 jne 8b jmp 99b diff --git a/nptl/sysdeps/x86_64/configure b/nptl/sysdeps/x86_64/configure new file mode 100644 index 0000000000..b959168843 --- /dev/null +++ b/nptl/sysdeps/x86_64/configure @@ -0,0 +1,36 @@ +# 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; } +if test "${libc_cv_asm_cfi_personality+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat > conftest.s <<EOF +${libc_cv_dot_text} +foo: + .cfi_startproc + .cfi_personality 0, foo + .cfi_lsda 0, foo + .cfi_endproc +EOF + if { ac_try='${CC-cc} $ASFLAGS -c conftest.s 1>&5' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + libc_cv_asm_cfi_personality=yes + else + libc_cv_asm_cfi_personality=no + fi + rm -f conftest* + +fi +{ echo "$as_me:$LINENO: result: $libc_cv_asm_cfi_personality" >&5 +echo "${ECHO_T}$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;} + { (exit 1); exit 1; }; } +fi diff --git a/nptl/sysdeps/x86_64/configure.in b/nptl/sysdeps/x86_64/configure.in new file mode 100644 index 0000000000..0ba0cc3726 --- /dev/null +++ b/nptl/sysdeps/x86_64/configure.in @@ -0,0 +1,23 @@ +GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +# Local configure fragment for sysdeps/i386. + +AC_CACHE_CHECK([for .cfi_personality and .cfi_lsda pseudo-ops], + libc_cv_asm_cfi_personality, [dnl + cat > conftest.s <<EOF +${libc_cv_dot_text} +foo: + .cfi_startproc + .cfi_personality 0, foo + .cfi_lsda 0, foo + .cfi_endproc +EOF + if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then + libc_cv_asm_cfi_personality=yes + else + libc_cv_asm_cfi_personality=no + fi + rm -f conftest* +]) +if test x"$libc_cv_asm_cfi_personality" != xyes; then + AC_MSG_ERROR([assembler too old, .cfi_personality support missing]) +fi |