about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog57
-rw-r--r--elf/dl-load.c6
-rw-r--r--elf/dl-open.c2
-rw-r--r--libc.map5
-rw-r--r--libio/iogetline.c81
-rw-r--r--libio/libioP.h4
-rw-r--r--localedata/Makefile8
-rwxr-xr-xlocaledata/tst-locale.sh4
-rw-r--r--manual/arith.texi28
-rw-r--r--math/libm-test.c464
-rw-r--r--math/math.h66
-rw-r--r--sunrpc/rpc_cout.c12
-rw-r--r--sysdeps/generic/_G_config.h1
-rw-r--r--sysdeps/i386/fpu/bits/mathinline.h4
-rw-r--r--sysdeps/libm-ieee754/s_cacoshl.c10
-rw-r--r--sysdeps/libm-ieee754/s_cacosl.c4
-rw-r--r--sysdeps/libm-ieee754/s_casinhl.c4
-rw-r--r--sysdeps/libm-ieee754/s_catanhl.c6
-rw-r--r--sysdeps/libm-ieee754/s_catanl.c6
-rw-r--r--sysdeps/libm-ieee754/s_clog10l.c6
-rw-r--r--sysdeps/libm-ieee754/s_clogl.c4
-rw-r--r--sysdeps/unix/sysv/linux/_G_config.h1
-rw-r--r--time/Makefile7
-rw-r--r--timezone/Makefile2
24 files changed, 456 insertions, 336 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d976e4aa3..7b04fbfeda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,60 @@
+1998-02-17 15:10  Ulrich Drepper  <drepper@cygnus.com>
+
+	* elf/dl-load.c (open_path): Use __xstat instead of stat.
+
+	* localedata/tst-locale.sh: Comment out first test for now.
+
+1998-02-14 14:58  H.J. Lu  <hjl@gnu.org>
+
+	* sysdeps/generic/_G_config.h (_G_HAVE_IO_GETLINE_INFO): Defined
+	as 1.
+	* sysdeps/unix/sysv/linux/_G_config.h (_G_HAVE_IO_GETLINE_INFO):
+	Likewise.
+
+	* libio/iogetline.c (_IO_getline_info): Renamed from
+	_IO_getline.
+	(_IO_getline): Just call _IO_getline_info.
+
+	* libio/libioP.h (_IO_getline_info): New declaration.
+
+	* libc.map (_IO_getline_info, __write): Added.
+
+1998-02-17  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* sunrpc/rpc_cout.c (inline_struct): Change typo of plus to
+	const char* to shut up gcc.
+
+1998-02-17 11:37  Ulrich Drepper  <drepper@cygnus.com>
+
+	* eld/dl-open.c (_dl_open): Assign correct value to new->l_global.
+	Patch forwarded by Cristian Gafton <gafton@redhat.com>.
+
+	* math/math.h: Define M_* constants always as `double' and add new
+	macros M_*l which are of type `long double'.
+	* sysdeps/libm-ieee754/s_cacoshl.c: Use M_*l constants now.
+	* sysdeps/libm-ieee754/s_cacosl.c: Likewise.
+	* sysdeps/libm-ieee754/s_casinhl.c: Likewise.
+	* sysdeps/libm-ieee754/s_catanhl.c: Likewise.
+	* sysdeps/libm-ieee754/s_catanl.c: Likewise.
+	* sysdeps/libm-ieee754/s_clog10l.c: Likewise.
+	* sysdeps/libm-ieee754/s_clogl.c: Likewise.
+	* math/libm-tst.c: Likewise.
+
+	* sysdeps/i386/fpu/bits/mathinline.h (__M_SQRT2): Don't use _Mdbl,
+	define as long double unconditionally.
+
+1998-02-17  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* manual/arith.texi (Old-style number conversion): Correct some
+	typos.
+
+1998-02-16 16:28  H.J. Lu  <hjl@gnu.org>
+
+	* time/Makefile (tz-cflags, CFLAGS-tzfile.c, CFLAGS-tzset.c):
+	Restore.
+
+	* timezone/Makefile (CFLAGS-tzfile.c, CFLAGS-tzset.c): Deleted.
+
 1998-02-16  Ulrich Drepper  <drepper@cygnus.com>
 
 	* elf/Makefile ($(objpfx)ld.so): Don't depend on rtld-script but
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 73cafcca37..96c1eb6bc6 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -832,7 +832,8 @@ open_path (const char *name, size_t namelen,
 
 		buf[this_dir->machdirnamelen - 1] = '\0';
 
-		if (stat (buf, &st) != 0 || ! S_ISDIR (st.st_mode))
+		if (__xstat (_STAT_VER, buf, &st) != 0
+		    || ! S_ISDIR (st.st_mode))
 		  /* The directory does not exist ot it is no directory.  */
 		  this_dir->machdirstatus = nonexisting;
 		else
@@ -863,7 +864,8 @@ open_path (const char *name, size_t namelen,
 
 		  buf[this_dir->dirnamelen - 1] = '\0';
 
-		  if (stat (buf, &st) != 0 || ! S_ISDIR (st.st_mode))
+		  if (__xstat (_STAT_VER, buf, &st) != 0
+		      || ! S_ISDIR (st.st_mode))
 		    /* The directory does not exist ot it is no directory.  */
 		    this_dir->dirstatus = nonexisting;
 		  else
diff --git a/elf/dl-open.c b/elf/dl-open.c
index b984aa8f89..d095f5e65d 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -110,7 +110,7 @@ _dl_open (const char *file, int mode)
       l = l->l_prev;
     }
 
-  new->l_global = (mode & RTLD_GLOBAL);
+  new->l_global = (mode & RTLD_GLOBAL) ? 1 : 0;
   if (new->l_global)
     {
       /* The symbols of the new object and its dependencies are to be
diff --git a/libc.map b/libc.map
index ec82b60616..473755b6a1 100644
--- a/libc.map
+++ b/libc.map
@@ -100,7 +100,7 @@ GLIBC_2.0 {
     __vsscanf; __vfscanf; __vsnprintf;
     _rpc_dtablesize; _null_auth; _seterr_reply;
     __res_randomid; __syscall_rt_sigqueueinfo; __getpid; __pread64; __pwrite64;
-    __strcasecmp;
+    __strcasecmp; __write;
 
     # Exception handling support functions from libgcc
     __register_frame; __register_frame_table; __deregister_frame;
@@ -470,4 +470,7 @@ GLIBC_2.1 {
 
     # New special glibc functions.
     gnu_get_libc_release; gnu_get_libc_version;
+
+    # Changed getline function in libio.
+    _IO_getline_info;
 } GLIBC_2.0;
diff --git a/libio/iogetline.c b/libio/iogetline.c
index bd1a7431f3..328e20e6ea 100644
--- a/libio/iogetline.c
+++ b/libio/iogetline.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU IO Library.
 
    This library is free software; you can redistribute it and/or
@@ -26,6 +26,19 @@
 #include "libioP.h"
 #include <string.h>
 
+#if defined _LIBC || !_G_HAVE_IO_GETLINE_INFO
+
+_IO_size_t
+_IO_getline (fp, buf, n, delim, extract_delim)
+     _IO_FILE *fp;
+     char *buf;
+     _IO_size_t n;
+     int delim;
+     int extract_delim;
+{
+  return _IO_getline_info (fp, buf, n, delim, extract_delim, (int *) 0);
+}
+
 /* Algorithm based on that used by Berkeley pre-4.4 fgets implementation.
 
    Read chars into buf (of size n), until delim is seen.
@@ -35,44 +48,68 @@
    If extract_delim > 0, insert delim in output. */
 
 _IO_size_t
-_IO_getline (fp, buf, n, delim, extract_delim)
+_IO_getline_info (fp, buf, n, delim, extract_delim, eof)
      _IO_FILE *fp;
      char *buf;
      _IO_size_t n;
      int delim;
      int extract_delim;
+     int *eof;
 {
   char *ptr = buf;
+  if (eof != NULL)
+    *eof = 0;
   do
     {
       _IO_ssize_t len = fp->_IO_read_end - fp->_IO_read_ptr;
-      char *t;
       if (len <= 0)
-	if (__underflow (fp) == EOF)
-	  break;
-	else
-	  len = fp->_IO_read_end - fp->_IO_read_ptr;
-      if ((_IO_size_t) len >= n)
-	len = n;
-      t = (char *) memchr ((void *) fp->_IO_read_ptr, delim, len);
-      if (t != NULL)
 	{
-	  _IO_size_t old_len = ptr-buf;
-	  len = t - fp->_IO_read_ptr;
-	  if (extract_delim >= 0)
+	  int c = __uflow (fp);
+	  if (c == EOF)
 	    {
-	      ++t;
+	      if (eof) *eof = c;
+	      break;
+	    }
+	  if (c == delim)
+	    {
+ 	      if (extract_delim > 0)
+		*ptr++ = c;
+	      else if (extract_delim < 0)
+		_IO_sputbackc (fp, c);
+	      return ptr - buf;
 	      if (extract_delim > 0)
 		++len;
 	    }
-	  memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len);
-	  fp->_IO_read_ptr = t;
-	  return old_len + len;
+	  *ptr++ = c;
+	  n--;
 	}
-      memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len);
-      fp->_IO_read_ptr += len;
-      ptr += len;
-      n -= len;
+	else
+	  {
+	    char *t;
+	    if ((_IO_size_t) len >= n)
+	      len = n;
+	    t = (char *) memchr ((void *) fp->_IO_read_ptr, delim, len);
+	    if (t != NULL)
+	      {
+		_IO_size_t old_len = ptr-buf;
+		len = t - fp->_IO_read_ptr;
+		if (extract_delim >= 0)
+		  {
+		    ++t;
+		    if (extract_delim > 0)
+		      ++len;
+		  }
+		memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len);
+		fp->_IO_read_ptr = t;
+		return old_len + len;
+	      }
+	    memcpy ((void *) ptr, (void *) fp->_IO_read_ptr, len);
+	    fp->_IO_read_ptr += len;
+	    ptr += len;
+	    n -= len;
+	  }
     } while (n != 0);
   return ptr - buf;
 }
+
+#endif /* Defined _LIBC || !_G_HAVE_IO_GETLINE_INFO */
diff --git a/libio/libioP.h b/libio/libioP.h
index 568bbe8812..785bfee08a 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU IO Library.
 
    This library is free software; you can redistribute it and/or
