http://gcc.gnu.org/ml/gcc-patches/2008-02/msg01094.html

[pf3gnuchains/gcc-fork.git] / libgfortran / m4 / maxloc1.m4

diff --git a/libgfortran/m4/maxloc1.m4 b/libgfortran/m4/maxloc1.m4
index 52baf34..69214a3 100644 (file)
--- a/libgfortran/m4/maxloc1.m4
+++ b/libgfortran/m4/maxloc1.m4
@@ -1,5 +1,5 @@
 `/* Implementation of the MAXLOC intrinsic
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright 2002, 2007 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -25,23 +25,24 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public
 License along with libgfortran; see the file COPYING.  If not,
-write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
-#include "config.h"
+#include "libgfortran.h"
 #include <stdlib.h>
 #include <assert.h>
-#include <float.h>
-#include <limits.h>
-#include "libgfortran.h"'
+#include <limits.h>'
 
 include(iparm.m4)dnl
 include(ifunction.m4)dnl
+
+`#if defined (HAVE_'atype_name`) && defined (HAVE_'rtype_name`)'
+
 ARRAY_FUNCTION(0,
 `  atype_name maxval;
   maxval = atype_min;
-  result = 1;',
-`  if (*src > maxval)
+  result = 0;',
+`  if (*src > maxval || !result)
     {
       maxval = *src;
       result = (rtype_name)n + 1;
@@ -50,10 +51,13 @@ ARRAY_FUNCTION(0,
 MASKED_ARRAY_FUNCTION(0,
 `  atype_name maxval;
   maxval = atype_min;
-  result = 1;',
-`  if (*msrc && *src > maxval)
+  result = 0;',
+`  if (*msrc && (*src > maxval || !result))
     {
       maxval = *src;
       result = (rtype_name)n + 1;
     }')
 
+SCALAR_ARRAY_FUNCTION(0)
+
+#endif