From 3b1ea24972af975f96f7bdf6040fbc5048ea8b6d Mon Sep 17 00:00:00 2001 From: "sgk@chromium.org" Date: Wed, 25 Nov 2009 22:17:26 +0000 Subject: Match the vendor branch to the current tcmalloc rev in DEPS. BUG=27911 TEST=none Review URL: http://codereview.chromium.org/443010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33136 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/tcmalloc/vendor/m4/pc_from_ucontext.m4 | 33 ++++++---------------- 1 file changed, 9 insertions(+), 24 deletions(-) (limited to 'third_party/tcmalloc/vendor/m4') diff --git a/third_party/tcmalloc/vendor/m4/pc_from_ucontext.m4 b/third_party/tcmalloc/vendor/m4/pc_from_ucontext.m4 index daffddb..8c4c5ce 100644 --- a/third_party/tcmalloc/vendor/m4/pc_from_ucontext.m4 +++ b/third_party/tcmalloc/vendor/m4/pc_from_ucontext.m4 @@ -6,13 +6,8 @@ # OpenBSD doesn't have ucontext.h, but we can get PC from ucontext_t # by using signal.h. -# The first argument of AC_PC_FROM_UCONTEXT will be invoked when we -# cannot find a way to obtain PC from ucontext. - AC_DEFUN([AC_PC_FROM_UCONTEXT], - [AC_CHECK_HEADERS(ucontext.h) - AC_CHECK_HEADERS(sys/ucontext.h) # ucontext on OS X 10.6 (at least) - AC_MSG_CHECKING([how to access the program counter from a struct ucontext]) + [AC_MSG_CHECKING([how to access the program counter from a struct ucontext]) pc_fields=" uc_mcontext.gregs[[REG_PC]]" # Solaris x86 (32 + 64 bit) pc_fields="$pc_fields uc_mcontext.gregs[[REG_EIP]]" # Linux (i386) pc_fields="$pc_fields uc_mcontext.gregs[[REG_RIP]]" # Linux (x86_64) @@ -33,23 +28,13 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT], pc_field_found=false for pc_field in $pc_fields; do if ! $pc_field_found; then - if test "x$ac_cv_header_sys_ucontext_h" = xyes; then - AC_TRY_COMPILE([#define _GNU_SOURCE 1 - #include ], - [ucontext_t u; return u.$pc_field == 0;], - AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field, - How to access the PC from a struct ucontext) - AC_MSG_RESULT([$pc_field]) - pc_field_found=true) - else - AC_TRY_COMPILE([#define _GNU_SOURCE 1 - #include ], - [ucontext_t u; return u.$pc_field == 0;], - AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field, - How to access the PC from a struct ucontext) - AC_MSG_RESULT([$pc_field]) - pc_field_found=true) - fi + AC_TRY_COMPILE([#define _GNU_SOURCE 1 + #include ], + [ucontext_t u; return u.$pc_field == 0;], + AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field, + How to access the PC from a struct ucontext) + AC_MSG_RESULT([$pc_field]) + pc_field_found=true) fi done if ! $pc_field_found; then @@ -67,5 +52,5 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT], done fi if ! $pc_field_found; then - [$1] + AC_MSG_WARN(Could not find the PC. Will not output failed addresses...) fi]) -- cgit v1.1