@@ -428,6 +428,8 @@ extern int _IO_vsnprintf __P ((char *string, _IO_size_t maxlen,
 
 
 extern _IO_size_t _IO_getline __P ((_IO_FILE *,char *, _IO_size_t, int, int));
+extern _IO_size_t _IO_getline_info __P ((_IO_FILE *,char *, _IO_size_t,
+					 int, int, int *));
 extern _IO_ssize_t _IO_getdelim __P ((char **, _IO_size_t *, int, _IO_FILE *));
 extern double _IO_strtod __P ((const char *, char **));
 extern char *_IO_dtoa __P ((double __d, int __mode, int __ndigits,
diff --git a/localedata/Makefile b/localedata/Makefile
index 2d45558eb1..4e26d15374 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -37,13 +37,13 @@ test-output := $(foreach s, .out .xout, \
 generated := $(test-input) $(test-output)
 generated-dirs := $(basename $(test-input)) en_US
 
-test-names := test1 test2 test3 test4
-test-srcs := $(addprefix tests/,$(addsuffix .cm,$(test-names)) \
-				$(addsuffix .def,$(test-names)))
+ld-test-names := test1 test2 test3 test4
+ld-test-srcs := $(addprefix tests/,$(addsuffix .cm,$(ld-test-names)) \
+				   $(addsuffix .def,$(ld-test-names)))
 
 distribute := CHECKSUMS tst-fmon.sh tst-fmon.data ChangeLog sort-test.sh \
 	      README mnemonic.ds fr_CA,2.13.in de_DE.in da_DK.in	 \
-	      $(charmaps) $(locales) $(test-srcs)
+	      $(charmaps) $(locales) $(ld-test-srcs)
 
 # Get $(inst_i18ndir) defined.
 include ../Makeconfig
diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh
index f6182e6daf..699a18b8aa 100755
--- a/localedata/tst-locale.sh
+++ b/localedata/tst-locale.sh
@@ -38,7 +38,9 @@ test_locale ()
     fi
 }
 
-test_locale IBM437 de_DE de_DE.437
+# I take this out for now since it is a known problem
+# (see [PR libc/229] and [PR libc/454].
+# test_locale IBM437 de_DE de_DE.437
 test_locale tests/test1.cm tests/test1.def test1
 test_locale tests/test2.cm tests/test2.def test2
 test_locale tests/test3.cm tests/test3.def test3
diff --git a/manual/arith.texi b/manual/arith.texi
index 3b060689a9..22819b12f4 100644
--- a/manual/arith.texi
+++ b/manual/arith.texi
@@ -1337,7 +1337,7 @@ extensions in the same sense.
 
 Generally, you should avoid using these functions unless the really fit
 into the problem you have to to solve.  Otherwise it is almost always
-better to use @code{sprinf} since it's greater availability (it is an
+better to use @code{sprintf} since its greater availability (it is an
 @w{ISO C} function).
 
 
@@ -1387,14 +1387,14 @@ The prototype for this function can be found in @file{stdlib.h}.
 @comment SVID, Unix98
 @deftypefun {char *} gcvt (double @var{value}, int @var{ndigit}, char *@var{buf})
 The @code{gcvt} function also converts @var{value} to a NUL terminated
-string but does in a way similar to the @code{%g} format of
-@code{printf}.  It also does not use a static buffer but instead uses
+string but in a way similar to the @code{%g} format of
+@code{sprintf}.  It also does not use a static buffer but instead uses
 the user-provided buffer starting at @var{buf}.  It is the user's
 responsibility to make sure the buffer is long enough to contain the
-result.  Unlike the @code{ecvt} and @code{fcvt} function @code{gcvt}
-includes the sign and the decimal point character (which is determined
+result.  Unlike the @code{ecvt} and @code{fcvt} functions @code{gcvt}
+includes the sign and the decimal point characters (which are determined
 according to the current locale) in the result.  Therefore there are yet
-less reasons to use this function instead of @code{printf}.
+less reasons to use this function instead of @code{sprintf}.
 
 The return value is @var{buf}.
 
@@ -1402,11 +1402,11 @@ The prototype for this function can be found in @file{stdlib.h}.
 @end deftypefun
 
 
-All these three functions have in common that they use @code{double}
-values as the parameters.  Calling these functions using @code{long
+All three functions have in common that they use @code{double}
+values as parameter.  Calling these functions using @code{long
 double} values would mean a loss of precision due to the implicit
 rounding.  Therefore the GNU C library contains three more functions
-with similar semantic which take @code{long double} values.
+with similar semantics which take @code{long double} values.
 
 @comment stdlib.h
 @comment GNU
@@ -1453,7 +1453,7 @@ is no need for a @code{gcvt_r} function.
 @deftypefun {char *} ecvt_r (double @var{value}, int @var{ndigit}, int *@var{decpt}, int *@var{sign}, char *@var{buf}, size_t @var{len})
 The @code{ecvt_r} function is similar to the @code{ecvt} function except
 that it places its result into the user-specified buffer starting at
-@var{buf}.
+@var{buf} with length @var{len}.
 
 This function is a GNU extension.  The prototype can be found in
 @file{stdlib.h}.
@@ -1464,7 +1464,7 @@ This function is a GNU extension.  The prototype can be found in
 @deftypefun {char *} fcvt_r (double @var{value}, int @var{ndigit}, int @var{decpt}, int *@var{sign}, char *@var{buf}, size_t @var{len})
 The @code{fcvt_r} function is similar to the @code{fcvt} function except
 that it places its result into the user-specified buffer starting at
-@var{buf}.
+@var{buf} with length @var{len}.
 
 This function is a GNU extension.  The prototype can be found in
 @file{stdlib.h}.
@@ -1475,7 +1475,7 @@ This function is a GNU extension.  The prototype can be found in
 @deftypefun {char *} qecvt_r (long double @var{value}, int @var{ndigit}, int *@var{decpt}, int *@var{sign}, char *@var{buf}, size_t @var{len})
 The @code{qecvt_r} function is similar to the @code{qecvt} function except
 that it places its result into the user-specified buffer starting at
-@var{buf}.
+@var{buf} with length @var{len}.
 
 This function is a GNU extension.  The prototype can be found in
 @file{stdlib.h}.
@@ -1483,10 +1483,10 @@ This function is a GNU extension.  The prototype can be found in
 
 @comment stdlib.h
 @comment GNU
-@deftypefun {char *} qfcvt (long double @var{value}, int @var{ndigit}, int @var{decpt}, int *@var{sign}, char *@var{buf}, size_t @var{len})
+@deftypefun {char *} qfcvt_r (long double @var{value}, int @var{ndigit}, int @var{decpt}, int *@var{sign}, char *@var{buf}, size_t @var{len})
 The @code{qfcvt_r} function is similar to the @code{qfcvt} function except
 that it places its result into the user-specified buffer starting at
-@var{buf}.
+@var{buf} with length @var{len}.
 
 This function is a GNU extension.  The prototype can be found in
 @file{stdlib.h}.
diff --git a/math/libm-test.c b/math/libm-test.c
index 3dffcad6dc..8fa473eaf5 100644
--- a/math/libm-test.c
+++ b/math/libm-test.c
@@ -137,9 +137,9 @@
 #define NO_PRINT 0
 
 /* Various constants (we must supply them precalculated for accuracy).  */
-#define M_PI_6  .52359877559829887308L
-#define M_E2	7.389056098930650227230L
-#define M_E3	20.08553692318766774093L
+#define M_PI_6l  .52359877559829887308L
+#define M_E2l	7.389056098930650227230L
+#define M_E3l	20.08553692318766774093L
 
 static int noErrors;   /* number of errors */
 static int noTests;    /* number of tests (without testing exceptions) */
@@ -840,15 +840,15 @@ acos_test (void)
 		   FUNC(acos) (x),
 		   INVALID_EXCEPTION);
 #endif
-  check ("acos (0) == pi/2", FUNC(acos) (0), M_PI_2);
-  check ("acos (-0) == pi/2", FUNC(acos) (minus_zero), M_PI_2);
+  check ("acos (0) == pi/2", FUNC(acos) (0), M_PI_2l);
+  check ("acos (-0) == pi/2", FUNC(acos) (minus_zero), M_PI_2l);
 
   check ("acos (1) == 0", FUNC(acos) (1), 0);
-  check ("acos (-1) == pi", FUNC(acos) (-1), M_PI);
+  check ("acos (-1) == pi", FUNC(acos) (-1), M_PIl);
 
-  check_eps ("acos (0.5) == pi/3", FUNC(acos) (0.5), M_PI_6 * 2.0,
+  check_eps ("acos (0.5) == pi/3", FUNC(acos) (0.5), M_PI_6l * 2.0,
 	     CHOOSE (1e-18, 0, 0));
-  check_eps ("acos (-0.5) == 2*pi/3", FUNC(acos) (-0.5), M_PI_6 * 4.0,
+  check_eps ("acos (-0.5) == 2*pi/3", FUNC(acos) (-0.5), M_PI_6l * 4.0,
 	     CHOOSE (1e-17, 0, 0));
 
   check_eps ("acos (0.7) == 0.795398830...", FUNC(acos) (0.7),
@@ -895,12 +895,12 @@ asin_test (void)
 
   check ("asin (0) == 0", FUNC(asin) (0), 0);
   check ("asin (-0) == -0", FUNC(asin) (minus_zero), minus_zero);
-  check_eps ("asin (0.5) ==  pi/6", FUNC(asin) (0.5), M_PI_6,
+  check_eps ("asin (0.5) ==  pi/6", FUNC(asin) (0.5), M_PI_6l,
 	     CHOOSE(3.5e-18, 0, 2e-7));
-  check_eps ("asin (-0.5) ==  -pi/6", FUNC(asin) (-0.5), -M_PI_6,
+  check_eps ("asin (-0.5) ==  -pi/6", FUNC(asin) (-0.5), -M_PI_6l,
 	     CHOOSE(3.5e-18, 0, 2e-7));
-  check ("asin (1.0) ==  pi/2", FUNC(asin) (1.0), M_PI_2);
-  check ("asin (-1.0) ==  -pi/2", FUNC(asin) (-1.0), -M_PI_2);
+  check ("asin (1.0) ==  pi/2", FUNC(asin) (1.0), M_PI_2l);
+  check ("asin (-1.0) ==  -pi/2", FUNC(asin) (-1.0), -M_PI_2l);
   check_eps ("asin (0.7) ==  0.775397496...", FUNC(asin) (0.7),
 	     0.7753974966107530637L, CHOOSE(7e-17L, 2e-16, 0));
 }
@@ -928,12 +928,12 @@ atan_test (void)
   check ("atan (0) == 0", FUNC(atan) (0), 0);
   check ("atan (-0) == -0", FUNC(atan) (minus_zero), minus_zero);
 
-  check ("atan (+inf) == pi/2", FUNC(atan) (plus_infty), M_PI_2);
-  check ("atan (-inf) == -pi/2", FUNC(atan) (minus_infty), -M_PI_2);
+  check ("atan (+inf) == pi/2", FUNC(atan) (plus_infty), M_PI_2l);
+  check ("atan (-inf) == -pi/2", FUNC(atan) (minus_infty), -M_PI_2l);
 
-  check_eps ("atan (1) == pi/4", FUNC(atan) (1), M_PI_4,
+  check_eps ("atan (1) == pi/4", FUNC(atan) (1), M_PI_4l,
 	     CHOOSE (1e-18, 0, 0));
-  check_eps ("atan (-1) == -pi/4", FUNC(atan) (1), M_PI_4,
+  check_eps ("atan (-1) == -pi/4", FUNC(atan) (1), M_PI_4l,
 	     CHOOSE (1e-18, 0, 0));
 
   check_eps ("atan (0.7) == 0.610725964...", FUNC(atan) (0.7),
@@ -957,25 +957,27 @@ atan2_test (void)
   check ("atan2 (-0,+0) == -0", FUNC(atan2) (minus_zero, 0), minus_zero);
 
   x = -random_greater (0);
-  check ("atan2 (+0,x) == +pi for x < 0", FUNC(atan2) (0, x), M_PI);
+  check ("atan2 (+0,x) == +pi for x < 0", FUNC(atan2) (0, x), M_PIl);
 
   x = -random_greater (0);
-  check ("atan2 (-0,x) == -pi for x < 0", FUNC(atan2) (minus_zero, x), -M_PI);
+  check ("atan2 (-0,x) == -pi for x < 0", FUNC(atan2) (minus_zero, x), -M_PIl);
 
-  check ("atan2 (+0,-0) == +pi", FUNC(atan2) (0, minus_zero), M_PI);
-  check ("atan2 (-0,-0) == -pi", FUNC(atan2) (minus_zero, minus_zero), -M_PI);
+  check ("atan2 (+0,-0) == +pi", FUNC(atan2) (0, minus_zero), M_PIl);
+  check ("atan2 (-0,-0) == -pi", FUNC(atan2) (minus_zero, minus_zero), -M_PIl);
 
   x = random_greater (0);
-  check ("atan2 (y,+0) == pi/2 for y > 0", FUNC(atan2) (x, 0), M_PI_2);
+  check ("atan2 (y,+0) == pi/2 for y > 0", FUNC(atan2) (x, 0), M_PI_2l);
 
   x = random_greater (0);
-  check ("atan2 (y,-0) == pi/2 for y > 0", FUNC(atan2) (x, minus_zero), M_PI_2);
+  check ("atan2 (y,-0) == pi/2 for y > 0", FUNC(atan2) (x, minus_zero),
+	 M_PI_2l);
 
   x = random_less (0);
-  check ("atan2 (y,+0) == -pi/2 for y < 0", FUNC(atan2) (x, 0), -M_PI_2);
+  check ("atan2 (y,+0) == -pi/2 for y < 0", FUNC(atan2) (x, 0), -M_PI_2l);
 
   x = random_less (0);
-  check ("atan2 (y,-0) == -pi/2 for y < 0", FUNC(atan2) (x, minus_zero), -M_PI_2);
+  check ("atan2 (y,-0) == -pi/2 for y < 0", FUNC(atan2) (x, minus_zero),
+	 -M_PI_2l);
 
   x = random_greater (0);
   check ("atan2 (y,inf) == +0 for finite y > 0",
@@ -987,31 +989,31 @@ atan2_test (void)
 
   x = random_value (-1e4, 1e4);
   check ("atan2(+inf, x) == pi/2 for finite x",
-         FUNC(atan2) (plus_infty, x), M_PI_2);
+         FUNC(atan2) (plus_infty, x), M_PI_2l);
 
   x = random_value (-1e4, 1e4);
   check ("atan2(-inf, x) == -pi/2 for finite x",
-         FUNC(atan2) (minus_infty, x), -M_PI_2);
+         FUNC(atan2) (minus_infty, x), -M_PI_2l);
 
   x = random_greater (0);
   check ("atan2 (y,-inf) == +pi for finite y > 0",
-	 FUNC(atan2) (x, minus_infty), M_PI);
+	 FUNC(atan2) (x, minus_infty), M_PIl);
 
   x = -random_greater (0);
   check ("atan2 (y,-inf) == -pi for finite y < 0",
-	 FUNC(atan2) (x, minus_infty), -M_PI);
+	 FUNC(atan2) (x, minus_infty), -M_PIl);
 
   check ("atan2 (+inf,+inf) == +pi/4",
-	 FUNC(atan2) (plus_infty, plus_infty), M_PI_4);
+	 FUNC(atan2) (plus_infty, plus_infty), M_PI_4l);
 
   check ("atan2 (-inf,+inf) == -pi/4",
-	 FUNC(atan2) (minus_infty, plus_infty), -M_PI_4);
+	 FUNC(atan2) (minus_infty, plus_infty), -M_PI_4l);
 
   check ("atan2 (+inf,-inf) == +3*pi/4",
-	 FUNC(atan2) (plus_infty, minus_infty), 3 * M_PI_4);
+	 FUNC(atan2) (plus_infty, minus_infty), 3 * M_PI_4l);
 
   check ("atan2 (-inf,-inf) == -3*pi/4",
-	 FUNC(atan2) (minus_infty, minus_infty), -3 * M_PI_4);
+	 FUNC(atan2) (minus_infty, minus_infty), -3 * M_PI_4l);
 
   /* FIXME: Add some specific tests */
   check_eps ("atan2 (0.7,1) == 0.61072...", FUNC(atan2) (0.7,1),
@@ -1084,8 +1086,8 @@ ceil_test (void)
   check_isinfp ("ceil (+inf) == +inf", FUNC(ceil) (plus_infty));
   check_isinfn ("ceil (-inf) == -inf", FUNC(ceil) (minus_infty));
 
-  check ("ceil (pi) == 4", FUNC(ceil) (M_PI), 4.0);
-  check ("ceil (-pi) == -3", FUNC(ceil) (-M_PI), -3.0);
+  check ("ceil (pi) == 4", FUNC(ceil) (M_PIl), 4.0);
+  check ("ceil (-pi) == -3", FUNC(ceil) (-M_PIl), -3.0);
 }
 
 
@@ -1102,11 +1104,11 @@ cos_test (void)
 		   FUNC(cos) (minus_infty),
 		   INVALID_EXCEPTION);
 
-  check_eps ("cos (pi/3) == 0.5", FUNC(cos) (M_PI_6 * 2.0),
+  check_eps ("cos (pi/3) == 0.5", FUNC(cos) (M_PI_6l * 2.0),
 	     0.5, CHOOSE (4e-18L, 1e-15L, 1e-7L));
-  check_eps ("cos (2*pi/3) == -0.5", FUNC(cos) (M_PI_6 * 4.0),
+  check_eps ("cos (2*pi/3) == -0.5", FUNC(cos) (M_PI_6l * 4.0),
 	     -0.5, CHOOSE (4e-18L, 1e-15L, 1e-7L));
-  check_eps ("cos (pi/2) == 0", FUNC(cos) (M_PI_2),
+  check_eps ("cos (pi/2) == 0", FUNC(cos) (M_PI_2l),
 	     0, CHOOSE (1e-19L, 1e-16L, 1e-7L));
 
   check_eps ("cos (0.7) == 0.7648421872...", FUNC(cos) (0.7),
@@ -1177,11 +1179,11 @@ exp_test (void)
   check_isinfp ("exp (+inf) == +inf", FUNC(exp) (plus_infty));
   check ("exp (-inf) == 0", FUNC(exp) (minus_infty), 0);
 #endif
-  check_eps ("exp (1) == e", FUNC(exp) (1), M_E, CHOOSE (4e-18L, 0, 0));
+  check_eps ("exp (1) == e", FUNC(exp) (1), M_El, CHOOSE (4e-18L, 0, 0));
 
-  check_eps ("exp (2) == e^2", FUNC(exp) (2), M_E2,
+  check_eps ("exp (2) == e^2", FUNC(exp) (2), M_E2l,
 	     CHOOSE (1e-18, 0, 0));
-  check_eps ("exp (3) == e^3", FUNC(exp) (3), M_E3,
+  check_eps ("exp (3) == e^3", FUNC(exp) (3), M_E3l,
 	     CHOOSE (1.5e-17, 0, 0));
   check_eps ("exp (0.7) == 2.0137527074...", FUNC(exp) (0.7),
 	     2.0137527074704765216L, CHOOSE(9e-17L, 0, 0));
@@ -1222,7 +1224,7 @@ expm1_test (void)
   check ("expm1 (-inf) == -1", FUNC(expm1) (minus_infty), -1);
 #endif
 
-  check_eps ("expm1 (1) == e-1", FUNC(expm1) (1), M_E - 1.0,
+  check_eps ("expm1 (1) == e-1", FUNC(expm1) (1), M_El - 1.0,
 	     CHOOSE (4e-18L, 0, 2e-7));
 
   check_eps ("expm1 (0.7) == 1.01375...", FUNC(expm1) (0.7),
@@ -1418,17 +1420,17 @@ gamma_test (void)
   check_int ("gamma (0) sets signgam to 1", signgam, 1);
 
   signgam = 0;
-  check ("gamma (3) == M_LN2", FUNC(gamma) (3), M_LN2);
+  check ("gamma (3) == M_LN2", FUNC(gamma) (3), M_LN2l);
   check_int ("gamma (3) sets signgam to 1", signgam, 1);
 
   signgam = 0;
   check_eps ("gamma (0.5) == log(sqrt(pi))", FUNC(gamma) (0.5),
-             FUNC(log) (FUNC(sqrt) (M_PI)), CHOOSE (0, 1e-15, 1e-7));
+             FUNC(log) (FUNC(sqrt) (M_PIl)), CHOOSE (0, 1e-15, 1e-7));
   check_int ("gamma (0.5) sets signgam to 1", signgam, 1);
 
   signgam = 0;
   check_eps ("gamma (-0.5) == log(2*sqrt(pi))", FUNC(gamma) (-0.5),
-             FUNC(log) (2*FUNC(sqrt) (M_PI)), CHOOSE (0, 1e-15, 0));
+             FUNC(log) (2*FUNC(sqrt) (M_PIl)), CHOOSE (0, 1e-15, 0));
 
   check_int ("gamma (-0.5) sets signgam to -1", signgam, -1);
 
@@ -1445,11 +1447,11 @@ gamma_test (void)
                    FUNC(gamma) (minus_infty), INVALID_EXCEPTION);
 
 #ifdef TODO
-  check_eps ("gamma (0.5) == sqrt(pi)", FUNC(gamma) (0.5), FUNC(sqrt) (M_PI),
+  check_eps ("gamma (0.5) == sqrt(pi)", FUNC(gamma) (0.5), FUNC(sqrt) (M_PIl),
 	     CHOOSE (0, 5e-16, 2e-7));
 #endif
   check_eps ("gamma (-0.5) == -2*sqrt(pi)", FUNC(gamma) (-0.5),
-	     -2*FUNC(sqrt) (M_PI), CHOOSE (0, 5e-16, 3e-7));
+	     -2*FUNC(sqrt) (M_PIl), CHOOSE (0, 5e-16, 3e-7));
 
   check ("gamma (1) == 1", FUNC(gamma) (1), 1);
   check ("gamma (4) == 6", FUNC(gamma) (4), 6);
@@ -1486,17 +1488,17 @@ lgamma_test (void)
   check_int ("lgamma (0) sets signgam to 1", signgam, 1);
 
   signgam = 0;
-  check ("lgamma (3) == M_LN2", FUNC(lgamma) (3), M_LN2);
+  check ("lgamma (3) == M_LN2", FUNC(lgamma) (3), M_LN2l);
   check_int ("lgamma (3) sets signgam to 1", signgam, 1);
 
   signgam = 0;
   check_eps ("lgamma (0.5) == log(sqrt(pi))", FUNC(lgamma) (0.5),
-             FUNC(log) (FUNC(sqrt) (M_PI)), CHOOSE (0, 1e-15, 1e-7));
+             FUNC(log) (FUNC(sqrt) (M_PIl)), CHOOSE (0, 1e-15, 1e-7));
   check_int ("lgamma (0.5) sets signgam to 1", signgam, 1);
 
   signgam = 0;
   check_eps ("lgamma (-0.5) == log(2*sqrt(pi))", FUNC(lgamma) (-0.5),
-             FUNC(log) (2*FUNC(sqrt) (M_PI)), CHOOSE (0, 1e-15, 0));
+             FUNC(log) (2*FUNC(sqrt) (M_PIl)), CHOOSE (0, 1e-15, 0));
 
   check_int ("lgamma (-0.5) sets signgam to -1", signgam, -1);
 
@@ -1519,7 +1521,7 @@ ilogb_test (void)
   int i;
 
   check_int ("ilogb (1) == 0", FUNC(ilogb) (1), 0);
-  check_int ("ilogb (e) == 1", FUNC(ilogb) (M_E), 1);
+  check_int ("ilogb (e) == 1", FUNC(ilogb) (M_El), 1);
   check_int ("ilogb (1024) == 10", FUNC(ilogb) (1024), 10);
   check_int ("ilogb (-2000) == 10", FUNC(ilogb) (-2000), 10);
 
@@ -1569,11 +1571,11 @@ log_test (void)
 		   FUNC(log) (-1), INVALID_EXCEPTION);
   check_isinfp ("log (+inf) == +inf", FUNC(log) (plus_infty));
 
-  check_eps ("log (e) == 1", FUNC(log) (M_E), 1, CHOOSE (1e-18L, 0, 9e-8L));
-  check_eps ("log (1/e) == -1", FUNC(log) (1.0 / M_E), -1,
+  check_eps ("log (e) == 1", FUNC(log) (M_El), 1, CHOOSE (1e-18L, 0, 9e-8L));
+  check_eps ("log (1/e) == -1", FUNC(log) (1.0 / M_El), -1,
 	     CHOOSE (2e-18L, 0, 0));
-  check ("log (2) == M_LN2", FUNC(log) (2), M_LN2);
-  check_eps ("log (10) == M_LN10", FUNC(log) (10), M_LN10,
+  check ("log (2) == M_LN2", FUNC(log) (2), M_LN2l);
+  check_eps ("log (10) == M_LN10", FUNC(log) (10), M_LN10l,
 	     CHOOSE (1e-18L, 0, 0));
   check_eps ("log (0.7) == -0.3566749439...", FUNC(log) (0.7),
 	     -0.35667494393873237891L, CHOOSE(7e-17L, 6e-17, 3e-8));
@@ -1602,7 +1604,7 @@ log10_test (void)
   check_eps ("log10 (100) == 2", FUNC(log10) (100.0), 2,
 	     CHOOSE (1e-18L, 0, 0));
   check ("log10 (10000) == 4", FUNC(log10) (10000.0), 4);
-  check_eps ("log10 (e) == M_LOG10E", FUNC(log10) (M_E), M_LOG10E,
+  check_eps ("log10 (e) == M_LOG10E", FUNC(log10) (M_El), M_LOG10El,
 	     CHOOSE (1e-18, 0, 9e-8));
   check_eps ("log10 (0.7) == -0.1549019599...", FUNC(log10) (0.7),
 	     -0.15490195998574316929L, CHOOSE(3e-17L, 3e-17, 0));
@@ -1622,7 +1624,7 @@ log1p_test (void)
 
   check_isinfp ("log1p (+inf) == +inf", FUNC(log1p) (plus_infty));
 
-  check_eps ("log1p (e-1) == 1", FUNC(log1p) (M_E - 1.0), 1,
+  check_eps ("log1p (e-1) == 1", FUNC(log1p) (M_El - 1.0), 1,
 	     CHOOSE (1e-18L, 0, 6e-8));
 
   check_eps ("log1p (-0.3) == -0.35667...", FUNC(log1p) (-0.3),
@@ -1645,7 +1647,7 @@ log2_test (void)
 
   check_isinfp ("log2 (+inf) == +inf", FUNC(log2) (plus_infty));
 
-  check_eps ("log2 (e) == M_LOG2E", FUNC(log2) (M_E), M_LOG2E,
+  check_eps ("log2 (e) == M_LOG2E", FUNC(log2) (M_El), M_LOG2El,
 	     CHOOSE (1e-18L, 0, 0));
   check ("log2 (2) == 1", FUNC(log2) (2.0), 1);
   check_eps ("log2 (16) == 4", FUNC(log2) (16.0), 4, CHOOSE (1e-18L, 0, 0));
@@ -1669,7 +1671,7 @@ logb_test (void)
 		    FUNC(logb) (minus_zero), DIVIDE_BY_ZERO_EXCEPTION);
 
   check ("logb (1) == 0", FUNC(logb) (1), 0);
-  check ("logb (e) == 1", FUNC(logb) (M_E), 1);
+  check ("logb (e) == 1", FUNC(logb) (M_El), 1);
   check ("logb (1024) == 10", FUNC(logb) (1024), 10);
   check ("logb (-2000) == 10", FUNC(logb) (-2000), 10);
 
@@ -1826,12 +1828,12 @@ sin_test (void)
 		   FUNC(sin) (minus_infty),
 		   INVALID_EXCEPTION);
 
-  check_eps ("sin (pi/6) == 0.5", FUNC(sin) (M_PI_6),
+  check_eps ("sin (pi/6) == 0.5", FUNC(sin) (M_PI_6l),
 	     0.5, CHOOSE (4e-18L, 0, 0));
-  check_eps ("sin (-pi/6) == -0.5", FUNC(sin) (-M_PI_6),
+  check_eps ("sin (-pi/6) == -0.5", FUNC(sin) (-M_PI_6l),
 	     -0.5, CHOOSE (4e-18L, 0, 0));
-  check ("sin (pi/2) == 1", FUNC(sin) (M_PI_2), 1);
-  check ("sin (-pi/2) == -1", FUNC(sin) (-M_PI_2), -1);
+  check ("sin (pi/2) == 1", FUNC(sin) (M_PI_2l), 1);
+  check ("sin (-pi/2) == -1", FUNC(sin) (-M_PI_2l), -1);
   check_eps ("sin (0.7) == 0.6442176872...", FUNC(sin) (0.7),
 	     0.64421768723769105367L, CHOOSE(4e-17L, 0, 0));
 }
@@ -1888,18 +1890,18 @@ sincos_test (void)
   check_isnan_exc ("sincos (-inf,&sin, &cos) puts NaN in cos plus invalid exception",
 		   cos_res, INVALID_EXCEPTION);
 
-  FUNC(sincos) (M_PI_2, &sin_res, &cos_res);
+  FUNC(sincos) (M_PI_2l, &sin_res, &cos_res);
   fegetenv (&fenv);
   check ("sincos (pi/2, &sin, &cos) puts 1 in sin", sin_res, 1);
   fesetenv (&fenv);
   check_eps ("sincos (pi/2, &sin, &cos) puts 0 in cos", cos_res, 0,
 	     CHOOSE (1e-18L, 1e-16, 1e-7));
 
-  FUNC(sincos) (M_PI_6, &sin_res, &cos_res);
+  FUNC(sincos) (M_PI_6l, &sin_res, &cos_res);
   check_eps ("sincos (pi/6, &sin, &cos) puts 0.5 in sin", sin_res, 0.5,
 	     CHOOSE (5e-18L, 0, 0));
 
-  FUNC(sincos) (M_PI_6*2.0, &sin_res, &cos_res);
+  FUNC(sincos) (M_PI_6l*2.0, &sin_res, &cos_res);
   check_eps ("sincos (pi/3, &sin, &cos) puts 0.5 in cos", cos_res, 0.5,
 	     CHOOSE (5e-18L, 1e-15, 1e-7));
 
@@ -1921,7 +1923,7 @@ tan_test (void)
   check_isnan_exc ("tan (-inf) == NaN plus invalid exception",
 		   FUNC(tan) (minus_infty), INVALID_EXCEPTION);
 
-  check_eps ("tan (pi/4) == 1", FUNC(tan) (M_PI_4), 1,
+  check_eps ("tan (pi/4) == 1", FUNC(tan) (M_PI_4l), 1,
 	     CHOOSE (2e-18L, 1e-15L, 2e-7));
   check_eps ("tan (0.7) == 0.8422883804...", FUNC(tan) (0.7),
 	     0.84228838046307944813L, CHOOSE(8e-17L, 0, 0));
@@ -1953,7 +1955,7 @@ fabs_test (void)
   check_isinfp ("fabs (-inf) == +inf", FUNC(fabs) (minus_infty));
 
   check ("fabs (+38) == 38", FUNC(fabs) (38.0), 38.0);
-  check ("fabs (-e) == e", FUNC(fabs) (-M_E), M_E);
+  check ("fabs (-e) == e", FUNC(fabs) (-M_El), M_El);
 }
 
 
@@ -1965,8 +1967,8 @@ floor_test (void)
   check_isinfp ("floor (+inf) == +inf", FUNC(floor) (plus_infty));
   check_isinfn ("floor (-inf) == -inf", FUNC(floor) (minus_infty));
 
-  check ("floor (pi) == 3", FUNC(floor) (M_PI), 3.0);
-  check ("floor (-pi) == -4", FUNC(floor) (-M_PI), -4.0);
+  check ("floor (pi) == 3", FUNC(floor) (M_PIl), 3.0);
+  check ("floor (-pi) == -4", FUNC(floor) (-M_PIl), -4.0);
 }
 
 
@@ -3440,62 +3442,64 @@ cacos_test (void)
   __complex__ MATHTYPE result;
 
   result = FUNC(cacos) (BUILD_COMPLEX (0, 0));
-  check ("real(cacos(0 + i0)) = pi/2", __real__ result, M_PI_2);
+  check ("real(cacos(0 + i0)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(cacos(0 + i0)) = -0", __imag__ result, minus_zero);
   result = FUNC(cacos) (BUILD_COMPLEX (minus_zero, 0));
-  check ("real(cacos(-0 + i0)) = pi/2", __real__ result, M_PI_2);
+  check ("real(cacos(-0 + i0)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(cacos(-0 + i0)) = -0", __imag__ result, minus_zero);
   result = FUNC(cacos) (BUILD_COMPLEX (0, minus_zero));
-  check ("real(cacos(0 - i0)) = pi/2", __real__ result, M_PI_2);
+  check ("real(cacos(0 - i0)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(cacos(0 - i0)) = 0", __imag__ result, 0);
   result = FUNC(cacos) (BUILD_COMPLEX (minus_zero, minus_zero));
-  check ("real(cacos(-0 - i0)) = pi/2", __real__ result, M_PI_2);
+  check ("real(cacos(-0 - i0)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(cacos(-0 - i0)) = 0", __imag__ result, 0);
 
   result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, plus_infty));
-  check ("real(cacos(-Inf + i Inf)) = 3*pi/4", __real__ result, M_PI - M_PI_4);
+  check ("real(cacos(-Inf + i Inf)) = 3*pi/4", __real__ result,
+	 M_PIl - M_PI_4l);
   check_isinfn ("imag(cacos(-Inf + i Inf)) = -Inf", __imag__ result);
   result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, minus_infty));
-  check ("real(cacos(-Inf - i Inf)) = 3*pi/4", __real__ result, M_PI - M_PI_4);
+  check ("real(cacos(-Inf - i Inf)) = 3*pi/4", __real__ result,
+ M_PIl - M_PI_4l);
   check_isinfp ("imag(cacos(-Inf - i Inf)) = +Inf", __imag__ result);
 
   result = FUNC(cacos) (BUILD_COMPLEX (plus_infty, plus_infty));
-  check ("real(cacos(+Inf + i Inf)) = pi/4", __real__ result, M_PI_4);
+  check ("real(cacos(+Inf + i Inf)) = pi/4", __real__ result, M_PI_4l);
   check_isinfn ("imag(cacos(+Inf + i Inf)) = -Inf", __imag__ result);
   result = FUNC(cacos) (BUILD_COMPLEX (plus_infty, minus_infty));
-  check ("real(cacos(+Inf - i Inf)) = pi/4", __real__ result, M_PI_4);
+  check ("real(cacos(+Inf - i Inf)) = pi/4", __real__ result, M_PI_4l);
   check_isinfp ("imag(cacos(+Inf - i Inf)) = +Inf", __imag__ result);
 
   result = FUNC(cacos) (BUILD_COMPLEX (-10.0, plus_infty));
-  check ("real(cacos(-10.0 + i Inf)) = pi/2", __real__ result, M_PI_2);
+  check ("real(cacos(-10.0 + i Inf)) = pi/2", __real__ result, M_PI_2l);
   check_isinfn ("imag(cacos(-10.0 + i Inf)) = -Inf", __imag__ result);
   result = FUNC(cacos) (BUILD_COMPLEX (-10.0, minus_infty));
-  check ("real(cacos(-10.0 - i Inf)) = pi/2", __real__ result, M_PI_2);
+  check ("real(cacos(-10.0 - i Inf)) = pi/2", __real__ result, M_PI_2l);
   check_isinfp ("imag(cacos(-10.0 - i Inf)) = +Inf", __imag__ result);
   result = FUNC(cacos) (BUILD_COMPLEX (0, plus_infty));
-  check ("real(cacos(0 + i Inf)) = pi/2", __real__ result, M_PI_2);
+  check ("real(cacos(0 + i Inf)) = pi/2", __real__ result, M_PI_2l);
   check_isinfn ("imag(cacos(0 + i Inf)) = -Inf", __imag__ result);
   result = FUNC(cacos) (BUILD_COMPLEX (0, minus_infty));
-  check ("real(cacos(0 - i Inf)) = pi/2", __real__ result, M_PI_2);
+  check ("real(cacos(0 - i Inf)) = pi/2", __real__ result, M_PI_2l);
   check_isinfp ("imag(cacos(0 - i Inf)) = +Inf", __imag__ result);
   result = FUNC(cacos) (BUILD_COMPLEX (0.1, plus_infty));
-  check ("real(cacos(0.1 + i Inf)) = pi/2", __real__ result, M_PI_2);
+  check ("real(cacos(0.1 + i Inf)) = pi/2", __real__ result, M_PI_2l);
   check_isinfn ("imag(cacos(0.1 + i Inf)) = -Inf", __imag__ result);
   result = FUNC(cacos) (BUILD_COMPLEX (0.1, minus_infty));
-  check ("real(cacos(0.1 - i Inf)) = pi/2", __real__ result, M_PI_2);
+  check ("real(cacos(0.1 - i Inf)) = pi/2", __real__ result, M_PI_2l);
   check_isinfp ("imag(cacos(0.1 - i Inf)) = +Inf", __imag__ result);
 
   result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, 0));
-  check ("real(cacos(-Inf + i0)) = pi", __real__ result, M_PI);
+  check ("real(cacos(-Inf + i0)) = pi", __real__ result, M_PIl);
   check_isinfn ("imag(cacos(-Inf + i0)) = -Inf", __imag__ result);
   result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, minus_zero));
-  check ("real(cacos(-Inf - i0)) = pi", __real__ result, M_PI);
+  check ("real(cacos(-Inf - i0)) = pi", __real__ result, M_PIl);
   check_isinfp ("imag(cacos(-Inf - i0)) = +Inf", __imag__ result);
   result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, 100));
