--- old/usr/src/lib/libm/common/m9x/fmax.c
          +++ new/usr/src/lib/libm/common/m9x/fmax.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 fmax = __fmax
  32   32  #endif
  33   33  
  34   34  /*
  35   35   * fmax(x,y) returns the larger of x and y.  If just one of the
  36   36   * arguments is NaN, fmax returns the other argument.  If both
  37   37   * arguments are NaN, fmax returns NaN.
  38   38   *
  39   39   * See fmaxf.c for a discussion of implementation trade-offs.
  40   40   */
  41   41  
  42   42  #include "libm.h"       /* for isgreaterequal macro */
  43   43  #include <fenv.h>
  44   44  
  45   45  double
  46   46  __fmax(double x, double y) {
  47   47          union {
  48   48                  unsigned i[2];
  49   49                  double d;
  50   50          } xx, yy;

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

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX