← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to math/s_csinhl.c

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
math/s_csinhl.c
42
42
          const int t = (int) ((LDBL_MAX_EXP - 1) * M_LN2l);
43
43
          long double sinix, cosix;
44
44
 
45
 
          __sincosl (__imag__ x, &sinix, &cosix);
 
45
          if (__builtin_expect (icls != FP_SUBNORMAL, 1))
 
46
            {
 
47
              __sincosl (__imag__ x, &sinix, &cosix);
 
48
            }
 
49
          else
 
50
            {
 
51
              sinix = __imag__ x;
 
52
              cosix = 1.0;
 
53
            }
46
54
 
47
55
          if (fabsl (__real__ x) > t)
48
56
            {
109
117
          /* Imaginary part is finite.  */
110
118
          long double sinix, cosix;
111
119
 
112
 
          __sincosl (__imag__ x, &sinix, &cosix);
 
120
          if (__builtin_expect (icls != FP_SUBNORMAL, 1))
 
121
            {
 
122
              __sincosl (__imag__ x, &sinix, &cosix);
 
123
            }
 
124
          else
 
125
            {
 
126
              sinix = __imag__ x;
 
127
              cosix = 1.0;
 
128
            }
113
129
 
114
130
          __real__ retval = __copysignl (HUGE_VALL, cosix);
115
131
          __imag__ retval = __copysignl (HUGE_VALL, sinix);