-  check ("real(cacos(-Inf + i100)) = pi", __real__ result, M_PI);
+  check ("real(cacos(-Inf + i100)) = pi", __real__ result, M_PIl);
   check_isinfn ("imag(cacos(-Inf + i100)) = -Inf", __imag__ result);
   result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, -100));
-  check ("real(cacos(-Inf - i100)) = pi", __real__ result, M_PI);
+  check ("real(cacos(-Inf - i100)) = pi", __real__ result, M_PIl);
   check_isinfp ("imag(cacos(-Inf - i100)) = +Inf", __imag__ result);
 
   result = FUNC(cacos) (BUILD_COMPLEX (plus_infty, 0));
@@ -3521,10 +3525,10 @@ cacos_test (void)
 		FUNC(fabs) (__imag__ result));
 
   result = FUNC(cacos) (BUILD_COMPLEX (0, nan_value));
-  check ("real(cacos(0 + i NaN)) = pi/2", __real__ result, M_PI_2);
+  check ("real(cacos(0 + i NaN)) = pi/2", __real__ result, M_PI_2l);
   check_isnan ("imag(cacos(0 + i NaN)) = NaN", __imag__ result);
   result = FUNC(cacos) (BUILD_COMPLEX (minus_zero, nan_value));
-  check ("real(cacos(-0 + i NaN)) = pi/2", __real__ result, M_PI_2);
+  check ("real(cacos(-0 + i NaN)) = pi/2", __real__ result, M_PI_2l);
   check_isnan ("imag(cacos(-0 + i NaN)) = NaN", __imag__ result);
 
   result = FUNC(cacos) (BUILD_COMPLEX (nan_value, plus_infty));
