Patchwork libsanitizer merge from upstream r196489

login
register
mail settings
Submitter H.J. Lu
Date Dec. 5, 2013, 2:42 p.m.
Message ID <CAMe9rOqg=dmbacv_ne38TmQZE9O1VT7hdzMn4QtA8MFJNhO3Jw@mail.gmail.com>
Download mbox | patch
Permalink /patch/297156/
State New
Headers show

Comments

H.J. Lu - Dec. 5, 2013, 2:42 p.m.
On Thu, Dec 5, 2013 at 5:00 AM, Jakub Jelinek <jakub@redhat.com> wrote:
> On Thu, Dec 05, 2013 at 04:54:23AM -0800, H.J. Lu wrote:
>> I am testing this for the libm issue.
>
> Preapproved with proper ChangeLog entry if it works.
>
>> --- a/libsanitizer/configure.ac
>> +++ b/libsanitizer/configure.ac
>> @@ -87,7 +87,7 @@ AM_CONDITIONAL(LSAN_SUPPORTED, [test
>> "x$LSAN_SUPPORTED" = "xyes"])
>>  AC_CHECK_FUNCS(clock_getres clock_gettime clock_settime)
>>
>>  # Common libraries that we need to link against for all sanitizer libs.
>> -link_sanitizer_common='-lpthread -ldl'
>> +link_sanitizer_common='-lpthread -ldl -lm'
>>
>>  # Set up the set of additional libraries that we need to link against
>> for libasan.
>>  link_libasan=$link_sanitizer_common
>

This is the patch I checked in.

Patch

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 0af33d0..5d02ec3 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,8 @@ 
+2013-12-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+    * configure.ac (link_sanitizer_common): Add -lm.
+    * configure: Regenerated.
+
 2013-12-05  Kostya Serebryany  <kcc@google.com>

     * All source files: Merge from upstream r196489.
diff --git a/libsanitizer/configure b/libsanitizer/configure
index e5c3206..6db2a1f 100755
--- a/libsanitizer/configure
+++ b/libsanitizer/configure
@@ -14564,7 +14564,7 @@  done


 # Common libraries that we need to link against for all sanitizer libs.
-link_sanitizer_common='-lpthread -ldl'
+link_sanitizer_common='-lpthread -ldl -lm'

 # Set up the set of additional libraries that we need to link against
for libasan.
 link_libasan=$link_sanitizer_common
diff --git a/libsanitizer/configure.ac b/libsanitizer/configure.ac
index 7f93279..3c87984 100644
--- a/libsanitizer/configure.ac
+++ b/libsanitizer/configure.ac
@@ -87,7 +87,7 @@  AM_CONDITIONAL(LSAN_SUPPORTED, [test
"x$LSAN_SUPPORTED" = "xyes"])
 AC_CHECK_FUNCS(clock_getres clock_gettime clock_settime)

 # Common libraries that we need to link against for all sanitizer libs.
-link_sanitizer_common='-lpthread -ldl'
+link_sanitizer_common='-lpthread -ldl -lm'

 # Set up the set of additional libraries that we need to link against