summaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog8
-rw-r--r--libgfortran/acinclude.m42
-rwxr-xr-xlibgfortran/configure4
-rw-r--r--libgfortran/configure.ac2
-rw-r--r--libgfortran/intrinsics/c99_functions.c15
5 files changed, 13 insertions, 18 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index a5094358aac..ef81d3104c5 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * configure.ac: Remove Tru64 reference.
+ * acinclude.m4 (LIBGFOR_GTHREAD_WEAK): Remove alpha*-dec-osf*
+ handling.
+ * configure: Regenerate.
+ * intrinsics/c99_functions.c [__osf__]: Remove.
+
2012-03-10 Tobias Burnus <burnus@net-b.de>
* libgfortran.h (descriptor_dimension, GFC_DIMENSION_LBOUND,
diff --git a/libgfortran/acinclude.m4 b/libgfortran/acinclude.m4
index 645b248deb4..d4acf76ba42 100644
--- a/libgfortran/acinclude.m4
+++ b/libgfortran/acinclude.m4
@@ -99,7 +99,7 @@ void foo (void);
[Define to 1 if the target supports #pragma weak])
fi
case "$host" in
- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | alpha*-dec-osf* )
+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* )
AC_DEFINE(GTHREAD_USE_WEAK, 0,
[Define to 0 if the target shouldn't use #pragma weak])
;;
diff --git a/libgfortran/configure b/libgfortran/configure
index 0498238c739..ff524eef4ee 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -25196,7 +25196,7 @@ $as_echo "#define HAVE_FEENABLEEXCEPT 1" >>confdefs.h
fi
-# At least for glibc and Tru64, clock_gettime is in librt. But don't
+# At least for glibc, clock_gettime is in librt. But don't
# pull that in if it still doesn't give us the function we want. This
# test is copied from libgomp, and modified to not link in -lrt as
# libgfortran calls clock_gettime via a weak reference if it's found
@@ -25564,7 +25564,7 @@ $as_echo "#define SUPPORTS_WEAK 1" >>confdefs.h
fi
case "$host" in
- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | alpha*-dec-osf* )
+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* )
$as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
index af987bd2916..7011a937bba 100644
--- a/libgfortran/configure.ac
+++ b/libgfortran/configure.ac
@@ -484,7 +484,7 @@ LIBGFOR_CHECK_FLOAT128
# Check for GNU libc feenableexcept
AC_CHECK_LIB([m],[feenableexcept],[have_feenableexcept=yes AC_DEFINE([HAVE_FEENABLEEXCEPT],[1],[libm includes feenableexcept])])
-# At least for glibc and Tru64, clock_gettime is in librt. But don't
+# At least for glibc, clock_gettime is in librt. But don't
# pull that in if it still doesn't give us the function we want. This
# test is copied from libgomp, and modified to not link in -lrt as
# libgfortran calls clock_gettime via a weak reference if it's found
diff --git a/libgfortran/intrinsics/c99_functions.c b/libgfortran/intrinsics/c99_functions.c
index a95f09ac01d..b65723c9baa 100644
--- a/libgfortran/intrinsics/c99_functions.c
+++ b/libgfortran/intrinsics/c99_functions.c
@@ -1,5 +1,5 @@
/* Implementation of various C99 functions
- Copyright (C) 2004, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2009, 2010, 2012 Free Software Foundation, Inc.
This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -41,19 +41,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define cabsl __gfc_cabsl
#endif
-/* Tru64's <math.h> declares a non-C99 compliant implementation of cabs,
- which takes two floating point arguments instead of a single complex.
- To work around this we redirect cabs{,f,l} calls to __gfc_cabs{,f,l}. */
-
-#ifdef __osf__
-#undef HAVE_CABS
-#undef HAVE_CABSF
-#undef HAVE_CABSL
-#define cabs __gfc_cabs
-#define cabsf __gfc_cabsf
-#define cabsl __gfc_cabsl
-#endif
-
/* On a C99 system "I" (with I*I = -1) should be defined in complex.h;
if not, we define a fallback version here. */
#ifndef I