@@ -3581,64 +3585,64 @@ cacosh_test (void)
 
   result = FUNC(cacosh) (BUILD_COMPLEX (0, 0));
   check ("real(cacosh(0 + i0)) = 0", __real__ result, 0);
-  check ("imag(cacosh(0 + i0)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(cacosh(0 + i0)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(cacosh) (BUILD_COMPLEX (minus_zero, 0));
   check ("real(cacosh(-0 + i0)) = 0", __real__ result, 0);
-  check ("imag(cacosh(-0 + i0)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(cacosh(-0 + i0)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(cacosh) (BUILD_COMPLEX (0, minus_zero));
   check ("real(cacosh(0 - i0)) = 0", __real__ result, 0);
-  check ("imag(cacosh(0 - i0)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(cacosh(0 - i0)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(cacosh) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(cacosh(-0 - i0)) = 0", __real__ result, 0);
-  check ("imag(cacosh(-0 - i0)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(cacosh(-0 - i0)) = -pi/2", __imag__ result, -M_PI_2l);
 
   result = FUNC(cacosh) (BUILD_COMPLEX (minus_infty, plus_infty));
   check_isinfp ("real(cacosh(-Inf + i Inf)) = +Inf", __real__ result);
   check ("imag(cacosh(-Inf + i Inf)) = 3*pi/4", __imag__ result,
-	 M_PI - M_PI_4);
+	 M_PIl - M_PI_4l);
   result = FUNC(cacosh) (BUILD_COMPLEX (minus_infty, minus_infty));
   check_isinfp ("real(cacosh(-Inf - i Inf)) = +Inf", __real__ result);
   check ("imag(cacosh(-Inf - i Inf)) = -3*pi/4", __imag__ result,
-	 M_PI_4 - M_PI);
+	 M_PI_4l - M_PIl);
 
   result = FUNC(cacosh) (BUILD_COMPLEX (plus_infty, plus_infty));
   check_isinfp ("real(cacosh(+Inf + i Inf)) = +Inf", __real__ result);
-  check ("imag(cacosh(+Inf + i Inf)) = pi/4", __imag__ result, M_PI_4);
+  check ("imag(cacosh(+Inf + i Inf)) = pi/4", __imag__ result, M_PI_4l);
   result = FUNC(cacosh) (BUILD_COMPLEX (plus_infty, minus_infty));
   check_isinfp ("real(cacosh(+Inf - i Inf)) = +Inf", __real__ result);
-  check ("imag(cacosh(+Inf - i Inf)) = -pi/4", __imag__ result, -M_PI_4);
+  check ("imag(cacosh(+Inf - i Inf)) = -pi/4", __imag__ result, -M_PI_4l);
 
   result = FUNC(cacosh) (BUILD_COMPLEX (-10.0, plus_infty));
   check_isinfp ("real(cacosh(-10.0 + i Inf)) = +Inf", __real__ result);
-  check ("imag(cacosh(-10.0 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(cacosh(-10.0 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(cacosh) (BUILD_COMPLEX (-10.0, minus_infty));
   check_isinfp ("real(cacosh(-10.0 - i Inf)) = +Inf", __real__ result);
-  check ("imag(cacosh(-10.0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(cacosh(-10.0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(cacosh) (BUILD_COMPLEX (0, plus_infty));
   check_isinfp ("real(cacosh(0 + i Inf)) = +Inf", __real__ result);
-  check ("imag(cacosh(0 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(cacosh(0 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(cacosh) (BUILD_COMPLEX (0, minus_infty));
   check_isinfp ("real(cacosh(0 - i Inf)) = +Inf", __real__ result);
-  check ("imag(cacosh(0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(cacosh(0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(cacosh) (BUILD_COMPLEX (0.1, plus_infty));
   check_isinfp ("real(cacosh(0.1 + i Inf)) = +Inf", __real__ result);
-  check ("imag(cacosh(0.1 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(cacosh(0.1 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(cacosh) (BUILD_COMPLEX (0.1, minus_infty));
   check_isinfp ("real(cacosh(0.1 - i Inf)) = +Inf", __real__ result);
-  check ("imag(cacosh(0.1 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(cacosh(0.1 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
 
   result = FUNC(cacosh) (BUILD_COMPLEX (minus_infty, 0));
   check_isinfp ("real(cacosh(-Inf + i0)) = +Inf", __real__ result);
-  check ("imag(cacosh(-Inf + i0)) = pi", __imag__ result, M_PI);
+  check ("imag(cacosh(-Inf + i0)) = pi", __imag__ result, M_PIl);
   result = FUNC(cacosh) (BUILD_COMPLEX (minus_infty, minus_zero));
   check_isinfp ("real(cacosh(-Inf - i0)) = +Inf", __real__ result);
-  check ("imag(cacosh(-Inf - i0)) = -pi", __imag__ result, -M_PI);
+  check ("imag(cacosh(-Inf - i0)) = -pi", __imag__ result, -M_PIl);
   result = FUNC(cacosh) (BUILD_COMPLEX (minus_infty, 100));
   check_isinfp ("real(cacosh(-Inf + i100)) = +Inf", __real__ result);
-  check ("imag(cacosh(-Inf + i100)) = pi", __imag__ result, M_PI);
+  check ("imag(cacosh(-Inf + i100)) = pi", __imag__ result, M_PIl);
   result = FUNC(cacosh) (BUILD_COMPLEX (minus_infty, -100));
   check_isinfp ("real(cacosh(-Inf - i100)) = +Inf", __real__ result);
-  check ("imag(cacosh(-Inf - i100)) = -pi", __imag__ result, -M_PI);
+  check ("imag(cacosh(-Inf - i100)) = -pi", __imag__ result, -M_PIl);
 
   result = FUNC(cacosh) (BUILD_COMPLEX (plus_infty, 0));
   check_isinfp ("real(cacosh(+Inf + i0)) = +Inf", __real__ result);
@@ -3733,16 +3737,16 @@ casin_test (void)
   check ("imag(casin(-0 - i0)) = -0", __imag__ result, minus_zero);
 
   result = FUNC(casin) (BUILD_COMPLEX (plus_infty, plus_infty));
-  check ("real(casin(+Inf + i Inf)) = pi/4", __real__ result, M_PI_4);
+  check ("real(casin(+Inf + i Inf)) = pi/4", __real__ result, M_PI_4l);
   check_isinfp ("imag(casin(+Inf + i Inf)) = +Inf", __imag__ result);
   result = FUNC(casin) (BUILD_COMPLEX (plus_infty, minus_infty));
-  check ("real(casin(+Inf - i Inf)) = pi/4", __real__ result, M_PI_4);
+  check ("real(casin(+Inf - i Inf)) = pi/4", __real__ result, M_PI_4l);
   check_isinfn ("imag(casin(+Inf - i Inf)) = -Inf", __imag__ result);
   result = FUNC(casin) (BUILD_COMPLEX (minus_infty, plus_infty));
-  check ("real(casin(-Inf + i Inf)) = -pi/4", __real__ result, -M_PI_4);
+  check ("real(casin(-Inf + i Inf)) = -pi/4", __real__ result, -M_PI_4l);
   check_isinfp ("imag(casin(-Inf + i Inf)) = +Inf", __imag__ result);
   result = FUNC(casin) (BUILD_COMPLEX (minus_infty, minus_infty));
-  check ("real(casin(-Inf - i Inf)) = -pi/4", __real__ result, -M_PI_4);
+  check ("real(casin(-Inf - i Inf)) = -pi/4", __real__ result, -M_PI_4l);
   check_isinfn ("imag(casin(-Inf - i Inf)) = -Inf", __imag__ result);
 
   result = FUNC(casin) (BUILD_COMPLEX (-10.0, plus_infty));
@@ -3771,29 +3775,29 @@ casin_test (void)
   check_isinfn ("imag(casin(0.1 - i Inf)) = -Inf", __imag__ result);
 
   result = FUNC(casin) (BUILD_COMPLEX (minus_infty, 0));
-  check ("real(casin(-Inf + i0)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(casin(-Inf + i0)) = -pi/2", __real__ result, -M_PI_2l);
   check_isinfp ("imag(casin(-Inf + i0)) = +Inf", __imag__ result);
   result = FUNC(casin) (BUILD_COMPLEX (minus_infty, minus_zero));
-  check ("real(casin(-Inf - i0)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(casin(-Inf - i0)) = -pi/2", __real__ result, -M_PI_2l);
   check_isinfn ("imag(casin(-Inf - i0)) = -Inf", __imag__ result);
   result = FUNC(casin) (BUILD_COMPLEX (minus_infty, 100));
-  check ("real(casin(-Inf + i100)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(casin(-Inf + i100)) = -pi/2", __real__ result, -M_PI_2l);
   check_isinfp ("imag(casin(-Inf + i100)) = +Inf", __imag__ result);
   result = FUNC(casin) (BUILD_COMPLEX (minus_infty, -100));
-  check ("real(casin(-Inf - i100)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(casin(-Inf - i100)) = -pi/2", __real__ result, -M_PI_2l);
   check_isinfn ("imag(casin(-Inf - i100)) = -Inf", __imag__ result);
 
   result = FUNC(casin) (BUILD_COMPLEX (plus_infty, 0));
-  check ("real(casin(+Inf + i0)) = pi/2", __real__ result, M_PI_2);
+  check ("real(casin(+Inf + i0)) = pi/2", __real__ result, M_PI_2l);
   check_isinfp ("imag(casin(+Inf + i0)) = +Inf", __imag__ result);
   result = FUNC(casin) (BUILD_COMPLEX (plus_infty, minus_zero));
-  check ("real(casin(+Inf - i0)) = pi/2", __real__ result, M_PI_2);
+  check ("real(casin(+Inf - i0)) = pi/2", __real__ result, M_PI_2l);
   check_isinfn ("imag(casin(+Inf - i0)) = -Inf", __imag__ result);
   result = FUNC(casin) (BUILD_COMPLEX (plus_infty, 0.5));
-  check ("real(casin(+Inf + i0.5)) = pi/2", __real__ result, M_PI_2);
+  check ("real(casin(+Inf + i0.5)) = pi/2", __real__ result, M_PI_2l);
   check_isinfp ("imag(casin(+Inf + i0.5)) = +Inf", __imag__ result);
   result = FUNC(casin) (BUILD_COMPLEX (plus_infty, -0.5));
-  check ("real(casin(+Inf - i0.5)) = pi/2", __real__ result, M_PI_2);
+  check ("real(casin(+Inf - i0.5)) = pi/2", __real__ result, M_PI_2l);
   check_isinfn ("imag(casin(+Inf - i0.5)) = -Inf", __imag__ result);
 
   result = FUNC(casin) (BUILD_COMPLEX (nan_value, plus_infty));
@@ -3879,41 +3883,41 @@ casinh_test (void)
 
   result = FUNC(casinh) (BUILD_COMPLEX (plus_infty, plus_infty));
   check_isinfp ("real(casinh(+Inf + i Inf)) = +Inf", __real__ result);
-  check ("imag(casinh(+Inf + i Inf)) = pi/4", __imag__ result, M_PI_4);
+  check ("imag(casinh(+Inf + i Inf)) = pi/4", __imag__ result, M_PI_4l);
   result = FUNC(casinh) (BUILD_COMPLEX (plus_infty, minus_infty));
   check_isinfp ("real(casinh(+Inf - i Inf)) = +Inf", __real__ result);
-  check ("imag(casinh(+Inf - i Inf)) = -pi/4", __imag__ result, -M_PI_4);
+  check ("imag(casinh(+Inf - i Inf)) = -pi/4", __imag__ result, -M_PI_4l);
   result = FUNC(casinh) (BUILD_COMPLEX (minus_infty, plus_infty));
   check_isinfn ("real(casinh(-Inf + i Inf)) = -Inf", __real__ result);
-  check ("imag(casinh(-Inf + i Inf)) = pi/4", __imag__ result, M_PI_4);
+  check ("imag(casinh(-Inf + i Inf)) = pi/4", __imag__ result, M_PI_4l);
   result = FUNC(casinh) (BUILD_COMPLEX (minus_infty, minus_infty));
   check_isinfn ("real(casinh(-Inf - i Inf)) = -Inf", __real__ result);
-  check ("imag(casinh(-Inf - i Inf)) = -pi/4", __imag__ result, -M_PI_4);
+  check ("imag(casinh(-Inf - i Inf)) = -pi/4", __imag__ result, -M_PI_4l);
 
   result = FUNC(casinh) (BUILD_COMPLEX (-10.0, plus_infty));
   check_isinfn ("real(casinh(-10.0 + i Inf)) = -Inf", __real__ result);
-  check ("imag(casinh(-10.0 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(casinh(-10.0 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(casinh) (BUILD_COMPLEX (-10.0, minus_infty));
   check_isinfn ("real(casinh(-10.0 - i Inf)) = -Inf", __real__ result);
-  check ("imag(casinh(-10.0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(casinh(-10.0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(casinh) (BUILD_COMPLEX (0, plus_infty));
   check_isinfp ("real(casinh(0 + i Inf)) = +Inf", __real__ result);
-  check ("imag(casinh(0 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(casinh(0 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(casinh) (BUILD_COMPLEX (0, minus_infty));
   check_isinfp ("real(casinh(0 - i Inf)) = +Inf", __real__ result);
-  check ("imag(casinh(0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(casinh(0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(casinh) (BUILD_COMPLEX (minus_zero, plus_infty));
   check_isinfn ("real(casinh(-0 + i Inf)) = -Inf", __real__ result);
-  check ("imag(casinh(-0 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(casinh(-0 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(casinh) (BUILD_COMPLEX (minus_zero, minus_infty));
   check_isinfn ("real(casinh(-0 - i Inf)) = -Inf", __real__ result);
-  check ("imag(casinh(-0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(casinh(-0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(casinh) (BUILD_COMPLEX (0.1, plus_infty));
   check_isinfp ("real(casinh(0.1 + i Inf)) = +Inf", __real__ result);
-  check ("imag(casinh(0.1 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(casinh(0.1 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(casinh) (BUILD_COMPLEX (0.1, minus_infty));
   check_isinfp ("real(casinh(0.1 - i Inf)) = +Inf", __real__ result);
-  check ("imag(casinh(0.1 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(casinh(0.1 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
 
   result = FUNC(casinh) (BUILD_COMPLEX (minus_infty, 0));
   check_isinfn ("real(casinh(-Inf + i0)) = -Inf", __real__ result);
@@ -4023,67 +4027,67 @@ catan_test (void)
   check ("imag(catan(-0 - i0)) = -0", __imag__ result, minus_zero);
 
   result = FUNC(catan) (BUILD_COMPLEX (plus_infty, plus_infty));
-  check ("real(catan(+Inf + i Inf)) = pi/2", __real__ result, M_PI_2);
+  check ("real(catan(+Inf + i Inf)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(catan(+Inf + i Inf)) = 0", __imag__ result, 0);
   result = FUNC(catan) (BUILD_COMPLEX (plus_infty, minus_infty));
-  check ("real(catan(+Inf - i Inf)) = pi/2", __real__ result, M_PI_2);
+  check ("real(catan(+Inf - i Inf)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(catan(+Inf - i Inf)) = -0", __imag__ result, minus_zero);
   result = FUNC(catan) (BUILD_COMPLEX (minus_infty, plus_infty));
-  check ("real(catan(-Inf + i Inf)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(catan(-Inf + i Inf)) = -pi/2", __real__ result, -M_PI_2l);
   check ("imag(catan(-Inf + i Inf)) = 0", __imag__ result, 0.0);
   result = FUNC(catan) (BUILD_COMPLEX (minus_infty, minus_infty));
-  check ("real(catan(-Inf - i Inf)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(catan(-Inf - i Inf)) = -pi/2", __real__ result, -M_PI_2l);
   check ("imag(catan(-Inf - i Inf)) = -0", __imag__ result, minus_zero);
 
   result = FUNC(catan) (BUILD_COMPLEX (plus_infty, -10.0));
-  check ("real(catan(+Inf - i10.0)) = pi/2", __real__ result, M_PI_2);
+  check ("real(catan(+Inf - i10.0)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(catan(+Inf - i10.0)) = -0", __imag__ result, minus_zero);
   result = FUNC(catan) (BUILD_COMPLEX (minus_infty, -10.0));
-  check ("real(catan(-Inf - i10.0)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(catan(-Inf - i10.0)) = -pi/2", __real__ result, -M_PI_2l);
   check ("imag(catan(-Inf - i10.0)) = -0", __imag__ result, minus_zero);
   result = FUNC(catan) (BUILD_COMPLEX (plus_infty, minus_zero));
-  check ("real(catan(Inf - i0)) = pi/2", __real__ result, M_PI_2);
+  check ("real(catan(Inf - i0)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(catan(Inf - i0)) = -0", __imag__ result, minus_zero);
   result = FUNC(catan) (BUILD_COMPLEX (minus_infty, minus_zero));
-  check ("real(catan(-Inf - i0)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(catan(-Inf - i0)) = -pi/2", __real__ result, -M_PI_2l);
   check ("imag(catan(-Inf - i0)) = -0", __imag__ result, minus_zero);
   result = FUNC(catan) (BUILD_COMPLEX (plus_infty, 0.0));
-  check ("real(catan(Inf + i0)) = pi/2", __real__ result, M_PI_2);
+  check ("real(catan(Inf + i0)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(catan(Inf + i0)) = 0", __imag__ result, 0.0);
   result = FUNC(catan) (BUILD_COMPLEX (minus_infty, 0.0));
-  check ("real(catan(-Inf + i0)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(catan(-Inf + i0)) = -pi/2", __real__ result, -M_PI_2l);
   check ("imag(catan(-Inf + i0)) = 0", __imag__ result, 0.0);
   result = FUNC(catan) (BUILD_COMPLEX (plus_infty, 0.1));
-  check ("real(catan(+Inf + i0.1)) = pi/2", __real__ result, M_PI_2);
+  check ("real(catan(+Inf + i0.1)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(catan(+Inf + i0.1)) = 0", __imag__ result, 0);
   result = FUNC(catan) (BUILD_COMPLEX (minus_infty, 0.1));
-  check ("real(catan(-Inf + i0.1)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(catan(-Inf + i0.1)) = -pi/2", __real__ result, -M_PI_2l);
   check ("imag(catan(-Inf + i0.1)) = 0", __imag__ result, 0);
 
   result = FUNC(catan) (BUILD_COMPLEX (0.0, minus_infty));
-  check ("real(catan(0 - i Inf)) = pi/2", __real__ result, M_PI_2);
+  check ("real(catan(0 - i Inf)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(catan(0 - i Inf)) = -0", __imag__ result, minus_zero);
   result = FUNC(catan) (BUILD_COMPLEX (minus_zero, minus_infty));
-  check ("real(catan(-0 - i Inf)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(catan(-0 - i Inf)) = -pi/2", __real__ result, -M_PI_2l);
   check ("imag(catan(-0 - i Inf)) = -0", __imag__ result, minus_zero);
   result = FUNC(catan) (BUILD_COMPLEX (100.0, minus_infty));
-  check ("real(catan(100 - i Inf)) = pi/2", __real__ result, M_PI_2);
+  check ("real(catan(100 - i Inf)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(catan(100 - i Inf)) = -0", __imag__ result, minus_zero);
   result = FUNC(catan) (BUILD_COMPLEX (-100.0, minus_infty));
-  check ("real(catan(-100 - i Inf)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(catan(-100 - i Inf)) = -pi/2", __real__ result, -M_PI_2l);
   check ("imag(catan(-100 - i Inf)) = -0", __imag__ result, minus_zero);
 
   result = FUNC(catan) (BUILD_COMPLEX (0.0, plus_infty));
-  check ("real(catan(0 + i Inf)) = pi/2", __real__ result, M_PI_2);
+  check ("real(catan(0 + i Inf)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(catan(0 + i Inf)) = 0", __imag__ result, 0);
   result = FUNC(catan) (BUILD_COMPLEX (minus_zero, plus_infty));
-  check ("real(catan(-0 + i Inf)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(catan(-0 + i Inf)) = -pi/2", __real__ result, -M_PI_2l);
   check ("imag(catan(-0 + i Inf)) = 0", __imag__ result, 0);
   result = FUNC(catan) (BUILD_COMPLEX (0.5, plus_infty));
-  check ("real(catan(0.5 + i Inf)) = pi/2", __real__ result, M_PI_2);
+  check ("real(catan(0.5 + i Inf)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(catan(0.5 + i Inf)) = 0", __imag__ result, 0);
   result = FUNC(catan) (BUILD_COMPLEX (-0.5, plus_infty));
-  check ("real(catan(-0.5 + i Inf)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(catan(-0.5 + i Inf)) = -pi/2", __real__ result, -M_PI_2l);
   check ("imag(catan(-0.5 + i Inf)) = 0", __imag__ result, 0);
 
   result = FUNC(catan) (BUILD_COMPLEX (nan_value, 0.0));
@@ -4108,10 +4112,10 @@ catan_test (void)
   check_isnan ("imag(catan(-0 + i NaN)) = NaN", __imag__ result);
 
   result = FUNC(catan) (BUILD_COMPLEX (plus_infty, nan_value));
-  check ("real(catan(+Inf + i NaN)) = pi/2", __real__ result, M_PI_2);
+  check ("real(catan(+Inf + i NaN)) = pi/2", __real__ result, M_PI_2l);
   check ("imag(catan(+Inf + i NaN)) = +-0", FUNC(fabs) (__imag__ result), 0);
   result = FUNC(catan) (BUILD_COMPLEX (minus_infty, nan_value));
-  check ("real(catan(-Inf + i NaN)) = -pi/2", __real__ result, -M_PI_2);
+  check ("real(catan(-Inf + i NaN)) = -pi/2", __real__ result, -M_PI_2l);
   check ("imag(catan(-Inf + i NaN)) = +-0", FUNC(fabs) (__imag__ result), 0);
 
   result = FUNC(catan) (BUILD_COMPLEX (nan_value, 10.5));
@@ -4174,67 +4178,67 @@ catanh_test (void)
 
   result = FUNC(catanh) (BUILD_COMPLEX (plus_infty, plus_infty));
   check ("real(catanh(+Inf + i Inf)) = 0", __real__ result, 0);
-  check ("imag(catanh(+Inf + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(catanh(+Inf + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (plus_infty, minus_infty));
   check ("real(catanh(+Inf - i Inf)) = 0", __real__ result, 0);
-  check ("imag(catanh(+Inf - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(catanh(+Inf - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (minus_infty, plus_infty));
   check ("real(catanh(-Inf + i Inf)) = -0", __real__ result, minus_zero);
-  check ("imag(catanh(-Inf + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(catanh(-Inf + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (minus_infty, minus_infty));
   check ("real(catanh(-Inf - i Inf)) = -0", __real__ result, minus_zero);
-  check ("imag(catanh(-Inf - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(catanh(-Inf - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
 
   result = FUNC(catanh) (BUILD_COMPLEX (-10.0, plus_infty));
   check ("real(catanh(-10.0 + i Inf)) = -0", __real__ result, minus_zero);
-  check ("imag(catanh(-10.0 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(catanh(-10.0 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (-10.0, minus_infty));
   check ("real(catanh(-10.0 - i Inf)) = -0", __real__ result, minus_zero);
-  check ("imag(catanh(-10.0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(catanh(-10.0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (minus_zero, plus_infty));
   check ("real(catanh(-0 + i Inf)) = -0", __real__ result, minus_zero);
-  check ("imag(catanh(-0 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(catanh(-0 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (minus_zero, minus_infty));
   check ("real(catanh(-0 - i Inf)) = -0", __real__ result, minus_zero);
-  check ("imag(catanh(-0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(catanh(-0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (0, plus_infty));
   check ("real(catanh(0 + i Inf)) = 0", __real__ result, 0);
-  check ("imag(catanh(0 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(catanh(0 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (0, minus_infty));
   check ("real(catanh(0 - i Inf)) = 0", __real__ result, 0);
-  check ("imag(catanh(0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(catanh(0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (0.1, plus_infty));
   check ("real(catanh(0.1 + i Inf)) = 0", __real__ result, 0);
-  check ("imag(catanh(0.1 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(catanh(0.1 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (0.1, minus_infty));
   check ("real(catanh(0.1 - i Inf)) = 0", __real__ result, 0);
-  check ("imag(catanh(0.1 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(catanh(0.1 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
 
   result = FUNC(catanh) (BUILD_COMPLEX (minus_infty, 0));
   check ("real(catanh(-Inf + i0)) = -0", __real__ result, minus_zero);
-  check ("imag(catanh(-Inf + i0)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(catanh(-Inf + i0)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (minus_infty, minus_zero));
   check ("real(catanh(-Inf - i0)) = -0", __real__ result, minus_zero);
-  check ("imag(catanh(-Inf - i0)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(catanh(-Inf - i0)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (minus_infty, 100));
   check ("real(catanh(-Inf + i100)) = -0", __real__ result, minus_zero);
-  check ("imag(catanh(-Inf + i100)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(catanh(-Inf + i100)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (minus_infty, -100));
   check ("real(catanh(-Inf - i100)) = -0", __real__ result, minus_zero);
-  check ("imag(catanh(-Inf - i100)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(catanh(-Inf - i100)) = -pi/2", __imag__ result, -M_PI_2l);
 
   result = FUNC(catanh) (BUILD_COMPLEX (plus_infty, 0));
   check ("real(catanh(+Inf + i0)) = 0", __real__ result, 0);
-  check ("imag(catanh(+Inf + i0)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(catanh(+Inf + i0)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (plus_infty, minus_zero));
   check ("real(catanh(+Inf - i0)) = 0", __real__ result, 0);
-  check ("imag(catanh(+Inf - i0)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(catanh(+Inf - i0)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (plus_infty, 0.5));
   check ("real(catanh(+Inf + i0.5)) = 0", __real__ result, 0);
-  check ("imag(catanh(+Inf + i0.5)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(catanh(+Inf + i0.5)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (plus_infty, -0.5));
   check ("real(catanh(+Inf - i0.5)) = 0", __real__ result, 0);
-  check ("imag(catanh(+Inf - i0.5)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(catanh(+Inf - i0.5)) = -pi/2", __imag__ result, -M_PI_2l);
 
   result = FUNC(catanh) (BUILD_COMPLEX (0, nan_value));
   check ("real(catanh(0 + i NaN)) = 0", __real__ result, 0);
@@ -4259,10 +4263,10 @@ catanh_test (void)
 
   result = FUNC(catanh) (BUILD_COMPLEX (nan_value, plus_infty));
   check ("real(catanh(NaN + i Inf)) = +-0", FUNC(fabs) (__real__ result), 0);
-  check ("imag(catanh(NaN + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(catanh(NaN + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(catanh) (BUILD_COMPLEX (nan_value, minus_infty));
   check ("real(catanh(NaN - i Inf)) = +-0", FUNC(fabs) (__real__ result), 0);
-  check ("imag(catanh(NaN - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(catanh(NaN - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
 
   result = FUNC(catanh) (BUILD_COMPLEX (10.5, nan_value));
   check_isnan_maybe_exc ("real(catanh(10.5 + i NaN)) = NaN plus maybe invalid exception",
@@ -4588,7 +4592,7 @@ ctanh_test (void)
   check_isnan ("real(ctanh(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(ctanh(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(ctanh) (BUILD_COMPLEX (0, M_PI_4));
+  result = FUNC(ctanh) (BUILD_COMPLEX (0, M_PI_4l));
   check ("real(ctanh (0 + i pi/4)) == 0", __real__ result, 0);
   check_eps ("imag(ctanh (0 + i pi/4)) == 1", __imag__ result, 1,
 	     CHOOSE (0, 2e-16, 2e-7));
@@ -4616,12 +4620,12 @@ clog_test (void)
   check_isinfn_exc ("real(clog(-0 + i0)) = -Inf plus divide-by-zero exception",
 		    __real__ result, DIVIDE_BY_ZERO_EXCEPTION);
   check ("imag(clog(-0 + i0)) = pi plus divide-by-zero exception",
-	 __imag__ result, M_PI);
+	 __imag__ result, M_PIl);
   result = FUNC(clog) (BUILD_COMPLEX (minus_zero, minus_zero));
   check_isinfn_exc ("real(clog(-0 - i0)) = -Inf plus divide-by-zero exception",
 		    __real__ result, DIVIDE_BY_ZERO_EXCEPTION);
   check ("imag(clog(-0 - i0)) = -pi plus divide-by-zero exception",
-	 __imag__ result, -M_PI);
+	 __imag__ result, -M_PIl);
 
   result = FUNC(clog) (BUILD_COMPLEX (0, 0));
   check_isinfn_exc ("real(clog(0 + i0)) = -Inf plus divide-by-zero exception",
@@ -4636,55 +4640,57 @@ clog_test (void)
 
   result = FUNC(clog) (BUILD_COMPLEX (minus_infty, plus_infty));
   check_isinfp ("real(clog(-Inf + i Inf)) = +Inf", __real__ result);
-  check ("imag(clog(-Inf + i Inf)) = 3*pi/4", __imag__ result, M_PI - M_PI_4);
+  check ("imag(clog(-Inf + i Inf)) = 3*pi/4", __imag__ result,
+	 M_PIl - M_PI_4l);
   result = FUNC(clog) (BUILD_COMPLEX (minus_infty, minus_infty));
   check_isinfp ("real(clog(-Inf - i Inf)) = +Inf", __real__ result);
-  check ("imag(clog(-Inf - i Inf)) = -3*pi/4", __imag__ result, M_PI_4 - M_PI);
+  check ("imag(clog(-Inf - i Inf)) = -3*pi/4", __imag__ result,
+	 M_PI_4l - M_PIl);
 
   result = FUNC(clog) (BUILD_COMPLEX (plus_infty, plus_infty));
   check_isinfp ("real(clog(+Inf + i Inf)) = +Inf", __real__ result);
-  check ("imag(clog(+Inf + i Inf)) = pi/4", __imag__ result, M_PI_4);
+  check ("imag(clog(+Inf + i Inf)) = pi/4", __imag__ result, M_PI_4l);
   result = FUNC(clog) (BUILD_COMPLEX (plus_infty, minus_infty));
   check_isinfp ("real(clog(+Inf - i Inf)) = +Inf", __real__ result);
-  check ("imag(clog(+Inf - i Inf)) = -pi/4", __imag__ result, -M_PI_4);
+  check ("imag(clog(+Inf - i Inf)) = -pi/4", __imag__ result, -M_PI_4l);
 
   result = FUNC(clog) (BUILD_COMPLEX (0, plus_infty));
   check_isinfp ("real(clog(0 + i Inf)) = +Inf", __real__ result);
-  check ("imag(clog(0 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(clog(0 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(clog) (BUILD_COMPLEX (3, plus_infty));
   check_isinfp ("real(clog(3 + i Inf)) = +Inf", __real__ result);
-  check ("imag(clog(3 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(clog(3 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(clog) (BUILD_COMPLEX (minus_zero, plus_infty));
   check_isinfp ("real(clog(-0 + i Inf)) = +Inf", __real__ result);
-  check ("imag(clog(-0 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(clog(-0 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(clog) (BUILD_COMPLEX (-3, plus_infty));
   check_isinfp ("real(clog(-3 + i Inf)) = +Inf", __real__ result);
-  check ("imag(clog(-3 + i Inf)) = pi/2", __imag__ result, M_PI_2);
+  check ("imag(clog(-3 + i Inf)) = pi/2", __imag__ result, M_PI_2l);
   result = FUNC(clog) (BUILD_COMPLEX (0, minus_infty));
   check_isinfp ("real(clog(0 - i Inf)) = +Inf", __real__ result);
-  check ("imag(clog(0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(clog(0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(clog) (BUILD_COMPLEX (3, minus_infty));
   check_isinfp ("real(clog(3 - i Inf)) = +Inf", __real__ result);
-  check ("imag(clog(3 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(clog(3 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(clog) (BUILD_COMPLEX (minus_zero, minus_infty));
   check_isinfp ("real(clog(-0 - i Inf)) = +Inf", __real__ result);
-  check ("imag(clog(-0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(clog(-0 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
   result = FUNC(clog) (BUILD_COMPLEX (-3, minus_infty));
   check_isinfp ("real(clog(-3 - i Inf)) = +Inf", __real__ result);
-  check ("imag(clog(-3 - i Inf)) = -pi/2", __imag__ result, -M_PI_2);
+  check ("imag(clog(-3 - i Inf)) = -pi/2", __imag__ result, -M_PI_2l);
 
   result = FUNC(clog) (BUILD_COMPLEX (minus_infty, 0));
   check_isinfp ("real(clog(-Inf + i0)) = +Inf", __real__ result);
-  check ("imag(clog(-Inf + i0)) = pi", __imag__ result, M_PI);
+  check ("imag(clog(-Inf + i0)) = pi", __imag__ result, M_PIl);
   result = FUNC(clog) (BUILD_COMPLEX (minus_infty, 1));
   check_isinfp ("real(clog(-Inf + i1)) = +Inf", __real__ result);
-  check ("imag(clog(-Inf + i1)) = pi", __imag__ result, M_PI);
+  check ("imag(clog(-Inf + i1)) = pi", __imag__ result, M_PIl);
   result = FUNC(clog) (BUILD_COMPLEX (minus_infty, minus_zero));
   check_isinfp ("real(clog(-Inf - i0)) = +Inf", __real__ result);
-  check ("imag(clog(-Inf - i0)) = -pi", __imag__ result, -M_PI);
+  check ("imag(clog(-Inf - i0)) = -pi", __imag__ result, -M_PIl);
   result = FUNC(clog) (BUILD_COMPLEX (minus_infty, -1));
   check_isinfp ("real(clog(-Inf - i1)) = +Inf", __real__ result);
-  check ("imag(clog(-Inf - i1)) = -pi", __imag__ result, -M_PI);
+  check ("imag(clog(-Inf - i1)) = -pi", __imag__ result, -M_PIl);
 
   result = FUNC(clog) (BUILD_COMPLEX (plus_infty, 0));
   check_isinfp ("real(clog(+Inf + i0)) = +Inf", __real__ result);
@@ -4782,12 +4788,12 @@ clog10_test (void)
   check_isinfn_exc ("real(clog10(-0 + i0)) = -Inf plus divide-by-zero exception",
 		    __real__ result, DIVIDE_BY_ZERO_EXCEPTION);
   check ("imag(clog10(-0 + i0)) = pi plus divide-by-zero exception",
-	 __imag__ result, M_PI);
+	 __imag__ result, M_PIl);
   result = FUNC(clog10) (BUILD_COMPLEX (minus_zero, minus_zero));
   check_isinfn_exc ("real(clog10(-0 - i0)) = -Inf plus divide-by-zero exception",
 		    __real__ result, DIVIDE_BY_ZERO_EXCEPTION);
   check ("imag(clog10(-0 - i0)) = -pi plus divide-by-zero exception",
-	 __imag__ result, -M_PI);
+	 __imag__ result, -M_PIl);
 
   result = FUNC(clog10) (BUILD_COMPLEX (0, 0));
   check_isinfn_exc ("real(clog10(0 + i0)) = -Inf plus divide-by-zero exception",
@@ -4803,70 +4809,70 @@ clog10_test (void)
   result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, plus_infty));
   check_isinfp ("real(clog10(-Inf + i Inf)) = +Inf", __real__ result);
   check_eps ("imag(clog10(-Inf + i Inf)) = 3*pi/4*M_LOG10E", __imag__ result,
-	     (M_PI - M_PI_4) * M_LOG10E, CHOOSE (0, 3e-16, 0));
+	     (M_PIl - M_PI_4l) * M_LOG10El, CHOOSE (0, 3e-16, 0));
   result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, minus_infty));
   check_isinfp ("real(clog10(-Inf - i Inf)) = +Inf", __real__ result);
   check_eps ("imag(clog10(-Inf - i Inf)) = -3*pi/4*M_LOG10E", __imag__ result,
-	     (M_PI_4 - M_PI) * M_LOG10E, CHOOSE (0, 3e-16, 0));
+	     (M_PI_4l - M_PIl) * M_LOG10El, CHOOSE (0, 3e-16, 0));
 
   result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, plus_infty));
   check_isinfp ("real(clog10(+Inf + i Inf)) = +Inf", __real__ result);
   check_eps ("imag(clog10(+Inf + i Inf)) = pi/4*M_LOG10E", __imag__ result,
-	     M_PI_4 * M_LOG10E, CHOOSE (0, 6e-17, 3e-8));
+	     M_PI_4l * M_LOG10El, CHOOSE (0, 6e-17, 3e-8));
   result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, minus_infty));
   check_isinfp ("real(clog10(+Inf - i Inf)) = +Inf", __real__ result);
   check_eps ("imag(clog10(+Inf - i Inf)) = -pi/4*M_LOG10E", __imag__ result,
-	     -M_PI_4 * M_LOG10E, CHOOSE (0, 6e-17, 3e-8));
+	     -M_PI_4l * M_LOG10El, CHOOSE (0, 6e-17, 3e-8));
 
   result = FUNC(clog10) (BUILD_COMPLEX (0, plus_infty));
   check_isinfp ("real(clog10(0 + i Inf)) = +Inf", __real__ result);
   check_eps ("imag(clog10(0 + i Inf)) = pi/2*M_LOG10E", __imag__ result,
-	     M_PI_2 * M_LOG10E, CHOOSE (0, 2e-16, 6e-8));
+	     M_PI_2l * M_LOG10El, CHOOSE (0, 2e-16, 6e-8));
   result = FUNC(clog10) (BUILD_COMPLEX (3, plus_infty));
   check_isinfp ("real(clog10(3 + i Inf)) = +Inf", __real__ result);
   check_eps ("imag(clog10(3 + i Inf)) = pi/2*M_LOG10E", __imag__ result,
-	     M_PI_2 * M_LOG10E, CHOOSE (0, 2e-16, 6e-8));
+	     M_PI_2l * M_LOG10El, CHOOSE (0, 2e-16, 6e-8));
   result = FUNC(clog10) (BUILD_COMPLEX (minus_zero, plus_infty));
   check_isinfp ("real(clog10(-0 + i Inf)) = +Inf", __real__ result);
   check_eps ("imag(clog10(-0 + i Inf)) = pi/2*M_LOG10E", __imag__ result,
-	     M_PI_2 * M_LOG10E, CHOOSE (0, 2e-16, 6e-8));
+	     M_PI_2l * M_LOG10El, CHOOSE (0, 2e-16, 6e-8));
   result = FUNC(clog10) (BUILD_COMPLEX (-3, plus_infty));
   check_isinfp ("real(clog10(-3 + i Inf)) = +Inf", __real__ result);
   check_eps ("imag(clog10(-3 + i Inf)) = pi/2*M_LOG10E", __imag__ result,
-	     M_PI_2 * M_LOG10E, CHOOSE (0, 2e-16, 6e-8));
+	     M_PI_2l * M_LOG10El, CHOOSE (0, 2e-16, 6e-8));
   result = FUNC(clog10) (BUILD_COMPLEX (0, minus_infty));
   check_isinfp ("real(clog10(0 - i Inf)) = +Inf", __real__ result);
   check_eps ("imag(clog10(0 - i Inf)) = -pi/2*M_LOG10E", __imag__ result,
-	     -M_PI_2*M_LOG10E, CHOOSE (0, 2e-16, 6e-8));
+	     -M_PI_2l * M_LOG10El, CHOOSE (0, 2e-16, 6e-8));
   result = FUNC(clog10) (BUILD_COMPLEX (3, minus_infty));
   check_isinfp ("real(clog10(3 - i Inf)) = +Inf", __real__ result);
   check_eps ("imag(clog10(3 - i Inf)) = -pi/2*M_LOG10E", __imag__ result,
-	     -M_PI_2*M_LOG10E, CHOOSE (0, 2e-16, 6e-8));
+	     -M_PI_2l * M_LOG10El, CHOOSE (0, 2e-16, 6e-8));
   result = FUNC(clog10) (BUILD_COMPLEX (minus_zero, minus_infty));
   check_isinfp ("real(clog10(-0 - i Inf)) = +Inf", __real__ result);
   check_eps ("imag(clog10(-0 - i Inf)) = -pi/2*M_LOG10E", __imag__ result,
-	     -M_PI_2 * M_LOG10E, CHOOSE (0, 2e-16, 6e-8));
+	     -M_PI_2l * M_LOG10El, CHOOSE (0, 2e-16, 6e-8));
   result = FUNC(clog10) (BUILD_COMPLEX (-3, minus_infty));
   check_isinfp ("real(clog10(-3 - i Inf)) = +Inf", __real__ result);
   check_eps ("imag(clog10(-3 - i Inf)) = -pi/2*M_LOG10E", __imag__ result,
-	     -M_PI_2 * M_LOG10E, CHOOSE (0, 2e-16, 6e-8));
+	     -M_PI_2l * M_LOG10El, CHOOSE (0, 2e-16, 6e-8));
 
   result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, 0));
   check_isinfp ("real(clog10(-Inf + i0)) = +Inf", __real__ result);
   check_eps ("imag(clog10(-Inf + i0)) = pi*M_LOG10E", __imag__ result,
-	     M_PI * M_LOG10E, CHOOSE (0, 3e-16, 2e-7));
+	     M_PIl * M_LOG10El, CHOOSE (0, 3e-16, 2e-7));
   result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, 1));
   check_isinfp ("real(clog10(-Inf + i1)) = +Inf", __real__ result);
   check_eps ("imag(clog10(-Inf + i1)) = pi*M_LOG10E", __imag__ result,
-	     M_PI * M_LOG10E, CHOOSE (0, 3e-16, 2e-7));
+	     M_PIl * M_LOG10El, CHOOSE (0, 3e-16, 2e-7));
   result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, minus_zero));
   check_isinfp ("real(clog10(-Inf - i0)) = +Inf", __real__ result);
   check_eps ("imag(clog10(-Inf - i0)) = -pi*M_LOG10E", __imag__ result,
-	     -M_PI * M_LOG10E, CHOOSE (0, 3e-16, 2e-7));
+	     -M_PIl * M_LOG10El, CHOOSE (0, 3e-16, 2e-7));
   result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, -1));
   check_isinfp ("real(clog10(-Inf - i1)) = +Inf", __real__ result);
   check_eps ("imag(clog10(-Inf - i1)) = -pi*M_LOG10E", __imag__ result,
-	     -M_PI * M_LOG10E, CHOOSE (0, 3e-16, 2e-7));
+	     -M_PIl * M_LOG10El, CHOOSE (0, 3e-16, 2e-7));
 
   result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, 0));
   check_isinfp ("real(clog10(+Inf + i0)) = +Inf", __real__ result);
@@ -5135,7 +5141,7 @@ cpow_test (void)
 	     CHOOSE (2e-16L, 0, 0));
   check ("imag(cpow (2 + i0), (10 + i0)) == 0", __imag__ result, 0);
 
-  result = FUNC (cpow) (BUILD_COMPLEX (M_E, 0), BUILD_COMPLEX (0, 2*M_PI));
+  result = FUNC (cpow) (BUILD_COMPLEX (M_El, 0), BUILD_COMPLEX (0, 2 * M_PIl));
   check_eps ("real(cpow (e + i0), (0 + i 2*PI)) == 1", __real__ result, 1,
 	     CHOOSE (0, 0, 6e-8));
   check_eps ("imag(cpow (e + i0), (0 + i 2*PI)) == 0", __imag__ result, 0,
@@ -5212,32 +5218,32 @@ carg_test (void)
 
   x = -random_greater (0);
   check ("carg (x + i 0) == +pi for x < 0", FUNC(carg) (BUILD_COMPLEX(x, 0)),
-	 M_PI);
+	 M_PIl);
 
   x = -random_greater (0);
   check ("carg (x - i 0) == -pi for x < 0",
-	 FUNC(carg) (BUILD_COMPLEX(x, minus_zero)), -M_PI);
+	 FUNC(carg) (BUILD_COMPLEX(x, minus_zero)), -M_PIl);
 
   check ("carg (-0 + i 0) == +pi", FUNC(carg) (BUILD_COMPLEX(minus_zero, 0)),
-	 M_PI);
+	 M_PIl);
   check ("carg (-0 - i 0) == -pi",
-	 FUNC(carg) (BUILD_COMPLEX(minus_zero, minus_zero)), -M_PI);
+	 FUNC(carg) (BUILD_COMPLEX(minus_zero, minus_zero)), -M_PIl);
 
   x = random_greater (0);
   check ("carg (+0 + i y) == pi/2 for y > 0", FUNC(carg) (BUILD_COMPLEX(0, x)),
-	 M_PI_2);
+	 M_PI_2l);
 
   x = random_greater (0);
   check ("carg (-0 + i y) == pi/2 for y > 0",
-	 FUNC(carg) (BUILD_COMPLEX(minus_zero, x)), M_PI_2);
+	 FUNC(carg) (BUILD_COMPLEX(minus_zero, x)), M_PI_2l);
 
   x = random_less (0);
   check ("carg (+0 + i y) == -pi/2 for y < 0", FUNC(carg) (BUILD_COMPLEX(0, x)),
-	 -M_PI_2);
+	 -M_PI_2l);
 
   x = random_less (0);
   check ("carg (-0 + i y) == -pi/2 for y < 0",
-	 FUNC(carg) (BUILD_COMPLEX(minus_zero, x)), -M_PI_2);
+	 FUNC(carg) (BUILD_COMPLEX(minus_zero, x)), -M_PI_2l);
 
   x = random_greater (0);
   check ("carg (inf + i y) == +0 for finite y > 0",
@@ -5249,31 +5255,31 @@ carg_test (void)
 
   x = random_value (-1e4, 1e4);
   check ("carg(x + i inf) == pi/2 for finite x",
-         FUNC(carg) (BUILD_COMPLEX(x, plus_infty)), M_PI_2);
+         FUNC(carg) (BUILD_COMPLEX(x, plus_infty)), M_PI_2l);
 
   x = random_value (-1e4, 1e4);
   check ("carg(x - i inf) == -pi/2 for finite x",
-         FUNC(carg) (BUILD_COMPLEX(x, minus_infty)), -M_PI_2);
+         FUNC(carg) (BUILD_COMPLEX(x, minus_infty)), -M_PI_2l);
 
   x = random_greater (0);
   check ("carg (-inf + i y) == +pi for finite y > 0",
-	 FUNC(carg) (BUILD_COMPLEX(minus_infty, x)), M_PI);
+	 FUNC(carg) (BUILD_COMPLEX(minus_infty, x)), M_PIl);
 
   x = -random_greater (0);
   check ("carg (-inf + i y) == -pi for finite y < 0",
-	 FUNC(carg) (BUILD_COMPLEX(minus_infty, x)), -M_PI);
+	 FUNC(carg) (BUILD_COMPLEX(minus_infty, x)), -M_PIl);
 
   check ("carg (+inf + i inf) == +pi/4",
-	 FUNC(carg) (BUILD_COMPLEX(plus_infty, plus_infty)), M_PI_4);
+	 FUNC(carg) (BUILD_COMPLEX(plus_infty, plus_infty)), M_PI_4l);
 
   check ("carg (+inf -i inf) == -pi/4",
-	 FUNC(carg) (BUILD_COMPLEX(plus_infty, minus_infty)), -M_PI_4);
+	 FUNC(carg) (BUILD_COMPLEX(plus_infty, minus_infty)), -M_PI_4l);
 
   check ("carg (-inf +i inf) == +3*pi/4",
-	 FUNC(carg) (BUILD_COMPLEX(minus_infty, plus_infty)), 3 * M_PI_4);
+	 FUNC(carg) (BUILD_COMPLEX(minus_infty, plus_infty)), 3 * M_PI_4l);
 
   check ("carg (-inf -i inf) == -3*pi/4",
-	 FUNC(carg) (BUILD_COMPLEX(minus_infty, minus_infty)), -3 * M_PI_4);
+	 FUNC(carg) (BUILD_COMPLEX(minus_infty, minus_infty)), -3 * M_PI_4l);
 
 }
 
diff --git a/math/math.h b/math/math.h
index ae83262338..5103f2ef3c 100644
--- a/math/math.h
+++ b/math/math.h
@@ -1,5 +1,5 @@
 /* Declarations for math functions.
-   Copyright (C) 1991, 92, 93, 95, 96, 97 Free Software Foundation, Inc.
+   Copyright (C) 1991, 92, 93, 95, 96, 97, 98 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -262,41 +262,41 @@ extern int matherr __P ((struct exception *__exc));
 #endif	/* SVID */
 
 
-#if defined __USE_BSD || defined __USE_UNIX98
-
 /* Some useful constants.  */
-# define M_E		_Mldbl(2.7182818284590452354)	/* e */
-# define M_LOG2E	_Mldbl(1.4426950408889634074)	/* log_2 e */
-# define M_LOG10E	_Mldbl(0.43429448190325182765)	/* log_10 e */
-# define M_LN2		_Mldbl(0.69314718055994530942)	/* log_e 2 */
-# define M_LN10		_Mldbl(2.30258509299404568402)	/* log_e 10 */
-# define M_PI		_Mldbl(3.14159265358979323846)	/* pi */
-# define M_PI_2		_Mldbl(1.57079632679489661923)	/* pi/2 */
-# define M_PI_4		_Mldbl(0.78539816339744830962)	/* pi/4 */
-# define M_1_PI		_Mldbl(0.31830988618379067154)	/* 1/pi */
-# define M_2_PI		_Mldbl(0.63661977236758134308)	/* 2/pi */
-# define M_2_SQRTPI	_Mldbl(1.12837916709551257390)	/* 2/sqrt(pi) */
-# define M_SQRT2	_Mldbl(1.41421356237309504880)	/* sqrt(2) */
-# define M_SQRT1_2	_Mldbl(0.70710678118654752440)	/* 1/sqrt(2) */
-
+#if defined __USE_BSD || defined __USE_UNIX98
+# define M_E		2.7182818284590452354	/* e */
+# define M_LOG2E	1.4426950408889634074	/* log_2 e */
+# define M_LOG10E	0.43429448190325182765	/* log_10 e */
+# define M_LN2		0.69314718055994530942	/* log_e 2 */
+# define M_LN10		2.30258509299404568402	/* log_e 10 */
+# define M_PI		3.14159265358979323846	/* pi */
+# define M_PI_2		1.57079632679489661923	/* pi/2 */
+# define M_PI_4		0.78539816339744830962	/* pi/4 */
+# define M_1_PI		0.31830988618379067154	/* 1/pi */
+# define M_2_PI		0.63661977236758134308	/* 2/pi */
+# define M_2_SQRTPI	1.12837916709551257390	/* 2/sqrt(pi) */
+# define M_SQRT2	1.41421356237309504880	/* sqrt(2) */
+# define M_SQRT1_2	0.70710678118654752440	/* 1/sqrt(2) */
 #endif
 
-/* Our constants might specify more precision than `double' can represent.
-   Use `long double' constants in standard and GNU C, where they are
-   supported and the cast to `double'.
-
-   If the constants are use in code which does not use prototypes, one
-   might get problems if a function takes a `double' argument and any
-   of the constants are provided as the argument.  In this case, cast
-   the argument to `double'.
-
-   Please note we define the macro even if the constants are not defined.
-   This helps us to use the macros in other places.  */
-#if (__STDC__ - 0 || __GNUC__ - 0) && defined __USE_GNU
-# define _Mldbl(x) x##L
-#else	/* Traditional C.  */
-# define _Mldbl(x) x
-#endif	/* Standard or GNU C.  */
+/* The above constants are not adequate for computation using `long double's.
+   Therefore we provide as an extension constants with similar names as a
+   GNU extension.  */
+#ifdef __USE_GNU
+# define M_El		2.7182818284590452354L	/* e */
+# define M_LOG2El	1.4426950408889634074L	/* log_2 e */
+# define M_LOG10El	0.43429448190325182765L	/* log_10 e */
+# define M_LN2l		0.69314718055994530942L	/* log_e 2 */
+# define M_LN10l	2.30258509299404568402L	/* log_e 10 */
+# define M_PIl		3.14159265358979323846L	/* pi */
+# define M_PI_2l	1.57079632679489661923L	/* pi/2 */
+# define M_PI_4l	0.78539816339744830962L	/* pi/4 */
+# define M_1_PIl	0.31830988618379067154L	/* 1/pi */
+# define M_2_PIl	0.63661977236758134308L	/* 2/pi */
+# define M_2_SQRTPIl	1.12837916709551257390L	/* 2/sqrt(pi) */
+# define M_SQRT2l	1.41421356237309504880L	/* sqrt(2) */
+# define M_SQRT1_2l	0.70710678118654752440L	/* 1/sqrt(2) */
+#endif
 
 
 /* Get machine-dependent inline versions (if there are any).  */
diff --git a/sunrpc/rpc_cout.c b/sunrpc/rpc_cout.c
index 44ff8d59b5..a9da54e7f8 100644
--- a/sunrpc/rpc_cout.c
+++ b/sunrpc/rpc_cout.c
@@ -442,9 +442,11 @@ inline_struct (definition *def, int flag)
 {
   decl_list *dl;
   int i, size;
-  decl_list *cur, *psav;
+  decl_list *cur = NULL;
+  decl_list *psav;
   bas_type *ptr;
-  char *sizestr, *plus;
+  char *sizestr;
+  const char *plus;
   char ptemp[256];
   int indent = 1;
 
@@ -760,14 +762,16 @@ emit_single_in_line (int indent, declaration *decl, int flag, relation rel)
     {
       free (upp_case);
       freed = 1;
-      upp_case = "LONG";
+      /* Casting is safe since the `freed' flag is set.  */
+      upp_case = (char *) "LONG";
     }
 
   if (!strcmp (upp_case, "U_INT"))
     {
       free (upp_case);
       freed = 1;
-      upp_case = "U_LONG";
+      /* Casting is safe since the `freed' flag is set.  */
+      upp_case = (char *) "U_LONG";
     }
 
   if (flag == PUT)
diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h
index 6734996877..d63b0d71a6 100644
--- a/sysdeps/generic/_G_config.h
+++ b/sysdeps/generic/_G_config.h
@@ -51,6 +51,7 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
 #define _G_HAVE_MMAP 1
 #define _G_HAVE_LONG_DOUBLE_IO 1
 #define _G_HAVE_IO_FILE_OPEN 1
+#define _G_HAVE_IO_GETLINE_INFO 1
 
 #define _G_IO_IO_FILE_VERSION 0x20001
 
diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h
index 10e2b4ee33..9917316f7a 100644
--- a/sysdeps/i386/fpu/bits/mathinline.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -1,5 +1,5 @@
 /* Inline math functions for i387.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by John C. Bowman <bowman@math.ualberta.ca>, 1995.
 
@@ -505,7 +505,7 @@ __inline_mathcode (expm1, __x, __expm1_code)
 
 /* We cannot rely on M_SQRT being defined.  So we do it for ourself
    here.  */
-# define __M_SQRT2	_Mldbl(1.41421356237309504880)	/* sqrt(2) */
+# define __M_SQRT2	1.41421356237309504880L	/* sqrt(2) */
 
 __inline_mathcode (log1p, __x, \
   register long double __value;						      \
diff --git a/sysdeps/libm-ieee754/s_cacoshl.c b/sysdeps/libm-ieee754/s_cacoshl.c
index ed5980c551..1c91e93fab 100644
--- a/sysdeps/libm-ieee754/s_cacoshl.c
+++ b/sysdeps/libm-ieee754/s_cacoshl.c
@@ -1,5 +1,5 @@
 /* Return arc hyperbole cosine for long double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -40,15 +40,15 @@ __cacoshl (__complex__ long double x)
 	  else
 	    __imag__ res = __copysignl ((rcls == FP_INFINITE
 					 ? (__real__ x < 0.0
-					    ? M_PI - M_PI_4 : M_PI_4)
-					 : M_PI_2), __imag__ x);
+					    ? M_PIl - M_PI_4l : M_PI_4l)
+					 : M_PI_2l), __imag__ x);
 	}
       else if (rcls == FP_INFINITE)
 	{
 	  __real__ res = HUGE_VALL;
 
 	  if (icls >= FP_ZERO)
-	    __imag__ res = __copysignl (signbit (__real__ x) ? M_PI : 0.0,
+	    __imag__ res = __copysignl (signbit (__real__ x) ? M_PIl : 0.0,
 					__imag__ x);
 	  else
 	    __imag__ res = __nanl ("");
@@ -62,7 +62,7 @@ __cacoshl (__complex__ long double x)
   else if (rcls == FP_ZERO && icls == FP_ZERO)
     {
       __real__ res = 0.0;
-      __imag__ res = __copysignl (M_PI_2, __imag__ x);
+      __imag__ res = __copysignl (M_PI_2l, __imag__ x);
     }
   else
     {
diff --git a/sysdeps/libm-ieee754/s_cacosl.c b/sysdeps/libm-ieee754/s_cacosl.c
index 7a60de5a50..40ad812aa1 100644
--- a/sysdeps/libm-ieee754/s_cacosl.c
+++ b/sysdeps/libm-ieee754/s_cacosl.c
@@ -1,5 +1,5 @@
 /* Return cosine of complex long double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -29,7 +29,7 @@ __cacosl (__complex__ long double x)
 
   y = __casinl (x);
 
-  __real__ res = M_PI_2 - __real__ y;
+  __real__ res = M_PI_2l - __real__ y;
   __imag__ res = -__imag__ y;
 
   return res;
diff --git a/sysdeps/libm-ieee754/s_casinhl.c b/sysdeps/libm-ieee754/s_casinhl.c
index cc6757b189..44e07f773f 100644
--- a/sysdeps/libm-ieee754/s_casinhl.c
+++ b/sysdeps/libm-ieee754/s_casinhl.c
@@ -1,5 +1,5 @@
 /* Return arc hyperbole sine for long double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -38,7 +38,7 @@ __casinhl (__complex__ long double x)
 	  if (rcls == FP_NAN)
 	    __imag__ res = __nanl ("");
 	  else
-	    __imag__ res = __copysignl (rcls >= FP_ZERO ? M_PI_2 : M_PI_4,
+	    __imag__ res = __copysignl (rcls >= FP_ZERO ? M_PI_2l : M_PI_4l,
 					__imag__ x);
 	}
       else if (rcls <= FP_INFINITE)
diff --git a/sysdeps/libm-ieee754/s_catanhl.c b/sysdeps/libm-ieee754/s_catanhl.c
index 693799639a..22f3d4b646 100644
--- a/sysdeps/libm-ieee754/s_catanhl.c
+++ b/sysdeps/libm-ieee754/s_catanhl.c
@@ -1,5 +1,5 @@
 /* Return arc hyperbole tangent for long double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -36,13 +36,13 @@ __catanhl (__complex__ long double x)
       if (icls == FP_INFINITE)
 	{
 	  __real__ res = __copysignl (0.0, __real__ x);
-	  __imag__ res = __copysignl (M_PI_2, __imag__ x);
+	  __imag__ res = __copysignl (M_PI_2l, __imag__ x);
 	}
       else if (rcls == FP_INFINITE || rcls == FP_ZERO)
 	{
 	  __real__ res = __copysignl (0.0, __real__ x);
 	  if (icls >= FP_ZERO)
-	    __imag__ res = __copysignl (M_PI_2, __imag__ x);
+	    __imag__ res = __copysignl (M_PI_2l, __imag__ x);
 	  else
 	    __imag__ res = __nanl ("");
 	}
diff --git a/sysdeps/libm-ieee754/s_catanl.c b/sysdeps/libm-ieee754/s_catanl.c
index 1da7c6c008..b7df5c39c2 100644
--- a/sysdeps/libm-ieee754/s_catanl.c
+++ b/sysdeps/libm-ieee754/s_catanl.c
@@ -1,5 +1,5 @@
 /* Return arc tangent of complex long double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -35,13 +35,13 @@ __catanl (__complex__ long double x)
     {
       if (rcls == FP_INFINITE)
 	{
-	  __real__ res = __copysignl (M_PI_2, __real__ x);
+	  __real__ res = __copysignl (M_PI_2l, __real__ x);
 	  __imag__ res = __copysignl (0.0, __imag__ x);
 	}
       else if (icls == FP_INFINITE)
 	{
 	  if (rcls >= FP_ZERO)
-	    __real__ res = __copysignl (M_PI_2, __real__ x);
+	    __real__ res = __copysignl (M_PI_2l, __real__ x);
 	  else
 	    __real__ res = __nanl ("");
 	  __imag__ res = __copysignl (0.0, __imag__ x);
diff --git a/sysdeps/libm-ieee754/s_clog10l.c b/sysdeps/libm-ieee754/s_clog10l.c
index 70940f6863..186eba25cd 100644
--- a/sysdeps/libm-ieee754/s_clog10l.c
+++ b/sysdeps/libm-ieee754/s_clog10l.c
@@ -1,5 +1,5 @@
 /* Compute complex base 10 logarithm.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -34,7 +34,7 @@ __clog10l (__complex__ long double x)
   if (rcls == FP_ZERO && icls == FP_ZERO)
     {
       /* Real and imaginary part are 0.0.  */
-      __imag__ result = signbit (__real__ x) ? M_PI : 0.0;
+      __imag__ result = signbit (__real__ x) ? M_PIl : 0.0;
       __imag__ result = __copysignl (__imag__ result, __imag__ x);
       /* Yes, the following line raises an exception.  */
       __real__ result = -1.0 / fabsl (__real__ x);
@@ -44,7 +44,7 @@ __clog10l (__complex__ long double x)
       /* Neither real nor imaginary part is NaN.  */
       __real__ result = __ieee754_log10l (__ieee754_hypotl (__real__ x,
 							    __imag__ x));
-      __imag__ result = M_LOG10E * __ieee754_atan2l (__imag__ x, __real__ x);
+      __imag__ result = M_LOG10El * __ieee754_atan2l (__imag__ x, __real__ x);
     }
   else
     {
diff --git a/sysdeps/libm-ieee754/s_clogl.c b/sysdeps/libm-ieee754/s_clogl.c
index 51bee372a6..a297ec9628 100644
--- a/sysdeps/libm-ieee754/s_clogl.c
+++ b/sysdeps/libm-ieee754/s_clogl.c
@@ -1,5 +1,5 @@
 /* Compute complex natural logarithm.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -34,7 +34,7 @@ __clogl (__complex__ long double x)
   if (rcls == FP_ZERO && icls == FP_ZERO)
     {
       /* Real and imaginary part are 0.0.  */
-      __imag__ result = signbit (__real__ x) ? M_PI : 0.0;
+      __imag__ result = signbit (__real__ x) ? M_PIl : 0.0;
       __imag__ result = __copysignl (__imag__ result, __imag__ x);
       /* Yes, the following line raises an exception.  */
       __real__ result = -1.0 / fabsl (__real__ x);
diff --git a/sysdeps/unix/sysv/linux/_G_config.h b/sysdeps/unix/sysv/linux/_G_config.h
index 61a4bf6f92..f96d4e9422 100644
--- a/sysdeps/unix/sysv/linux/_G_config.h
+++ b/sysdeps/unix/sysv/linux/_G_config.h
@@ -51,6 +51,7 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
 #define _G_HAVE_MMAP 1
 #define _G_HAVE_LONG_DOUBLE_IO 1
 #define _G_HAVE_IO_FILE_OPEN 1
+#define _G_HAVE_IO_GETLINE_INFO 1
 
 #define _G_IO_IO_FILE_VERSION 0x20001
 
diff --git a/time/Makefile b/time/Makefile
index d90dbce8d4..170639d884 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -33,3 +33,10 @@ routines := offtime asctime clock ctime ctime_r difftime \
 tests	:= test_time clocktest
 
 include ../Rules
+
+tz-cflags = -DTZDIR='"$(zonedir)"' \
+	    -DTZDEFAULT='"$(localtime-file)"' \
+	    -DTZDEFRULES='"$(posixrules-file)"'
+
+CFLAGS-tzfile.c = $(tz-cflags)
+CFLAGS-tzset.c = $(tz-cflags)
diff --git a/timezone/Makefile b/timezone/Makefile
index 778abe1335..f089b94995 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -161,8 +161,6 @@ CFLAGS-zdump.c = -Wno-strict-prototypes -DNOID
 CFLAGS-zic.c = -Wno-strict-prototypes -DNOID $(tz-cflags)
 CFLAGS-ialloc.c = -Wno-strict-prototypes -DNOID
 CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID
-CFLAGS-tzfile.c = $(tz-cflags)
-CFLAGS-tzset.c = $(tz-cflags)
 
 # We have to make sure the data for testing the tz functions is available.
 $(objpfx)test-tz.out: $(addprefix $(objpfx)testdata/, America/New_York \