--- old/usr/src/lib/libm/common/m9x/fmaxl.c
          +++ new/usr/src/lib/libm/common/m9x/fmaxl.c

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  24   24   */
  25   25  /*
  26   26   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  27   27   * Use is subject to license terms.
  28   28   */
  29   29  
  30   30  #if defined(ELFOBJ)
  31   31  #pragma weak fmaxl = __fmaxl
  32   32  #endif
  33   33  
  34   34  #include "libm.h"       /* for isgreaterequal macro */
  35   35  
  36   36  long double
  37   37  __fmaxl(long double x, long double y) {
  38   38          union {
  39   39  #if defined(__sparc)
  40   40                  unsigned i[4];
  41   41  #elif defined(__x86)
  42   42                  unsigned i[3];
  43   43  #else

  44   44  #error Unknown architecture
  45   45  #endif
  46   46                  long double ld;
  47   47          } xx, yy;
  48   48          unsigned s;
  49   49  
  50   50          /* if y is nan, replace it by x */
  51   51          if (y != y)
  52   52                  y = x;
  53   53  
  54      -        /* if x is less than y or x and y are unordered, replace x by y */
  55      -#if defined(COMPARISON_MACRO_BUG)
  56      -        if (x != x || x < y)
  57      -#else
  58      -        if (!isgreaterequal(x, y))
  59      -#endif
       54 +        /* if x is nan, replace it by y */
       55 +        if (x != x)
       56 +                x = y;
       57 +
       58 +        /* At this point, x and y are either both numeric, or both NaN */
       59 +        if (!isnan(x) && !isgreaterequal(x, y))
  60   60                  x = y;
  61   61  
  62   62          /*
  63      -         * now x and y are either both NaN or both numeric; clear the
  64      -         * sign of the result if either x or y has its sign clear
       63 +         * clear the sign of the result if either x or y has its sign clear
  65   64           */
  66   65          xx.ld = x;
  67   66          yy.ld = y;
  68   67  #if defined(__sparc)
  69   68          s = ~(xx.i[0] & yy.i[0]) & 0x80000000;
  70   69          xx.i[0] &= ~s;
  71   70  #elif defined(__x86)
  72   71          s = ~(xx.i[2] & yy.i[2]) & 0x8000;
  73   72          xx.i[2] &= ~s;
  74   73  #else
  75   74  #error Unknown architecture
  76   75  #endif
  77   76  
  78   77          return (xx.ld);
  79   78  }
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX