summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog59
-rw-r--r--argp/argp.h67
-rw-r--r--dirent/dirent.h30
-rw-r--r--elf/dlfcn.h8
-rw-r--r--grp/grp.h29
-rw-r--r--iconv/iconv.h8
-rw-r--r--inet/aliases.h16
-rw-r--r--libio/libio.h6
-rw-r--r--libio/stdio.h32
-rw-r--r--linuxthreads/ChangeLog6
-rw-r--r--linuxthreads/pthread.c5
-rw-r--r--locale/locale.h6
-rw-r--r--math/libm-test.c1720
-rw-r--r--misc/mntent.h10
-rw-r--r--misc/sys/cdefs.h12
-rw-r--r--posix/wordexp.h4
-rw-r--r--pwd/pwd.h29
-rw-r--r--resolv/netdb.h263
-rw-r--r--rt/aio.h27
-rw-r--r--stdio-common/printf.h14
-rw-r--r--stdlib/monetary.h11
-rw-r--r--stdlib/stdlib.h76
-rw-r--r--string/argz.h110
-rw-r--r--string/envz.h30
-rw-r--r--string/string.h25
-rw-r--r--sysdeps/arm/dl-machine.h1
-rw-r--r--sysdeps/unix/sysv/linux/configure.in11
-rw-r--r--sysdeps/unix/sysv/linux/sys/fsuid.h2
-rw-r--r--time/strptime.c11
-rw-r--r--time/time.h21
30 files changed, 1440 insertions, 1209 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b74bd47f1..ed302255b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,62 @@
+1998-12-04  Ulrich Drepper  <drepper@cygnus.com>
+
+	* argp/argp.h: Add __retrict.
+	* dirent/dirent.h: Likewise.
+	* elf/dlfcn.h: Likewise.
+	* grp/grp.h: Likewise.
+	* iconv/iconv.h: Likewise.
+	* inet/aliases.h: Likewise.
+	* libio/libio.h: Likewise.
+	* libio/stdio.h: Likewise.
+	* locale/locale.h: Likewise.
+	* misc/mntent.h: Likewise.
+	* posix/wordexp.h: Likewise.
+	* pwd/pwd.h: Likewise.
+	* resolv/netdb.h: Likewise.
+	* rt/aio.h: Likewise.
+	* stdio-common/printf.h: Likewise.
+	* stdlib/monetary.h: Likewise.
+	* stdlib/stdlib.h: Likewise.
+	* string/argz.h: Likewise.
+	* string/envz.h: Likewise.
+	* string/string.h: Likewise.
+	* time/time.h: Likewise.
+
+1998-12-04  Zack Weinberg  <zack@rabi.phys.columbia.edu>
+
+	* misc/sys/cdefs.h: Only include features.h if _FEATURES_H isn't
+	defined.  gcc's redundant include optimizer isn't clever enough to
+	prevent a reinclusion here.
+	Define __restrict to the empty string only if not GCC or
+	GCC version less than 2.92.
+
+1998-12-03  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* sysdeps/unix/sysv/linux/configure.in: Fix last change.
+
+1998-12-03  Mark Kettenis  <kettenis@phys.uva.nl>
+
+	* time/strptime.c (strptime_internal): Make use of `%C' format
+	specifier if it is seen together with the `%y' specifier.
+
+1998-12-04  Ulrich Drepper  <drepper@cygnus.com>
+
+	* po/sk.po: New file.
+
+1998-12-03  Scott Bambrough  <scottb@corelcomputer.com>
+
+	* sysdeps/arm/dl-machine.h (dl_start_user): Incorrect address
+	for _dl_main_searchlist passed to _dl_init_next.
+
+1998-12-02  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* math/libm-test.c: Expand literal tabs in strings.  Normalize
+	whitespace.
+
+1998-12-02  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* sysdeps/unix/sysv/linux/sys/fsuid.h: Fix spelling.
+
 1998-12-04  Mark Kettenis  <kettenis@phys.uva.nl>
 
 	Provide backwards binary compatibility for the Hurd.
diff --git a/argp/argp.h b/argp/argp.h
index cc35970afa..eb570f1653 100644
--- a/argp/argp.h
+++ b/argp/argp.h
@@ -388,12 +388,15 @@ struct argp_state
    routine returned a non-zero value, it is returned; otherwise 0 is
    returned.  This function may also call exit unless the ARGP_NO_HELP flag
    is set.  INPUT is a pointer to a value to be passed in to the parser.  */
-extern error_t argp_parse __P ((__const struct argp *__argp,
-				int __argc, char **__argv, unsigned __flags,
-				int *__arg_index, void *__input));
-extern error_t __argp_parse __P ((__const struct argp *__argp,
-				  int __argc, char **__argv, unsigned __flags,
-				  int *__arg_index, void *__input));
+extern error_t argp_parse __P ((__const struct argp *__restrict __argp,
+				int __argc, char **__restrict __argv,
+				unsigned __flags, int *__restrict __arg_index,
+				void *__restrict __input));
+extern error_t __argp_parse __P ((__const struct argp *__restrict __argp,
+				  int __argc, char **__restrict __argv,
+				  unsigned __flags,
+				  int *__restrict __arg_index,
+				  void *__restrict __input));
 
 /* Global variables.  */
 
@@ -408,8 +411,9 @@ extern __const char *argp_program_version;
    calls this function with a stream to print the version to and a pointer to
    the current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
    used).  This variable takes precedent over ARGP_PROGRAM_VERSION.  */
-extern void (*argp_program_version_hook) __PMT ((FILE *__stream,
-						 struct argp_state *__state));
+extern void (*argp_program_version_hook) __PMT ((FILE *__restrict __stream,
+						 struct argp_state *__restrict
+						 __state));
 
 /* If defined or set by the user program, it should point to string that is
    the bug-reporting address for the program.  It will be printed by
@@ -454,10 +458,12 @@ extern error_t argp_err_exit_status;
 
 /* Output a usage message for ARGP to STREAM.  FLAGS are from the set
    ARGP_HELP_*.  */
-extern void argp_help __P ((__const struct argp *__argp, FILE *__stream,
-			    unsigned __flags, char *__name));
-extern void __argp_help __P ((__const struct argp *__argp, FILE *__stream,
-			      unsigned __flags, char *__name));
+extern void argp_help __P ((__const struct argp *__restrict __argp,
+			    FILE *__restrict __stream,
+			    unsigned __flags, char *__restrict __name));
+extern void __argp_help __P ((__const struct argp *__restrict __argp,
+			      FILE *__restrict __stream, unsigned __flags,
+			      char *__name));
 
 /* The following routines are intended to be called from within an argp
    parsing routine (thus taking an argp_state structure as the first
@@ -469,10 +475,14 @@ extern void __argp_help __P ((__const struct argp *__argp, FILE *__stream,
 
 /* Output, if appropriate, a usage message for STATE to STREAM.  FLAGS are
    from the set ARGP_HELP_*.  */
-extern void argp_state_help __P ((__const struct argp_state *__state,
-				  FILE *__stream, unsigned __flags));
-extern void __argp_state_help __P ((__const struct argp_state *__state,
-				    FILE *__stream, unsigned __flags));
+extern void argp_state_help __P ((__const struct argp_state *__restrict
+				  __state,
+				  FILE *__restrict __stream,
+				  unsigned int __flags));
+extern void __argp_state_help __P ((__const struct argp_state *__restrict
+				    __state,
+				    FILE *__restrict __stream,
+				    unsigned int __flags));
 
 /* Possibly output the standard usage message for ARGP to stderr and exit.  */
 extern void argp_usage __P ((__const struct argp_state *__state));
@@ -481,11 +491,11 @@ extern void __argp_usage __P ((__const struct argp_state *__state));
 /* If appropriate, print the printf string FMT and following args, preceded
    by the program name and `:', to stderr, and followed by a `Try ... --help'
    message, then exit (1).  */
-extern void argp_error __P ((__const struct argp_state *__state,
-			     __const char *__fmt, ...))
+extern void argp_error __P ((__const struct argp_state *__restrict __state,
+			     __const char *__restrict __fmt, ...))
      __attribute__ ((__format__ (__printf__, 2, 3)));
-extern void __argp_error __P ((__const struct argp_state *__state,
-			       __const char *__fmt, ...))
+extern void __argp_error __P ((__const struct argp_state *__restrict __state,
+			       __const char *__restrict __fmt, ...))
      __attribute__ ((__format__ (__printf__, 2, 3)));
 
 /* Similar to the standard gnu error-reporting function error(), but will
@@ -496,13 +506,13 @@ extern void __argp_error __P ((__const struct argp_state *__state,
    difference between this function and argp_error is that the latter is for
    *parsing errors*, and the former is for other problems that occur during
    parsing but don't reflect a (syntactic) problem with the input.  */
-extern void argp_failure __P ((__const struct argp_state *__state,
+extern void argp_failure __P ((__const struct argp_state *__restrict __state,
 			       int __status, int __errnum,
-			       __const char *__fmt, ...))
+			       __const char *__restrict __fmt, ...))
      __attribute__ ((__format__ (__printf__, 4, 5)));
-extern void __argp_failure __P ((__const struct argp_state *__state,
+extern void __argp_failure __P ((__const struct argp_state *__restrict __state,
 				 int __status, int __errnum,
-				 __const char *__fmt, ...))
+				 __const char *__restrict __fmt, ...))
      __attribute__ ((__format__ (__printf__, 4, 5)));
 
 /* Returns true if the option OPT is a valid short option.  */
@@ -516,10 +526,11 @@ extern int __option_is_end __P ((__const struct argp_option *__opt));
 
 /* Return the input field for ARGP in the parser corresponding to STATE; used
    by the help routines.  */
-extern void *_argp_input __P ((__const struct argp *argp,
-			       __const struct argp_state *state));
-extern void *__argp_input __P ((__const struct argp *argp,
-				__const struct argp_state *state));
+extern void *_argp_input __P ((__const struct argp *__restrict __argp,
+			       __const struct argp_state *__restrict __state));
+extern void *__argp_input __P ((__const struct argp *__restrict __argp,
+				__const struct argp_state *__restrict
+				__state));
 
 #ifdef __USE_EXTERN_INLINES
 
diff --git a/dirent/dirent.h b/dirent/dirent.h
index e286498f06..375d66ef30 100644
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -143,12 +143,14 @@ extern struct dirent64 *readdir64 __P ((DIR *__dirp));
 /* Reentrant version of `readdir'.  Return in RESULT a pointer to the
    next entry.  */
 # ifndef __USE_FILE_OFFSET64
-extern int readdir_r __P ((DIR *__dirp, struct dirent *__entry,
-			   struct dirent **__result));
+extern int readdir_r __P ((DIR *__restrict __dirp,
+			   struct dirent *__restrict __entry,
+			   struct dirent **__restrict __result));
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (readdir_r, __P ((DIR *__dirp, struct dirent *__entry,
-				    struct dirent **__result)),
+extern int __REDIRECT (readdir_r, __P ((DIR *__restrict __dirp,
+					struct dirent *__restrict __entry,
+					struct dirent **__restrict __result)),
 		    readdir64_r);
 #  else
 #   define readdir_r readdir64_r
@@ -156,8 +158,9 @@ extern int __REDIRECT (readdir_r, __P ((DIR *__dirp, struct dirent *__entry,
 # endif
 
 # ifdef __USE_LARGEFILE64
-extern int readdir64_r __P ((DIR *__dirp, struct dirent64 *__entry,
-			     struct dirent64 **__result));
+extern int readdir64_r __P ((DIR *__restrict __dirp,
+			     struct dirent64 *__restrict __entry,
+			     struct dirent64 **__restrict __result));
 # endif
 #endif	/* POSIX or misc */
 
@@ -203,14 +206,15 @@ extern int dirfd __P ((DIR *__dirp));
    sorted using qsort with CMP, and collected in a malloc'd array in
    *NAMELIST.  Returns the number of entries selected, or -1 on error.  */
 # ifndef __USE_FILE_OFFSET64
-extern int scandir __P ((__const char *__dir, struct dirent ***__namelist,
+extern int scandir __P ((__const char *__restrict __dir,
+			 struct dirent ***__restrict __namelist,
 			 int (*__selector) (__const struct dirent *),
 			 int (*__cmp) (__const __ptr_t, __const __ptr_t)));
 # else
 #  ifdef __REDIRECT
 extern int __REDIRECT (scandir,
-		       __P ((__const char *__dir,
-			     struct dirent ***__namelist,
+		       __P ((__const char *__restrict __dir,
+			     struct dirent ***__restrict __namelist,
 			     int (*__selector) (__const struct dirent *),
 			     int (*__cmp) (__const __ptr_t, __const __ptr_t))),
 		       scandir64);
@@ -222,7 +226,8 @@ extern int __REDIRECT (scandir,
 # if defined __USE_GNU && defined __USE_LARGEFILE64
 /* This function is like `scandir' but it uses the 64bit dirent structure.
    Please note that the CMP function must now work with struct dirent64 **.  */
-extern int scandir64 __P ((__const char *__dir, struct dirent64 ***__namelist,
+extern int scandir64 __P ((__const char *__restrict __dir,
+			   struct dirent64 ***__restrict __namelist,
 			   int (*__selector) (__const struct dirent64 *),
 			   int (*__cmp) (__const __ptr_t, __const __ptr_t)));
 # endif
@@ -267,8 +272,9 @@ extern int versionsort64 __P ((__const __ptr_t __e1, __const __ptr_t __e2));
    Reading starts at offset *BASEP, and *BASEP is updated with the new
    position after reading.  Returns the number of bytes read; zero when at
    end of directory; or -1 for errors.  */
-extern __ssize_t getdirentries __P ((int __fd, char *__buf,
-				     size_t __nbytes, __off_t *__basep));
+extern __ssize_t getdirentries __P ((int __fd, char *__restrict __buf,
+				     size_t __nbytes,
+				     __off_t *__restrict __basep));
 
 
 #endif /* Use BSD or misc.  */
diff --git a/elf/dlfcn.h b/elf/dlfcn.h
index d2a27b85a2..80fd656d16 100644
--- a/elf/dlfcn.h
+++ b/elf/dlfcn.h
@@ -50,13 +50,15 @@ extern int dlclose __P ((void *__handle));
 
 /* Find the run-time address in the shared object HANDLE refers to
    of the symbol called NAME.  */
-extern void *dlsym __P ((void *__handle, __const char *__name));
+extern void *dlsym __P ((void *__restrict __handle,
+			 __const char *__restrict __name));
 
 #ifdef __USE_GNU
 /* Find the run-time address in the shared object HANDLE refers to
    of the symbol called NAME with VERSION.  */
-extern void *dlvsym __P ((void *__handle, __const char *__name,
-			  __const char *__version));
+extern void *dlvsym __P ((void *__restrict __handle,
+			  __const char *__restrict __name,
+			  __const char *__restrict __version));
 #endif
 
 /* When any of the above functions fails, call this function
diff --git a/grp/grp.h b/grp/grp.h
index 9b71df8eb7..45cb6de664 100644
--- a/grp/grp.h
+++ b/grp/grp.h
@@ -73,7 +73,8 @@ extern struct group *fgetgrent __P ((FILE *__stream));
 
 #ifdef __USE_GNU
 /* Write the given entry onto the given stream.  */
-extern int putgrent __P ((__const struct group *__p, FILE *__f));
+extern int putgrent __P ((__const struct group *__restrict __p,
+			  FILE *__restrict __f));
 #endif
 
 /* Search for an entry with a matching group ID.  */
@@ -99,26 +100,30 @@ extern struct group *getgrnam __P ((__const char *__name));
    POSIX people would choose.  */
 
 # if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-extern int getgrent_r __P ((struct group *__resultbuf, char *__buffer,
-			    size_t __buflen, struct group **__result));
+extern int getgrent_r __P ((struct group *__restrict __resultbuf,
+			    char *__restrict __buffer, size_t __buflen,
+			    struct group **__restrict __result));
 # endif
 
 /* Search for an entry with a matching group ID.  */
-extern int getgrgid_r __P ((__gid_t __gid, struct group *__resultbuf,
-			    char *__buffer, size_t __buflen,
-			    struct group **__result));
+extern int getgrgid_r __P ((__gid_t __gid,
+			    struct group *__restrict __resultbuf,
+			    char *__restrict __buffer, size_t __buflen,
+			    struct group **__restrict __result));
 
 /* Search for an entry with a matching group name.  */
-extern int getgrnam_r __P ((__const char *__name, struct group *__resultbuf,
-			    char *__buffer, size_t __buflen,
-			    struct group **__result));
+extern int getgrnam_r __P ((__const char *__restrict __name,
+			    struct group *__restrict __resultbuf,
+			    char *__restrict __buffer, size_t __buflen,
+			    struct group **__restrict __result));
 
 # ifdef	__USE_SVID
 /* Read a group entry from STREAM.  This function is not standardized
    an probably never will.  */
-extern int fgetgrent_r __P ((FILE * __stream, struct group *__resultbuf,
-			     char *__buffer, size_t __buflen,
-			     struct group **__result));
+extern int fgetgrent_r __P ((FILE *__restrict __stream,
+			     struct group *__restrict __resultbuf,
+			     char *__restrict __buffer, size_t __buflen,
+			     struct group **__restrict __result));
 # endif
 
 #endif	/* POSIX or reentrant */
diff --git a/iconv/iconv.h b/iconv/iconv.h
index ceb120d4f3..dac885bec8 100644
--- a/iconv/iconv.h
+++ b/iconv/iconv.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998 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
@@ -39,8 +39,10 @@ extern iconv_t iconv_open __P ((__const char *__tocode,
    code conversion algorithm specified by CD and place up to
    *OUTBYTESLEFT bytes in buffer at *OUTBUF.  */
 extern size_t iconv __P ((iconv_t cd,
-			  __const char **__inbuf, size_t *__inbytesleft,
-			  char **__outbuf, size_t *__outbytesleft));
+			  __const char **__restrict __inbuf,
+			  size_t *__restrict __inbytesleft,
+			  char **__restrict __outbuf,
+			  size_t *__restrict __outbytesleft));
 
 /* Free resources allocated for descriptor CD for code conversion.  */
 extern int iconv_close __P ((iconv_t __cd));
diff --git a/inet/aliases.h b/inet/aliases.h
index c6e829007e..8c47fe50c6 100644
--- a/inet/aliases.h
+++ b/inet/aliases.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 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
@@ -46,17 +46,19 @@ extern void endaliasent __P ((void));
 extern struct aliasent *getaliasent __P ((void));
 
 /* Get the next entry from the alias data base and put it in RESULT_BUF.  */
-extern int getaliasent_r __P ((struct aliasent *__result_buf, char *__buffer,
-			       size_t __buflen, struct aliasent **__result));
+extern int getaliasent_r __P ((struct aliasent *__restrict __result_buf,
+			       char *__restrict __buffer,
+			       size_t __buflen,
+			       struct aliasent **__restrict __result));
 
 /* Get alias entry corresponding to NAME.  */
 extern struct aliasent *getaliasbyname __P ((__const char *__name));
 
 /* Get alias entry corresponding to NAME and put it in RESULT_BUF.  */
-extern int getaliasbyname_r __P ((__const char *__name,
-				  struct aliasent *__result_buf,
-				  char *__buffer, size_t __buflen,
-				  struct aliasent **__result));
+extern int getaliasbyname_r __P ((__const char *__restrict __name,
+				  struct aliasent *__restrict __result_buf,
+				  char *__restrict __buffer, size_t __buflen,
+				  struct aliasent **__restrict __result));
 
 __END_DECLS
 
diff --git a/libio/libio.h b/libio/libio.h
index 011d44042e..d1dcc7d07c 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -325,8 +325,10 @@ extern int _IO_ftrylockfile __P ((_IO_FILE *));
 # define _IO_cleanup_region_end(_Doit) /**/
 #endif /* !_IO_MTSAFE_IO */
 
-extern int _IO_vfscanf __P ((_IO_FILE *, const char *, _IO_va_list, int *));
-extern int _IO_vfprintf __P ((_IO_FILE *, const char *, _IO_va_list));
+extern int _IO_vfscanf __P ((_IO_FILE * __restrict, const char * __restrict,
+			     _IO_va_list, int *__restrict));
+extern int _IO_vfprintf __P ((_IO_FILE *__restrict, const char *__restrict,
+			      _IO_va_list));
 extern _IO_ssize_t _IO_padn __P ((_IO_FILE *, int, _IO_ssize_t));
 extern _IO_size_t _IO_sgetn __P ((_IO_FILE *, void *, _IO_size_t));
 
diff --git a/libio/stdio.h b/libio/stdio.h
index cd7205f048..edbd82b3dc 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -211,13 +211,15 @@ extern FILE *fdopen __P ((int __fd, __const char *__modes));
 #ifdef	__USE_GNU
 /* Create a new stream that refers to the given magic cookie,
    and uses the given functions for input and output.  */
-extern FILE *fopencookie __P ((void *__magic_cookie, __const char *__modes,
+extern FILE *fopencookie __P ((void *__restrict __magic_cookie,
+			       __const char *__restrict __modes,
 			       _IO_cookie_io_functions_t __io_funcs));
 
 /* Open a stream that writes into a malloc'd buffer that is expanded as
    necessary.  *BUFLOC and *SIZELOC are updated with the buffer's location
    and the number of characters written on fflush or fclose.  */
-extern FILE *open_memstream __P ((char **__bufloc, size_t *__sizeloc));
+extern FILE *open_memstream __P ((char **__restrict __bufloc,
+				  size_t *__restrict __sizeloc));
 #endif
 
 
@@ -233,7 +235,8 @@ extern int setvbuf __P ((FILE *__restrict __stream, char *__restrict __buf,
 #ifdef	__USE_BSD
 /* If BUF is NULL, make STREAM unbuffered.
    Else make it use SIZE bytes of BUF for buffering.  */
-extern void setbuffer __P ((FILE *__stream, char *__buf, size_t __size));
+extern void setbuffer __P ((FILE *__restrict __stream, char *__restrict __buf,
+			    size_t __size));
 
 /* Make STREAM line-buffered.  */
 extern void setlinebuf __P ((FILE *__stream));
@@ -398,14 +401,17 @@ extern char *gets __P ((char *__s));
    NULL), pointing to *N characters of space.  It is realloc'd as
    necessary.  Returns the number of characters read (not including the
    null terminator), or -1 on error or EOF.  */
-extern _IO_ssize_t __getdelim __P ((char **__lineptr, size_t *__n,
-				    int __delimiter, FILE *__stream));
-extern _IO_ssize_t getdelim __P ((char **__lineptr, size_t *__n,
-				  int __delimiter, FILE *__stream));
+extern _IO_ssize_t __getdelim __P ((char **__restrict __lineptr,
+				    size_t *__restrict __n, int __delimiter,
+				    FILE *__restrict __stream));
+extern _IO_ssize_t getdelim __P ((char **__restrict __lineptr,
+				  size_t *__restrict __n, int __delimiter,
+				  FILE *__restrict __stream));
 
 /* Like `getdelim', but reads up to a newline.  */
-extern _IO_ssize_t getline __P ((char **__lineptr, size_t *__n,
-				 FILE *__stream));
+extern _IO_ssize_t getline __P ((char **__restrict __lineptr,
+				 size_t *__restrict __n,
+				 FILE *__restrict __stream));
 #endif
 
 
@@ -584,10 +590,10 @@ extern char *cuserid __P ((char *__s));
 struct obstack;			/* See <obstack.h>.  */
 
 /* Write formatted output to an obstack.  */
-extern int obstack_printf __P ((struct obstack *__obstack,
-				__const char *__format, ...));
-extern int obstack_vprintf __P ((struct obstack *__obstack,
-				 __const char *__format,
+extern int obstack_printf __P ((struct obstack *__restrict __obstack,
+				__const char *__restrict __format, ...));
+extern int obstack_vprintf __P ((struct obstack *__restrict __obstack,
+				 __const char *__restrict __format,
 				 _G_va_list __args));
 #endif /* Use GNU.  */
 
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 92c4492692..cf6d45fcaf 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+1998-12-02  H.J. Lu  <hjl@gnu.org>
+
+	* pthread.c (__pthread_sig_restart): Initiliaze to 0 if
+	SIGRTMIN is defined.
+	(__pthread_sig_cancel): Likewise.
+
 1998-12-01  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* wrapsyscall.c: Include <sys/mman.h> for msync,
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index bd4ea5a8c2..004c346e3a 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -147,8 +147,13 @@ const int __pthread_offsetof_pid = offsetof(struct _pthread_descr_struct,
                                             p_pid);
 
 /* Signal numbers used for the communication.  */
+#ifdef SIGRTMIN
+int __pthread_sig_restart;
+int __pthread_sig_cancel;
+#else
 int __pthread_sig_restart = DEFAULT_SIG_RESTART;
 int __pthread_sig_cancel = DEFAULT_SIG_CANCEL;
+#endif
 
 /* These variables are used by the setup code.  */
 extern int _errno;
diff --git a/locale/locale.h b/locale/locale.h
index 18771d7da8..41cb669bbe 100644
--- a/locale/locale.h
+++ b/locale/locale.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 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
@@ -115,8 +115,8 @@ extern struct lconv *localeconv __P ((void));
    BASE is non-null the appropriate category information in the BASE
    record is replaced.  */
 extern __locale_t __newlocale __P ((int __category_mask,
-				     __const char *__locale,
-				     __locale_t __base));
+				    __const char *__locale,
+				    __locale_t __base));
 
 /* Return a duplicate of the set of locale in DATASET.  All usage
    counters are increased if necessary.  */
diff --git a/math/libm-test.c b/math/libm-test.c
index 2f57ef21bd..b1452c2022 100644
--- a/math/libm-test.c
+++ b/math/libm-test.c
@@ -157,10 +157,10 @@ typedef MATHTYPE (*mathfunc) (MATHTYPE);
 
 
 #define ISINF(x) \
-(sizeof (x) == sizeof (float) ?						      \
- isinff (x)								      \
- : sizeof (x) == sizeof (double) ?					      \
- isinf (x) : isinfl (x))
+(sizeof (x) == sizeof (float)						      \
+ ? isinff (x)								      \
+ : sizeof (x) == sizeof (double)					      \
+ ? isinf (x) : isinfl (x))
 
 
 /* Test if Floating-Point stack hasn't changed */
@@ -171,7 +171,7 @@ fpstack_test (const char *test_name)
   static int old_stack;
   int sw;
 
-  asm ("fnstsw":"=a" (sw));
+  asm ("fnstsw" : "=a" (sw));
   sw >>= 11;
   sw &= 7;
 
@@ -213,7 +213,7 @@ random_value (MATHTYPE min_value, MATHTYPE max_value)
 static MATHTYPE
 random_greater (MATHTYPE min_value)
 {
-  return random_value (min_value, 1e6);		/* CHOOSE(LDBL_MAX, DBL_MAX, FLT_MAX) */
+  return random_value (min_value, 1e6);		/* CHOOSE (LDBL_MAX, DBL_MAX, FLT_MAX) */
 }
 
 
@@ -451,12 +451,12 @@ output_result (const char *test_name, int result,
       if (verbose > 1 && print_values)
 	{
 	  printf ("Result:\n");
-	  printf (" is:		% .20" PRINTF_EXPR "  % .20" PRINTF_XEXPR "\n",
+	  printf (" is:         % .20" PRINTF_EXPR "  % .20" PRINTF_XEXPR "\n",
 		  computed, computed);
-	  printf (" should be:	% .20" PRINTF_EXPR "  % .20" PRINTF_XEXPR "\n",
+	  printf (" should be:  % .20" PRINTF_EXPR "  % .20" PRINTF_XEXPR "\n",
 		  expected, expected);
 	  if (print_diff)
-	    printf (" difference: % .20" PRINTF_EXPR "	% .20" PRINTF_XEXPR
+	    printf (" difference: % .20" PRINTF_EXPR "  % .20" PRINTF_XEXPR
 		    "\n", difference, difference);
 	}
       ++noErrors;
@@ -484,14 +484,14 @@ output_result_ext (const char *test_name, int result,
       if (verbose > 1 && print_values)
 	{
 	  printf ("Result:\n");
-	  printf (" is:		% .20" PRINTF_EXPR "  % .20" PRINTF_XEXPR "\n",
+	  printf (" is:         % .20" PRINTF_EXPR "  % .20" PRINTF_XEXPR "\n",
 		  computed, computed);
-	  printf (" should be:	% .20" PRINTF_EXPR "  % .20" PRINTF_XEXPR "\n",
+	  printf (" should be:  % .20" PRINTF_EXPR "  % .20" PRINTF_XEXPR "\n",
 		  expected, expected);
 	  if (print_diff)
-	    printf (" difference: % .20" PRINTF_EXPR "	% .20" PRINTF_XEXPR
+	    printf (" difference: % .20" PRINTF_EXPR "  % .20" PRINTF_XEXPR
 		    "\n", difference, difference);
-	  printf ("Parameter:	% .20" PRINTF_EXPR "  % .20" PRINTF_XEXPR "\n",
+	  printf ("Parameter:   % .20" PRINTF_EXPR "  % .20" PRINTF_XEXPR "\n",
 		  parameter, parameter);
 	}
       ++noErrors;
@@ -596,8 +596,8 @@ check_int (const char *test_name, int computed, int expected)
       if (verbose > 1)
 	{
 	  printf ("Result:\n");
-	  printf (" is:		%d\n", computed);
-	  printf (" should be:	%d\n", expected);
+	  printf (" is:         %d\n", computed);
+	  printf (" should be:  %d\n", expected);
 	}
       noErrors++;
     }
@@ -627,8 +627,8 @@ check_long (const char *test_name, long int computed, long int expected)
       if (verbose > 1)
 	{
 	  printf ("Result:\n");
-	  printf (" is:		%ld\n", computed);
-	  printf (" should be:	%ld\n", expected);
+	  printf (" is:         %ld\n", computed);
+	  printf (" should be:  %ld\n", expected);
 	}
       noErrors++;
     }
@@ -659,8 +659,8 @@ check_longlong (const char *test_name, long long int computed,
       if (verbose > 1)
 	{
 	  printf ("Result:\n");
-	  printf (" is:		%lld\n", computed);
-	  printf (" should be:	%lld\n", expected);
+	  printf (" is:         %lld\n", computed);
+	  printf (" should be:  %lld\n", expected);
 	}
       noErrors++;
     }
@@ -825,12 +825,12 @@ acos_test (void)
   check ("acos (-1) == pi", FUNC(acos) (-1), M_PIl);
 
   check_eps ("acos (0.5) == pi/3", FUNC(acos) (0.5), M_PI_6l * 2.0,
-	     CHOOSE(1e-18, 0, 0));
+	     CHOOSE (1e-18, 0, 0));
   check_eps ("acos (-0.5) == 2*pi/3", FUNC(acos) (-0.5), M_PI_6l * 4.0,
-	     CHOOSE(1e-17, 0, 0));
+	     CHOOSE (1e-17, 0, 0));
 
   check_eps ("acos (0.7) == 0.795398830...", FUNC(acos) (0.7),
-	     0.7953988301841435554L, CHOOSE(7e-17L, 0, 0));
+	     0.7953988301841435554L, CHOOSE (7e-17L, 0, 0));
 }
 
 
@@ -849,7 +849,7 @@ acosh_test (void)
 
   check ("acosh(1) == 0", FUNC(acosh) (1), 0);
   check_eps ("acosh(7) == 2.633915793...", FUNC(acosh) (7),
-	     2.6339157938496334172L, CHOOSE(3e-19, 0, 0));
+	     2.6339157938496334172L, CHOOSE (3e-19, 0, 0));
 }
 
 
@@ -873,13 +873,13 @@ 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_6l,
-	     CHOOSE(3.5e-18, 0, 2e-7));
+	     CHOOSE (3.5e-18, 0, 2e-7));
   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_2l);
+	     CHOOSE (3.5e-18, 0, 2e-7));
+  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, 2e-7));
+	     0.7753974966107530637L, CHOOSE (7e-17L, 2e-16, 2e-7));
 }
 
 
@@ -893,7 +893,7 @@ asinh_test (void)
   check_isinfn ("asinh(-inf) == -inf", FUNC(asinh) (minus_infty));
 #endif
   check_eps ("asinh(0.7) == 0.652666566...", FUNC(asinh) (0.7),
-	     0.652666566082355786L, CHOOSE(4e-17L, 0, 6e-8));
+	     0.652666566082355786L, CHOOSE (4e-17L, 0, 6e-8));
 }
 
 
@@ -907,12 +907,12 @@ atan_test (void)
   check ("atan (-inf) == -pi/2", FUNC(atan) (minus_infty), -M_PI_2l);
 
   check_eps ("atan (1) == pi/4", FUNC(atan) (1), M_PI_4l,
-	     CHOOSE(1e-18, 0, 0));
+	     CHOOSE (1e-18, 0, 0));
   check_eps ("atan (-1) == -pi/4", FUNC(atan) (1), M_PI_4l,
-	     CHOOSE(1e-18, 0, 0));
+	     CHOOSE (1e-18, 0, 0));
 
   check_eps ("atan (0.7) == 0.610725964...", FUNC(atan) (0.7),
-	     0.6107259643892086165L, CHOOSE(3e-17L, 0, 0));
+	     0.6107259643892086165L, CHOOSE (3e-17L, 0, 0));
 }
 
 
@@ -992,9 +992,9 @@ atan2_test (void)
 
   /* FIXME: Add some specific tests */
   check_eps ("atan2 (0.7,1) == 0.61072...", FUNC(atan2) (0.7, 1),
-	     0.6107259643892086165L, CHOOSE(3e-17L, 0, 0));
+	     0.6107259643892086165L, CHOOSE (3e-17L, 0, 0));
   check_eps ("atan2 (0.4,0.0003) == 1.57004...", FUNC(atan2) (0.4, 0.0003),
-	     1.5700463269355215718L, CHOOSE(2e-19L, 0, 1.2e-7));
+	     1.5700463269355215718L, CHOOSE (2e-19L, 0, 1.2e-7));
 }
 
 
@@ -1024,7 +1024,7 @@ atanh_test (void)
 
 #endif
   check_eps ("atanh(0.7) == 0.867300527...", FUNC(atanh) (0.7),
-	     0.8673005276940531944L, CHOOSE(9e-17L, 2e-16, 0));
+	     0.8673005276940531944L, CHOOSE (9e-17L, 2e-16, 0));
 }
 
 
@@ -1040,14 +1040,14 @@ cbrt_test (void)
   check_isnan ("cbrt (NaN) == NaN", FUNC(cbrt) (nan_value));
 #endif
   check_eps ("cbrt (-0.001) == -0.1", FUNC(cbrt) (-0.001), -0.1,
-	     CHOOSE(5e-18L, 0, 0));
-  check_eps ("cbrt (8) == 2", FUNC(cbrt) (8), 2, CHOOSE(5e-17L, 0, 0));
+	     CHOOSE (5e-18L, 0, 0));
+  check_eps ("cbrt (8) == 2", FUNC(cbrt) (8), 2, CHOOSE (5e-17L, 0, 0));
   check_eps ("cbrt (-27) == -3", FUNC(cbrt) (-27.0), -3.0,
-	     CHOOSE(3e-16L, 5e-16, 0));
+	     CHOOSE (3e-16L, 5e-16, 0));
   check_eps ("cbrt (0.970299) == 0.99", FUNC(cbrt) (0.970299), 0.99,
-	     CHOOSE(2e-17L, 2e-16, 0));
+	     CHOOSE (2e-17L, 2e-16, 0));
   check_eps ("cbrt (0.7) == .8879040017...", FUNC(cbrt) (0.7),
-	     0.8879040017426007084L, CHOOSE(2e-17L, 6e-16, 0));
+	     0.8879040017426007084L, CHOOSE (2e-17L, 6e-16, 0));
 }
 
 
@@ -1077,14 +1077,14 @@ cos_test (void)
 		   INVALID_EXCEPTION);
 
   check_eps ("cos (pi/3) == 0.5", FUNC(cos) (M_PI_6l * 2.0),
-	     0.5, CHOOSE(4e-18L, 1e-15L, 1e-7L));
+	     0.5, CHOOSE (4e-18L, 1e-15L, 1e-7L));
   check_eps ("cos (2*pi/3) == -0.5", FUNC(cos) (M_PI_6l * 4.0),
-	     -0.5, CHOOSE(4e-18L, 1e-15L, 1e-7L));
+	     -0.5, CHOOSE (4e-18L, 1e-15L, 1e-7L));
   check_eps ("cos (pi/2) == 0", FUNC(cos) (M_PI_2l),
-	     0, CHOOSE(1e-19L, 1e-16L, 1e-7L));
+	     0, CHOOSE (1e-19L, 1e-16L, 1e-7L));
 
   check_eps ("cos (0.7) == 0.7648421872...", FUNC(cos) (0.7),
-	     0.7648421872844884262L, CHOOSE(3e-17, 2e-16, 6e-8));
+	     0.7648421872844884262L, CHOOSE (3e-17, 2e-16, 6e-8));
 }
 
 
@@ -1100,7 +1100,7 @@ cosh_test (void)
 #endif
 
   check_eps ("cosh (0.7) ==  1.2551690056...", FUNC(cosh) (0.7),
-	     1.255169005630943018L, CHOOSE(4e-17L, 0, 0));
+	     1.255169005630943018L, CHOOSE (4e-17L, 0, 0));
 }
 
 
@@ -1119,7 +1119,7 @@ erf_test (void)
   check ("erf (-inf) == -1", FUNC(erf) (minus_infty), -1);
 
   check_eps ("erf (0.7) == 0.6778011938...", FUNC(erf) (0.7),
-	     0.67780119383741847297L, CHOOSE(0, 2e-16, 0));
+	     0.67780119383741847297L, CHOOSE (0, 2e-16, 0));
 }
 
 
@@ -1138,7 +1138,7 @@ erfc_test (void)
   check ("erfc (-0) == 1", FUNC(erfc) (minus_zero), 1.0);
 
   check_eps ("erfc (0.7) == 0.3221988061...", FUNC(erfc) (0.7),
-	     0.32219880616258152702L, CHOOSE(0, 6e-17, 0));
+	     0.32219880616258152702L, CHOOSE (0, 6e-17, 0));
 }
 
 
@@ -1152,14 +1152,14 @@ 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_El, 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_E2l,
-	     CHOOSE(1e-18, 0, 0));
+	     CHOOSE (1e-18, 0, 0));
   check_eps ("exp (3) == e^3", FUNC(exp) (3), M_E3l,
-	     CHOOSE(1.5e-17, 0, 0));
+	     CHOOSE (1.5e-17, 0, 0));
   check_eps ("exp (0.7) == 2.0137527074...", FUNC(exp) (0.7),
-	     2.0137527074704765216L, CHOOSE(9e-17L, 0, 0));
+	     2.0137527074704765216L, CHOOSE (9e-17L, 0, 0));
 }
 
 
@@ -1178,13 +1178,13 @@ exp10_test (void)
   check_isinfp ("exp10 (+inf) == +inf", FUNC(exp10) (plus_infty));
   check ("exp10 (-inf) == 0", FUNC(exp10) (minus_infty), 0);
   check_eps ("exp10 (3) == 1000", FUNC(exp10) (3), 1000,
-	     CHOOSE(5e-16, 7e-13, 2e-4));
+	     CHOOSE (5e-16, 7e-13, 2e-4));
   check_eps ("exp10 (-1) == 0.1", FUNC(exp10) (-1), 0.1,
-	     CHOOSE(6e-18, 3e-17, 8e-09));
+	     CHOOSE (6e-18, 3e-17, 8e-09));
   check_isinfp ("exp10 (1e6) == +inf", FUNC(exp10) (1e6));
   check ("exp10 (-1e6) == 0", FUNC(exp10) (-1e6), 0);
   check_eps ("exp10 (0.7) == 5.0118723...", FUNC(exp10) (0.7),
-	     5.0118723362727228500L, CHOOSE(6e-16, 9e-16, 5e-7));
+	     5.0118723362727228500L, CHOOSE (6e-16, 9e-16, 5e-7));
 }
 
 
@@ -1207,7 +1207,7 @@ exp2_test (void)
   check_isinfp ("exp2 (1e6) == +inf", FUNC(exp2) (1e6));
   check ("exp2 (-1e6) == 0", FUNC(exp2) (-1e6), 0);
   check_eps ("exp2 (0.7) == 1.6245047927...", FUNC(exp2) (0.7),
-	     1.6245047927124710452L, CHOOSE(6e-17L, 0, 6e-8));
+	     1.6245047927124710452L, CHOOSE (6e-17L, 0, 6e-8));
 }
 
 
@@ -1223,10 +1223,10 @@ expm1_test (void)
 #endif
 
   check_eps ("expm1 (1) == e-1", FUNC(expm1) (1), M_El - 1.0,
-	     CHOOSE(4e-18L, 0, 2e-7));
+	     CHOOSE (4e-18L, 0, 2e-7));
 
   check_eps ("expm1 (0.7) == 1.01375...", FUNC(expm1) (0.7),
-	     1.0137527074704765216L, CHOOSE(9e-17L, 0, 0));
+	     1.0137527074704765216L, CHOOSE (9e-17L, 0, 0));
 }
 
 
@@ -1252,10 +1252,10 @@ check_frexp (const char *test_name, MATHTYPE computed, MATHTYPE expected,
       if (verbose > 1)
 	{
 	  printf ("Result:\n");
-	  printf (" is:		%.20" PRINTF_EXPR " *2^%d  %.20"
+	  printf (" is:         %.20" PRINTF_EXPR " *2^%d  %.20"
 		  PRINTF_XEXPR "*2^%d\n",
 		  computed, comp_int, computed, comp_int);
-	  printf (" should be:	%.20" PRINTF_EXPR " *2^%d  %.20"
+	  printf (" should be:  %.20" PRINTF_EXPR " *2^%d  %.20"
 		  PRINTF_XEXPR "*2^%d\n",
 		  expected, exp_int, expected, exp_int);
 	  printf (" difference: %.20" PRINTF_EXPR "  %.20" PRINTF_XEXPR "\n",
@@ -1393,12 +1393,12 @@ gamma_test (void)
 
   signgam = 0;
   check_eps ("gamma (0.5) == log(sqrt(pi))", FUNC(gamma) (0.5),
-	     FUNC(log) (FUNC(sqrt) (M_PIl)), 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_PIl)), 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);
 }
@@ -1424,15 +1424,15 @@ tgamma_test (void)
 		   FUNC(tgamma) (minus_infty), INVALID_EXCEPTION);
 
   check_eps ("tgamma (0.5) == sqrt(pi)", FUNC(tgamma) (0.5),
-	     FUNC(sqrt) (M_PIl), CHOOSE(0, 5e-16, 2e-7));
+	     FUNC(sqrt) (M_PIl), CHOOSE (0, 5e-16, 2e-7));
   check_eps ("tgamma (-0.5) == -2*sqrt(pi)", FUNC(tgamma) (-0.5),
-	     -2*FUNC(sqrt) (M_PIl), CHOOSE(0, 5e-16, 3e-7));
+	     -2*FUNC(sqrt) (M_PIl), CHOOSE (0, 5e-16, 3e-7));
 
   check ("tgamma (1) == 1", FUNC(tgamma) (1), 1);
   check ("tgamma (4) == 6", FUNC(tgamma) (4), 6);
 
   check_eps ("tgamma (0.7) == 1.29805...", FUNC(tgamma) (0.7),
-	     1.29805533264755778568L, CHOOSE(0, 3e-16, 2e-7));
+	     1.29805533264755778568L, CHOOSE (0, 3e-16, 2e-7));
   check ("tgamma (1.2) == 0.91816...", FUNC(tgamma) (1.2),
 	 0.91816874239976061064L);
 }
@@ -1467,23 +1467,23 @@ lgamma_test (void)
 
   signgam = 0;
   check_eps ("lgamma (0.5) == log(sqrt(pi))", FUNC(lgamma) (0.5),
-	     FUNC(log) (FUNC(sqrt) (M_PIl)), 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_PIl)), 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);
 
   signgam = 0;
   check_eps ("lgamma (0.7) == 0.26086...", FUNC(lgamma) (0.7),
-	     0.26086724653166651439L, CHOOSE(0, 6e-17, 3e-8));
+	     0.26086724653166651439L, CHOOSE (0, 6e-17, 3e-8));
   check_int ("lgamma (0.7) sets signgam to 1", signgam, 1);
 
   signgam = 0;
   check_eps ("lgamma (1.2) == -0.08537...", FUNC(lgamma) (1.2),
-	     -0.853740900033158497197e-1L, CHOOSE(0, 2e-17, 2e-8));
+	     -0.853740900033158497197e-1L, CHOOSE (0, 2e-17, 2e-8));
   check_int ("lgamma (1.2) sets signgam to 1", signgam, 1);
 }
 
@@ -1542,15 +1542,15 @@ 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_El), 1, CHOOSE(1e-18L, 0, 9e-8L));
+  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));
+	     CHOOSE (2e-18L, 0, 0));
   check_eps ("log (2) == M_LN2", FUNC(log) (2), M_LN2l,
-	     CHOOSE(6e-20L, 0, 0));
+	     CHOOSE (6e-20L, 0, 0));
   check_eps ("log (10) == M_LN10", FUNC(log) (10), M_LN10l,
-	     CHOOSE(1e-18L, 0, 0));
+	     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));
+	     -0.35667494393873237891L, CHOOSE (7e-17L, 6e-17, 3e-8));
 }
 
 
@@ -1570,16 +1570,16 @@ log10_test (void)
   check_isinfp ("log10 (+inf) == +inf", FUNC(log10) (plus_infty));
 
   check_eps ("log10 (0.1) == -1", FUNC(log10) (0.1L), -1,
-	     CHOOSE(1e-18L, 0, 0));
+	     CHOOSE (1e-18L, 0, 0));
   check_eps ("log10 (10) == 1", FUNC(log10) (10.0), 1,
-	     CHOOSE(1e-18L, 0, 0));
+	     CHOOSE (1e-18L, 0, 0));
   check_eps ("log10 (100) == 2", FUNC(log10) (100.0), 2,
-	     CHOOSE(1e-18L, 0, 0));
+	     CHOOSE (1e-18L, 0, 0));
   check ("log10 (10000) == 4", FUNC(log10) (10000.0), 4);
   check_eps ("log10 (e) == M_LOG10E", FUNC(log10) (M_El), M_LOG10El,
-	     CHOOSE(1e-18, 0, 9e-8));
+	     CHOOSE (1e-18, 0, 9e-8));
   check_eps ("log10 (0.7) == -0.1549019599...", FUNC(log10) (0.7),
-	     -0.15490195998574316929L, CHOOSE(3e-17L, 3e-17, 2e-8));
+	     -0.15490195998574316929L, CHOOSE (3e-17L, 3e-17, 2e-8));
 }
 
 
@@ -1597,10 +1597,10 @@ log1p_test (void)
   check_isinfp ("log1p (+inf) == +inf", FUNC(log1p) (plus_infty));
 
   check_eps ("log1p (e-1) == 1", FUNC(log1p) (M_El - 1.0), 1,
-	     CHOOSE(1e-18L, 0, 6e-8));
+	     CHOOSE (1e-18L, 0, 6e-8));
 
   check_eps ("log1p (-0.3) == -0.35667...", FUNC(log1p) (-0.3),
-	     -0.35667494393873237891L, CHOOSE(2e-17L, 6e-17, 3e-8));
+	     -0.35667494393873237891L, CHOOSE (2e-17L, 6e-17, 3e-8));
 }
 
 
@@ -1620,12 +1620,12 @@ log2_test (void)
   check_isinfp ("log2 (+inf) == +inf", FUNC(log2) (plus_infty));
 
   check_eps ("log2 (e) == M_LOG2E", FUNC(log2) (M_El), M_LOG2El,
-	     CHOOSE(1e-18L, 0, 0));
+	     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));
+  check_eps ("log2 (16) == 4", FUNC(log2) (16.0), 4, CHOOSE (1e-18L, 0, 0));
   check ("log2 (256) == 8", FUNC(log2) (256.0), 8);
   check_eps ("log2 (0.7) == -0.5145731728...", FUNC(log2) (0.7),
-	     -0.51457317282975824043L, CHOOSE(1e-16L, 2e-16, 6e-8));
+	     -0.51457317282975824043L, CHOOSE (1e-16L, 2e-16, 6e-8));
 }
 
 
@@ -1695,7 +1695,7 @@ modf_test (void)
 
   result = FUNC(modf) (89.6, &intpart);
   check_eps ("modf (89.6, &x) returns 0.6", result, 0.6,
-	     CHOOSE(6e-15L, 6e-15, 2e-6));
+	     CHOOSE (6e-15L, 6e-15, 2e-6));
   check ("modf (89.6, &x) sets x to 89", intpart, 89);
 }
 
@@ -1803,13 +1803,13 @@ sin_test (void)
 		   INVALID_EXCEPTION);
 
   check_eps ("sin (pi/6) == 0.5", FUNC(sin) (M_PI_6l),
-	     0.5, CHOOSE(4e-18L, 0, 0));
+	     0.5, CHOOSE (4e-18L, 0, 0));
   check_eps ("sin (-pi/6) == -0.5", FUNC(sin) (-M_PI_6l),
-	     -0.5, CHOOSE(4e-18L, 0, 0));
+	     -0.5, CHOOSE (4e-18L, 0, 0));
   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));
+	     0.64421768723769105367L, CHOOSE (4e-17L, 0, 0));
 }
 
 
@@ -1826,7 +1826,7 @@ sinh_test (void)
 #endif
 
   check_eps ("sinh (0.7) == 0.7585837018...", FUNC(sinh) (0.7),
-	     0.75858370183953350346L, CHOOSE(6e-17L, 2e-16, 6e-8));
+	     0.75858370183953350346L, CHOOSE (6e-17L, 2e-16, 6e-8));
 }
 
 
@@ -1869,21 +1869,21 @@ sincos_test (void)
   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));
+	     CHOOSE (1e-18L, 1e-16, 1e-7));
 
   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));
+	     CHOOSE (5e-18L, 0, 0));
 
   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));
+	     CHOOSE (5e-18L, 1e-15, 1e-7));
 
   FUNC(sincos) (0.7, &sin_res, &cos_res);
   check_eps ("sincos (0.7, &sin, &cos) puts 0.6442176872... in sin", sin_res,
-	     0.64421768723769105367L, CHOOSE(4e-17L, 0, 0));
+	     0.64421768723769105367L, CHOOSE (4e-17L, 0, 0));
   check_eps ("sincos (0.7, &sin, &cos) puts 0.7648421872... in cos", cos_res,
-	     0.76484218728448842626L, CHOOSE(3e-17L, 2e-16, 6e-8));
+	     0.76484218728448842626L, CHOOSE (3e-17L, 2e-16, 6e-8));
 }
 
 
@@ -1898,9 +1898,9 @@ tan_test (void)
 		   FUNC(tan) (minus_infty), INVALID_EXCEPTION);
 
   check_eps ("tan (pi/4) == 1", FUNC(tan) (M_PI_4l), 1,
-	     CHOOSE(2e-18L, 1e-15L, 2e-7));
+	     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));
+	     0.84228838046307944813L, CHOOSE (8e-17L, 0, 0));
 }
 
 
@@ -1915,7 +1915,7 @@ tanh_test (void)
   check ("tanh (-inf) == -1", FUNC(tanh) (minus_infty), -1);
 #endif
   check_eps ("tanh (0.7) == 0.6043677771...", FUNC(tanh) (0.7),
-	     0.60436777711716349631L, CHOOSE(3e-17L, 2e-16, 6e-8));
+	     0.60436777711716349631L, CHOOSE (3e-17L, 2e-16, 6e-8));
 }
 
 
@@ -1976,7 +1976,7 @@ hypot_test (void)
   check ("hypot (x,0) == fabs (x)", FUNC(hypot) (5.7e7L, 0), 5.7e7L);
 
   check_eps ("hypot (0.7,1.2) == 1.38924...", FUNC(hypot) (0.7, 1.2),
-	     1.3892443989449804508L, CHOOSE(7e-17L, 3e-16, 0));
+	     1.3892443989449804508L, CHOOSE (7e-17L, 3e-16, 0));
 }
 
 
@@ -2171,7 +2171,7 @@ pow_test (void)
 	     FUNC(pow) (minus_zero, x), 0.0, x);
 
   check_eps ("pow (0.7, 1.2) == 0.65180...", FUNC(pow) (0.7, 1.2),
-	     0.65180494056638638188L, CHOOSE(4e-17L, 0, 0));
+	     0.65180494056638638188L, CHOOSE (4e-17L, 0, 0));
 
 #ifdef TEST_DOUBLE
   check ("pow (-7.49321e+133, -9.80818e+16) == 0",
@@ -2304,13 +2304,13 @@ fmod_test (void)
 	     FUNC(fmod) (x, minus_infty), x, x);
 
   check_eps ("fmod (6.5, 2.3) == 1.9", FUNC(fmod) (6.5, 2.3), 1.9,
-	     CHOOSE(5e-16, 1e-15, 2e-7));
+	     CHOOSE (5e-16, 1e-15, 2e-7));
   check_eps ("fmod (-6.5, 2.3) == -1.9", FUNC(fmod) (-6.5, 2.3), -1.9,
-	     CHOOSE(5e-16, 1e-15, 2e-7));
+	     CHOOSE (5e-16, 1e-15, 2e-7));
   check_eps ("fmod (6.5, -2.3) == 1.9", FUNC(fmod) (6.5, -2.3), 1.9,
-	     CHOOSE(5e-16, 1e-15, 2e-7));
+	     CHOOSE (5e-16, 1e-15, 2e-7));
   check_eps ("fmod (-6.5, -2.3) == -1.9", FUNC(fmod) (-6.5, -2.3), -1.9,
-	     CHOOSE(5e-16, 1e-15, 2e-7));
+	     CHOOSE (5e-16, 1e-15, 2e-7));
 }
 
 
@@ -2435,9 +2435,9 @@ sqrt_test (void)
   check ("sqrt (0.25) == 0.5", FUNC(sqrt) (0.25), 0.5);
   check ("sqrt (6642.25) == 81.5", FUNC(sqrt) (6642.25), 81.5);
   check_eps ("sqrt (15239.903) == 123.45", FUNC(sqrt) (15239.903), 123.45,
-	     CHOOSE(3e-6L, 3e-6, 8e-6));
+	     CHOOSE (3e-6L, 3e-6, 8e-6));
   check_eps ("sqrt (0.7) == 0.8366600265", FUNC(sqrt) (0.7),
-	     0.83666002653407554798L, CHOOSE(3e-17L, 0, 0));
+	     0.83666002653407554798L, CHOOSE (3e-17L, 0, 0));
 }
 
 
@@ -2535,158 +2535,158 @@ cexp_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(cexp) (BUILD_COMPLEX(plus_zero, plus_zero));
+  result = FUNC(cexp) (BUILD_COMPLEX (plus_zero, plus_zero));
   check ("real(cexp(0 + 0i)) = 1", __real__ result, 1);
   check ("imag(cexp(0 + 0i)) = 0", __imag__ result, 0);
-  result = FUNC(cexp) (BUILD_COMPLEX(minus_zero, plus_zero));
+  result = FUNC(cexp) (BUILD_COMPLEX (minus_zero, plus_zero));
   check ("real(cexp(-0 + 0i)) = 1", __real__ result, 1);
   check ("imag(cexp(-0 + 0i)) = 0", __imag__ result, 0);
-  result = FUNC(cexp) (BUILD_COMPLEX(plus_zero, minus_zero));
+  result = FUNC(cexp) (BUILD_COMPLEX (plus_zero, minus_zero));
   check ("real(cexp(0 - 0i)) = 1", __real__ result, 1);
   check ("imag(cexp(0 - 0i)) = -0", __imag__ result, minus_zero);
-  result = FUNC(cexp) (BUILD_COMPLEX(minus_zero, minus_zero));
+  result = FUNC(cexp) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(cexp(-0 - 0i)) = 1", __real__ result, 1);
   check ("imag(cexp(-0 - 0i)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(plus_infty, plus_zero));
+  result = FUNC(cexp) (BUILD_COMPLEX (plus_infty, plus_zero));
   check_isinfp ("real(cexp(+inf + 0i)) = +inf", __real__ result);
   check ("imag(cexp(+inf + 0i)) = 0", __imag__ result, 0);
-  result = FUNC(cexp) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(cexp) (BUILD_COMPLEX (plus_infty, minus_zero));
   check_isinfp ("real(cexp(+inf - 0i)) = +inf", __real__ result);
   check ("imag(cexp(+inf - 0i)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(minus_infty, plus_zero));
+  result = FUNC(cexp) (BUILD_COMPLEX (minus_infty, plus_zero));
   check ("real(cexp(-inf + 0i)) = 0", __real__ result, 0);
   check ("imag(cexp(-inf + 0i)) = 0", __imag__ result, 0);
-  result = FUNC(cexp) (BUILD_COMPLEX(minus_infty, minus_zero));
+  result = FUNC(cexp) (BUILD_COMPLEX (minus_infty, minus_zero));
   check ("real(cexp(-inf - 0i)) = 0", __real__ result, 0);
   check ("imag(cexp(-inf - 0i)) = -0", __imag__ result, minus_zero);
 
 
-  result = FUNC(cexp) (BUILD_COMPLEX(0.0, plus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (0.0, plus_infty));
   check_isnan_exc ("real(cexp(0 + i inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(0 + i inf)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(minus_zero, plus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (minus_zero, plus_infty));
   check_isnan_exc ("real(cexp(-0 + i inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(-0 + i inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(cexp) (BUILD_COMPLEX(0.0, minus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (0.0, minus_infty));
   check_isnan_exc ("real(cexp(0 - i inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(0 - i inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(cexp) (BUILD_COMPLEX(minus_zero, minus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (minus_zero, minus_infty));
   check_isnan_exc ("real(cexp(-0 - i inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(-0 - i inf)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(100.0, plus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (100.0, plus_infty));
   check_isnan_exc ("real(cexp(100.0 + i inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(100.0 + i inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(cexp) (BUILD_COMPLEX(-100.0, plus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (-100.0, plus_infty));
   check_isnan_exc ("real(cexp(-100.0 + i inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(-100.0 + i inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(cexp) (BUILD_COMPLEX(100.0, minus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (100.0, minus_infty));
   check_isnan_exc ("real(cexp(100.0 - i inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(100.0 - i inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(cexp) (BUILD_COMPLEX(-100.0, minus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (-100.0, minus_infty));
   check_isnan_exc ("real(cexp(-100.0 - i inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(-100.0 - i inf)) = NaN", __imag__ result);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(minus_infty, 2.0));
+  result = FUNC(cexp) (BUILD_COMPLEX (minus_infty, 2.0));
   check ("real(cexp(-inf + 2.0i)) = -0", __real__ result, minus_zero);
   check ("imag(cexp(-inf + 2.0i)) = 0", __imag__ result, 0);
-  result = FUNC(cexp) (BUILD_COMPLEX(minus_infty, 4.0));
+  result = FUNC(cexp) (BUILD_COMPLEX (minus_infty, 4.0));
   check ("real(cexp(-inf + 4.0i)) = -0", __real__ result, minus_zero);
   check ("imag(cexp(-inf + 4.0i)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(plus_infty, 2.0));
+  result = FUNC(cexp) (BUILD_COMPLEX (plus_infty, 2.0));
   check_isinfn ("real(cexp(+inf + 2.0i)) = -inf", __real__ result);
   check_isinfp ("imag(cexp(+inf + 2.0i)) = +inf", __imag__ result);
-  result = FUNC(cexp) (BUILD_COMPLEX(plus_infty, 4.0));
+  result = FUNC(cexp) (BUILD_COMPLEX (plus_infty, 4.0));
   check_isinfn ("real(cexp(+inf + 4.0i)) = -inf", __real__ result);
   check_isinfn ("imag(cexp(+inf + 4.0i)) = -inf", __imag__ result);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(plus_infty, plus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (plus_infty, plus_infty));
   check_isinfp_exc ("real(cexp(+inf + i inf)) = +inf plus invalid exception",
 		    __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(+inf + i inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(cexp) (BUILD_COMPLEX(plus_infty, minus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (plus_infty, minus_infty));
   check_isinfp_exc ("real(cexp(+inf - i inf)) = +inf plus invalid exception",
 		    __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(+inf - i inf)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(minus_infty, plus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (minus_infty, plus_infty));
   check ("real(cexp(-inf + i inf)) = 0", __real__ result, 0);
   check ("imag(cexp(-inf + i inf)) = 0", __imag__ result, 0);
-  result = FUNC(cexp) (BUILD_COMPLEX(minus_infty, minus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (minus_infty, minus_infty));
   check ("real(cexp(-inf - i inf)) = 0", __real__ result, 0);
   check ("imag(cexp(-inf - i inf)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(cexp) (BUILD_COMPLEX (minus_infty, nan_value));
   check ("real(cexp(-inf + i NaN)) = 0", __real__ result, 0);
   check ("imag(cexp(-inf + i NaN)) = 0", fabs (__imag__ result), 0);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(cexp) (BUILD_COMPLEX (plus_infty, nan_value));
   check_isinfp ("real(cexp(+inf + i NaN)) = +inf", __real__ result);
   check_isnan ("imag(cexp(+inf + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(nan_value, 0.0));
+  result = FUNC(cexp) (BUILD_COMPLEX (nan_value, 0.0));
   check_isnan_maybe_exc ("real(cexp(NaN + i0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(NaN + i0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(cexp) (BUILD_COMPLEX(nan_value, 1.0));
+  result = FUNC(cexp) (BUILD_COMPLEX (nan_value, 1.0));
   check_isnan_maybe_exc ("real(cexp(NaN + 1i)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(NaN + 1i)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(cexp) (BUILD_COMPLEX(nan_value, plus_infty));
+  result = FUNC(cexp) (BUILD_COMPLEX (nan_value, plus_infty));
   check_isnan_maybe_exc ("real(cexp(NaN + i inf)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(NaN + i inf)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(0, nan_value));
+  result = FUNC(cexp) (BUILD_COMPLEX (0, nan_value));
   check_isnan_maybe_exc ("real(cexp(0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(cexp) (BUILD_COMPLEX(1, nan_value));
+  result = FUNC(cexp) (BUILD_COMPLEX (1, nan_value));
   check_isnan_maybe_exc ("real(cexp(1 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cexp(1 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(cexp) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(cexp(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(cexp(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(cexp) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(cexp) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(cexp(0.7 + i 1.2)) == 0.72969...", __real__ result,
-	     0.7296989091503236012L, CHOOSE(6e-17L, 2e-16, 2e-7));
+	     0.7296989091503236012L, CHOOSE (6e-17L, 2e-16, 2e-7));
   check_eps ("imag(cexp(0.7 + i 1.2)) == 1.87689...", __imag__ result,
-	     1.8768962328348102821L, CHOOSE(2e-16L, 2.5e-16, 3e-7));
+	     1.8768962328348102821L, CHOOSE (2e-16L, 2.5e-16, 3e-7));
 
-  result = FUNC(cexp) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(cexp) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(cexp(-2 - i 3)) == -0.13398...", __real__ result,
-	     -0.1339809149295426134L, CHOOSE(6.8e-20L, 0, 2e-8));
+	     -0.1339809149295426134L, CHOOSE (6.8e-20L, 0, 2e-8));
   check_eps ("imag(cexp(-2 - i 3)) == -0.01909...", __imag__ result,
-	     -0.0190985162611351964L, CHOOSE(4e-20L, 0, 2e-9));
+	     -0.0190985162611351964L, CHOOSE (4e-20L, 0, 2e-9));
 }
 
 
@@ -2695,179 +2695,179 @@ csin_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(csin) (BUILD_COMPLEX(0.0, 0.0));
+  result = FUNC(csin) (BUILD_COMPLEX (0.0, 0.0));
   check ("real(csin(0 + 0i)) = 0", __real__ result, 0);
   check ("imag(csin(0 + 0i)) = 0", __imag__ result, 0);
-  result = FUNC(csin) (BUILD_COMPLEX(minus_zero, 0.0));
+  result = FUNC(csin) (BUILD_COMPLEX (minus_zero, 0.0));
   check ("real(csin(-0 + 0i)) = -0", __real__ result, minus_zero);
   check ("imag(csin(-0 + 0i)) = 0", __imag__ result, 0);
-  result = FUNC(csin) (BUILD_COMPLEX(0.0, minus_zero));
+  result = FUNC(csin) (BUILD_COMPLEX (0.0, minus_zero));
   check ("real(csin(0 - 0i)) = 0", __real__ result, 0);
   check ("imag(csin(0 - 0i)) = -0", __imag__ result, minus_zero);
-  result = FUNC(csin) (BUILD_COMPLEX(minus_zero, minus_zero));
+  result = FUNC(csin) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(csin(-0 - 0i)) = -0", __real__ result, minus_zero);
   check ("imag(csin(-0 - 0i)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(csin) (BUILD_COMPLEX(0.0, plus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (0.0, plus_infty));
   check ("real(csin(0 + i Inf)) = 0", __real__ result, 0);
   check_isinfp ("imag(csin(0 + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(minus_zero, plus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (minus_zero, plus_infty));
   check ("real(csin(-0 + i Inf)) = -0", __real__ result, minus_zero);
   check_isinfp ("imag(csin(-0 + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(0.0, minus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (0.0, minus_infty));
   check ("real(csin(0 - i Inf)) = 0", __real__ result, 0);
   check_isinfn ("imag(csin(0 - i Inf)) = -Inf", __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(minus_zero, minus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (minus_zero, minus_infty));
   check ("real(csin(-0 - i Inf)) = -0", __real__ result, minus_zero);
   check_isinfn ("imag(csin(-0 - i Inf)) = -Inf", __imag__ result);
 
-  result = FUNC(csin) (BUILD_COMPLEX(plus_infty, 0.0));
+  result = FUNC(csin) (BUILD_COMPLEX (plus_infty, 0.0));
   check_isnan_exc ("real(csin(+Inf + 0i)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check ("imag(csin(+Inf + 0i)) = +-0 plus invalid exception",
 	 FUNC(fabs) (__imag__ result), 0);
-  result = FUNC(csin) (BUILD_COMPLEX(minus_infty, 0.0));
+  result = FUNC(csin) (BUILD_COMPLEX (minus_infty, 0.0));
   check_isnan_exc ("real(csin(-Inf + 0i)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check ("imag(csin(-Inf + 0i)) = +-0 plus invalid exception",
 	 FUNC(fabs) (__imag__ result), 0);
-  result = FUNC(csin) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(csin) (BUILD_COMPLEX (plus_infty, minus_zero));
   check_isnan_exc ("real(csin(+Inf - 0i)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check ("imag(csin(+Inf - 0i)) = +-0 plus invalid exception",
 	 FUNC(fabs) (__imag__ result), 0.0);
-  result = FUNC(csin) (BUILD_COMPLEX(minus_infty, minus_zero));
+  result = FUNC(csin) (BUILD_COMPLEX (minus_infty, minus_zero));
   check_isnan_exc ("real(csin(-Inf - 0i)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check ("imag(csin(-Inf - 0i)) = +-0 plus invalid exception",
 	 FUNC(fabs) (__imag__ result), 0.0);
 
-  result = FUNC(csin) (BUILD_COMPLEX(plus_infty, plus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (plus_infty, plus_infty));
   check_isnan_exc ("real(csin(+Inf + i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isinfp ("imag(csin(+Inf + i Inf)) = +-Inf plus invalid exception",
 		FUNC(fabs) (__imag__ result));
-  result = FUNC(csin) (BUILD_COMPLEX(minus_infty, plus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (minus_infty, plus_infty));
   check_isnan_exc ("real(csin(-Inf + i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isinfp ("imag(csin(-Inf + i Inf)) = +-Inf plus invalid exception",
 		FUNC(fabs) (__imag__ result));
-  result = FUNC(csin) (BUILD_COMPLEX(plus_infty, minus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (plus_infty, minus_infty));
   check_isnan_exc ("real(csin(Inf - i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isinfp ("imag(csin(Inf - i Inf)) = +-Inf plus invalid exception",
 		FUNC(fabs) (__imag__ result));
-  result = FUNC(csin) (BUILD_COMPLEX(minus_infty, minus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (minus_infty, minus_infty));
   check_isnan_exc ("real(csin(-Inf - i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isinfp ("imag(csin(-Inf - i Inf)) = +-Inf plus invalid exception",
 		FUNC(fabs) (__imag__ result));
 
-  result = FUNC(csin) (BUILD_COMPLEX(plus_infty, 6.75));
+  result = FUNC(csin) (BUILD_COMPLEX (plus_infty, 6.75));
   check_isnan_exc ("real(csin(+Inf + i 6.75)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csin(+Inf + i6.75)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(plus_infty, -6.75));
+  result = FUNC(csin) (BUILD_COMPLEX (plus_infty, -6.75));
   check_isnan_exc ("real(csin(+Inf - i 6.75)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csin(+Inf - i6.75)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(minus_infty, 6.75));
+  result = FUNC(csin) (BUILD_COMPLEX (minus_infty, 6.75));
   check_isnan_exc ("real(csin(-Inf + i6.75)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csin(-Inf + i6.75)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(minus_infty, -6.75));
+  result = FUNC(csin) (BUILD_COMPLEX (minus_infty, -6.75));
   check_isnan_exc ("real(csin(-Inf - i6.75)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csin(-Inf - i6.75)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(csin) (BUILD_COMPLEX(4.625, plus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (4.625, plus_infty));
   check_isinfn ("real(csin(4.625 + i Inf)) = -Inf", __real__ result);
   check_isinfn ("imag(csin(4.625 + i Inf)) = -Inf", __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(4.625, minus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (4.625, minus_infty));
   check_isinfn ("real(csin(4.625 - i Inf)) = -Inf", __real__ result);
   check_isinfp ("imag(csin(4.625 - i Inf)) = +Inf", __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(-4.625, plus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (-4.625, plus_infty));
   check_isinfp ("real(csin(-4.625 + i Inf)) = +Inf", __real__ result);
   check_isinfn ("imag(csin(-4.625 + i Inf)) = -Inf", __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(-4.625, minus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (-4.625, minus_infty));
   check_isinfp ("real(csin(-4.625 - i Inf)) = +Inf", __real__ result);
   check_isinfp ("imag(csin(-4.625 - i Inf)) = +Inf", __imag__ result);
 
-  result = FUNC(csin) (BUILD_COMPLEX(nan_value, 0.0));
+  result = FUNC(csin) (BUILD_COMPLEX (nan_value, 0.0));
   check_isnan ("real(csin(NaN + i0)) = NaN", __real__ result);
   check ("imag(csin(NaN + i0)) = +-0", FUNC(fabs) (__imag__ result), 0);
-  result = FUNC(csin) (BUILD_COMPLEX(nan_value, minus_zero));
+  result = FUNC(csin) (BUILD_COMPLEX (nan_value, minus_zero));
   check_isnan ("real(csin(NaN - i0)) = NaN", __real__ result);
   check ("imag(csin(NaN - i0)) = +-0", FUNC(fabs) (__imag__ result), 0);
 
-  result = FUNC(csin) (BUILD_COMPLEX(nan_value, plus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (nan_value, plus_infty));
   check_isnan ("real(csin(NaN + i Inf)) = NaN", __real__ result);
   check_isinfp ("imag(csin(NaN + i Inf)) = +-Inf",
 		FUNC(fabs) (__imag__ result));
-  result = FUNC(csin) (BUILD_COMPLEX(nan_value, minus_infty));
+  result = FUNC(csin) (BUILD_COMPLEX (nan_value, minus_infty));
   check_isnan ("real(csin(NaN - i Inf)) = NaN", __real__ result);
   check_isinfp ("real(csin(NaN - i Inf)) = +-Inf",
 		FUNC(fabs) (__imag__ result));
 
-  result = FUNC(csin) (BUILD_COMPLEX(nan_value, 9.0));
+  result = FUNC(csin) (BUILD_COMPLEX (nan_value, 9.0));
   check_isnan_maybe_exc ("real(csin(NaN + i9.0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csin(NaN + i9.0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(nan_value, -9.0));
+  result = FUNC(csin) (BUILD_COMPLEX (nan_value, -9.0));
   check_isnan_maybe_exc ("real(csin(NaN - i9.0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csin(NaN - i9.0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(csin) (BUILD_COMPLEX(0.0, nan_value));
+  result = FUNC(csin) (BUILD_COMPLEX (0.0, nan_value));
   check ("real(csin(0 + i NaN))", __real__ result, 0.0);
   check_isnan ("imag(csin(0 + i NaN)) = NaN", __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(csin) (BUILD_COMPLEX (minus_zero, nan_value));
   check ("real(csin(-0 + i NaN)) = -0", __real__ result, minus_zero);
   check_isnan ("imag(csin(-0 + NaN)) = NaN", __imag__ result);
 
-  result = FUNC(csin) (BUILD_COMPLEX(10.0, nan_value));
+  result = FUNC(csin) (BUILD_COMPLEX (10.0, nan_value));
   check_isnan_maybe_exc ("real(csin(10 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csin(10 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(nan_value, -10.0));
+  result = FUNC(csin) (BUILD_COMPLEX (nan_value, -10.0));
   check_isnan_maybe_exc ("real(csin(-10 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csin(-10 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(csin) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(csin) (BUILD_COMPLEX (plus_infty, nan_value));
   check_isnan_maybe_exc ("real(csin(+Inf + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csin(+Inf + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(csin) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(csin) (BUILD_COMPLEX (minus_infty, nan_value));
   check_isnan_maybe_exc ("real(csin(-Inf + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csin(-Inf + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(csin) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(csin) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(csin(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(csin(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(csin) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(csin) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(csin(0.7 + i 1.2)) = 1.166456341...", __real__ result,
-	     1.1664563419657581376L, CHOOSE(2e-16L, 0, 0));
+	     1.1664563419657581376L, CHOOSE (2e-16L, 0, 0));
   check_eps ("imag(csin(0.7 + i 1.2)) = 1.154499724...", __imag__ result,
-	     1.1544997246948547371L, CHOOSE(2e-17L, 0, 2e-7));
+	     1.1544997246948547371L, CHOOSE (2e-17L, 0, 2e-7));
 
-  result = FUNC(csin) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(csin) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(csin(-2 - i 3)) == -9.15449...", __real__ result,
-	     -9.1544991469114295734L, CHOOSE(4e-18L, 0, 1e-6));
+	     -9.1544991469114295734L, CHOOSE (4e-18L, 0, 1e-6));
   check_eps ("imag(csin(-2 - i 3)) == -4.16890...", __imag__ result,
-	     4.1689069599665643507L, CHOOSE(2e-17L, 0, 5e-7));
+	     4.1689069599665643507L, CHOOSE (2e-17L, 0, 5e-7));
 }
 
 
@@ -2876,179 +2876,179 @@ csinh_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(csinh) (BUILD_COMPLEX(0.0, 0.0));
+  result = FUNC(csinh) (BUILD_COMPLEX (0.0, 0.0));
   check ("real(csinh(0 + 0i)) = 0", __real__ result, 0);
   check ("imag(csinh(0 + 0i)) = 0", __imag__ result, 0);
-  result = FUNC(csinh) (BUILD_COMPLEX(minus_zero, 0.0));
+  result = FUNC(csinh) (BUILD_COMPLEX (minus_zero, 0.0));
   check ("real(csinh(-0 + 0i)) = -0", __real__ result, minus_zero);
   check ("imag(csinh(-0 + 0i)) = 0", __imag__ result, 0);
-  result = FUNC(csinh) (BUILD_COMPLEX(0.0, minus_zero));
+  result = FUNC(csinh) (BUILD_COMPLEX (0.0, minus_zero));
   check ("real(csinh(0 - 0i)) = 0", __real__ result, 0);
   check ("imag(csinh(0 - 0i)) = -0", __imag__ result, minus_zero);
-  result = FUNC(csinh) (BUILD_COMPLEX(minus_zero, minus_zero));
+  result = FUNC(csinh) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(csinh(-0 - 0i)) = -0", __real__ result, minus_zero);
   check ("imag(csinh(-0 - 0i)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(0.0, plus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (0.0, plus_infty));
   check_exc ("real(csinh(0 + i Inf)) = +-0 plus invalid exception",
 	     FUNC(fabs) (__real__ result), 0, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(0 + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(minus_zero, plus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (minus_zero, plus_infty));
   check_exc ("real(csinh(-0 + i Inf)) = +-0 plus invalid exception",
 	     FUNC(fabs) (__real__ result), 0, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(-0 + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(0.0, minus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (0.0, minus_infty));
   check_exc ("real(csinh(0 - i Inf)) = +-0 plus invalid exception",
 	     FUNC(fabs) (__real__ result), 0, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(0 - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(minus_zero, minus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (minus_zero, minus_infty));
   check_exc ("real(csinh(-0 - i Inf)) = +-0 plus invalid exception",
 	     FUNC(fabs) (__real__ result), 0, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(-0 - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(plus_infty, 0.0));
+  result = FUNC(csinh) (BUILD_COMPLEX (plus_infty, 0.0));
   check_isinfp ("real(csinh(+Inf + 0i)) = +Inf", __real__ result);
   check ("imag(csinh(+Inf + 0i)) = 0", __imag__ result, 0);
-  result = FUNC(csinh) (BUILD_COMPLEX(minus_infty, 0.0));
+  result = FUNC(csinh) (BUILD_COMPLEX (minus_infty, 0.0));
   check_isinfn ("real(csinh(-Inf + 0i)) = -Inf", __real__ result);
   check ("imag(csinh(-Inf + 0i)) = 0", __imag__ result, 0);
-  result = FUNC(csinh) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(csinh) (BUILD_COMPLEX (plus_infty, minus_zero));
   check_isinfp ("real(csinh(+Inf - 0i)) = +Inf", __real__ result);
   check ("imag(csinh(+Inf - 0i)) = -0", __imag__ result, minus_zero);
-  result = FUNC(csinh) (BUILD_COMPLEX(minus_infty, minus_zero));
+  result = FUNC(csinh) (BUILD_COMPLEX (minus_infty, minus_zero));
   check_isinfn ("real(csinh(-Inf - 0i)) = -Inf", __real__ result);
   check ("imag(csinh(-Inf - 0i)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(plus_infty, plus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (plus_infty, plus_infty));
   check_isinfp_exc ("real(csinh(+Inf + i Inf)) = +-Inf plus invalid exception",
 		    FUNC(fabs) (__real__ result), INVALID_EXCEPTION);
   check_isnan ("imag(csinh(+Inf + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(minus_infty, plus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (minus_infty, plus_infty));
   check_isinfp_exc ("real(csinh(-Inf + i Inf)) = +-Inf plus invalid exception",
 		    FUNC(fabs) (__real__ result), INVALID_EXCEPTION);
   check_isnan ("imag(csinh(-Inf + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(plus_infty, minus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (plus_infty, minus_infty));
   check_isinfp_exc ("real(csinh(Inf - i Inf)) = +-Inf plus invalid exception",
 		    FUNC(fabs) (__real__ result), INVALID_EXCEPTION);
   check_isnan ("imag(csinh(Inf - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(minus_infty, minus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (minus_infty, minus_infty));
   check_isinfp_exc ("real(csinh(-Inf - i Inf)) = +-Inf plus invalid exception",
 		    FUNC(fabs) (__real__ result), INVALID_EXCEPTION);
   check_isnan ("imag(csinh(-Inf - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(plus_infty, 4.625));
+  result = FUNC(csinh) (BUILD_COMPLEX (plus_infty, 4.625));
   check_isinfn ("real(csinh(+Inf + i4.625)) = -Inf", __real__ result);
   check_isinfn ("imag(csinh(+Inf + i4.625)) = -Inf", __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(minus_infty, 4.625));
+  result = FUNC(csinh) (BUILD_COMPLEX (minus_infty, 4.625));
   check_isinfp ("real(csinh(-Inf + i4.625)) = +Inf", __real__ result);
   check_isinfn ("imag(csinh(-Inf + i4.625)) = -Inf", __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(plus_infty, -4.625));
+  result = FUNC(csinh) (BUILD_COMPLEX (plus_infty, -4.625));
   check_isinfn ("real(csinh(+Inf - i4.625)) = -Inf", __real__ result);
   check_isinfp ("imag(csinh(+Inf - i4.625)) = +Inf", __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(minus_infty, -4.625));
+  result = FUNC(csinh) (BUILD_COMPLEX (minus_infty, -4.625));
   check_isinfp ("real(csinh(-Inf - i4.625)) = +Inf", __real__ result);
   check_isinfp ("imag(csinh(-Inf - i4.625)) = +Inf", __imag__ result);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(6.75, plus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (6.75, plus_infty));
   check_isnan_exc ("real(csinh(6.75 + i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(6.75 + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(-6.75, plus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (-6.75, plus_infty));
   check_isnan_exc ("real(csinh(-6.75 + i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(-6.75 + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(6.75, minus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (6.75, minus_infty));
   check_isnan_exc ("real(csinh(6.75 - i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(6.75 - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(-6.75, minus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (-6.75, minus_infty));
   check_isnan_exc ("real(csinh(-6.75 - i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(-6.75 - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(0.0, nan_value));
+  result = FUNC(csinh) (BUILD_COMPLEX (0.0, nan_value));
   check ("real(csinh(0 + i NaN)) = +-0", FUNC(fabs) (__real__ result), 0);
   check_isnan ("imag(csinh(0 + i NaN)) = NaN", __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(csinh) (BUILD_COMPLEX (minus_zero, nan_value));
   check ("real(csinh(-0 + i NaN)) = +-0", FUNC(fabs) (__real__ result), 0);
   check_isnan ("imag(csinh(-0 + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(csinh) (BUILD_COMPLEX (plus_infty, nan_value));
   check_isinfp ("real(csinh(+Inf + i NaN)) = +-Inf",
 		FUNC(fabs) (__real__ result));
   check_isnan ("imag(csinh(+Inf + i NaN)) = NaN", __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(csinh) (BUILD_COMPLEX (minus_infty, nan_value));
   check_isinfp ("real(csinh(-Inf + i NaN)) = +-Inf",
 		FUNC(fabs) (__real__ result));
   check_isnan ("imag(csinh(-Inf + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(9.0, nan_value));
+  result = FUNC(csinh) (BUILD_COMPLEX (9.0, nan_value));
   check_isnan_maybe_exc ("real(csinh(9.0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(9.0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(-9.0, nan_value));
+  result = FUNC(csinh) (BUILD_COMPLEX (-9.0, nan_value));
   check_isnan_maybe_exc ("real(csinh(-9.0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(-9.0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(nan_value, 0.0));
+  result = FUNC(csinh) (BUILD_COMPLEX (nan_value, 0.0));
   check_isnan ("real(csinh(NaN + i0)) = NaN", __real__ result);
   check ("imag(csinh(NaN + i0)) = 0", __imag__ result, 0.0);
-  result = FUNC(csinh) (BUILD_COMPLEX(nan_value, minus_zero));
+  result = FUNC(csinh) (BUILD_COMPLEX (nan_value, minus_zero));
   check_isnan ("real(csinh(NaN - i0)) = NaN", __real__ result);
   check ("imag(csinh(NaN - i0)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(nan_value, 10.0));
+  result = FUNC(csinh) (BUILD_COMPLEX (nan_value, 10.0));
   check_isnan_maybe_exc ("real(csinh(NaN + i10)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(NaN + i10)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(nan_value, -10.0));
+  result = FUNC(csinh) (BUILD_COMPLEX (nan_value, -10.0));
   check_isnan_maybe_exc ("real(csinh(NaN - i10)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(NaN - i10)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(nan_value, plus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (nan_value, plus_infty));
   check_isnan_maybe_exc ("real(csinh(NaN + i Inf)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(NaN + i Inf)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(csinh) (BUILD_COMPLEX(nan_value, minus_infty));
+  result = FUNC(csinh) (BUILD_COMPLEX (nan_value, minus_infty));
   check_isnan_maybe_exc ("real(csinh(NaN - i Inf)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csinh(NaN - i Inf)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(csinh) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(csinh(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(csinh(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(csinh) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(csinh) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(csinh(0.7 + i 1.2)) = 0.274878686...", __real__ result,
-	     0.27487868678117583582L, CHOOSE(2e-17L, 6e-17, 3e-8));
+	     0.27487868678117583582L, CHOOSE (2e-17L, 6e-17, 3e-8));
   check_eps ("imag(csinh(0.7 + i 1.2)) = 1.169866572...", __imag__ result,
-	     1.1698665727426565139L, CHOOSE(6e-17L, 0, 2e-7));
+	     1.1698665727426565139L, CHOOSE (6e-17L, 0, 2e-7));
 
-  result = FUNC(csinh) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(csinh) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(csinh(-2 - i 3)) == -3.59056...", __real__ result,
-	     3.5905645899857799520L, CHOOSE(7e-19L, 5e-16, 3e-7));
+	     3.5905645899857799520L, CHOOSE (7e-19L, 5e-16, 3e-7));
   check_eps ("imag(csinh(-2 - i 3)) == -0.53092...", __imag__ result,
-	     -0.5309210862485198052L, CHOOSE(3e-19L, 2e-16, 6e-8));
+	     -0.5309210862485198052L, CHOOSE (3e-19L, 2e-16, 6e-8));
 }
 
 
@@ -3057,177 +3057,177 @@ ccos_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(ccos) (BUILD_COMPLEX(0.0, 0.0));
+  result = FUNC(ccos) (BUILD_COMPLEX (0.0, 0.0));
   check ("real(ccos(0 + 0i)) = 1.0", __real__ result, 1.0);
   check ("imag(ccos(0 + 0i)) = -0", __imag__ result, minus_zero);
-  result = FUNC(ccos) (BUILD_COMPLEX(minus_zero, 0.0));
+  result = FUNC(ccos) (BUILD_COMPLEX (minus_zero, 0.0));
   check ("real(ccos(-0 + 0i)) = 1.0", __real__ result, 1.0);
   check ("imag(ccos(-0 + 0i)) = 0", __imag__ result, 0.0);
-  result = FUNC(ccos) (BUILD_COMPLEX(0.0, minus_zero));
+  result = FUNC(ccos) (BUILD_COMPLEX (0.0, minus_zero));
   check ("real(ccos(0 - 0i)) = 1.0", __real__ result, 1.0);
   check ("imag(ccos(0 - 0i)) = 0", __imag__ result, 0.0);
-  result = FUNC(ccos) (BUILD_COMPLEX(minus_zero, minus_zero));
+  result = FUNC(ccos) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(ccos(-0 - 0i)) = 1.0", __real__ result, 1.0);
   check ("imag(ccos(-0 - 0i)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(plus_infty, 0.0));
+  result = FUNC(ccos) (BUILD_COMPLEX (plus_infty, 0.0));
   check_isnan_exc ("real(ccos(+Inf + i0)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check ("imag(ccos(Inf + i0)) = +-0 plus invalid exception",
 	 FUNC(fabs) (__imag__ result), 0);
-  result = FUNC(ccos) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(ccos) (BUILD_COMPLEX (plus_infty, minus_zero));
   check_isnan_exc ("real(ccos(Inf - i0)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check ("imag(ccos(Inf - i0)) = +-0 plus invalid exception",
 	 FUNC(fabs) (__imag__ result), 0);
-  result = FUNC(ccos) (BUILD_COMPLEX(minus_infty, 0.0));
+  result = FUNC(ccos) (BUILD_COMPLEX (minus_infty, 0.0));
   check_isnan_exc ("real(ccos(-Inf + i0)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check ("imag(ccos(-Inf + i0)) = +-0 plus invalid exception",
 	 FUNC(fabs) (__imag__ result), 0);
-  result = FUNC(ccos) (BUILD_COMPLEX(minus_infty, minus_zero));
+  result = FUNC(ccos) (BUILD_COMPLEX (minus_infty, minus_zero));
   check_isnan_exc ("real(ccos(-Inf - i0)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check ("imag(ccos(-Inf - i0)) = +-0 plus invalid exception",
 	 FUNC(fabs) (__imag__ result), 0);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(0.0, plus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (0.0, plus_infty));
   check_isinfp ("real(ccos(0 + i Inf)) = +Inf", __real__ result);
   check ("imag(ccos(0 + i Inf)) = -0", __imag__ result, minus_zero);
-  result = FUNC(ccos) (BUILD_COMPLEX(0.0, minus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (0.0, minus_infty));
   check_isinfp ("real(ccos(0 - i Inf)) = +Inf", __real__ result);
   check ("imag(ccos(0 - i Inf)) = 0", __imag__ result, 0);
-  result = FUNC(ccos) (BUILD_COMPLEX(minus_zero, plus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (minus_zero, plus_infty));
   check_isinfp ("real(ccos(-0 + i Inf)) = +Inf", __real__ result);
   check ("imag(ccos(-0 + i Inf)) = 0", __imag__ result, 0.0);
-  result = FUNC(ccos) (BUILD_COMPLEX(minus_zero, minus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (minus_zero, minus_infty));
   check_isinfp ("real(ccos(-0 - i Inf)) = +Inf", __real__ result);
   check ("imag(ccos(-0 - i Inf)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(plus_infty, plus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (plus_infty, plus_infty));
   check_isinfp_exc ("real(ccos(+Inf + i Inf)) = +Inf plus invalid exception",
 		    __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(+Inf + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(minus_infty, plus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (minus_infty, plus_infty));
   check_isinfp_exc ("real(ccos(-Inf + i Inf)) = +Inf plus invalid exception",
 		    __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(-Inf + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(plus_infty, minus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (plus_infty, minus_infty));
   check_isinfp_exc ("real(ccos(Inf - i Inf)) = +Inf plus invalid exception",
 		    __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(Inf - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(minus_infty, minus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (minus_infty, minus_infty));
   check_isinfp_exc ("real(ccos(-Inf - i Inf)) = +Inf plus invalid exception",
 		    __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(-Inf - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(4.625, plus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (4.625, plus_infty));
   check_isinfn ("real(ccos(4.625 + i Inf)) = -Inf", __real__ result);
   check_isinfp ("imag(ccos(4.625 + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(4.625, minus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (4.625, minus_infty));
   check_isinfn ("real(ccos(4.625 - i Inf)) = -Inf", __real__ result);
   check_isinfn ("imag(ccos(4.625 - i Inf)) = -Inf", __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(-4.625, plus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (-4.625, plus_infty));
   check_isinfn ("real(ccos(-4.625 + i Inf)) = -Inf", __real__ result);
   check_isinfn ("imag(ccos(-4.625 + i Inf)) = -Inf", __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(-4.625, minus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (-4.625, minus_infty));
   check_isinfn ("real(ccos(-4.625 - i Inf)) = -Inf", __real__ result);
   check_isinfp ("imag(ccos(-4.625 - i Inf)) = +Inf", __imag__ result);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(plus_infty, 6.75));
+  result = FUNC(ccos) (BUILD_COMPLEX (plus_infty, 6.75));
   check_isnan_exc ("real(ccos(+Inf + i6.75)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(+Inf + i6.75)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(plus_infty, -6.75));
+  result = FUNC(ccos) (BUILD_COMPLEX (plus_infty, -6.75));
   check_isnan_exc ("real(ccos(+Inf - i6.75)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(+Inf - i6.75)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(minus_infty, 6.75));
+  result = FUNC(ccos) (BUILD_COMPLEX (minus_infty, 6.75));
   check_isnan_exc ("real(ccos(-Inf + i6.75)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(-Inf + i6.75)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(minus_infty, -6.75));
+  result = FUNC(ccos) (BUILD_COMPLEX (minus_infty, -6.75));
   check_isnan_exc ("real(ccos(-Inf - i6.75)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(-Inf - i6.75)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(nan_value, 0.0));
+  result = FUNC(ccos) (BUILD_COMPLEX (nan_value, 0.0));
   check_isnan ("real(ccos(NaN + i0)) = NaN", __real__ result);
   check ("imag(ccos(NaN + i0)) = +-0", FUNC(fabs) (__imag__ result), 0);
-  result = FUNC(ccos) (BUILD_COMPLEX(nan_value, minus_zero));
+  result = FUNC(ccos) (BUILD_COMPLEX (nan_value, minus_zero));
   check_isnan ("real(ccos(NaN - i0)) = NaN", __real__ result);
   check ("imag(ccos(NaN - i0)) = +-0", FUNC(fabs) (__imag__ result), 0);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(nan_value, plus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (nan_value, plus_infty));
   check_isinfp ("real(ccos(NaN + i Inf)) = +Inf", __real__ result);
   check_isnan ("imag(ccos(NaN + i Inf)) = NaN", __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(nan_value, minus_infty));
+  result = FUNC(ccos) (BUILD_COMPLEX (nan_value, minus_infty));
   check_isinfp ("real(ccos(NaN - i Inf)) = +Inf", __real__ result);
   check_isnan ("imag(ccos(NaN - i Inf)) = NaN", __imag__ result);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(nan_value, 9.0));
+  result = FUNC(ccos) (BUILD_COMPLEX (nan_value, 9.0));
   check_isnan_maybe_exc ("real(ccos(NaN + i9.0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(NaN + i9.0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(nan_value, -9.0));
+  result = FUNC(ccos) (BUILD_COMPLEX (nan_value, -9.0));
   check_isnan_maybe_exc ("real(ccos(NaN - i9.0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(NaN - i9.0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(0.0, nan_value));
+  result = FUNC(ccos) (BUILD_COMPLEX (0.0, nan_value));
   check_isnan ("real(ccos(0 + i NaN)) = NaN", __real__ result);
   check ("imag(ccos(0 + i NaN)) = +-0", FUNC(fabs) (__imag__ result), 0.0);
-  result = FUNC(ccos) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(ccos) (BUILD_COMPLEX (minus_zero, nan_value));
   check_isnan ("real(ccos(-0 + i NaN)) = NaN", __real__ result);
   check ("imag(ccos(-0 + i NaN)) = +-0", FUNC(fabs) (__imag__ result), 0.0);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(10.0, nan_value));
+  result = FUNC(ccos) (BUILD_COMPLEX (10.0, nan_value));
   check_isnan_maybe_exc ("real(ccos(10 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(10 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(-10.0, nan_value));
+  result = FUNC(ccos) (BUILD_COMPLEX (-10.0, nan_value));
   check_isnan_maybe_exc ("real(ccos(-10 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(-10 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(ccos) (BUILD_COMPLEX (plus_infty, nan_value));
   check_isnan_maybe_exc ("real(ccos(+Inf + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(+Inf + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ccos) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(ccos) (BUILD_COMPLEX (minus_infty, nan_value));
   check_isnan_maybe_exc ("real(ccos(-Inf + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccos(-Inf + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(ccos) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(ccos(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(ccos(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(ccos) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(ccos) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(ccos(0.7 + i 1.2)) = 1.384865764...", __real__ result,
-	     1.3848657645312111080L, CHOOSE(4e-18L, 3e-16, 2e-7));
+	     1.3848657645312111080L, CHOOSE (4e-18L, 3e-16, 2e-7));
   check_eps ("imag(ccos(0.7 + i 1.2)) = -0.972421703...", __imag__ result,
-	     -0.97242170335830028619L, CHOOSE(2e-16L, 2e-16, 0));
+	     -0.97242170335830028619L, CHOOSE (2e-16L, 2e-16, 0));
 
-  result = FUNC(ccos) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(ccos) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(ccos(-2 - i 3)) == -4.18962...", __real__ result,
-	     -4.1896256909688072301L, CHOOSE(2e-17L, 0, 5e-7));
+	     -4.1896256909688072301L, CHOOSE (2e-17L, 0, 5e-7));
   check_eps ("imag(ccos(-2 - i 3)) == -9.10922...", __imag__ result,
-	     -9.1092278937553365979L, CHOOSE(3e-18L, 0, 1e-6));
+	     -9.1092278937553365979L, CHOOSE (3e-18L, 0, 1e-6));
 }
 
 
@@ -3236,177 +3236,177 @@ ccosh_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(0.0, 0.0));
+  result = FUNC(ccosh) (BUILD_COMPLEX (0.0, 0.0));
   check ("real(ccosh(0 + 0i)) = 1.0", __real__ result, 1.0);
   check ("imag(ccosh(0 + 0i)) = 0", __imag__ result, 0);
-  result = FUNC(ccosh) (BUILD_COMPLEX(minus_zero, 0.0));
+  result = FUNC(ccosh) (BUILD_COMPLEX (minus_zero, 0.0));
   check ("real(ccosh(-0 + 0i)) = 1.0", __real__ result, 1.0);
   check ("imag(ccosh(-0 + 0i)) = -0", __imag__ result, minus_zero);
-  result = FUNC(ccosh) (BUILD_COMPLEX(0.0, minus_zero));
+  result = FUNC(ccosh) (BUILD_COMPLEX (0.0, minus_zero));
   check ("real(ccosh(0 - 0i)) = 1.0", __real__ result, 1.0);
   check ("imag(ccosh(0 - 0i)) = -0", __imag__ result, minus_zero);
-  result = FUNC(ccosh) (BUILD_COMPLEX(minus_zero, minus_zero));
+  result = FUNC(ccosh) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(ccosh(-0 - 0i)) = 1.0", __real__ result, 1.0);
   check ("imag(ccosh(-0 - 0i)) = 0", __imag__ result, 0.0);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(0.0, plus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (0.0, plus_infty));
   check_isnan_exc ("real(ccosh(0 + i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check ("imag(ccosh(0 + i Inf)) = +-0 plus invalid exception",
 	 FUNC(fabs) (__imag__ result), 0);
-  result = FUNC(ccosh) (BUILD_COMPLEX(minus_zero, plus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (minus_zero, plus_infty));
   check_isnan_exc ("real(ccosh(-0 + i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check ("imag(ccosh(-0 + i Inf)) = +-0 plus invalid exception",
 	 FUNC(fabs) (__imag__ result), 0);
-  result = FUNC(ccosh) (BUILD_COMPLEX(0.0, minus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (0.0, minus_infty));
   check_isnan_exc ("real(ccosh(0 - i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check ("imag(ccosh(0 - i Inf)) = +-0 plus invalid exception",
 	 FUNC(fabs) (__imag__ result), 0);
-  result = FUNC(ccosh) (BUILD_COMPLEX(minus_zero, minus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (minus_zero, minus_infty));
   check_isnan_exc ("real(ccosh(-0 - i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check ("imag(ccosh(-0 - i Inf)) = +-0 plus invalid exception",
 	 FUNC(fabs) (__imag__ result), 0);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(plus_infty, 0.0));
+  result = FUNC(ccosh) (BUILD_COMPLEX (plus_infty, 0.0));
   check_isinfp ("real(ccosh(+Inf + 0i)) = +Inf", __real__ result);
   check ("imag(ccosh(+Inf + 0i)) = 0", __imag__ result, 0);
-  result = FUNC(ccosh) (BUILD_COMPLEX(minus_infty, 0.0));
+  result = FUNC(ccosh) (BUILD_COMPLEX (minus_infty, 0.0));
   check_isinfp ("real(ccosh(-Inf + 0i)) = +Inf", __real__ result);
   check ("imag(ccosh(-Inf + 0i)) = -0", __imag__ result, minus_zero);
-  result = FUNC(ccosh) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(ccosh) (BUILD_COMPLEX (plus_infty, minus_zero));
   check_isinfp ("real(ccosh(+Inf - 0i)) = +Inf", __real__ result);
   check ("imag(ccosh(+Inf - 0i)) = -0", __imag__ result, minus_zero);
-  result = FUNC(ccosh) (BUILD_COMPLEX(minus_infty, minus_zero));
+  result = FUNC(ccosh) (BUILD_COMPLEX (minus_infty, minus_zero));
   check_isinfp ("real(ccosh(-Inf - 0i)) = +Inf", __real__ result);
   check ("imag(ccosh(-Inf - 0i)) = 0", __imag__ result, 0.0);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(plus_infty, plus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (plus_infty, plus_infty));
   check_isinfp_exc ("real(ccosh(+Inf + i Inf)) = +Inf plus invalid exception",
 		    __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(+Inf + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(minus_infty, plus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (minus_infty, plus_infty));
   check_isinfp_exc ("real(ccosh(-Inf + i Inf)) = +Inf plus invalid exception",
 		    __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(-Inf + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(plus_infty, minus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (plus_infty, minus_infty));
   check_isinfp_exc ("real(ccosh(Inf - i Inf)) = +Inf plus invalid exception",
 		    __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(Inf - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(minus_infty, minus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (minus_infty, minus_infty));
   check_isinfp_exc ("real(ccosh(-Inf - i Inf)) = +Inf plus invalid exception",
 		    __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(-Inf - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(plus_infty, 4.625));
+  result = FUNC(ccosh) (BUILD_COMPLEX (plus_infty, 4.625));
   check_isinfn ("real(ccosh(+Inf + i4.625)) = -Inf", __real__ result);
   check_isinfn ("imag(ccosh(+Inf + i4.625)) = -Inf", __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(minus_infty, 4.625));
+  result = FUNC(ccosh) (BUILD_COMPLEX (minus_infty, 4.625));
   check_isinfn ("real(ccosh(-Inf + i4.625)) = -Inf", __real__ result);
   check_isinfp ("imag(ccosh(-Inf + i4.625)) = Inf", __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(plus_infty, -4.625));
+  result = FUNC(ccosh) (BUILD_COMPLEX (plus_infty, -4.625));
   check_isinfn ("real(ccosh(+Inf - i4.625)) = -Inf", __real__ result);
   check_isinfp ("imag(ccosh(+Inf - i4.625)) = +Inf", __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(minus_infty, -4.625));
+  result = FUNC(ccosh) (BUILD_COMPLEX (minus_infty, -4.625));
   check_isinfn ("real(ccosh(-Inf - i4.625)) = -Inf", __real__ result);
   check_isinfn ("imag(ccosh(-Inf - i4.625)) = -Inf", __imag__ result);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(6.75, plus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (6.75, plus_infty));
   check_isnan_exc ("real(ccosh(6.75 + i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(6.75 + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(-6.75, plus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (-6.75, plus_infty));
   check_isnan_exc ("real(ccosh(-6.75 + i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(-6.75 + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(6.75, minus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (6.75, minus_infty));
   check_isnan_exc ("real(ccosh(6.75 - i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(6.75 - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(-6.75, minus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (-6.75, minus_infty));
   check_isnan_exc ("real(ccosh(-6.75 - i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(-6.75 - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(0.0, nan_value));
+  result = FUNC(ccosh) (BUILD_COMPLEX (0.0, nan_value));
   check_isnan ("real(ccosh(0 + i NaN)) = NaN", __real__ result);
   check ("imag(ccosh(0 + i NaN)) = +-0", FUNC(fabs) (__imag__ result), 0);
-  result = FUNC(ccosh) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(ccosh) (BUILD_COMPLEX (minus_zero, nan_value));
   check_isnan ("real(ccosh(-0 + i NaN)) = NaN", __real__ result);
   check ("imag(ccosh(-0 + i NaN)) = +-0", FUNC(fabs) (__imag__ result), 0);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(ccosh) (BUILD_COMPLEX (plus_infty, nan_value));
   check_isinfp ("real(ccosh(+Inf + i NaN)) = +Inf", __real__ result);
   check_isnan ("imag(ccosh(+Inf + i NaN)) = NaN", __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(ccosh) (BUILD_COMPLEX (minus_infty, nan_value));
   check_isinfp ("real(ccosh(-Inf + i NaN)) = +Inf", __real__ result);
   check_isnan ("imag(ccosh(-Inf + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(9.0, nan_value));
+  result = FUNC(ccosh) (BUILD_COMPLEX (9.0, nan_value));
   check_isnan_maybe_exc ("real(ccosh(9.0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(9.0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(-9.0, nan_value));
+  result = FUNC(ccosh) (BUILD_COMPLEX (-9.0, nan_value));
   check_isnan_maybe_exc ("real(ccosh(-9.0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(-9.0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(nan_value, 0.0));
+  result = FUNC(ccosh) (BUILD_COMPLEX (nan_value, 0.0));
   check_isnan ("real(ccosh(NaN + i0)) = NaN", __real__ result);
   check ("imag(ccosh(NaN + i0)) = +-0", FUNC(fabs) (__imag__ result), 0.0);
-  result = FUNC(ccosh) (BUILD_COMPLEX(nan_value, minus_zero));
+  result = FUNC(ccosh) (BUILD_COMPLEX (nan_value, minus_zero));
   check_isnan ("real(ccosh(NaN - i0)) = NaN", __real__ result);
   check ("imag(ccosh(NaN - i0)) = +-0", FUNC(fabs) (__imag__ result), 0.0);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(nan_value, 10.0));
+  result = FUNC(ccosh) (BUILD_COMPLEX (nan_value, 10.0));
   check_isnan_maybe_exc ("real(ccosh(NaN + i10)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(NaN + i10)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(nan_value, -10.0));
+  result = FUNC(ccosh) (BUILD_COMPLEX (nan_value, -10.0));
   check_isnan_maybe_exc ("real(ccosh(NaN - i10)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(NaN - i10)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(nan_value, plus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (nan_value, plus_infty));
   check_isnan_maybe_exc ("real(ccosh(NaN + i Inf)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(NaN + i Inf)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ccosh) (BUILD_COMPLEX(nan_value, minus_infty));
+  result = FUNC(ccosh) (BUILD_COMPLEX (nan_value, minus_infty));
   check_isnan_maybe_exc ("real(ccosh(NaN - i Inf)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ccosh(NaN - i Inf)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(ccosh) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(ccosh(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(ccosh(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(ccosh) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(ccosh(0.7 + i 1.2)) == 0.45482...", __real__ result,
-	     0.4548202223691477654L, CHOOSE(5e-17L, 6e-17, 9e-8));
+	     0.4548202223691477654L, CHOOSE (5e-17L, 6e-17, 9e-8));
   check_eps ("imag(ccosh(0.7 + i 1.2)) == 0.70702...", __imag__ result,
-	     0.7070296600921537682L, CHOOSE(7e-17L, 2e-16, 0));
+	     0.7070296600921537682L, CHOOSE (7e-17L, 2e-16, 0));
 
-  result = FUNC(ccosh) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(ccosh) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(ccosh(-2 - i 3)) == -3.72454...", __real__ result,
-	     -3.7245455049153225654L, CHOOSE(7e-19L, 0, 3e-7));
+	     -3.7245455049153225654L, CHOOSE (7e-19L, 0, 3e-7));
   check_eps ("imag(ccosh(-2 - i 3)) == -0.51182...", __imag__ result,
-	     0.5118225699873846088L, CHOOSE(3e-19L, 2e-16, 6e-8));
+	     0.5118225699873846088L, CHOOSE (3e-19L, 2e-16, 6e-8));
 }
 
 
@@ -3415,140 +3415,140 @@ cacos_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(cacos) (BUILD_COMPLEX(0, 0));
+  result = FUNC(cacos) (BUILD_COMPLEX (0, 0));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (minus_zero, 0));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (0, minus_zero));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (minus_zero, minus_zero));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, plus_infty));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, minus_infty));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (plus_infty, plus_infty));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (plus_infty, minus_infty));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (-10.0, plus_infty));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (-10.0, minus_infty));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (0, plus_infty));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (0, minus_infty));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (0.1, plus_infty));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (0.1, minus_infty));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, 0));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, minus_zero));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, 100));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, -100));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (plus_infty, 0));
   check ("real(cacos(+Inf + i0)) = 0", __real__ result, 0);
   check_isinfn ("imag(cacos(+Inf + i0)) = -Inf", __imag__ result);
-  result = FUNC(cacos) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(cacos) (BUILD_COMPLEX (plus_infty, minus_zero));
   check ("real(cacos(+Inf - i0)) = 0", __real__ result, 0);
   check_isinfp ("imag(cacos(+Inf - i0)) = +Inf", __imag__ result);
-  result = FUNC(cacos) (BUILD_COMPLEX(plus_infty, 0.5));
+  result = FUNC(cacos) (BUILD_COMPLEX (plus_infty, 0.5));
   check ("real(cacos(+Inf + i0.5)) = 0", __real__ result, 0);
   check_isinfn ("imag(cacos(+Inf + i0.5)) = -Inf", __imag__ result);
-  result = FUNC(cacos) (BUILD_COMPLEX(plus_infty, -0.5));
+  result = FUNC(cacos) (BUILD_COMPLEX (plus_infty, -0.5));
   check ("real(cacos(+Inf - i0.5)) = 0", __real__ result, 0);
   check_isinfp ("imag(cacos(+Inf - i0.5)) = +Inf", __imag__ result);
 
-  result = FUNC(cacos) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(cacos) (BUILD_COMPLEX (plus_infty, nan_value));
   check_isnan ("real(cacos(+Inf + i NaN)) = NaN", __real__ result);
   check_isinfp ("imag(cacos(+Inf + i NaN)) = +-Inf",
 		FUNC(fabs) (__imag__ result));
-  result = FUNC(cacos) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(cacos) (BUILD_COMPLEX (minus_infty, nan_value));
   check_isnan ("real(cacos(-Inf + i NaN)) = NaN", __real__ result);
   check_isinfp ("imag(cacos(-Inf + i NaN)) = +-Inf",
 		FUNC(fabs) (__imag__ result));
 
-  result = FUNC(cacos) (BUILD_COMPLEX(0, nan_value));
+  result = FUNC(cacos) (BUILD_COMPLEX (0, nan_value));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (minus_zero, nan_value));
   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));
+  result = FUNC(cacos) (BUILD_COMPLEX (nan_value, plus_infty));
   check_isnan ("real(cacos(NaN + i Inf)) = NaN", __real__ result);
   check_isinfn ("imag(cacos(NaN + i Inf)) = -Inf", __imag__ result);
-  result = FUNC(cacos) (BUILD_COMPLEX(nan_value, minus_infty));
+  result = FUNC(cacos) (BUILD_COMPLEX (nan_value, minus_infty));
   check_isnan ("real(cacos(NaN - i Inf)) = NaN", __real__ result);
   check_isinfp ("imag(cacos(NaN - i Inf)) = +Inf", __imag__ result);
 
-  result = FUNC(cacos) (BUILD_COMPLEX(10.5, nan_value));
+  result = FUNC(cacos) (BUILD_COMPLEX (10.5, nan_value));
   check_isnan_maybe_exc ("real(cacos(10.5 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cacos(10.5 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(cacos) (BUILD_COMPLEX(-10.5, nan_value));
+  result = FUNC(cacos) (BUILD_COMPLEX (-10.5, nan_value));
   check_isnan_maybe_exc ("real(cacos(-10.5 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cacos(-10.5 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(cacos) (BUILD_COMPLEX(nan_value, 0.75));
+  result = FUNC(cacos) (BUILD_COMPLEX (nan_value, 0.75));
   check_isnan_maybe_exc ("real(cacos(NaN + i0.75)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cacos(NaN + i0.75)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(cacos) (BUILD_COMPLEX(-10.5, nan_value));
+  result = FUNC(cacos) (BUILD_COMPLEX (-10.5, nan_value));
   check_isnan_maybe_exc ("real(cacos(NaN - i0.75)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cacos(NaN - i0.75)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(cacos) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(cacos) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(cacos(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(cacos(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(cacos) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(cacos) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(cacos(0.7 + i 1.2)) == 1.13518...", __real__ result,
-	     1.1351827477151551089L, CHOOSE(2e-17L, 3e-16, 2e-7));
+	     1.1351827477151551089L, CHOOSE (2e-17L, 3e-16, 2e-7));
   check_eps ("imag(cacos(0.7 + i 1.2)) == -1.09276...", __imag__ result,
-	     -1.0927647857577371459L, CHOOSE(4e-17L, 3e-16, 3e-7));
+	     -1.0927647857577371459L, CHOOSE (4e-17L, 3e-16, 3e-7));
 
-  result = FUNC(cacos) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(cacos) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(cacos(-2 - i 3)) == 2.14144...", __real__ result,
-	     2.1414491111159960199L, CHOOSE(3e-19L, 0, 0));
+	     2.1414491111159960199L, CHOOSE (3e-19L, 0, 0));
   check_eps ("imag(cacos(-2 - i 3)) == -1.98338...", __imag__ result,
-	     1.9833870299165354323L, CHOOSE(3e-19L, 0, 0));
+	     1.9833870299165354323L, CHOOSE (3e-19L, 0, 0));
 }
 
 
@@ -3557,138 +3557,138 @@ cacosh_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(0, 0));
+  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_2l);
-  result = FUNC(cacosh) (BUILD_COMPLEX(minus_zero, 0));
+  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_2l);
-  result = FUNC(cacosh) (BUILD_COMPLEX(0, minus_zero));
+  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_2l);
-  result = FUNC(cacosh) (BUILD_COMPLEX(minus_zero, minus_zero));
+  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_2l);
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(minus_infty, plus_infty));
+  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_PIl - M_PI_4l);
-  result = FUNC(cacosh) (BUILD_COMPLEX(minus_infty, minus_infty));
+  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_4l - M_PIl);
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(plus_infty, plus_infty));
+  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_4l);
-  result = FUNC(cacosh) (BUILD_COMPLEX(plus_infty, minus_infty));
+  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_4l);
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(-10.0, plus_infty));
+  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_2l);
-  result = FUNC(cacosh) (BUILD_COMPLEX(-10.0, minus_infty));
+  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_2l);
-  result = FUNC(cacosh) (BUILD_COMPLEX(0, plus_infty));
+  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_2l);
-  result = FUNC(cacosh) (BUILD_COMPLEX(0, minus_infty));
+  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_2l);
-  result = FUNC(cacosh) (BUILD_COMPLEX(0.1, plus_infty));
+  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_2l);
-  result = FUNC(cacosh) (BUILD_COMPLEX(0.1, minus_infty));
+  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_2l);
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(minus_infty, 0));
+  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_PIl);
-  result = FUNC(cacosh) (BUILD_COMPLEX(minus_infty, minus_zero));
+  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_PIl);
-  result = FUNC(cacosh) (BUILD_COMPLEX(minus_infty, 100));
+  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_PIl);
-  result = FUNC(cacosh) (BUILD_COMPLEX(minus_infty, -100));
+  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_PIl);
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(plus_infty, 0));
+  result = FUNC(cacosh) (BUILD_COMPLEX (plus_infty, 0));
   check_isinfp ("real(cacosh(+Inf + i0)) = +Inf", __real__ result);
   check ("imag(cacosh(+Inf + i0)) = 0", __imag__ result, 0);
-  result = FUNC(cacosh) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(cacosh) (BUILD_COMPLEX (plus_infty, minus_zero));
   check_isinfp ("real(cacosh(+Inf - i0)) = +Inf", __real__ result);
   check ("imag(cacosh(+Inf - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(cacosh) (BUILD_COMPLEX(plus_infty, 0.5));
+  result = FUNC(cacosh) (BUILD_COMPLEX (plus_infty, 0.5));
   check_isinfp ("real(cacosh(+Inf + i0.5)) = +Inf", __real__ result);
   check ("imag(cacosh(+Inf + i0.5)) = 0", __imag__ result, 0);
-  result = FUNC(cacosh) (BUILD_COMPLEX(plus_infty, -0.5));
+  result = FUNC(cacosh) (BUILD_COMPLEX (plus_infty, -0.5));
   check_isinfp ("real(cacosh(+Inf - i0.5)) = +Inf", __real__ result);
   check ("imag(cacosh(+Inf - i0.5)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(cacosh) (BUILD_COMPLEX (plus_infty, nan_value));
   check_isinfp ("real(cacosh(+Inf + i NaN)) = +Inf", __real__ result);
   check_isnan ("imag(cacosh(+Inf + i NaN)) = NaN", __imag__ result);
-  result = FUNC(cacosh) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(cacosh) (BUILD_COMPLEX (minus_infty, nan_value));
   check_isinfp ("real(cacosh(-Inf + i NaN)) = +Inf", __real__ result);
   check_isnan ("imag(cacosh(-Inf + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(0, nan_value));
+  result = FUNC(cacosh) (BUILD_COMPLEX (0, nan_value));
   check_isnan ("real(cacosh(0 + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(cacosh(0 + i NaN)) = NaN", __imag__ result);
-  result = FUNC(cacosh) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(cacosh) (BUILD_COMPLEX (minus_zero, nan_value));
   check_isnan ("real(cacosh(-0 + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(cacosh(-0 + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(nan_value, plus_infty));
+  result = FUNC(cacosh) (BUILD_COMPLEX (nan_value, plus_infty));
   check_isinfp ("real(cacosh(NaN + i Inf)) = +Inf", __real__ result);
   check_isnan ("imag(cacosh(NaN + i Inf)) = NaN", __imag__ result);
-  result = FUNC(cacosh) (BUILD_COMPLEX(nan_value, minus_infty));
+  result = FUNC(cacosh) (BUILD_COMPLEX (nan_value, minus_infty));
   check_isinfp ("real(cacosh(NaN - i Inf)) = +Inf", __real__ result);
   check_isnan ("imag(cacosh(NaN - i Inf)) = NaN", __imag__ result);
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(10.5, nan_value));
+  result = FUNC(cacosh) (BUILD_COMPLEX (10.5, nan_value));
   check_isnan_maybe_exc ("real(cacosh(10.5 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cacosh(10.5 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(cacosh) (BUILD_COMPLEX(-10.5, nan_value));
+  result = FUNC(cacosh) (BUILD_COMPLEX (-10.5, nan_value));
   check_isnan_maybe_exc ("real(cacosh(-10.5 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cacosh(-10.5 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(nan_value, 0.75));
+  result = FUNC(cacosh) (BUILD_COMPLEX (nan_value, 0.75));
   check_isnan_maybe_exc ("real(cacosh(NaN + i0.75)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cacosh(NaN + i0.75)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(cacosh) (BUILD_COMPLEX(-10.5, nan_value));
+  result = FUNC(cacosh) (BUILD_COMPLEX (-10.5, nan_value));
   check_isnan_maybe_exc ("real(cacosh(NaN - i0.75)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(cacosh(NaN - i0.75)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(cacosh) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(cacosh(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(cacosh(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(cacosh) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(cacosh(0.7 + i 1.2)) == 1.09276...", __real__ result,
-	     1.0927647857577371459L, CHOOSE(4e-17L, 3e-16, 2e-7));
+	     1.0927647857577371459L, CHOOSE (4e-17L, 3e-16, 2e-7));
   check_eps ("imag(cacosh(0.7 + i 1.2)) == 1.13518...", __imag__ result,
-	     1.1351827477151551089L, CHOOSE(2e-17L, 0, 1.2e-7));
+	     1.1351827477151551089L, CHOOSE (2e-17L, 0, 1.2e-7));
 
-  result = FUNC(cacosh) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(cacosh) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(cacosh(-2 - i 3)) == -1.98338...", __real__ result,
-	     -1.9833870299165354323L, CHOOSE(2e-18L, 3e-16, 9e-7));
+	     -1.9833870299165354323L, CHOOSE (2e-18L, 3e-16, 9e-7));
   check_eps ("imag(cacosh(-2 - i 3)) == 2.14144...", __imag__ result,
-	     2.1414491111159960199L, CHOOSE(4.5e-19, 5e-16, 1e-6));
+	     2.1414491111159960199L, CHOOSE (4.5e-19, 5e-16, 1e-6));
 }
 
 
@@ -3697,143 +3697,143 @@ casin_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(casin) (BUILD_COMPLEX(0, 0));
+  result = FUNC(casin) (BUILD_COMPLEX (0, 0));
   check ("real(casin(0 + i0)) = 0", __real__ result, 0);
   check ("imag(casin(0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(casin) (BUILD_COMPLEX(minus_zero, 0));
+  result = FUNC(casin) (BUILD_COMPLEX (minus_zero, 0));
   check ("real(casin(-0 + i0)) = -0", __real__ result, minus_zero);
   check ("imag(casin(-0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(casin) (BUILD_COMPLEX(0, minus_zero));
+  result = FUNC(casin) (BUILD_COMPLEX (0, minus_zero));
   check ("real(casin(0 - i0)) = 0", __real__ result, 0);
   check ("imag(casin(0 - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(casin) (BUILD_COMPLEX(minus_zero, minus_zero));
+  result = FUNC(casin) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(casin(-0 - i0)) = -0", __real__ result, minus_zero);
   check ("imag(casin(-0 - i0)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(casin) (BUILD_COMPLEX(plus_infty, plus_infty));
+  result = FUNC(casin) (BUILD_COMPLEX (plus_infty, plus_infty));
   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));
+  result = FUNC(casin) (BUILD_COMPLEX (plus_infty, minus_infty));
   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));
+  result = FUNC(casin) (BUILD_COMPLEX (minus_infty, plus_infty));
   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));
+  result = FUNC(casin) (BUILD_COMPLEX (minus_infty, minus_infty));
   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));
+  result = FUNC(casin) (BUILD_COMPLEX (-10.0, plus_infty));
   check ("real(casin(-10.0 + i Inf)) = -0", __real__ result, minus_zero);
   check_isinfp ("imag(casin(-10.0 + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(casin) (BUILD_COMPLEX(-10.0, minus_infty));
+  result = FUNC(casin) (BUILD_COMPLEX (-10.0, minus_infty));
   check ("real(casin(-10.0 - i Inf)) = -0", __real__ result, minus_zero);
   check_isinfn ("imag(casin(-10.0 - i Inf)) = -Inf", __imag__ result);
-  result = FUNC(casin) (BUILD_COMPLEX(0, plus_infty));
+  result = FUNC(casin) (BUILD_COMPLEX (0, plus_infty));
   check ("real(casin(0 + i Inf)) = 0", __real__ result, 0.0);
   check_isinfp ("imag(casin(0 + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(casin) (BUILD_COMPLEX(0, minus_infty));
+  result = FUNC(casin) (BUILD_COMPLEX (0, minus_infty));
   check ("real(casin(0 - i Inf)) = 0", __real__ result, 0.0);
   check_isinfn ("imag(casin(0 - i Inf)) = -Inf", __imag__ result);
-  result = FUNC(casin) (BUILD_COMPLEX(minus_zero, plus_infty));
+  result = FUNC(casin) (BUILD_COMPLEX (minus_zero, plus_infty));
   check ("real(casin(-0 + i Inf)) = -0", __real__ result, minus_zero);
   check_isinfp ("imag(casin(-0 + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(casin) (BUILD_COMPLEX(minus_zero, minus_infty));
+  result = FUNC(casin) (BUILD_COMPLEX (minus_zero, minus_infty));
   check ("real(casin(-0 - i Inf)) = -0", __real__ result, minus_zero);
   check_isinfn ("imag(casin(-0 - i Inf)) = -Inf", __imag__ result);
-  result = FUNC(casin) (BUILD_COMPLEX(0.1, plus_infty));
+  result = FUNC(casin) (BUILD_COMPLEX (0.1, plus_infty));
   check ("real(casin(0.1 + i Inf)) = 0", __real__ result, 0);
   check_isinfp ("imag(casin(0.1 + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(casin) (BUILD_COMPLEX(0.1, minus_infty));
+  result = FUNC(casin) (BUILD_COMPLEX (0.1, minus_infty));
   check ("real(casin(0.1 - i Inf)) = 0", __real__ result, 0);
   check_isinfn ("imag(casin(0.1 - i Inf)) = -Inf", __imag__ result);
 
-  result = FUNC(casin) (BUILD_COMPLEX(minus_infty, 0));
+  result = FUNC(casin) (BUILD_COMPLEX (minus_infty, 0));
   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));
+  result = FUNC(casin) (BUILD_COMPLEX (minus_infty, minus_zero));
   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));
+  result = FUNC(casin) (BUILD_COMPLEX (minus_infty, 100));
   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));
+  result = FUNC(casin) (BUILD_COMPLEX (minus_infty, -100));
   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));
+  result = FUNC(casin) (BUILD_COMPLEX (plus_infty, 0));
   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));
+  result = FUNC(casin) (BUILD_COMPLEX (plus_infty, minus_zero));
   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));
+  result = FUNC(casin) (BUILD_COMPLEX (plus_infty, 0.5));
   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));
+  result = FUNC(casin) (BUILD_COMPLEX (plus_infty, -0.5));
   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));
+  result = FUNC(casin) (BUILD_COMPLEX (nan_value, plus_infty));
   check_isnan ("real(casin(NaN + i Inf)) = NaN", __real__ result);
   check_isinfp ("imag(casin(NaN + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(casin) (BUILD_COMPLEX(nan_value, minus_infty));
+  result = FUNC(casin) (BUILD_COMPLEX (nan_value, minus_infty));
   check_isnan ("real(casin(NaN - i Inf)) = NaN", __real__ result);
   check_isinfn ("imag(casin(NaN - i Inf)) = -Inf", __imag__ result);
 
-  result = FUNC(casin) (BUILD_COMPLEX(0.0, nan_value));
+  result = FUNC(casin) (BUILD_COMPLEX (0.0, nan_value));
   check ("real(casin(0 + i NaN)) = 0", __real__ result, 0.0);
   check_isnan ("imag(casin(0 + i NaN)) = NaN", __imag__ result);
-  result = FUNC(casin) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(casin) (BUILD_COMPLEX (minus_zero, nan_value));
   check ("real(casin(-0 + i NaN)) = -0", __real__ result, minus_zero);
   check_isnan ("imag(casin(-0 + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(casin) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(casin) (BUILD_COMPLEX (plus_infty, nan_value));
   check_isnan ("real(casin(+Inf + i NaN)) = NaN", __real__ result);
   check_isinfp ("imag(casin(+Inf + i NaN)) = +-Inf",
 		FUNC(fabs) (__imag__ result));
-  result = FUNC(casin) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(casin) (BUILD_COMPLEX (minus_infty, nan_value));
   check_isnan ("real(casin(-Inf + i NaN)) = NaN", __real__ result);
   check_isinfp ("imag(casin(-Inf + NaN)) = +-Inf",
 		FUNC(fabs) (__imag__ result));
 
-  result = FUNC(casin) (BUILD_COMPLEX(nan_value, 10.5));
+  result = FUNC(casin) (BUILD_COMPLEX (nan_value, 10.5));
   check_isnan_maybe_exc ("real(casin(NaN + i10.5)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(casin(NaN + i10.5)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(casin) (BUILD_COMPLEX(nan_value, -10.5));
+  result = FUNC(casin) (BUILD_COMPLEX (nan_value, -10.5));
   check_isnan_maybe_exc ("real(casin(NaN - i10.5)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(casin(NaN - i10.5)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(casin) (BUILD_COMPLEX(0.75, nan_value));
+  result = FUNC(casin) (BUILD_COMPLEX (0.75, nan_value));
   check_isnan_maybe_exc ("real(casin(0.75 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(casin(0.75 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(casin) (BUILD_COMPLEX(-0.75, nan_value));
+  result = FUNC(casin) (BUILD_COMPLEX (-0.75, nan_value));
   check_isnan_maybe_exc ("real(casin(-0.75 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(casin(-0.75 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(casin) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(casin) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(casin(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(casin(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(casin) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(casin) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(casin(0.7 + i 1.2)) == 0.43561...", __real__ result,
-	     0.4356135790797415103L, CHOOSE(2e-17L, 2e-16, 2e-7));
+	     0.4356135790797415103L, CHOOSE (2e-17L, 2e-16, 2e-7));
   check_eps ("imag(casin(0.7 + i 1.2)) == 1.09276...", __imag__ result,
-	     1.0927647857577371459L, CHOOSE(4e-17L, 3e-16, 3e-7));
+	     1.0927647857577371459L, CHOOSE (4e-17L, 3e-16, 3e-7));
 
-  result = FUNC(casin) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(casin) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(casin(-2 - i 3)) == -0.57065...", __real__ result,
-	     -0.5706527843210994007L, CHOOSE(4e-19L, 0, 0));
+	     -0.5706527843210994007L, CHOOSE (4e-19L, 0, 0));
   check_eps ("imag(casin(-2 - i 3)) == -1.98338...", __imag__ result,
-	     -1.9833870299165354323L, CHOOSE(3e-19L, 0, 0));
+	     -1.9833870299165354323L, CHOOSE (3e-19L, 0, 0));
 }
 
 
@@ -3842,143 +3842,143 @@ casinh_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(casinh) (BUILD_COMPLEX(0, 0));
+  result = FUNC(casinh) (BUILD_COMPLEX (0, 0));
   check ("real(casinh(0 + i0)) = 0", __real__ result, 0);
   check ("imag(casinh(0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(casinh) (BUILD_COMPLEX(minus_zero, 0));
+  result = FUNC(casinh) (BUILD_COMPLEX (minus_zero, 0));
   check ("real(casinh(-0 + i0)) = -0", __real__ result, minus_zero);
   check ("imag(casinh(-0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(casinh) (BUILD_COMPLEX(0, minus_zero));
+  result = FUNC(casinh) (BUILD_COMPLEX (0, minus_zero));
   check ("real(casinh(0 - i0)) = 0", __real__ result, 0);
   check ("imag(casinh(0 - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(casinh) (BUILD_COMPLEX(minus_zero, minus_zero));
+  result = FUNC(casinh) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(casinh(-0 - i0)) = -0", __real__ result, minus_zero);
   check ("imag(casinh(-0 - i0)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(casinh) (BUILD_COMPLEX(plus_infty, plus_infty));
+  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_4l);
-  result = FUNC(casinh) (BUILD_COMPLEX(plus_infty, minus_infty));
+  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_4l);
-  result = FUNC(casinh) (BUILD_COMPLEX(minus_infty, plus_infty));
+  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_4l);
-  result = FUNC(casinh) (BUILD_COMPLEX(minus_infty, minus_infty));
+  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_4l);
 
-  result = FUNC(casinh) (BUILD_COMPLEX(-10.0, plus_infty));
+  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_2l);
-  result = FUNC(casinh) (BUILD_COMPLEX(-10.0, minus_infty));
+  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_2l);
-  result = FUNC(casinh) (BUILD_COMPLEX(0, plus_infty));
+  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_2l);
-  result = FUNC(casinh) (BUILD_COMPLEX(0, minus_infty));
+  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_2l);
-  result = FUNC(casinh) (BUILD_COMPLEX(minus_zero, plus_infty));
+  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_2l);
-  result = FUNC(casinh) (BUILD_COMPLEX(minus_zero, minus_infty));
+  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_2l);
-  result = FUNC(casinh) (BUILD_COMPLEX(0.1, plus_infty));
+  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_2l);
-  result = FUNC(casinh) (BUILD_COMPLEX(0.1, minus_infty));
+  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_2l);
 
-  result = FUNC(casinh) (BUILD_COMPLEX(minus_infty, 0));
+  result = FUNC(casinh) (BUILD_COMPLEX (minus_infty, 0));
   check_isinfn ("real(casinh(-Inf + i0)) = -Inf", __real__ result);
   check ("imag(casinh(-Inf + i0)) = 0", __imag__ result, 0);
-  result = FUNC(casinh) (BUILD_COMPLEX(minus_infty, minus_zero));
+  result = FUNC(casinh) (BUILD_COMPLEX (minus_infty, minus_zero));
   check_isinfn ("real(casinh(-Inf - i0)) = -Inf", __real__ result);
   check ("imag(casinh(-Inf - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(casinh) (BUILD_COMPLEX(minus_infty, 100));
+  result = FUNC(casinh) (BUILD_COMPLEX (minus_infty, 100));
   check_isinfn ("real(casinh(-Inf + i100)) = -Inf", __real__ result);
   check ("imag(casinh(-Inf + i100)) = 0", __imag__ result, 0);
-  result = FUNC(casinh) (BUILD_COMPLEX(minus_infty, -100));
+  result = FUNC(casinh) (BUILD_COMPLEX (minus_infty, -100));
   check_isinfn ("real(casinh(-Inf - i100)) = -Inf", __real__ result);
   check ("imag(casinh(-Inf - i100)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(casinh) (BUILD_COMPLEX(plus_infty, 0));
+  result = FUNC(casinh) (BUILD_COMPLEX (plus_infty, 0));
   check_isinfp ("real(casinh(+Inf + i0)) = +Inf", __real__ result);
   check ("imag(casinh(+Inf + i0)) = 0", __imag__ result, 0);
-  result = FUNC(casinh) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(casinh) (BUILD_COMPLEX (plus_infty, minus_zero));
   check_isinfp ("real(casinh(+Inf - i0)) = +Inf", __real__ result);
   check ("imag(casinh(+Inf - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(casinh) (BUILD_COMPLEX(plus_infty, 0.5));
+  result = FUNC(casinh) (BUILD_COMPLEX (plus_infty, 0.5));
   check_isinfp ("real(casinh(+Inf + i0.5)) = +Inf", __real__ result);
   check ("imag(casinh(+Inf + i0.5)) = 0", __imag__ result, 0);
-  result = FUNC(casinh) (BUILD_COMPLEX(plus_infty, -0.5));
+  result = FUNC(casinh) (BUILD_COMPLEX (plus_infty, -0.5));
   check_isinfp ("real(casinh(+Inf - i0.5)) = +Inf", __real__ result);
   check ("imag(casinh(+Inf - i0.5)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(casinh) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(casinh) (BUILD_COMPLEX (plus_infty, nan_value));
   check_isinfp ("real(casinh(+Inf + i NaN)) = +Inf", __real__ result);
   check_isnan ("imag(casinh(+Inf + i NaN)) = NaN", __imag__ result);
-  result = FUNC(casinh) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(casinh) (BUILD_COMPLEX (minus_infty, nan_value));
   check_isinfn ("real(casinh(-Inf + i NaN)) = -Inf", __real__ result);
   check_isnan ("imag(casinh(-Inf + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(casinh) (BUILD_COMPLEX(nan_value, 0));
+  result = FUNC(casinh) (BUILD_COMPLEX (nan_value, 0));
   check_isnan ("real(casinh(NaN + i0)) = NaN", __real__ result);
   check ("imag(casinh(NaN + i0)) = 0", __imag__ result, 0);
-  result = FUNC(casinh) (BUILD_COMPLEX(nan_value, minus_zero));
+  result = FUNC(casinh) (BUILD_COMPLEX (nan_value, minus_zero));
   check_isnan ("real(casinh(NaN - i0)) = NaN", __real__ result);
   check ("imag(casinh(NaN - i0)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(casinh) (BUILD_COMPLEX(nan_value, plus_infty));
+  result = FUNC(casinh) (BUILD_COMPLEX (nan_value, plus_infty));
   check_isinfp ("real(casinh(NaN + i Inf)) = +-Inf",
 		FUNC(fabs) (__real__ result));
   check_isnan ("imag(casinh(NaN + i Inf)) = NaN", __imag__ result);
-  result = FUNC(casinh) (BUILD_COMPLEX(nan_value, minus_infty));
+  result = FUNC(casinh) (BUILD_COMPLEX (nan_value, minus_infty));
   check_isinfp ("real(casinh(NaN - i Inf)) = +-Inf",
 		FUNC(fabs) (__real__ result));
   check_isnan ("imag(casinh(NaN - i Inf)) = NaN", __imag__ result);
 
-  result = FUNC(casinh) (BUILD_COMPLEX(10.5, nan_value));
+  result = FUNC(casinh) (BUILD_COMPLEX (10.5, nan_value));
   check_isnan_maybe_exc ("real(casinh(10.5 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(casinh(10.5 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(casinh) (BUILD_COMPLEX(-10.5, nan_value));
+  result = FUNC(casinh) (BUILD_COMPLEX (-10.5, nan_value));
   check_isnan_maybe_exc ("real(casinh(-10.5 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(casinh(-10.5 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(casinh) (BUILD_COMPLEX(nan_value, 0.75));
+  result = FUNC(casinh) (BUILD_COMPLEX (nan_value, 0.75));
   check_isnan_maybe_exc ("real(casinh(NaN + i0.75)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(casinh(NaN + i0.75)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(casinh) (BUILD_COMPLEX(-0.75, nan_value));
+  result = FUNC(casinh) (BUILD_COMPLEX (-0.75, nan_value));
   check_isnan_maybe_exc ("real(casinh(NaN - i0.75)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(casinh(NaN - i0.75)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(casinh) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(casinh) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(casinh(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(casinh(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(casinh) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(casinh) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(casinh(0.7 + i 1.2)) == 0.97865...", __real__ result,
-	     0.9786545955936738768L, CHOOSE(5e-17L, 2e-16, 0));
+	     0.9786545955936738768L, CHOOSE (5e-17L, 2e-16, 0));
   check_eps ("imag(casinh(0.7 + i 1.2)) == 0.91135...", __imag__ result,
-	     0.9113541895315601156L, CHOOSE(7e-19L, 2e-16, 2e-7));
+	     0.9113541895315601156L, CHOOSE (7e-19L, 2e-16, 2e-7));
 
-  result = FUNC(casinh) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(casinh) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(casinh(-2 - i 3)) == -1.96863...", __real__ result,
-	     -1.9686379257930962917L, CHOOSE(7e-19L, 2e-15, 3e-6));
+	     -1.9686379257930962917L, CHOOSE (7e-19L, 2e-15, 3e-6));
   check_eps ("imag(casinh(-2 - i 3)) == -0.96465...", __imag__ result,
-	     -0.9646585044076027920L, CHOOSE(4e-19L, 2e-15, 4.5e-7));
+	     -0.9646585044076027920L, CHOOSE (4e-19L, 2e-15, 4.5e-7));
 }
 
 
@@ -3987,148 +3987,148 @@ catan_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(catan) (BUILD_COMPLEX(0, 0));
+  result = FUNC(catan) (BUILD_COMPLEX (0, 0));
   check ("real(catan(0 + i0)) = 0", __real__ result, 0);
   check ("imag(catan(0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(catan) (BUILD_COMPLEX(minus_zero, 0));
+  result = FUNC(catan) (BUILD_COMPLEX (minus_zero, 0));
   check ("real(catan(-0 + i0)) = -0", __real__ result, minus_zero);
   check ("imag(catan(-0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(catan) (BUILD_COMPLEX(0, minus_zero));
+  result = FUNC(catan) (BUILD_COMPLEX (0, minus_zero));
   check ("real(catan(0 - i0)) = 0", __real__ result, 0);
   check ("imag(catan(0 - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(catan) (BUILD_COMPLEX(minus_zero, minus_zero));
+  result = FUNC(catan) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(catan(-0 - i0)) = -0", __real__ result, minus_zero);
   check ("imag(catan(-0 - i0)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(catan) (BUILD_COMPLEX(plus_infty, plus_infty));
+  result = FUNC(catan) (BUILD_COMPLEX (plus_infty, plus_infty));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (plus_infty, minus_infty));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (minus_infty, plus_infty));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (minus_infty, minus_infty));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (plus_infty, -10.0));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (minus_infty, -10.0));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (plus_infty, minus_zero));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (minus_infty, minus_zero));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (plus_infty, 0.0));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (minus_infty, 0.0));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (plus_infty, 0.1));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (minus_infty, 0.1));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (0.0, minus_infty));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (minus_zero, minus_infty));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (100.0, minus_infty));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (-100.0, minus_infty));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (0.0, plus_infty));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (minus_zero, plus_infty));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (0.5, plus_infty));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (-0.5, plus_infty));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (nan_value, 0.0));
   check_isnan ("real(catan(NaN + i0)) = NaN", __real__ result);
   check ("imag(catan(NaN + i0)) = 0", __imag__ result, 0.0);
-  result = FUNC(catan) (BUILD_COMPLEX(nan_value, minus_zero));
+  result = FUNC(catan) (BUILD_COMPLEX (nan_value, minus_zero));
   check_isnan ("real(catan(NaN - i0)) = NaN", __real__ result);
   check ("imag(catan(NaN - i0)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(catan) (BUILD_COMPLEX(nan_value, plus_infty));
+  result = FUNC(catan) (BUILD_COMPLEX (nan_value, plus_infty));
   check_isnan ("real(catan(NaN + i Inf)) = NaN", __real__ result);
   check ("imag(catan(NaN + i Inf)) = 0", __imag__ result, 0);
-  result = FUNC(catan) (BUILD_COMPLEX(nan_value, minus_infty));
+  result = FUNC(catan) (BUILD_COMPLEX (nan_value, minus_infty));
   check_isnan ("real(catan(NaN - i Inf)) = NaN", __real__ result);
   check ("imag(catan(NaN - i Inf)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(catan) (BUILD_COMPLEX(0.0, nan_value));
+  result = FUNC(catan) (BUILD_COMPLEX (0.0, nan_value));
   check_isnan ("real(catan(0 + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(catan(0 + i NaN)) = NaN", __imag__ result);
-  result = FUNC(catan) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(catan) (BUILD_COMPLEX (minus_zero, nan_value));
   check_isnan ("real(catan(-0 + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(catan(-0 + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(catan) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(catan) (BUILD_COMPLEX (plus_infty, nan_value));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (minus_infty, nan_value));
   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));
+  result = FUNC(catan) (BUILD_COMPLEX (nan_value, 10.5));
   check_isnan_maybe_exc ("real(catan(NaN + i10.5)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(catan(NaN + i10.5)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(catan) (BUILD_COMPLEX(nan_value, -10.5));
+  result = FUNC(catan) (BUILD_COMPLEX (nan_value, -10.5));
   check_isnan_maybe_exc ("real(catan(NaN - i10.5)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(catan(NaN - i10.5)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(catan) (BUILD_COMPLEX(0.75, nan_value));
+  result = FUNC(catan) (BUILD_COMPLEX (0.75, nan_value));
   check_isnan_maybe_exc ("real(catan(0.75 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(catan(0.75 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(catan) (BUILD_COMPLEX(-0.75, nan_value));
+  result = FUNC(catan) (BUILD_COMPLEX (-0.75, nan_value));
   check_isnan_maybe_exc ("real(catan(-0.75 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(catan(-0.75 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(catan) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(catan) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(catan(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(catan(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(catan) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(catan) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(catan(0.7 + i 1.2)) == 1.07857...", __real__ result,
-	     1.0785743834118921877L, CHOOSE(3e-17, 0, 5e-7));
+	     1.0785743834118921877L, CHOOSE (3e-17, 0, 5e-7));
   check_eps ("imag(catan(0.7 + i 1.2)) == 0.57705...", __imag__ result,
-	     0.5770573776534306764L, CHOOSE(3e-17L, 2e-16, 6e-8));
+	     0.5770573776534306764L, CHOOSE (3e-17L, 2e-16, 6e-8));
 
-  result = FUNC(catan) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(catan) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(catan(-2 - i 3)) == -1.40992...", __real__ result,
-	     -1.4099210495965755225L, CHOOSE(0, 0, 4e-7));
+	     -1.4099210495965755225L, CHOOSE (0, 0, 4e-7));
   check_eps ("imag(catan(-2 - i 3)) == -0.22907...", __imag__ result,
-	     -0.2290726829685387662L, CHOOSE(1.1e-19L, 3e-17, 2e-8));
+	     -0.2290726829685387662L, CHOOSE (1.1e-19L, 3e-17, 2e-8));
 }
 
 
@@ -4137,148 +4137,148 @@ catanh_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(catanh) (BUILD_COMPLEX(0, 0));
+  result = FUNC(catanh) (BUILD_COMPLEX (0, 0));
   check ("real(catanh(0 + i0)) = 0", __real__ result, 0);
   check ("imag(catanh(0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(catanh) (BUILD_COMPLEX(minus_zero, 0));
+  result = FUNC(catanh) (BUILD_COMPLEX (minus_zero, 0));
   check ("real(catanh(-0 + i0)) = -0", __real__ result, minus_zero);
   check ("imag(catanh(-0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(catanh) (BUILD_COMPLEX(0, minus_zero));
+  result = FUNC(catanh) (BUILD_COMPLEX (0, minus_zero));
   check ("real(catanh(0 - i0)) = 0", __real__ result, 0);
   check ("imag(catanh(0 - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(catanh) (BUILD_COMPLEX(minus_zero, minus_zero));
+  result = FUNC(catanh) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(catanh(-0 - i0)) = -0", __real__ result, minus_zero);
   check ("imag(catanh(-0 - i0)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(catanh) (BUILD_COMPLEX(plus_infty, plus_infty));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(plus_infty, minus_infty));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(minus_infty, plus_infty));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(minus_infty, minus_infty));
+  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_2l);
 
-  result = FUNC(catanh) (BUILD_COMPLEX(-10.0, plus_infty));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(-10.0, minus_infty));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(minus_zero, plus_infty));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(minus_zero, minus_infty));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(0, plus_infty));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(0, minus_infty));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(0.1, plus_infty));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(0.1, minus_infty));
+  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_2l);
 
-  result = FUNC(catanh) (BUILD_COMPLEX(minus_infty, 0));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(minus_infty, minus_zero));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(minus_infty, 100));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(minus_infty, -100));
+  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_2l);
 
-  result = FUNC(catanh) (BUILD_COMPLEX(plus_infty, 0));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(plus_infty, minus_zero));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(plus_infty, 0.5));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(plus_infty, -0.5));
+  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_2l);
 
-  result = FUNC(catanh) (BUILD_COMPLEX(0, nan_value));
+  result = FUNC(catanh) (BUILD_COMPLEX (0, nan_value));
   check ("real(catanh(0 + i NaN)) = 0", __real__ result, 0);
   check_isnan ("imag(catanh(0 + i NaN)) = NaN", __imag__ result);
-  result = FUNC(catanh) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(catanh) (BUILD_COMPLEX (minus_zero, nan_value));
   check ("real(catanh(-0 + i NaN)) = -0", __real__ result, minus_zero);
   check_isnan ("imag(catanh(-0 + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(catanh) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(catanh) (BUILD_COMPLEX (plus_infty, nan_value));
   check ("real(catanh(+Inf + i NaN)) = 0", __real__ result, 0);
   check_isnan ("imag(catanh(+Inf + i NaN)) = NaN", __imag__ result);
-  result = FUNC(catanh) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(catanh) (BUILD_COMPLEX (minus_infty, nan_value));
   check ("real(catanh(-Inf + i NaN)) = -0", __real__ result, minus_zero);
   check_isnan ("imag(catanh(-Inf + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(catanh) (BUILD_COMPLEX(nan_value, 0));
+  result = FUNC(catanh) (BUILD_COMPLEX (nan_value, 0));
   check_isnan ("real(catanh(NaN + i0)) = NaN", __real__ result);
   check_isnan ("imag(catanh(NaN + i0)) = NaN", __imag__ result);
-  result = FUNC(catanh) (BUILD_COMPLEX(nan_value, minus_zero));
+  result = FUNC(catanh) (BUILD_COMPLEX (nan_value, minus_zero));
   check_isnan ("real(catanh(NaN - i0)) = NaN", __real__ result);
   check_isnan ("imag(catanh(NaN - i0)) = NaN", __imag__ result);
 
-  result = FUNC(catanh) (BUILD_COMPLEX(nan_value, plus_infty));
+  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_2l);
-  result = FUNC(catanh) (BUILD_COMPLEX(nan_value, minus_infty));
+  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_2l);
 
-  result = FUNC(catanh) (BUILD_COMPLEX(10.5, nan_value));
+  result = FUNC(catanh) (BUILD_COMPLEX (10.5, nan_value));
   check_isnan_maybe_exc ("real(catanh(10.5 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(catanh(10.5 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(catanh) (BUILD_COMPLEX(-10.5, nan_value));
+  result = FUNC(catanh) (BUILD_COMPLEX (-10.5, nan_value));
   check_isnan_maybe_exc ("real(catanh(-10.5 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(catanh(-10.5 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(catanh) (BUILD_COMPLEX(nan_value, 0.75));
+  result = FUNC(catanh) (BUILD_COMPLEX (nan_value, 0.75));
   check_isnan_maybe_exc ("real(catanh(NaN + i0.75)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(catanh(NaN + i0.75)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(catanh) (BUILD_COMPLEX(nan_value, -0.75));
+  result = FUNC(catanh) (BUILD_COMPLEX (nan_value, -0.75));
   check_isnan_maybe_exc ("real(catanh(NaN - i0.75)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(catanh(NaN - i0.75)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(catanh) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(catanh) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(catanh(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(catanh(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(catanh) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(catanh) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(catanh(0.7 + i 1.2)) == 0.26007...", __real__ result,
-	     0.2600749516525135959L, CHOOSE(2e-18, 6e-17, 3e-8));
+	     0.2600749516525135959L, CHOOSE (2e-18, 6e-17, 3e-8));
   check_eps ("imag(catanh(0.7 + i 1.2)) == 0.97024...", __imag__ result,
-	     0.9702403077950989849L, CHOOSE(3e-17, 2e-16, 4e-7));
+	     0.9702403077950989849L, CHOOSE (3e-17, 2e-16, 4e-7));
 
-  result = FUNC(catanh) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(catanh) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(catanh(-2 - i 3)) == -0.14694...", __real__ result,
-	     -0.1469466662255297520L, CHOOSE(9e-20L, 2e-16, 2e-8));
+	     -0.1469466662255297520L, CHOOSE (9e-20L, 2e-16, 2e-8));
   check_eps ("imag(catanh(-2 - i 3)) == -1.33897...", __imag__ result,
-	     -1.3389725222944935611L, CHOOSE(7e-19L, 0, 5e-7));
+	     -1.3389725222944935611L, CHOOSE (7e-19L, 0, 5e-7));
 }
 
 
@@ -4287,148 +4287,148 @@ ctan_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(ctan) (BUILD_COMPLEX(0, 0));
+  result = FUNC(ctan) (BUILD_COMPLEX (0, 0));
   check ("real(ctan(0 + i0)) = 0", __real__ result, 0);
   check ("imag(ctan(0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(ctan) (BUILD_COMPLEX(0, minus_zero));
+  result = FUNC(ctan) (BUILD_COMPLEX (0, minus_zero));
   check ("real(ctan(0 - i0)) = 0", __real__ result, 0);
   check ("imag(ctan(0 - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(ctan) (BUILD_COMPLEX(minus_zero, 0));
+  result = FUNC(ctan) (BUILD_COMPLEX (minus_zero, 0));
   check ("real(ctan(-0 + i0)) = -0", __real__ result, minus_zero);
   check ("imag(ctan(-0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(ctan) (BUILD_COMPLEX(minus_zero, minus_zero));
+  result = FUNC(ctan) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(ctan(-0 - i0)) = -0", __real__ result, minus_zero);
   check ("imag(ctan(-0 - i0)) = -0", __imag__ result, minus_zero);
 
 
-  result = FUNC(ctan) (BUILD_COMPLEX(0, plus_infty));
+  result = FUNC(ctan) (BUILD_COMPLEX (0, plus_infty));
   check ("real(ctan(0 + i Inf)) = 0", __real__ result, 0);
   check ("imag(ctan(0 + i Inf)) = 1", __imag__ result, 1);
-  result = FUNC(ctan) (BUILD_COMPLEX(1, plus_infty));
+  result = FUNC(ctan) (BUILD_COMPLEX (1, plus_infty));
   check ("real(ctan(1 + i Inf)) = 0", __real__ result, 0);
   check ("imag(ctan(1 + i Inf)) = 1", __imag__ result, 1);
-  result = FUNC(ctan) (BUILD_COMPLEX(minus_zero, plus_infty));
+  result = FUNC(ctan) (BUILD_COMPLEX (minus_zero, plus_infty));
   check ("real(ctan(-0 + i Inf)) = -0", __real__ result, minus_zero);
   check ("imag(ctan(-0 + i Inf)) = 1", __imag__ result, 1);
-  result = FUNC(ctan) (BUILD_COMPLEX(-1, plus_infty));
+  result = FUNC(ctan) (BUILD_COMPLEX (-1, plus_infty));
   check ("real(ctan(-1 + i Inf)) = -0", __real__ result, minus_zero);
   check ("imag(ctan(-1 + i Inf)) = 1", __imag__ result, 1);
 
-  result = FUNC(ctan) (BUILD_COMPLEX(0, minus_infty));
+  result = FUNC(ctan) (BUILD_COMPLEX (0, minus_infty));
   check ("real(ctan(0 - i Inf)) = 0", __real__ result, 0);
   check ("imag(ctan(0 - i Inf)) = -1", __imag__ result, -1);
-  result = FUNC(ctan) (BUILD_COMPLEX(1, minus_infty));
+  result = FUNC(ctan) (BUILD_COMPLEX (1, minus_infty));
   check ("real(ctan(1 - i Inf)) = 0", __real__ result, 0);
   check ("imag(ctan(1 - i Inf)) = -1", __imag__ result, -1);
-  result = FUNC(ctan) (BUILD_COMPLEX(minus_zero, minus_infty));
+  result = FUNC(ctan) (BUILD_COMPLEX (minus_zero, minus_infty));
   check ("real(ctan(-0 - i Inf)) = -0", __real__ result, minus_zero);
   check ("imag(ctan(-0 - i Inf)) = -1", __imag__ result, -1);
-  result = FUNC(ctan) (BUILD_COMPLEX(-1, minus_infty));
+  result = FUNC(ctan) (BUILD_COMPLEX (-1, minus_infty));
   check ("real(ctan(-1 - i Inf)) = -0", __real__ result, minus_zero);
   check ("imag(ctan(-1 - i Inf)) = -1", __imag__ result, -1);
 
-  result = FUNC(ctan) (BUILD_COMPLEX(plus_infty, 0));
+  result = FUNC(ctan) (BUILD_COMPLEX (plus_infty, 0));
   check_isnan_exc ("real(ctan(Inf + i 0)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(Inf + i 0)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctan) (BUILD_COMPLEX(plus_infty, 2));
+  result = FUNC(ctan) (BUILD_COMPLEX (plus_infty, 2));
   check_isnan_exc ("real(ctan(Inf + i 2)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(Inf + i 2)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctan) (BUILD_COMPLEX(minus_infty, 0));
+  result = FUNC(ctan) (BUILD_COMPLEX (minus_infty, 0));
   check_isnan_exc ("real(ctan(-Inf + i 0)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(-Inf + i 0)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctan) (BUILD_COMPLEX(minus_infty, 2));
+  result = FUNC(ctan) (BUILD_COMPLEX (minus_infty, 2));
   check_isnan_exc ("real(ctan(- Inf + i 2)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(- Inf + i 2)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctan) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(ctan) (BUILD_COMPLEX (plus_infty, minus_zero));
   check_isnan_exc ("real(ctan(Inf - i 0)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(Inf - i 0)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctan) (BUILD_COMPLEX(plus_infty, -2));
+  result = FUNC(ctan) (BUILD_COMPLEX (plus_infty, -2));
   check_isnan_exc ("real(ctan(Inf - i 2)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(Inf - i 2)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctan) (BUILD_COMPLEX(minus_infty, minus_zero));
+  result = FUNC(ctan) (BUILD_COMPLEX (minus_infty, minus_zero));
   check_isnan_exc ("real(ctan(-Inf - i 0)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(-Inf - i 0)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctan) (BUILD_COMPLEX(minus_infty, -2));
+  result = FUNC(ctan) (BUILD_COMPLEX (minus_infty, -2));
   check_isnan_exc ("real(ctan(-Inf - i 2)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(-Inf - i 2)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ctan) (BUILD_COMPLEX(nan_value, plus_infty));
+  result = FUNC(ctan) (BUILD_COMPLEX (nan_value, plus_infty));
   check ("real(ctan(NaN + i Inf)) = +-0", FUNC(fabs) (__real__ result), 0);
   check ("imag(ctan(NaN + i Inf)) = 1", __imag__ result, 1);
-  result = FUNC(ctan) (BUILD_COMPLEX(nan_value, minus_infty));
+  result = FUNC(ctan) (BUILD_COMPLEX (nan_value, minus_infty));
   check ("real(ctan(NaN - i Inf)) = +-0", FUNC(fabs) (__real__ result), 0);
   check ("imag(ctan(NaN - i Inf)) = -1", __imag__ result, -1);
 
-  result = FUNC(ctan) (BUILD_COMPLEX(0, nan_value));
+  result = FUNC(ctan) (BUILD_COMPLEX (0, nan_value));
   check ("real(ctan(0 + i NaN)) = 0", __real__ result, 0);
   check_isnan ("imag(ctan(0 + i NaN)) = NaN", __imag__ result);
-  result = FUNC(ctan) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(ctan) (BUILD_COMPLEX (minus_zero, nan_value));
   check ("real(ctan(-0 + i NaN)) = -0", __real__ result, minus_zero);
   check_isnan ("imag(ctan(-0 + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(ctan) (BUILD_COMPLEX(0.5, nan_value));
+  result = FUNC(ctan) (BUILD_COMPLEX (0.5, nan_value));
   check_isnan_maybe_exc ("real(ctan(0.5 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(0.5 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ctan) (BUILD_COMPLEX(-4.5, nan_value));
+  result = FUNC(ctan) (BUILD_COMPLEX (-4.5, nan_value));
   check_isnan_maybe_exc ("real(ctan(-4.5 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(-4.5 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ctan) (BUILD_COMPLEX(nan_value, 0));
+  result = FUNC(ctan) (BUILD_COMPLEX (nan_value, 0));
   check_isnan_maybe_exc ("real(ctan(NaN + i 0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(NaN + i 0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ctan) (BUILD_COMPLEX(nan_value, 5));
+  result = FUNC(ctan) (BUILD_COMPLEX (nan_value, 5));
   check_isnan_maybe_exc ("real(ctan(NaN + i 5)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(NaN + i 5)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ctan) (BUILD_COMPLEX(nan_value, minus_zero));
+  result = FUNC(ctan) (BUILD_COMPLEX (nan_value, minus_zero));
   check_isnan_maybe_exc ("real(ctan(NaN - i 0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(NaN - i 0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ctan) (BUILD_COMPLEX(nan_value, -0.25));
+  result = FUNC(ctan) (BUILD_COMPLEX (nan_value, -0.25));
   check_isnan_maybe_exc ("real(ctan(NaN -i 0.25)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctan(NaN -i 0.25)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ctan) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(ctan) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(ctan(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(ctan(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(ctan) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(ctan) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(ctan(0.7 + i 1.2)) == 0.17207...", __real__ result,
-	     0.1720734197630349001L, CHOOSE(1e-17L, 3e-17, 2e-8));
+	     0.1720734197630349001L, CHOOSE (1e-17L, 3e-17, 2e-8));
   check_eps ("imag(ctan(0.7 + i 1.2)) == 0.95448...", __imag__ result,
-	     0.9544807059989405538L, CHOOSE(2e-17L, 2e-16, 6e-8));
+	     0.9544807059989405538L, CHOOSE (2e-17L, 2e-16, 6e-8));
 
-  result = FUNC(ctan) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(ctan) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(ctan(-2 - i 3)) == -0.00376...", __real__ result,
-	     0.0037640256415042482L, CHOOSE(1e-19L, 5e-19, 0));
+	     0.0037640256415042482L, CHOOSE (1e-19L, 5e-19, 0));
   check_eps ("imag(ctan(-2 - i 3)) == -1.00323...", __imag__ result,
-	     -1.0032386273536098014L, CHOOSE(2e-19L, 0, 2e-7));
+	     -1.0032386273536098014L, CHOOSE (2e-19L, 0, 2e-7));
 }
 
 
@@ -4437,151 +4437,151 @@ ctanh_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(ctanh) (BUILD_COMPLEX(0, 0));
+  result = FUNC(ctanh) (BUILD_COMPLEX (0, 0));
   check ("real(ctanh(0 + i0)) = 0", __real__ result, 0);
   check ("imag(ctanh(0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(ctanh) (BUILD_COMPLEX(0, minus_zero));
+  result = FUNC(ctanh) (BUILD_COMPLEX (0, minus_zero));
   check ("real(ctanh(0 - i0)) = 0", __real__ result, 0);
   check ("imag(ctanh(0 - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(ctanh) (BUILD_COMPLEX(minus_zero, 0));
+  result = FUNC(ctanh) (BUILD_COMPLEX (minus_zero, 0));
   check ("real(ctanh(-0 + i0)) = -0", __real__ result, minus_zero);
   check ("imag(ctanh(-0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(ctanh) (BUILD_COMPLEX(minus_zero, minus_zero));
+  result = FUNC(ctanh) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(ctanh(-0 - i0)) = -0", __real__ result, minus_zero);
   check ("imag(ctanh(-0 - i0)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(ctanh) (BUILD_COMPLEX(plus_infty, 0));
+  result = FUNC(ctanh) (BUILD_COMPLEX (plus_infty, 0));
   check ("real(ctanh(+Inf + i0)) = 1", __real__ result, 1);
   check ("imag(ctanh(+Inf + i0)) = 0", __imag__ result, 0);
-  result = FUNC(ctanh) (BUILD_COMPLEX(plus_infty, 1));
+  result = FUNC(ctanh) (BUILD_COMPLEX (plus_infty, 1));
   check ("real(ctanh(+Inf + i1)) = 1", __real__ result, 1);
   check ("imag(ctanh(+Inf + i1)) = 0", __imag__ result, 0);
-  result = FUNC(ctanh) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(ctanh) (BUILD_COMPLEX (plus_infty, minus_zero));
   check ("real(ctanh(+Inf - i0)) = 1", __real__ result, 1);
   check ("imag(ctanh(+Inf - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(ctanh) (BUILD_COMPLEX(plus_infty, -1));
+  result = FUNC(ctanh) (BUILD_COMPLEX (plus_infty, -1));
   check ("real(ctanh(+Inf - i1)) = 1", __real__ result, 1);
   check ("imag(ctanh(+Inf - i1)) = -0", __imag__ result, minus_zero);
-  result = FUNC(ctanh) (BUILD_COMPLEX(minus_infty, 0));
+  result = FUNC(ctanh) (BUILD_COMPLEX (minus_infty, 0));
   check ("real(ctanh(-Inf + i0)) = -1", __real__ result, -1);
   check ("imag(ctanh(-Inf + i0)) = 0", __imag__ result, 0);
-  result = FUNC(ctanh) (BUILD_COMPLEX(minus_infty, 1));
+  result = FUNC(ctanh) (BUILD_COMPLEX (minus_infty, 1));
   check ("real(ctanh(-Inf + i1)) = -1", __real__ result, -1);
   check ("imag(ctanh(-Inf + i1)) = 0", __imag__ result, 0);
-  result = FUNC(ctanh) (BUILD_COMPLEX(minus_infty, minus_zero));
+  result = FUNC(ctanh) (BUILD_COMPLEX (minus_infty, minus_zero));
   check ("real(ctanh(-Inf - i0)) = -1", __real__ result, -1);
   check ("imag(ctanh(-Inf - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(ctanh) (BUILD_COMPLEX(minus_infty, -1));
+  result = FUNC(ctanh) (BUILD_COMPLEX (minus_infty, -1));
   check ("real(ctanh(-Inf - i1)) = -1", __real__ result, -1);
   check ("imag(ctanh(-Inf - i1)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(ctanh) (BUILD_COMPLEX(0, plus_infty));
+  result = FUNC(ctanh) (BUILD_COMPLEX (0, plus_infty));
   check_isnan_exc ("real(ctanh(0 + i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(0 + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctanh) (BUILD_COMPLEX(2, plus_infty));
+  result = FUNC(ctanh) (BUILD_COMPLEX (2, plus_infty));
   check_isnan_exc ("real(ctanh(2 + i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(2 + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctanh) (BUILD_COMPLEX(0, minus_infty));
+  result = FUNC(ctanh) (BUILD_COMPLEX (0, minus_infty));
   check_isnan_exc ("real(ctanh(0 - i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(0 - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctanh) (BUILD_COMPLEX(2, minus_infty));
+  result = FUNC(ctanh) (BUILD_COMPLEX (2, minus_infty));
   check_isnan_exc ("real(ctanh(2 - i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(2 - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctanh) (BUILD_COMPLEX(minus_zero, plus_infty));
+  result = FUNC(ctanh) (BUILD_COMPLEX (minus_zero, plus_infty));
   check_isnan_exc ("real(ctanh(-0 + i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(-0 + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctanh) (BUILD_COMPLEX(-2, plus_infty));
+  result = FUNC(ctanh) (BUILD_COMPLEX (-2, plus_infty));
   check_isnan_exc ("real(ctanh(-2 + i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(-2 + i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctanh) (BUILD_COMPLEX(minus_zero, minus_infty));
+  result = FUNC(ctanh) (BUILD_COMPLEX (minus_zero, minus_infty));
   check_isnan_exc ("real(ctanh(-0 - i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(-0 - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
-  result = FUNC(ctanh) (BUILD_COMPLEX(-2, minus_infty));
+  result = FUNC(ctanh) (BUILD_COMPLEX (-2, minus_infty));
   check_isnan_exc ("real(ctanh(-2 - i Inf)) = NaN plus invalid exception",
 		   __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(-2 - i Inf)) = NaN plus invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ctanh) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(ctanh) (BUILD_COMPLEX (plus_infty, nan_value));
   check ("real(ctanh(+Inf + i NaN)) = 1", __real__ result, 1);
   check ("imag(ctanh(+Inf + i NaN)) = +-0", FUNC(fabs) (__imag__ result), 0);
-  result = FUNC(ctanh) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(ctanh) (BUILD_COMPLEX (minus_infty, nan_value));
   check ("real(ctanh(-Inf + i NaN)) = -1", __real__ result, -1);
   check ("imag(ctanh(-Inf + i NaN)) = +-0", FUNC(fabs) (__imag__ result), 0);
 
-  result = FUNC(ctanh) (BUILD_COMPLEX(nan_value, 0));
+  result = FUNC(ctanh) (BUILD_COMPLEX (nan_value, 0));
   check_isnan ("real(ctanh(NaN + i0)) = NaN", __real__ result);
   check ("imag(ctanh(NaN + i0)) = 0", __imag__ result, 0);
-  result = FUNC(ctanh) (BUILD_COMPLEX(nan_value, minus_zero));
+  result = FUNC(ctanh) (BUILD_COMPLEX (nan_value, minus_zero));
   check_isnan ("real(ctanh(NaN - i0)) = NaN", __real__ result);
   check ("imag(ctanh(NaN - i0)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(ctanh) (BUILD_COMPLEX(nan_value, 0.5));
+  result = FUNC(ctanh) (BUILD_COMPLEX (nan_value, 0.5));
   check_isnan_maybe_exc ("real(ctanh(NaN + i0.5)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(NaN + i0.5)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ctanh) (BUILD_COMPLEX(nan_value, -4.5));
+  result = FUNC(ctanh) (BUILD_COMPLEX (nan_value, -4.5));
   check_isnan_maybe_exc ("real(ctanh(NaN - i4.5)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(NaN - i4.5)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ctanh) (BUILD_COMPLEX(0, nan_value));
+  result = FUNC(ctanh) (BUILD_COMPLEX (0, nan_value));
   check_isnan_maybe_exc ("real(ctanh(0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ctanh) (BUILD_COMPLEX(5, nan_value));
+  result = FUNC(ctanh) (BUILD_COMPLEX (5, nan_value));
   check_isnan_maybe_exc ("real(ctanh(5 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(5 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ctanh) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(ctanh) (BUILD_COMPLEX (minus_zero, nan_value));
   check_isnan_maybe_exc ("real(ctanh(-0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(-0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(ctanh) (BUILD_COMPLEX(-0.25, nan_value));
+  result = FUNC(ctanh) (BUILD_COMPLEX (-0.25, nan_value));
   check_isnan_maybe_exc ("real(ctanh(-0.25 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(ctanh(-0.25 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(ctanh) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(ctanh) (BUILD_COMPLEX (nan_value, nan_value));
   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_4l));
+  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));
+	     CHOOSE (0, 2e-16, 2e-7));
 
-  result = FUNC(ctanh) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(ctanh) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(ctanh(0.7 + i 1.2)) == 1.34721...", __real__ result,
-	     1.3472197399061191630L, CHOOSE(4e-17L, 5e-16, 2e-7));
+	     1.3472197399061191630L, CHOOSE (4e-17L, 5e-16, 2e-7));
   check_eps ("imag(ctanh(0.7 + i 1.2)) == -0.47786...", __imag__ result,
-	     0.4778641038326365540L, CHOOSE(9e-17L, 2e-16, 9e-8));
+	     0.4778641038326365540L, CHOOSE (9e-17L, 2e-16, 9e-8));
 
-  result = FUNC(ctanh) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(ctanh) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(ctanh(-2 - i 3)) == -0.96538...", __real__ result,
-	     -0.9653858790221331242L, CHOOSE(2e-19L, 2e-16, 2e-7));
+	     -0.9653858790221331242L, CHOOSE (2e-19L, 2e-16, 2e-7));
   check_eps ("imag(ctanh(-2 - i 3)) == 0.00988...", __imag__ result,
-	     0.0098843750383224937L, CHOOSE(7e-20L, 2e-16, 1e-9));
+	     0.0098843750383224937L, CHOOSE (7e-20L, 2e-16, 1e-9));
 }
 
 
@@ -4590,166 +4590,166 @@ clog_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(clog) (BUILD_COMPLEX(minus_zero, 0));
+  result = FUNC(clog) (BUILD_COMPLEX (minus_zero, 0));
   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_PIl);
-  result = FUNC(clog) (BUILD_COMPLEX(minus_zero, minus_zero));
+  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_PIl);
 
-  result = FUNC(clog) (BUILD_COMPLEX(0, 0));
+  result = FUNC(clog) (BUILD_COMPLEX (0, 0));
   check_isinfn_exc ("real(clog(0 + i0)) = -Inf plus divide-by-zero exception",
 		    __real__ result, DIVIDE_BY_ZERO_EXCEPTION);
   check ("imag(clog(0 + i0)) = 0 plus divide-by-zero exception",
 	 __imag__ result, 0);
-  result = FUNC(clog) (BUILD_COMPLEX(0, minus_zero));
+  result = FUNC(clog) (BUILD_COMPLEX (0, 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)) = -0 plus divide-by-zero exception",
 	 __imag__ result, minus_zero);
 
-  result = FUNC(clog) (BUILD_COMPLEX(minus_infty, plus_infty));
+  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_PIl - M_PI_4l);
-  result = FUNC(clog) (BUILD_COMPLEX(minus_infty, minus_infty));
+  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_4l - M_PIl);
 
-  result = FUNC(clog) (BUILD_COMPLEX(plus_infty, plus_infty));
+  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_4l);
-  result = FUNC(clog) (BUILD_COMPLEX(plus_infty, minus_infty));
+  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_4l);
 
-  result = FUNC(clog) (BUILD_COMPLEX(0, plus_infty));
+  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_2l);
-  result = FUNC(clog) (BUILD_COMPLEX(3, plus_infty));
+  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_2l);
-  result = FUNC(clog) (BUILD_COMPLEX(minus_zero, plus_infty));
+  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_2l);
-  result = FUNC(clog) (BUILD_COMPLEX(-3, plus_infty));
+  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_2l);
-  result = FUNC(clog) (BUILD_COMPLEX(0, minus_infty));
+  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_2l);
-  result = FUNC(clog) (BUILD_COMPLEX(3, minus_infty));
+  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_2l);
-  result = FUNC(clog) (BUILD_COMPLEX(minus_zero, minus_infty));
+  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_2l);
-  result = FUNC(clog) (BUILD_COMPLEX(-3, minus_infty));
+  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_2l);
 
-  result = FUNC(clog) (BUILD_COMPLEX(minus_infty, 0));
+  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_PIl);
-  result = FUNC(clog) (BUILD_COMPLEX(minus_infty, 1));
+  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_PIl);
-  result = FUNC(clog) (BUILD_COMPLEX(minus_infty, minus_zero));
+  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_PIl);
-  result = FUNC(clog) (BUILD_COMPLEX(minus_infty, -1));
+  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_PIl);
 
-  result = FUNC(clog) (BUILD_COMPLEX(plus_infty, 0));
+  result = FUNC(clog) (BUILD_COMPLEX (plus_infty, 0));
   check_isinfp ("real(clog(+Inf + i0)) = +Inf", __real__ result);
   check ("imag(clog(+Inf + i0)) = 0", __imag__ result, 0);
-  result = FUNC(clog) (BUILD_COMPLEX(plus_infty, 1));
+  result = FUNC(clog) (BUILD_COMPLEX (plus_infty, 1));
   check_isinfp ("real(clog(+Inf + i1)) = +Inf", __real__ result);
   check ("imag(clog(+Inf + i1)) = 0", __imag__ result, 0);
-  result = FUNC(clog) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(clog) (BUILD_COMPLEX (plus_infty, minus_zero));
   check_isinfp ("real(clog(+Inf - i0)) = +Inf", __real__ result);
   check ("imag(clog(+Inf - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(clog) (BUILD_COMPLEX(plus_infty, -1));
+  result = FUNC(clog) (BUILD_COMPLEX (plus_infty, -1));
   check_isinfp ("real(clog(+Inf - i1)) = +Inf", __real__ result);
   check ("imag(clog(+Inf - i1)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(clog) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(clog) (BUILD_COMPLEX (plus_infty, nan_value));
   check_isinfp ("real(clog(+Inf + i NaN)) = +Inf", __real__ result);
   check_isnan ("imag(clog(+Inf + i NaN)) = NaN", __imag__ result);
-  result = FUNC(clog) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(clog) (BUILD_COMPLEX (minus_infty, nan_value));
   check_isinfp ("real(clog(-Inf + i NaN)) = +Inf", __real__ result);
   check_isnan ("imag(clog(-Inf + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(clog) (BUILD_COMPLEX(nan_value, plus_infty));
+  result = FUNC(clog) (BUILD_COMPLEX (nan_value, plus_infty));
   check_isinfp ("real(clog(NaN + i Inf)) = +Inf", __real__ result);
   check_isnan ("imag(clog(NaN + i Inf)) = NaN", __imag__ result);
-  result = FUNC(clog) (BUILD_COMPLEX(nan_value, minus_infty));
+  result = FUNC(clog) (BUILD_COMPLEX (nan_value, minus_infty));
   check_isinfp ("real(clog(NaN - i Inf)) = +Inf", __real__ result);
   check_isnan ("imag(clog(NaN - i Inf)) = NaN", __imag__ result);
 
-  result = FUNC(clog) (BUILD_COMPLEX(0, nan_value));
+  result = FUNC(clog) (BUILD_COMPLEX (0, nan_value));
   check_isnan_maybe_exc ("real(clog(0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog(0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(clog) (BUILD_COMPLEX(3, nan_value));
+  result = FUNC(clog) (BUILD_COMPLEX (3, nan_value));
   check_isnan_maybe_exc ("real(clog(3 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog(3 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(clog) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(clog) (BUILD_COMPLEX (minus_zero, nan_value));
   check_isnan_maybe_exc ("real(clog(-0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog(-0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(clog) (BUILD_COMPLEX(-3, nan_value));
+  result = FUNC(clog) (BUILD_COMPLEX (-3, nan_value));
   check_isnan_maybe_exc ("real(clog(-3 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog(-3 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(clog) (BUILD_COMPLEX(nan_value, 0));
+  result = FUNC(clog) (BUILD_COMPLEX (nan_value, 0));
   check_isnan_maybe_exc ("real(clog(NaN + i0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog(NaN + i0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(clog) (BUILD_COMPLEX(nan_value, 5));
+  result = FUNC(clog) (BUILD_COMPLEX (nan_value, 5));
   check_isnan_maybe_exc ("real(clog(NaN + i5)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog(NaN + i5)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(clog) (BUILD_COMPLEX(nan_value, minus_zero));
+  result = FUNC(clog) (BUILD_COMPLEX (nan_value, minus_zero));
   check_isnan_maybe_exc ("real(clog(NaN - i0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog(NaN - i0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(clog) (BUILD_COMPLEX(nan_value, -5));
+  result = FUNC(clog) (BUILD_COMPLEX (nan_value, -5));
   check_isnan_maybe_exc ("real(clog(NaN - i5)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog(NaN - i5)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(clog) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(clog) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(clog(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(clog(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(clog) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(clog) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(clog(0.7 + i 1.2)) == 0.32876...", __real__ result,
-	     0.3287600014583970919L, CHOOSE(5e-17L, 6e-17, 3e-8));
+	     0.3287600014583970919L, CHOOSE (5e-17L, 6e-17, 3e-8));
   check_eps ("imag(clog(0.7 + i 1.2)) == 1.04272...", __imag__ result,
-	     1.0427218783685369524L, CHOOSE(2e-17L, 2.5e-16, 1.2e-7));
+	     1.0427218783685369524L, CHOOSE (2e-17L, 2.5e-16, 1.2e-7));
 
-  result = FUNC(clog) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(clog) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(clog(-2 - i 3)) == 1.28247...", __real__ result,
-	     1.2824746787307683680L, CHOOSE(3e-19L, 0, 0));
+	     1.2824746787307683680L, CHOOSE (3e-19L, 0, 0));
   check_eps ("imag(clog(-2 - i 3)) == -2.15879...", __imag__ result,
-	     -2.1587989303424641704L, CHOOSE(2e-18L, 5e-16, 8e-7));
+	     -2.1587989303424641704L, CHOOSE (2e-18L, 5e-16, 8e-7));
 }
 
 
@@ -4758,180 +4758,180 @@ clog10_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(clog10) (BUILD_COMPLEX(minus_zero, 0));
+  result = FUNC(clog10) (BUILD_COMPLEX (minus_zero, 0));
   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_PIl);
-  result = FUNC(clog10) (BUILD_COMPLEX(minus_zero, minus_zero));
+  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_PIl);
 
-  result = FUNC(clog10) (BUILD_COMPLEX(0, 0));
+  result = FUNC(clog10) (BUILD_COMPLEX (0, 0));
   check_isinfn_exc ("real(clog10(0 + i0)) = -Inf plus divide-by-zero exception",
 		    __real__ result, DIVIDE_BY_ZERO_EXCEPTION);
   check ("imag(clog10(0 + i0)) = 0 plus divide-by-zero exception",
 	 __imag__ result, 0);
-  result = FUNC(clog10) (BUILD_COMPLEX(0, minus_zero));
+  result = FUNC(clog10) (BUILD_COMPLEX (0, 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)) = -0 plus divide-by-zero exception",
 	 __imag__ result, minus_zero);
 
-  result = FUNC(clog10) (BUILD_COMPLEX(minus_infty, plus_infty));
+  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_PIl - M_PI_4l) * M_LOG10El, CHOOSE(0, 3e-16, 0));
-  result = FUNC(clog10) (BUILD_COMPLEX(minus_infty, minus_infty));
+	     (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_4l - M_PIl) * M_LOG10El, 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));
+  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_4l * M_LOG10El, CHOOSE(0, 6e-17, 3e-8));
-  result = FUNC(clog10) (BUILD_COMPLEX(plus_infty, minus_infty));
+	     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_4l * M_LOG10El, 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));
+  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_2l * M_LOG10El, CHOOSE(0, 2e-16, 6e-8));
-  result = FUNC(clog10) (BUILD_COMPLEX(3, plus_infty));
+	     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_2l * M_LOG10El, CHOOSE(0, 2e-16, 6e-8));
-  result = FUNC(clog10) (BUILD_COMPLEX(minus_zero, plus_infty));
+	     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_2l * M_LOG10El, CHOOSE(0, 2e-16, 6e-8));
-  result = FUNC(clog10) (BUILD_COMPLEX(-3, plus_infty));
+	     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_2l * M_LOG10El, CHOOSE(0, 2e-16, 6e-8));
-  result = FUNC(clog10) (BUILD_COMPLEX(0, minus_infty));
+	     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_2l * M_LOG10El, CHOOSE(0, 2e-16, 6e-8));
-  result = FUNC(clog10) (BUILD_COMPLEX(3, minus_infty));
+	     -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_2l * M_LOG10El, CHOOSE(0, 2e-16, 6e-8));
-  result = FUNC(clog10) (BUILD_COMPLEX(minus_zero, minus_infty));
+	     -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_2l * M_LOG10El, CHOOSE(0, 2e-16, 6e-8));
-  result = FUNC(clog10) (BUILD_COMPLEX(-3, minus_infty));
+	     -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_2l * M_LOG10El, 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));
+  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_PIl * M_LOG10El, CHOOSE(0, 3e-16, 2e-7));
-  result = FUNC(clog10) (BUILD_COMPLEX(minus_infty, 1));
+	     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_PIl * M_LOG10El, CHOOSE(0, 3e-16, 2e-7));
-  result = FUNC(clog10) (BUILD_COMPLEX(minus_infty, minus_zero));
+	     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_PIl * M_LOG10El, CHOOSE(0, 3e-16, 2e-7));
-  result = FUNC(clog10) (BUILD_COMPLEX(minus_infty, -1));
+	     -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_PIl * M_LOG10El, CHOOSE(0, 3e-16, 2e-7));
+	     -M_PIl * M_LOG10El, CHOOSE (0, 3e-16, 2e-7));
 
-  result = FUNC(clog10) (BUILD_COMPLEX(plus_infty, 0));
+  result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, 0));
   check_isinfp ("real(clog10(+Inf + i0)) = +Inf", __real__ result);
   check ("imag(clog10(+Inf + i0)) = 0", __imag__ result, 0);
-  result = FUNC(clog10) (BUILD_COMPLEX(plus_infty, 1));
+  result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, 1));
   check_isinfp ("real(clog10(+Inf + i1)) = +Inf", __real__ result);
   check ("imag(clog10(+Inf + i1)) = 0", __imag__ result, 0);
-  result = FUNC(clog10) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, minus_zero));
   check_isinfp ("real(clog10(+Inf - i0)) = +Inf", __real__ result);
   check ("imag(clog10(+Inf - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(clog10) (BUILD_COMPLEX(plus_infty, -1));
+  result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, -1));
   check_isinfp ("real(clog10(+Inf - i1)) = +Inf", __real__ result);
   check ("imag(clog10(+Inf - i1)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(clog10) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(clog10) (BUILD_COMPLEX (plus_infty, nan_value));
   check_isinfp ("real(clog10(+Inf + i NaN)) = +Inf", __real__ result);
   check_isnan ("imag(clog10(+Inf + i NaN)) = NaN", __imag__ result);
-  result = FUNC(clog10) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(clog10) (BUILD_COMPLEX (minus_infty, nan_value));
   check_isinfp ("real(clog10(-Inf + i NaN)) = +Inf", __real__ result);
   check_isnan ("imag(clog10(-Inf + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(clog10) (BUILD_COMPLEX(nan_value, plus_infty));
+  result = FUNC(clog10) (BUILD_COMPLEX (nan_value, plus_infty));
   check_isinfp ("real(clog10(NaN + i Inf)) = +Inf", __real__ result);
   check_isnan ("imag(clog10(NaN + i Inf)) = NaN", __imag__ result);
-  result = FUNC(clog10) (BUILD_COMPLEX(nan_value, minus_infty));
+  result = FUNC(clog10) (BUILD_COMPLEX (nan_value, minus_infty));
   check_isinfp ("real(clog10(NaN - i Inf)) = +Inf", __real__ result);
   check_isnan ("imag(clog10(NaN - i Inf)) = NaN", __imag__ result);
 
-  result = FUNC(clog10) (BUILD_COMPLEX(0, nan_value));
+  result = FUNC(clog10) (BUILD_COMPLEX (0, nan_value));
   check_isnan_maybe_exc ("real(clog10(0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog10(0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(clog10) (BUILD_COMPLEX(3, nan_value));
+  result = FUNC(clog10) (BUILD_COMPLEX (3, nan_value));
   check_isnan_maybe_exc ("real(clog10(3 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog10(3 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(clog10) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(clog10) (BUILD_COMPLEX (minus_zero, nan_value));
   check_isnan_maybe_exc ("real(clog10(-0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog10(-0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(clog10) (BUILD_COMPLEX(-3, nan_value));
+  result = FUNC(clog10) (BUILD_COMPLEX (-3, nan_value));
   check_isnan_maybe_exc ("real(clog10(-3 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog10(-3 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(clog10) (BUILD_COMPLEX(nan_value, 0));
+  result = FUNC(clog10) (BUILD_COMPLEX (nan_value, 0));
   check_isnan_maybe_exc ("real(clog10(NaN + i0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog10(NaN + i0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(clog10) (BUILD_COMPLEX(nan_value, 5));
+  result = FUNC(clog10) (BUILD_COMPLEX (nan_value, 5));
   check_isnan_maybe_exc ("real(clog10(NaN + i5)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog10(NaN + i5)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(clog10) (BUILD_COMPLEX(nan_value, minus_zero));
+  result = FUNC(clog10) (BUILD_COMPLEX (nan_value, minus_zero));
   check_isnan_maybe_exc ("real(clog10(NaN - i0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog10(NaN - i0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(clog10) (BUILD_COMPLEX(nan_value, -5));
+  result = FUNC(clog10) (BUILD_COMPLEX (nan_value, -5));
   check_isnan_maybe_exc ("real(clog10(NaN - i5)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(clog10(NaN - i5)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(clog10) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(clog10) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(clog10(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(clog10(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(clog10) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(clog10) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(clog10(0.7 + i 1.2)) == 0.14277...", __real__ result,
-	     0.1427786545038868803L, CHOOSE(2e-17L, 6e-17, 2e-8));
+	     0.1427786545038868803L, CHOOSE (2e-17L, 6e-17, 2e-8));
   check_eps ("imag(clog10(0.7 + i 1.2)) == 0.45284...", __imag__ result,
-	     0.4528483579352493248L, CHOOSE(6e-18, 6e-17, 6e-8));
+	     0.4528483579352493248L, CHOOSE (6e-18, 6e-17, 6e-8));
 
-  result = FUNC(clog10) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(clog10) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(clog10(-2 - i 3)) == 0.55697...", __real__ result,
-	     0.5569716761534183846L, CHOOSE(6e-20L, 0, 0));
+	     0.5569716761534183846L, CHOOSE (6e-20L, 0, 0));
   check_eps ("imag(clog10(-2 - i 3)) == -0.93755...", __imag__ result,
-	     -0.9375544629863747085L, CHOOSE(7e-19L, 2e-16, 3e-7));
+	     -0.9375544629863747085L, CHOOSE (7e-19L, 2e-16, 3e-7));
 }
 
 
@@ -4940,170 +4940,170 @@ csqrt_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(0, 0));
+  result = FUNC(csqrt) (BUILD_COMPLEX (0, 0));
   check ("real(csqrt(0 + i0)) = 0", __real__ result, 0);
   check ("imag(csqrt(0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(csqrt) (BUILD_COMPLEX(0, minus_zero));
+  result = FUNC(csqrt) (BUILD_COMPLEX (0, minus_zero));
   check ("real(csqrt(0 - i0)) = 0", __real__ result, 0);
   check ("imag(csqrt(0 - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(csqrt) (BUILD_COMPLEX(minus_zero, 0));
+  result = FUNC(csqrt) (BUILD_COMPLEX (minus_zero, 0));
   check ("real(csqrt(-0 + i0)) = 0", __real__ result, 0);
   check ("imag(csqrt(-0 + i0)) = 0", __imag__ result, 0);
-  result = FUNC(csqrt) (BUILD_COMPLEX(minus_zero, minus_zero));
+  result = FUNC(csqrt) (BUILD_COMPLEX (minus_zero, minus_zero));
   check ("real(csqrt(-0 - i0)) = 0", __real__ result, 0);
   check ("imag(csqrt(-0 - i0)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(minus_infty, 0));
+  result = FUNC(csqrt) (BUILD_COMPLEX (minus_infty, 0));
   check ("real(csqrt(-Inf + i0)) = 0", __real__ result, 0);
   check_isinfp ("imag(csqrt(-Inf + i0)) = +Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(minus_infty, 6));
+  result = FUNC(csqrt) (BUILD_COMPLEX (minus_infty, 6));
   check ("real(csqrt(-Inf + i6)) = 0", __real__ result, 0);
   check_isinfp ("imag(csqrt(-Inf + i6)) = +Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(minus_infty, minus_zero));
+  result = FUNC(csqrt) (BUILD_COMPLEX (minus_infty, minus_zero));
   check ("real(csqrt(-Inf - i0)) = 0", __real__ result, 0);
   check_isinfn ("imag(csqrt(-Inf - i0)) = -Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(minus_infty, -6));
+  result = FUNC(csqrt) (BUILD_COMPLEX (minus_infty, -6));
   check ("real(csqrt(-Inf - i6)) = 0", __real__ result, 0);
   check_isinfn ("imag(csqrt(-Inf - i6)) = -Inf", __imag__ result);
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(plus_infty, 0));
+  result = FUNC(csqrt) (BUILD_COMPLEX (plus_infty, 0));
   check_isinfp ("real(csqrt(+Inf + i0)) = +Inf", __real__ result);
   check ("imag(csqrt(+Inf + i0)) = 0", __imag__ result, 0);
-  result = FUNC(csqrt) (BUILD_COMPLEX(plus_infty, 6));
+  result = FUNC(csqrt) (BUILD_COMPLEX (plus_infty, 6));
   check_isinfp ("real(csqrt(+Inf + i6)) = +Inf", __real__ result);
   check ("imag(csqrt(+Inf + i6)) = 0", __imag__ result, 0);
-  result = FUNC(csqrt) (BUILD_COMPLEX(plus_infty, minus_zero));
+  result = FUNC(csqrt) (BUILD_COMPLEX (plus_infty, minus_zero));
   check_isinfp ("real(csqrt(+Inf - i0)) = +Inf", __real__ result);
   check ("imag(csqrt(+Inf - i0)) = -0", __imag__ result, minus_zero);
-  result = FUNC(csqrt) (BUILD_COMPLEX(plus_infty, -6));
+  result = FUNC(csqrt) (BUILD_COMPLEX (plus_infty, -6));
   check_isinfp ("real(csqrt(+Inf - i6)) = +Inf", __real__ result);
   check ("imag(csqrt(+Inf - i6)) = -0", __imag__ result, minus_zero);
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(0, plus_infty));
+  result = FUNC(csqrt) (BUILD_COMPLEX (0, plus_infty));
   check_isinfp ("real(csqrt(0 + i Inf)) = +Inf", __real__ result);
   check_isinfp ("imag(csqrt(0 + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(4, plus_infty));
+  result = FUNC(csqrt) (BUILD_COMPLEX (4, plus_infty));
   check_isinfp ("real(csqrt(4 + i Inf)) = +Inf", __real__ result);
   check_isinfp ("imag(csqrt(4 + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(plus_infty, plus_infty));
+  result = FUNC(csqrt) (BUILD_COMPLEX (plus_infty, plus_infty));
   check_isinfp ("real(csqrt(+Inf + i Inf)) = +Inf", __real__ result);
   check_isinfp ("imag(csqrt(+Inf + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(minus_zero, plus_infty));
+  result = FUNC(csqrt) (BUILD_COMPLEX (minus_zero, plus_infty));
   check_isinfp ("real(csqrt(-0 + i Inf)) = +Inf", __real__ result);
   check_isinfp ("imag(csqrt(-0 + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(-4, plus_infty));
+  result = FUNC(csqrt) (BUILD_COMPLEX (-4, plus_infty));
   check_isinfp ("real(csqrt(-4 + i Inf)) = +Inf", __real__ result);
   check_isinfp ("imag(csqrt(-4 + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(minus_infty, plus_infty));
+  result = FUNC(csqrt) (BUILD_COMPLEX (minus_infty, plus_infty));
   check_isinfp ("real(csqrt(-Inf + i Inf)) = +Inf", __real__ result);
   check_isinfp ("imag(csqrt(-Inf + i Inf)) = +Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(0, minus_infty));
+  result = FUNC(csqrt) (BUILD_COMPLEX (0, minus_infty));
   check_isinfp ("real(csqrt(0 - i Inf)) = +Inf", __real__ result);
   check_isinfn ("imag(csqrt(0 - i Inf)) = -Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(4, minus_infty));
+  result = FUNC(csqrt) (BUILD_COMPLEX (4, minus_infty));
   check_isinfp ("real(csqrt(4 - i Inf)) = +Inf", __real__ result);
   check_isinfn ("imag(csqrt(4 - i Inf)) = -Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(plus_infty, minus_infty));
+  result = FUNC(csqrt) (BUILD_COMPLEX (plus_infty, minus_infty));
   check_isinfp ("real(csqrt(+Inf - i Inf)) = +Inf", __real__ result);
   check_isinfn ("imag(csqrt(+Inf - i Inf)) = -Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(minus_zero, minus_infty));
+  result = FUNC(csqrt) (BUILD_COMPLEX (minus_zero, minus_infty));
   check_isinfp ("real(csqrt(-0 - i Inf)) = +Inf", __real__ result);
   check_isinfn ("imag(csqrt(-0 - i Inf)) = -Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(-4, minus_infty));
+  result = FUNC(csqrt) (BUILD_COMPLEX (-4, minus_infty));
   check_isinfp ("real(csqrt(-4 - i Inf)) = +Inf", __real__ result);
   check_isinfn ("imag(csqrt(-4 - i Inf)) = -Inf", __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(minus_infty, minus_infty));
+  result = FUNC(csqrt) (BUILD_COMPLEX (minus_infty, minus_infty));
   check_isinfp ("real(csqrt(-Inf - i Inf)) = +Inf", __real__ result);
   check_isinfn ("imag(csqrt(-Inf - i Inf)) = -Inf", __imag__ result);
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(minus_infty, nan_value));
+  result = FUNC(csqrt) (BUILD_COMPLEX (minus_infty, nan_value));
   check_isnan ("real(csqrt(-Inf + i NaN)) = NaN", __real__ result);
   check_isinfp ("imag(csqrt(-Inf + i NaN)) = +-Inf",
 		FUNC(fabs) (__imag__ result));
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(plus_infty, nan_value));
+  result = FUNC(csqrt) (BUILD_COMPLEX (plus_infty, nan_value));
   check_isinfp ("real(csqrt(+Inf + i NaN)) = +Inf", __real__ result);
   check_isnan ("imag(csqrt(+Inf + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(0, nan_value));
+  result = FUNC(csqrt) (BUILD_COMPLEX (0, nan_value));
   check_isnan_maybe_exc ("real(csqrt(0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csqrt(0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(1, nan_value));
+  result = FUNC(csqrt) (BUILD_COMPLEX (1, nan_value));
   check_isnan_maybe_exc ("real(csqrt(1 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csqrt(1 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(minus_zero, nan_value));
+  result = FUNC(csqrt) (BUILD_COMPLEX (minus_zero, nan_value));
   check_isnan_maybe_exc ("real(csqrt(-0 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csqrt(-0 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(-1, nan_value));
+  result = FUNC(csqrt) (BUILD_COMPLEX (-1, nan_value));
   check_isnan_maybe_exc ("real(csqrt(-1 + i NaN)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csqrt(-1 + i NaN)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(nan_value, 0));
+  result = FUNC(csqrt) (BUILD_COMPLEX (nan_value, 0));
   check_isnan_maybe_exc ("real(csqrt(NaN + i0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csqrt(NaN + i0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(nan_value, 8));
+  result = FUNC(csqrt) (BUILD_COMPLEX (nan_value, 8));
   check_isnan_maybe_exc ("real(csqrt(NaN + i8)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csqrt(NaN + i8)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(nan_value, minus_zero));
+  result = FUNC(csqrt) (BUILD_COMPLEX (nan_value, minus_zero));
   check_isnan_maybe_exc ("real(csqrt(NaN - i0)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csqrt(NaN - i0)) = NaN plus maybe invalid exception",
 	       __imag__ result);
-  result = FUNC(csqrt) (BUILD_COMPLEX(nan_value, -8));
+  result = FUNC(csqrt) (BUILD_COMPLEX (nan_value, -8));
   check_isnan_maybe_exc ("real(csqrt(NaN - i8)) = NaN plus maybe invalid exception",
 			 __real__ result, INVALID_EXCEPTION);
   check_isnan ("imag(csqrt(NaN - i8)) = NaN plus maybe invalid exception",
 	       __imag__ result);
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(nan_value, nan_value));
+  result = FUNC(csqrt) (BUILD_COMPLEX (nan_value, nan_value));
   check_isnan ("real(csqrt(NaN + i NaN)) = NaN", __real__ result);
   check_isnan ("imag(csqrt(NaN + i NaN)) = NaN", __imag__ result);
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(16.0, -30.0));
+  result = FUNC(csqrt) (BUILD_COMPLEX (16.0, -30.0));
   check ("real(csqrt(16 - 30i)) = 5", __real__ result, 5.0);
   check ("imag(csqrt(16 - 30i)) = -3", __imag__ result, -3.0);
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(-1, 0));
+  result = FUNC(csqrt) (BUILD_COMPLEX (-1, 0));
   check ("real(csqrt(1 + i0) = 0", __real__ result, 0);
   check ("imag(csqrt(1 + i0) = 1", __imag__ result, 1);
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(0, 2));
+  result = FUNC(csqrt) (BUILD_COMPLEX (0, 2));
   check ("real(csqrt(0 + i 2) = 1", __real__ result, 1);
   check ("imag(csqrt(0 + i 2) = 1", __imag__ result, 1);
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(119, 120));
+  result = FUNC(csqrt) (BUILD_COMPLEX (119, 120));
   check ("real(csqrt(119 + i 120) = 12", __real__ result, 12);
   check ("imag(csqrt(119 + i 120) = 5", __imag__ result, 5);
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(0.7, 1.2));
+  result = FUNC(csqrt) (BUILD_COMPLEX (0.7, 1.2));
   check_eps ("real(csqrt(0.7 + i 1.2)) == 1.02206...", __real__ result,
-	     1.0220676100300264507L, CHOOSE(3e-17L, 3e-16, 2e-7));
+	     1.0220676100300264507L, CHOOSE (3e-17L, 3e-16, 2e-7));
   check_eps ("imag(csqrt(0.7 + i 1.2)) == 0.58704...", __imag__ result,
-	     0.5870453129635652115L, CHOOSE(7e-18L, 0, 6e-8));
+	     0.5870453129635652115L, CHOOSE (7e-18L, 0, 6e-8));
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(-2, -3));
+  result = FUNC(csqrt) (BUILD_COMPLEX (-2, -3));
   check_eps ("real(csqrt(-2 - i 3)) == 0.89597...", __real__ result,
-	     0.8959774761298381247L, CHOOSE(6e-16L, 4e-16, 6e-8));
+	     0.8959774761298381247L, CHOOSE (6e-16L, 4e-16, 6e-8));
   check_eps ("imag(csqrt(-2 - i 3)) == -1.67414...", __imag__ result,
-	     -1.6741492280355400404L, CHOOSE(0, 5e-16, 0));
+	     -1.6741492280355400404L, CHOOSE (0, 5e-16, 0));
 
-  result = FUNC(csqrt) (BUILD_COMPLEX(-2, 3));
+  result = FUNC(csqrt) (BUILD_COMPLEX (-2, 3));
   check_eps ("real(csqrt(-2 + i 3)) == 0.89597...", __real__ result,
-	     0.8959774761298381247L, CHOOSE(6e-20L, 4e-16, 6e-8));
+	     0.8959774761298381247L, CHOOSE (6e-20L, 4e-16, 6e-8));
   check_eps ("imag(csqrt(-2 + i 3)) == 1.67414...", __imag__ result,
-	     1.6741492280355400404L, CHOOSE(0, 5e-16, 0));
+	     1.6741492280355400404L, CHOOSE (0, 5e-16, 0));
 }
 
 
@@ -5112,26 +5112,26 @@ cpow_test (void)
 {
   __complex__ MATHTYPE result;
 
-  result = FUNC(cpow) (BUILD_COMPLEX(1, 0), BUILD_COMPLEX(0, 0));
+  result = FUNC(cpow) (BUILD_COMPLEX (1, 0), BUILD_COMPLEX (0, 0));
   check ("real(cpow (1 + i0), (0 + i0)) == 0", __real__ result, 1);
   check ("imag(cpow (1 + i0), (0 + i0)) == 0", __imag__ result, 0);
 
-  result = FUNC(cpow) (BUILD_COMPLEX(2, 0), BUILD_COMPLEX(10, 0));
+  result = FUNC(cpow) (BUILD_COMPLEX (2, 0), BUILD_COMPLEX (10, 0));
   check_eps ("real(cpow (2 + i0), (10 + i0)) == 1024", __real__ result, 1024,
-	     CHOOSE(6e-16L, 0, 0));
+	     CHOOSE (6e-16L, 0, 0));
   check ("imag(cpow (2 + i0), (10 + i0)) == 0", __imag__ result, 0);
 
-  result = FUNC(cpow) (BUILD_COMPLEX(M_El, 0), BUILD_COMPLEX(0, 2 * M_PIl));
+  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));
+	     CHOOSE (0, 0, 6e-8));
   check_eps ("imag(cpow (e + i0), (0 + i 2*PI)) == 0", __imag__ result, 0,
-	     CHOOSE(3e-18L, 3e-16, 4e-7));
+	     CHOOSE (3e-18L, 3e-16, 4e-7));
 
-  result = FUNC(cpow) (BUILD_COMPLEX(2, 3), BUILD_COMPLEX(4, 0));
+  result = FUNC(cpow) (BUILD_COMPLEX (2, 3), BUILD_COMPLEX (4, 0));
   check_eps ("real(cpow (2 + i3), (4 + i0)) == -119", __real__ result, -119,
-	     CHOOSE(9e-16L, 2e-14, 4e-5));
+	     CHOOSE (9e-16L, 2e-14, 4e-5));
   check_eps ("imag(cpow (2 + i3), (4 + i0)) == -120", __imag__ result, -120,
-	     CHOOSE(1e-15L, 0, 5e-5));
+	     CHOOSE (1e-15L, 0, 5e-5));
 }
 
 
@@ -5142,40 +5142,40 @@ cabs_test (void)
   MATHTYPE a;
   a = random_greater (0);
   check_isinfp_ext ("cabs (+inf + i x) == +inf",
-		    FUNC(cabs) (BUILD_COMPLEX(plus_infty, a)), a);
+		    FUNC(cabs) (BUILD_COMPLEX (plus_infty, a)), a);
   check_isinfp_ext ("cabs (-inf + i x) == +inf",
-		    FUNC(cabs) (BUILD_COMPLEX(minus_infty, a)), a);
+		    FUNC(cabs) (BUILD_COMPLEX (minus_infty, a)), a);
 
   check_isinfp ("cabs (+inf+ iNaN) == +inf",
-		FUNC(cabs) (BUILD_COMPLEX(minus_infty, nan_value)));
+		FUNC(cabs) (BUILD_COMPLEX (minus_infty, nan_value)));
   check_isinfp ("cabs (-inf+ iNaN) == +inf",
-		FUNC(cabs) (BUILD_COMPLEX(minus_infty, nan_value)));
+		FUNC(cabs) (BUILD_COMPLEX (minus_infty, nan_value)));
 
   check_isnan ("cabs (NaN+ iNaN) == NaN",
-	       FUNC(cabs) (BUILD_COMPLEX(nan_value, nan_value)));
+	       FUNC(cabs) (BUILD_COMPLEX (nan_value, nan_value)));
 
-  a = FUNC(cabs) (BUILD_COMPLEX(12.4L, 0.7L));
+  a = FUNC(cabs) (BUILD_COMPLEX (12.4L, 0.7L));
   check ("cabs (x,y) == cabs (y,x)",
-	 FUNC(cabs) (BUILD_COMPLEX(0.7L, 12.4L)), a);
+	 FUNC(cabs) (BUILD_COMPLEX (0.7L, 12.4L)), a);
   check ("cabs (x,y) == cabs (-x,y)",
-	 FUNC(cabs) (BUILD_COMPLEX(-12.4L, 0.7L)), a);
+	 FUNC(cabs) (BUILD_COMPLEX (-12.4L, 0.7L)), a);
   check ("cabs (x,y) == cabs (-y,x)",
-	 FUNC(cabs) (BUILD_COMPLEX(-0.7L, 12.4L)), a);
+	 FUNC(cabs) (BUILD_COMPLEX (-0.7L, 12.4L)), a);
   check ("cabs (x,y) == cabs (-x,-y)",
-	 FUNC(cabs) (BUILD_COMPLEX(-12.4L, -0.7L)), a);
+	 FUNC(cabs) (BUILD_COMPLEX (-12.4L, -0.7L)), a);
   check ("cabs (x,y) == cabs (-y,-x)",
-	 FUNC(cabs) (BUILD_COMPLEX(-0.7L, -12.4L)), a);
-  check ("cabs (x,0) == fabs (x)", FUNC(cabs) (BUILD_COMPLEX(-0.7L, 0)), 0.7L);
-  check ("cabs (x,0) == fabs (x)", FUNC(cabs) (BUILD_COMPLEX(0.7L, 0)), 0.7L);
-  check ("cabs (x,0) == fabs (x)", FUNC(cabs) (BUILD_COMPLEX(-1.0L, 0)), 1.0L);
-  check ("cabs (x,0) == fabs (x)", FUNC(cabs) (BUILD_COMPLEX(1.0L, 0)), 1.0L);
-  check ("cabs (x,0) == fabs (x)", FUNC(cabs) (BUILD_COMPLEX(-5.7e7L, 0)),
+	 FUNC(cabs) (BUILD_COMPLEX (-0.7L, -12.4L)), a);
+  check ("cabs (x,0) == fabs (x)", FUNC(cabs) (BUILD_COMPLEX (-0.7L, 0)), 0.7L);
+  check ("cabs (x,0) == fabs (x)", FUNC(cabs) (BUILD_COMPLEX (0.7L, 0)), 0.7L);
+  check ("cabs (x,0) == fabs (x)", FUNC(cabs) (BUILD_COMPLEX (-1.0L, 0)), 1.0L);
+  check ("cabs (x,0) == fabs (x)", FUNC(cabs) (BUILD_COMPLEX (1.0L, 0)), 1.0L);
+  check ("cabs (x,0) == fabs (x)", FUNC(cabs) (BUILD_COMPLEX (-5.7e7L, 0)),
 	 5.7e7L);
-  check ("cabs (x,0) == fabs (x)", FUNC(cabs) (BUILD_COMPLEX(5.7e7L, 0)),
+  check ("cabs (x,0) == fabs (x)", FUNC(cabs) (BUILD_COMPLEX (5.7e7L, 0)),
 	 5.7e7L);
 
-  check_eps ("cabs (0.7 + i 1.2) == 1.38924...", FUNC(cabs) (BUILD_COMPLEX(0.7, 1.2)),
-	     1.3892443989449804508L, CHOOSE(7e-17L, 3e-16, 0));
+  check_eps ("cabs (0.7 + i 1.2) == 1.38924...", FUNC(cabs) (BUILD_COMPLEX (0.7, 1.2)),
+	     1.3892443989449804508L, CHOOSE (7e-17L, 3e-16, 0));
 }
 
 
@@ -5187,79 +5187,79 @@ carg_test (void)
 
   x = random_greater (0);
   check ("carg (x + i 0) == 0 for x > 0",
-	 FUNC(carg) (BUILD_COMPLEX(x, 0)), 0);
+	 FUNC(carg) (BUILD_COMPLEX (x, 0)), 0);
   x = random_greater (0);
   check ("carg (x - i 0) == -0 for x > 0",
-	 FUNC(carg) (BUILD_COMPLEX(x, minus_zero)), minus_zero);
+	 FUNC(carg) (BUILD_COMPLEX (x, minus_zero)), minus_zero);
 
-  check ("carg (+0 + i 0) == +0", FUNC(carg) (BUILD_COMPLEX(0, 0)), 0);
-  check ("carg (+0 - i 0) == -0", FUNC(carg) (BUILD_COMPLEX(0, minus_zero)),
+  check ("carg (+0 + i 0) == +0", FUNC(carg) (BUILD_COMPLEX (0, 0)), 0);
+  check ("carg (+0 - i 0) == -0", FUNC(carg) (BUILD_COMPLEX (0, minus_zero)),
 	 minus_zero);
 
   x = -random_greater (0);
-  check ("carg (x + i 0) == +pi for x < 0", FUNC(carg) (BUILD_COMPLEX(x, 0)),
+  check ("carg (x + i 0) == +pi for x < 0", FUNC(carg) (BUILD_COMPLEX (x, 0)),
 	 M_PIl);
 
   x = -random_greater (0);
   check ("carg (x - i 0) == -pi for x < 0",
-	 FUNC(carg) (BUILD_COMPLEX(x, minus_zero)), -M_PIl);
+	 FUNC(carg) (BUILD_COMPLEX (x, minus_zero)), -M_PIl);
 
-  check ("carg (-0 + i 0) == +pi", FUNC(carg) (BUILD_COMPLEX(minus_zero, 0)),
+  check ("carg (-0 + i 0) == +pi", FUNC(carg) (BUILD_COMPLEX (minus_zero, 0)),
 	 M_PIl);
   check ("carg (-0 - i 0) == -pi",
-	 FUNC(carg) (BUILD_COMPLEX(minus_zero, minus_zero)), -M_PIl);
+	 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)),
+  check ("carg (+0 + i y) == pi/2 for y > 0", FUNC(carg) (BUILD_COMPLEX (0, x)),
 	 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_2l);
+	 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)),
+  check ("carg (+0 + i y) == -pi/2 for y < 0", FUNC(carg) (BUILD_COMPLEX (0, x)),
 	 -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_2l);
+	 FUNC(carg) (BUILD_COMPLEX (minus_zero, x)), -M_PI_2l);
 
   x = random_greater (0);
   check ("carg (inf + i y) == +0 for finite y > 0",
-	 FUNC(carg) (BUILD_COMPLEX(plus_infty, x)), 0);
+	 FUNC(carg) (BUILD_COMPLEX (plus_infty, x)), 0);
 
   x = -random_greater (0);
   check ("carg (inf + i y) == -0 for finite y < 0",
-	 FUNC(carg) (BUILD_COMPLEX(plus_infty, x)), minus_zero);
+	 FUNC(carg) (BUILD_COMPLEX (plus_infty, x)), minus_zero);
 
   x = random_value (-1e4, 1e4);
   check ("carg(x + i inf) == pi/2 for finite x",
-	 FUNC(carg) (BUILD_COMPLEX(x, plus_infty)), M_PI_2l);
+	 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_2l);
+	 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_PIl);
+	 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_PIl);
+	 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_4l);
+	 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_4l);
+	 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_4l);
+	 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_4l);
+	 FUNC(carg) (BUILD_COMPLEX (minus_infty, minus_infty)), -3 * M_PI_4l);
 }
 
 
@@ -5616,38 +5616,38 @@ inverse_functions (void)
 {
   inverse_func_pair_test ("asin(sin(x)) == x",
 			  FUNC(sin), FUNC(asin), 1.0,
-			  CHOOSE(2e-18L, 0, 3e-7L));
+			  CHOOSE (2e-18L, 0, 3e-7L));
   inverse_func_pair_test ("sin(asin(x)) == x",
 			  FUNC(asin), FUNC(sin), 1.0, 0.0);
 
   inverse_func_pair_test ("acos(cos(x)) == x",
 			  FUNC(cos), FUNC(acos), 1.0,
-			  CHOOSE(4e-18L, 1e-15L, 0));
+			  CHOOSE (4e-18L, 1e-15L, 0));
   inverse_func_pair_test ("cos(acos(x)) == x",
 			  FUNC(acos), FUNC(cos), 1.0, 0.0);
   inverse_func_pair_test ("atan(tan(x)) == x",
 			  FUNC(tan), FUNC(atan), 1.0,
-			  CHOOSE(2e-18L, 0, 0));
+			  CHOOSE (2e-18L, 0, 0));
   inverse_func_pair_test ("tan(atan(x)) == x",
 			  FUNC(atan), FUNC(tan), 1.0,
-			  CHOOSE(2e-18L, 1e-15L, 2e-7));
+			  CHOOSE (2e-18L, 1e-15L, 2e-7));
 
   inverse_func_pair_test ("asinh(sinh(x)) == x",
 			  FUNC(sinh), FUNC(asinh), 1.0,
-			  CHOOSE(1e-18L, 0, 1e-7));
+			  CHOOSE (1e-18L, 0, 1e-7));
   inverse_func_pair_test ("sinh(asinh(x)) == x",
 			  FUNC(asinh), FUNC(sinh), 1.0,
-			  CHOOSE(2e-18L, 2e-16L, 2e-7));
+			  CHOOSE (2e-18L, 2e-16L, 2e-7));
 
   inverse_func_pair_test ("acosh(cosh(x)) == x",
 			  FUNC(cosh), FUNC(acosh), 1.0,
-			  CHOOSE(1e-18L, 1e-15L, 6e-8));
+			  CHOOSE (1e-18L, 1e-15L, 6e-8));
   inverse_func_pair_test ("cosh(acosh(x)) == x",
 			  FUNC(acosh), FUNC(cosh), 1.0, 0.0);
 
   inverse_func_pair_test ("atanh(tanh(x)) == x",
 			  FUNC(tanh), FUNC(atanh), 1.0,
-			  CHOOSE(1e-18L, 1e-15L, 0));
+			  CHOOSE (1e-18L, 1e-15L, 0));
   inverse_func_pair_test ("tanh(atanh(x)) == x",
 			  FUNC(atanh), FUNC(tanh), 1.0, 0.0);
 }
@@ -5723,20 +5723,20 @@ identities3_test (MATHTYPE x, MATHTYPE epsilon)
 static void
 identities (void)
 {
-  identities1_test (0.2L, CHOOSE(1e-18L, 0, 2e-7));
-  identities1_test (0.9L, CHOOSE(1e-18L, 2e-16, 2e-7));
+  identities1_test (0.2L, CHOOSE (1e-18L, 0, 2e-7));
+  identities1_test (0.9L, CHOOSE (1e-18L, 2e-16, 2e-7));
   identities1_test (0, 0);
-  identities1_test (-1, CHOOSE(1e-18L, 0, 1e-7));
+  identities1_test (-1, CHOOSE (1e-18L, 0, 1e-7));
 
-  identities2_test (0.2L, CHOOSE(1e-19L, 1e-16, 0));
-  identities2_test (0.9L, CHOOSE(3e-19L, 1e-15, 2e-7));
+  identities2_test (0.2L, CHOOSE (1e-19L, 1e-16, 0));
+  identities2_test (0.9L, CHOOSE (3e-19L, 1e-15, 2e-7));
   identities2_test (0, 0);
-  identities2_test (-1, CHOOSE(1e-18L, 1e-15, 2e-7));
+  identities2_test (-1, CHOOSE (1e-18L, 1e-15, 2e-7));
 
-  identities3_test (0.2L, CHOOSE(1e-18L, 0, 1e-7));
-  identities3_test (0.9L, CHOOSE(1e-18L, 1e-15, 1e-6));
-  identities3_test (0, CHOOSE(0, 0, 1e-6));
-  identities3_test (-1, CHOOSE(1e-18L, 7e-16, 1e-6));
+  identities3_test (0.2L, CHOOSE (1e-18L, 0, 1e-7));
+  identities3_test (0.9L, CHOOSE (1e-18L, 1e-15, 1e-6));
+  identities3_test (0, CHOOSE (0, 0, 1e-6));
+  identities3_test (-1, CHOOSE (1e-18L, 7e-16, 1e-6));
 }
 
 
@@ -5801,17 +5801,17 @@ basic_tests (void)
 
   /* test if EPSILON is ok */
   x1 = MATHCONST (1.0);
-  x2 = x1 + CHOOSE(LDBL_EPSILON, DBL_EPSILON, FLT_EPSILON);
+  x2 = x1 + CHOOSE (LDBL_EPSILON, DBL_EPSILON, FLT_EPSILON);
   check_bool ("1 != 1+EPSILON", x1 != x2);
 
   x1 = MATHCONST (1.0);
-  x2 = x1 - CHOOSE(LDBL_EPSILON, DBL_EPSILON, FLT_EPSILON);
+  x2 = x1 - CHOOSE (LDBL_EPSILON, DBL_EPSILON, FLT_EPSILON);
   check_bool ("1 != 1-EPSILON", x1 != x2);
 
   /* test if HUGE_VALx is ok */
-  x1 = CHOOSE(HUGE_VALL, HUGE_VAL, HUGE_VALF);
+  x1 = CHOOSE (HUGE_VALL, HUGE_VAL, HUGE_VALF);
   check_bool ("isinf (HUGE_VALx) == +1", ISINF (x1) == +1);
-  x1 = -CHOOSE(HUGE_VALL, HUGE_VAL, HUGE_VALF);
+  x1 = -CHOOSE (HUGE_VALL, HUGE_VAL, HUGE_VALF);
   check_bool ("isinf (-HUGE_VALx) == -1", ISINF (x1) == -1);
 }
 
@@ -5824,8 +5824,8 @@ initialize (void)
   nan_value = plus_zero / plus_zero;	/* Suppress GCC warning */
 
   minus_zero = FUNC(copysign) (0.0, -1.0);
-  plus_infty = CHOOSE(HUGE_VALL, HUGE_VAL, HUGE_VALF);
-  minus_infty = -CHOOSE(HUGE_VALL, HUGE_VAL, HUGE_VALF);
+  plus_infty = CHOOSE (HUGE_VALL, HUGE_VAL, HUGE_VALF);
+  minus_infty = CHOOSE (-HUGE_VALL, -HUGE_VAL, -HUGE_VALF);
 
   (void) &plus_zero;
   (void) &nan_value;
@@ -6011,7 +6011,7 @@ main (int argc, char *argv[])
 	  noTests, noExcTests);
   if (noErrors)
     {
-      printf ("	 %d errors occured.\n", noErrors);
+      printf ("  %d errors occured.\n", noErrors);
       exit (1);
     }
   printf ("  All tests passed successfully.\n");
diff --git a/misc/mntent.h b/misc/mntent.h
index f7101c19dd..6acd532ba8 100644
--- a/misc/mntent.h
+++ b/misc/mntent.h
@@ -73,14 +73,16 @@ extern struct mntent *getmntent __P ((FILE *__stream));
 
 #ifdef __USE_MISC
 /* Reentrant version of the above function.  */
-extern struct mntent *getmntent_r __P ((FILE *__stream,
-					struct mntent *__result,
-					char *__buffer, int __bufsize));
+extern struct mntent *getmntent_r __P ((FILE *__restrict __stream,
+					struct mntent *__restrict __result,
+					char *__restrict __buffer,
+					int __bufsize));
 #endif
 
 /* Write the mount table entry described by MNT to STREAM.
    Return zero on success, nonzero on failure.  */
-extern int addmntent __P ((FILE *__stream, __const struct mntent *__mnt));
+extern int addmntent __P ((FILE *__restrict __stream,
+			   __const struct mntent *__restrict __mnt));
 
 /* Close a stream opened with `setmntent'.  */
 extern int endmntent __P ((FILE *__stream));
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 539cbbc09f..24d5f315b7 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -19,7 +19,10 @@
 #ifndef	_SYS_CDEFS_H
 #define	_SYS_CDEFS_H	1
 
+/* We are almost always included from features.h. */
+#ifndef _FEATURES_H
 #include <features.h>
+#endif
 
 /* Some user header file might have defined this before.  */
 #undef	__P
@@ -152,8 +155,11 @@
 
 #endif
 
-/* No current version of gcc knows the `restrict' keyword.  Define it
-   for now unconditionally to the empty string.  */
-#define __restrict
+/* __restrict is known in EGCS 1.2 and above. */
+#if !defined __GNUC__ || __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 92)
+
+# define __restrict	/* Ignore */
+
+#endif
 
 #endif	 /* sys/cdefs.h */
diff --git a/posix/wordexp.h b/posix/wordexp.h
index 5a4102b760..32c2a3fb80 100644
--- a/posix/wordexp.h
+++ b/posix/wordexp.h
@@ -58,8 +58,8 @@ enum
   };
 
 /* Do word expansion of WORDS into PWORDEXP.  */
-extern int wordexp __P ((__const char *__words, wordexp_t *__pwordexp,
-			 int __flags));
+extern int wordexp __P ((__const char *__restrict __words,
+			 wordexp_t *__restrict __pwordexp, int __flags));
 
 /* Free the storage allocated by a `wordexp' call.  */
 extern void wordfree __P ((wordexp_t *__wordexp));
diff --git a/pwd/pwd.h b/pwd/pwd.h
index edccfedbca..e03144fee6 100644
--- a/pwd/pwd.h
+++ b/pwd/pwd.h
@@ -81,7 +81,8 @@ extern struct passwd *getpwent __P ((void));
 extern struct passwd *fgetpwent __P ((FILE *__stream));
 
 /* Write the given entry onto the given stream.  */
-extern int putpwent __P ((__const struct passwd *__p, FILE *__f));
+extern int putpwent __P ((__const struct passwd *__restrict __p,
+			  FILE *__restrict __f));
 #endif
 
 /* Search for an entry with a matching user ID.  */
@@ -107,25 +108,29 @@ extern struct passwd *getpwnam __P ((__const char *__name));
    POSIX people would choose.  */
 
 # if defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN_EXTENDED
-extern int getpwent_r __P ((struct passwd *__resultbuf, char *__buffer,
-			    size_t __buflen, struct passwd **__result));
+extern int getpwent_r __P ((struct passwd *__restrict __resultbuf,
+			    char *__restrict __buffer, size_t __buflen,
+			    struct passwd **__restrict __result));
 # endif
 
-extern int getpwuid_r __P ((__uid_t __uid, struct passwd *__resultbuf,
-			    char *__buffer, size_t __buflen,
-			    struct passwd **__result));
+extern int getpwuid_r __P ((__uid_t __uid,
+			    struct passwd *__restrict __resultbuf,
+			    char *__restrict __buffer, size_t __buflen,
+			    struct passwd **__restrict __result));
 
-extern int getpwnam_r __P ((__const char *__name, struct passwd *__resultbuf,
-			    char *__buffer, size_t __buflen,
-			    struct passwd **__result));
+extern int getpwnam_r __P ((__const char *__restrict __name,
+			    struct passwd *__restrict __resultbuf,
+			    char *__restrict __buffer, size_t __buflen,
+			    struct passwd **__restrict __result));
 
 
 # ifdef	__USE_SVID
 /* Read an entry from STREAM.  This function is not standardized and
    probably never will.  */
-extern int fgetpwent_r __P ((FILE * __stream, struct passwd *__resultbuf,
-			     char *__buffer, size_t __buflen,
-			     struct passwd **__result));
+extern int fgetpwent_r __P ((FILE *__restrict __stream,
+			     struct passwd *__restrict __resultbuf,
+			     char *__restrict __buffer, size_t __buflen,
+			     struct passwd **__restrict __result));
 # endif
 
 #endif	/* POSIX or reentrant */
diff --git a/resolv/netdb.h b/resolv/netdb.h
index 3365e5e24a..30ef1c8b47 100644
--- a/resolv/netdb.h
+++ b/resolv/netdb.h
@@ -130,39 +130,49 @@ extern struct hostent *gethostbyname2 __P ((__const char *__name, int __af));
    argument is a pointer to a variable which gets the value which
    would be stored in the global variable `herrno' by the
    non-reentrant functions.  */
-extern int __gethostent_r __P ((struct hostent *__result_buf, char *__buf,
-				size_t __buflen, struct hostent **__result,
-				int *__h_errnop));
-extern int gethostent_r __P ((struct hostent *__result_buf, char *__buf,
-			      size_t __buflen, struct hostent **__result,
-			      int *__h_errnop));
-
-extern int __gethostbyaddr_r __P ((__const char *__addr, int __len, int __type,
-				   struct hostent *__result_buf, char *__buf,
-				   size_t __buflen, struct hostent **__result,
-				   int *__h_errnop));
-extern int gethostbyaddr_r __P ((__const char *__addr, int __len, int __type,
-				 struct hostent *__result_buf, char *__buf,
-				 size_t __buflen, struct hostent **__result,
-				 int *__h_errnop));
-
-extern int __gethostbyname_r __P ((__const char *__name,
-				   struct hostent *__result_buf, char *__buf,
-				   size_t __buflen, struct hostent **__result,
-				   int *__h_errnop));
-extern int gethostbyname_r __P ((__const char *__name,
-				 struct hostent *__result_buf, char *__buf,
-				 size_t __buflen, struct hostent **__result,
-				 int *__h_errnop));
-
-extern int __gethostbyname2_r __P ((__const char *__name, int __af,
-				    struct hostent *__result_buf, char *__buf,
-				    size_t __buflen, struct hostent **__result,
-				    int *__h_errnop));
-extern int gethostbyname2_r __P ((__const char *__name, int __af,
-				  struct hostent *__result_buf, char *__buf,
-				  size_t __buflen, struct hostent **__result,
-				  int *__h_errnop));
+extern int __gethostent_r __P ((struct hostent *__restrict __result_buf,
+				char *__restrict __buf, size_t __buflen,
+				struct hostent **__restrict __result,
+				int *__restrict __h_errnop));
+extern int gethostent_r __P ((struct hostent *__restrict __result_buf,
+			      char *__restrict __buf, size_t __buflen,
+			      struct hostent **__restrict __result,
+			      int *__restrict __h_errnop));
+
+extern int __gethostbyaddr_r __P ((__const char *__restrict __addr,
+				   int __len, int __type,
+				   struct hostent *__restrict __result_buf,
+				   char *__restrict __buf, size_t __buflen,
+				   struct hostent **__restrict __result,
+				   int *__restrict __h_errnop));
+extern int gethostbyaddr_r __P ((__const char *__restrict __addr, int __len,
+				 int __type,
+				 struct hostent *__restrict __result_buf,
+				 char *__restrict __buf, size_t __buflen,
+				 struct hostent **__restrict __result,
+				 int *__restrict __h_errnop));
+
+extern int __gethostbyname_r __P ((__const char *__restrict __name,
+				   struct hostent *__restrict __result_buf,
+				   char *__restrict __buf, size_t __buflen,
+				   struct hostent **__restrict __result,
+				   int *__restrict __h_errnop));
+extern int gethostbyname_r __P ((__const char *__restrict __name,
+				 struct hostent *__restrict __result_buf,
+				 char *__restrict __buf, size_t __buflen,
+				 struct hostent **__restrict __result,
+				 int *__restrict __h_errnop));
+
+extern int __gethostbyname2_r __P ((__const char *__restrict __name, int __af,
+				    struct hostent *__restrict __result_buf,
+				    char *__restrict __buf, size_t __buflen,
+				    struct hostent **__restrict __result,
+				    int *__restrict __h_errnop));
+extern int gethostbyname2_r __P ((__const char *__restrict __name, int __af,
+				  struct hostent *__restrict __result_buf,
+				  char *__restrict __buf, size_t __buflen,
+				  struct hostent **__restrict __result,
+				  int *__restrict __h_errnop));
 #endif	/* misc */
 
 
@@ -215,30 +225,36 @@ extern struct netent *getnetbyname __P ((__const char *__name));
    argument is a pointer to a variable which gets the value which
    would be stored in the global variable `herrno' by the
    non-reentrant functions.  */
-extern int __getnetent_r __P ((struct netent *__result_buf, char *__buf,
-			       size_t __buflen, struct netent **__result,
-			       int *__h_errnop));
-extern int getnetent_r __P ((struct netent *__result_buf, char *__buf,
-			     size_t __buflen, struct netent **__result,
-			     int *__h_errnop));
+extern int __getnetent_r __P ((struct netent *__restrict __result_buf,
+			       char *__restrict __buf, size_t __buflen,
+			       struct netent **__restrict __result,
+			       int *__restrict __h_errnop));
+extern int getnetent_r __P ((struct netent *__restrict __result_buf,
+			     char *__restrict __buf, size_t __buflen,
+			     struct netent **__restrict __result,
+			     int *__restrict __h_errnop));
 
 extern int __getnetbyaddr_r __P ((unsigned long int __net, int __type,
-				  struct netent *__result_buf, char *__buf,
-				  size_t __buflen, struct netent **__result,
-				  int *__h_errnop));
+				  struct netent *__restrict __result_buf,
+				  char *__restrict __buf, size_t __buflen,
+				  struct netent **__restrict __result,
+				  int *__restrict __h_errnop));
 extern int getnetbyaddr_r __P ((unsigned long int __net, int __type,
-				struct netent *__result_buf, char *__buf,
-				size_t __buflen, struct netent **__result,
-				int *__h_errnop));
-
-extern int __getnetbyname_r __P ((__const char *__name,
-				  struct netent *__result_buf, char *__buf,
-				  size_t __buflen, struct netent **__result,
-				  int *__h_errnop));
-extern int getnetbyname_r __P ((__const char *__name,
-				struct netent *__result_buf, char *__buf,
-				size_t __buflen, struct netent **__result,
-				int *__h_errnop));
+				struct netent *__restrict __result_buf,
+				char *__restrict __buf, size_t __buflen,
+				struct netent **__restrict __result,
+				int *__restrict __h_errnop));
+
+extern int __getnetbyname_r __P ((__const char *__restrict __name,
+				  struct netent *__restrict __result_buf,
+				  char *__restrict __buf, size_t __buflen,
+				  struct netent **__restrict __result,
+				  int *__restrict __h_errnop));
+extern int getnetbyname_r __P ((__const char *__restrict __name,
+				struct netent *__restrict __result_buf,
+				char *__restrict __buf, size_t __buflen,
+				struct netent **__restrict __result,
+				int *__restrict __h_errnop));
 #endif	/* misc */
 
 
@@ -275,26 +291,33 @@ extern struct servent *getservbyport __P ((int __port, __const char *__proto));
 #ifdef	__USE_MISC
 /* Reentrant versions of the functions above.  The additional
    arguments specify a buffer of BUFLEN starting at BUF.  */
-extern int __getservent_r __P ((struct servent *__result_buf, char *__buf,
-				size_t __buflen, struct servent **__result));
-extern int getservent_r __P ((struct servent *__result_buf, char *__buf,
-			      size_t __buflen, struct servent **__result));
-
-extern int __getservbyname_r __P ((__const char *__name, __const char *__proto,
-				   struct servent *__result_buf, char *__buf,
-				   size_t __buflen,
-				   struct servent **__result));
-extern int getservbyname_r __P ((__const char *__name, __const char *__proto,
-				 struct servent *__result_buf, char *__buf,
-				 size_t __buflen, struct servent **__result));
-
-extern int __getservbyport_r __P ((int __port, __const char *__proto,
-				   struct servent *__result_buf, char *__buf,
-				   size_t __buflen,
-				   struct servent **__result));
-extern int getservbyport_r __P ((int __port, __const char *__proto,
-				 struct servent *__result_buf, char *__buf,
-				 size_t __buflen, struct servent **__result));
+extern int __getservent_r __P ((struct servent *__restrict __result_buf,
+				char *__restrict __buf, size_t __buflen,
+				struct servent **__restrict __result));
+extern int getservent_r __P ((struct servent *__restrict __result_buf,
+			      char *__restrict __buf, size_t __buflen,
+			      struct servent **__restrict __result));
+
+extern int __getservbyname_r __P ((__const char *__restrict __name,
+				   __const char *__restrict __proto,
+				   struct servent *__restrict __result_buf,
+				   char *__restrict __buf, size_t __buflen,
+				   struct servent **__restrict __result));
+extern int getservbyname_r __P ((__const char *__restrict __name,
+				 __const char *__restrict __proto,
+				 struct servent *__restrict __result_buf,
+				 char *__restrict __buf, size_t __buflen,
+				 struct servent **__restrict __result));
+
+extern int __getservbyport_r __P ((int __port,
+				   __const char *__restrict __proto,
+				   struct servent *__restrict __result_buf,
+				   char *__restrict __buf, size_t __buflen,
+				   struct servent **__restrict __result));
+extern int getservbyport_r __P ((int __port, __const char *__restrict __proto,
+				 struct servent *__restrict __result_buf,
+				 char *__restrict __buf, size_t __buflen,
+				 struct servent **__restrict __result));
 #endif	/* misc */
 
 
@@ -327,26 +350,30 @@ extern struct protoent *getprotobynumber __P ((int __proto));
 #ifdef	__USE_MISC
 /* Reentrant versions of the functions above.  The additional
    arguments specify a buffer of BUFLEN starting at BUF.  */
-extern int __getprotoent_r __P ((struct protoent *__result_buf, char *__buf,
-				 size_t __buflen, struct protoent **__result));
-extern int getprotoent_r __P ((struct protoent *__result_buf, char *__buf,
-			       size_t __buflen, struct protoent **__result));
-
-extern int __getprotobyname_r __P ((__const char *__name,
-				    struct protoent *__result_buf, char *__buf,
-				    size_t __buflen,
-				    struct protoent **__result));
-extern int getprotobyname_r __P ((__const char *__name,
-				  struct protoent *__result_buf, char *__buf,
-				  size_t __buflen,
-				  struct protoent **__result));
-
-extern int __getprotobynumber_r __P ((int __proto, struct protoent *__res_buf,
-				      char *__buf, size_t __buflen,
-				      struct protoent **__result));
-extern int getprotobynumber_r __P ((int __proto, struct protoent *__result_buf,
-				    char *__buf, size_t __buflen,
-				    struct protoent **__result));
+extern int __getprotoent_r __P ((struct protoent *__restrict __result_buf,
+				 char *__restrict __buf, size_t __buflen,
+				 struct protoent **__restrict __result));
+extern int getprotoent_r __P ((struct protoent *__restrict __result_buf,
+			       char *__restrict __buf, size_t __buflen,
+			       struct protoent **__restrict __result));
+
+extern int __getprotobyname_r __P ((__const char *__restrict __name,
+				    struct protoent *__restrict __result_buf,
+				    char *__restrict __buf, size_t __buflen,
+				    struct protoent **__restrict __result));
+extern int getprotobyname_r __P ((__const char *__restrict __name,
+				  struct protoent *__restrict __result_buf,
+				  char *__restrict __buf, size_t __buflen,
+				  struct protoent **__restrict __result));
+
+extern int __getprotobynumber_r __P ((int __proto,
+				      struct protoent *__restrict __res_buf,
+				      char *__restrict __buf, size_t __buflen,
+				      struct protoent **__restrict __result));
+extern int getprotobynumber_r __P ((int __proto,
+				    struct protoent *__restrict __result_buf,
+				    char *__restrict __buf, size_t __buflen,
+				    struct protoent **__restrict __result));
 #endif	/* misc */
 
 
@@ -358,8 +385,9 @@ extern void endnetgrent __P ((void));
 
 /* Get next member of netgroup established by last `setnetgrent' call
    and return pointers to elements in HOSTP, USERP, and DOMAINP.  */
-extern int getnetgrent __P ((char **__hostp, char **__userp,
-			     char **__domainp));
+extern int getnetgrent __P ((char **__restrict __hostp,
+			     char **__restrict __userp,
+			     char **__restrict __domainp));
 
 /* Test whether NETGROUP contains the triple (HOST,USER,DOMAIN).  */
 extern int innetgr __P ((__const char *__netgroup, __const char *__host,
@@ -367,12 +395,14 @@ extern int innetgr __P ((__const char *__netgroup, __const char *__host,
 
 #ifdef	__USE_MISC
 /* Reentrant version of `getnetgrent' where result is placed in BUFFER.  */
-extern int __getnetgrent_r __P ((char **__hostp, char **__userp,
-				 char **__domainp,
-				 char *__buffer, size_t __buflen));
-extern int getnetgrent_r __P ((char **__hostp, char **__userp,
-			       char **__domainp,
-			       char *__buffer, size_t __buflen));
+extern int __getnetgrent_r __P ((char **__restrict __hostp,
+				 char **__restrict __userp,
+				 char **__restrict __domainp,
+				 char *__restrict __buffer, size_t __buflen));
+extern int getnetgrent_r __P ((char **__restrict __hostp,
+			       char **__restrict __userp,
+			       char **__restrict __domainp,
+			       char *__restrict __buffer, size_t __buflen));
 #endif	/* misc */
 
 
@@ -383,18 +413,21 @@ extern int getnetgrent_r __P ((char **__hostp, char **__userp,
    connection is returned.  The caller must have the right to use a
    reserved port.  When the function returns *AHOST contains the
    official host name.  */
-extern int rcmd __P ((char **__ahost, unsigned short int __rport,
-		      __const char *__locuser, __const char *__remuser,
-		      __const char *__cmd, int *__fd2p));
+extern int rcmd __P ((char **__restrict __ahost, unsigned short int __rport,
+		      __const char *__restrict __locuser,
+		      __const char *__restrict __remuser,
+		      __const char *__restrict __cmd, int *__restrict __fd2p));
 
 /* Call `rexecd' at port RPORT on remote machine *AHOST to execute
    CMD.  The process runs at the remote machine using the ID of user
    NAME whose cleartext password is PASSWD.  In *FD2P the descriptor
    to the socket for the connection is returned.  When the function
    returns *AHOST contains the official host name.  */
-extern int rexec __P ((char **__ahost, int __rport, __const char *__name,
-		       __const char *__pass, __const char *__cmd,
-		       int *__fd2p));
+extern int rexec __P ((char **__restrict __ahost, int __rport,
+		       __const char *__restrict __name,
+		       __const char *__restrict __pass,
+		       __const char *__restrict __cmd,
+		       int *__restrict __fd2p));
 
 /* Check whether user REMUSER on system RHOST is allowed to login as LOCUSER.
    If SUSER is not zero the user tries to become superuser.  Return 0 if
@@ -453,9 +486,10 @@ struct addrinfo
 
 /* Translate name of a service location and/or a service name to set of
    socket addresses.  */
-extern int getaddrinfo __P ((__const char *__name, __const char *__service,
-			     __const struct addrinfo *__req,
-			     struct addrinfo **__pai));
+extern int getaddrinfo __P ((__const char *__restrict __name,
+			     __const char *__restrict __service,
+			     __const struct addrinfo *__restrict __req,
+			     struct addrinfo **__restrict __pai));
 
 /* Free `addrinfo' structure AI including associated storage.  */
 extern void freeaddrinfo __P ((struct addrinfo *__ai));
@@ -464,9 +498,10 @@ extern void freeaddrinfo __P ((struct addrinfo *__ai));
 extern char *gai_strerror __P  ((int __ecode));
 
 /* Translate a socket address to a location and service name.  */
-extern int getnameinfo __P ((__const struct sockaddr *__sa, socklen_t __salen,
-			     char *__host, size_t __hostlen,
-			     char *__serv, size_t __servlen,
+extern int getnameinfo __P ((__const struct sockaddr *__restrict __sa,
+			     socklen_t __salen,
+			     char *__restrict __host, size_t __hostlen,
+			     char *__restrict __serv, size_t __servlen,
 			     int __flags));
 
 #endif	/* POSIX */
diff --git a/rt/aio.h b/rt/aio.h
index 51effccc7e..cbfbe66b24 100644
--- a/rt/aio.h
+++ b/rt/aio.h
@@ -143,8 +143,9 @@ extern int aio_read __P ((struct aiocb *__aiocbp));
 extern int aio_write __P ((struct aiocb *__aiocbp));
 
 /* Initiate list of I/O requests.  */
-extern int lio_listio __P ((int __mode, struct aiocb *__const __list[],
-			    int __nent, struct sigevent *__sig));
+extern int lio_listio __P ((int __mode,
+			    struct aiocb *__const __list[],
+			    int __nent, struct sigevent *__restrict __sig));
 
 /* Retrieve error status associated with AIOCBP.  */
 extern int aio_error __P ((__const struct aiocb *__aiocbp));
@@ -158,7 +159,8 @@ extern int aio_cancel __P ((int __fildes, struct aiocb *__aiocbp));
 /* Suspend calling thread until at least one of the asynchronous I/O
    operations referenced by LIST has completed.  */
 extern int aio_suspend __P ((__const struct aiocb *__const __list[],
-			     int __nent, __const struct timespec *__timeout));
+			     int __nent,
+			     __const struct timespec *__restrict __timeout));
 
 /* Force all operations associated with file desriptor described by
    `aio_fildes' member of AIOCBP.  */
@@ -168,9 +170,10 @@ extern int aio_fsync __P ((int __operation, struct aiocb *__aiocbp));
 extern int __REDIRECT (aio_read, __P ((struct aiocb *__aiocbp)), aio_read64);
 extern int __REDIRECT (aio_write, __P ((struct aiocb *__aiocbp)), aio_write64);
 
-extern int __REDIRECT (lio_listio, __P ((int __mode,
-					 struct aiocb *__const __list[],
-					 int __nent, struct sigevent *__sig)),
+extern int __REDIRECT (lio_listio,
+		       __P ((int __mode,
+			     struct aiocb *__const __restrict __list[],
+			     int __nent, struct sigevent *__restrict __sig)),
 		       lio_listio64);
 
 extern int __REDIRECT (aio_error, __P ((__const struct aiocb *__aiocbp)),
@@ -183,8 +186,9 @@ extern int __REDIRECT (aio_cancel, __P ((int __fildes,
 		       aio_cancel64);
 
 extern int __REDIRECT (aio_suspend,
-		       __P ((__const struct aiocb *__const __list[],
-			     int __nent, __const struct timespec *__timeout)),
+		       __P ((__const struct aiocb *__const __restrict __list[],
+			     int __nent,
+			     __const struct timespec *__restrict __timeout)),
 		       aio_suspend64);
 
 extern int __REDIRECT (aio_fsync __P ((int __operation,
@@ -207,8 +211,9 @@ extern int __REDIRECT (aio_fsync __P ((int __operation,
 extern int aio_read64 __P ((struct aiocb64 *__aiocbp));
 extern int aio_write64 __P ((struct aiocb64 *__aiocbp));
 
-extern int lio_listio64 __P ((int __mode, struct aiocb64 *__const __list[],
-			      int __nent, struct sigevent *__sig));
+extern int lio_listio64 __P ((int __mode,
+			      struct aiocb64 *__const __list[], int __nent,
+			      struct sigevent *__restrict __sig));
 
 extern int aio_error64 __P ((__const struct aiocb64 *__aiocbp));
 extern __ssize_t aio_return64 __P ((struct aiocb64 *__aiocbp));
@@ -217,7 +222,7 @@ extern int aio_cancel64 __P ((int __fildes, struct aiocb64 *__aiocbp));
 
 extern int aio_suspend64 __P ((__const struct aiocb64 *__const __list[],
 			       int __nent,
-			       __const struct timespec *__timeout));
+			       __const struct timespec *__restrict __timeout));
 
 extern int aio_fsync64 __P ((int __operation, struct aiocb64 *__aiocbp));
 #endif
diff --git a/stdio-common/printf.h b/stdio-common/printf.h
index 852027ce21..18b2f4ab8a 100644
--- a/stdio-common/printf.h
+++ b/stdio-common/printf.h
@@ -91,9 +91,9 @@ extern int register_printf_function __P ((int __spec, printf_function __func,
    array it is passed with the types of the arguments it wants, and return
    the number of arguments it wants.  */
 
-extern size_t parse_printf_format __P ((__const char *__fmt,
+extern size_t parse_printf_format __P ((__const char *__restrict __fmt,
 					size_t __n,
-					int *__argtypes));
+					int *__restrict __argtypes));
 
 
 /* Codes returned by `parse_printf_format' for basic types.
@@ -130,12 +130,14 @@ enum
    of magnitude used for numbers ('k' for kilo, 'm' for mega etc).  If
    the format specifier is a uppercase character powers of 1000 are
    used.  Otherwise powers of 1024.  */
-extern int printf_size __P ((FILE *__fp, __const struct printf_info *__info,
-			     __const void *__const *args));
+extern int printf_size __P ((FILE *__restrict __fp,
+			     __const struct printf_info *__info,
+			     __const void *__const *__restrict __args));
 
 /* This is the appropriate argument information function for `printf_size'.  */
-extern int printf_size_info __P ((__const struct printf_info *__info,
-				  size_t __n, int *__argtypes));
+extern int printf_size_info __P ((__const struct printf_info *__restrict
+				  __info, size_t __n,
+				  int *__restrict __argtypes));
 
 
 __END_DECLS
diff --git a/stdlib/monetary.h b/stdlib/monetary.h
index aa9aa63986..d0dcaadfd7 100644
--- a/stdlib/monetary.h
+++ b/stdlib/monetary.h
@@ -1,5 +1,5 @@
 /* Header file for monetary value formatting functions.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 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
@@ -28,15 +28,16 @@
 __BEGIN_DECLS
 
 /* Formatting a monetary value according to the current locale.  */
-extern ssize_t strfmon __P ((char *__s, size_t __maxsize,
-			     __const char *__format, ...));
+extern ssize_t strfmon __P ((char *__restrict __s, size_t __maxsize,
+			     __const char *__restrict __format, ...));
 
 #ifdef __USE_GNU
 # include <xlocale.h>
 
 /* Formatting a monetary value according to the current locale.  */
-extern ssize_t __strfmon_l __P ((char *__s, size_t __maxsize, __locale_t loc,
-				 __const char *__format, ...));
+extern ssize_t __strfmon_l __P ((char *__restrict __s, size_t __maxsize,
+				 __locale_t loc,
+				 __const char *__restrict __format, ...));
 #endif
 
 __END_DECLS
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 0b4120967e..355c649652 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -372,14 +372,18 @@ struct random_data
     int32_t *end_ptr;		/* Pointer behind state table.  */
   };
 
-extern int random_r __P ((struct random_data *__buf, int32_t *__result));
+extern int random_r __P ((struct random_data *__restrict __buf,
+			  int32_t *__restrict __result));
 
 extern int srandom_r __P ((unsigned int __seed, struct random_data *__buf));
 
-extern int initstate_r __P ((unsigned int __seed, __ptr_t __statebuf,
-			     size_t __statelen, struct random_data *__buf));
+extern int initstate_r __P ((unsigned int __seed,
+			     __ptr_t __restrict __statebuf,
+			     size_t __statelen,
+			     struct random_data *__restrict __buf));
 
-extern int setstate_r __P ((__ptr_t __statebuf, struct random_data *__buf));
+extern int setstate_r __P ((__ptr_t __restrict __statebuf,
+			    struct random_data *__restrict __buf));
 # endif	/* Use misc.  */
 #endif	/* Use SVID || extended X/Open.  */
 
@@ -427,19 +431,25 @@ struct drand48_data
 
 # ifdef __USE_MISC
 /* Return non-negative, double-precision floating-point value in [0.0,1.0).  */
-extern int drand48_r __P ((struct drand48_data *__buffer, double *__result));
+extern int drand48_r __P ((struct drand48_data *__restrict __buffer,
+			   double *__restrict __result));
 extern int erand48_r __P ((unsigned short int __xsubi[3],
-			   struct drand48_data *__buffer, double *__result));
+			   struct drand48_data *__restrict __buffer,
+			   double *__restrict __result));
 
 /* Return non-negative, long integer in [0,2^31).  */
-extern int lrand48_r __P ((struct drand48_data *__buffer, long int *__result));
+extern int lrand48_r __P ((struct drand48_data *__restrict __buffer,
+			   long int *__restrict __result));
 extern int nrand48_r __P ((unsigned short int __xsubi[3],
-			   struct drand48_data *__buffer, long int *__result));
+			   struct drand48_data *__restrict __buffer,
+			   long int *__restrict __result));
 
 /* Return signed, long integers in [-2^31,2^31).  */
-extern int mrand48_r __P ((struct drand48_data *__buffer, long int *__result));
+extern int mrand48_r __P ((struct drand48_data *__restrict __buffer,
+			   long int *__restrict __result));
 extern int jrand48_r __P ((unsigned short int __xsubi[3],
-			   struct drand48_data *__buffer, long int *__result));
+			   struct drand48_data *__restrict __buffer,
+			   long int *__restrict __result));
 
 /* Seed random number generator.  */
 extern int srand48_r __P ((long int __seedval, struct drand48_data *__buffer));
@@ -572,7 +582,8 @@ extern char *canonicalize_file_name __P ((__const char *__name));
    name is PATH_MAX chars or more, returns null with `errno' set to
    ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars, returns the
    name in RESOLVED.  */
-extern char *realpath __P ((__const char *__name, char *__resolved));
+extern char *realpath __P ((__const char *__restrict __name,
+			    char *__restrict __resolved));
 #endif
 
 
@@ -627,14 +638,14 @@ __extension__ extern lldiv_t lldiv __P ((long long int __numer,
 /* Convert VALUE to a string with NDIGIT digits and return a pointer to
    this.  Set *DECPT with the position of the decimal character and *SIGN
    with the sign of the number.  */
-extern char *ecvt __P ((double __value, int __ndigit, int *__decpt,
-			int *__sign));
+extern char *ecvt __P ((double __value, int __ndigit, int *__restrict __decpt,
+			int *__restrict __sign));
 
 /* Convert VALUE to a string rounded to NDIGIT decimal digits.  Set *DECPT
    with the position of the decimal character and *SIGN with the sign of
    the number.  */
-extern char *fcvt __P ((double __value, int __ndigit, int *__decpt,
-			int *__sign));
+extern char *fcvt __P ((double __value, int __ndigit, int *__restrict __decpt,
+			int *__restrict __sign));
 
 /* If possible convert VALUE to a string with NDIGIT significant digits.
    Otherwise use exponential representation.  The resulting string will
@@ -642,25 +653,29 @@ extern char *fcvt __P ((double __value, int __ndigit, int *__decpt,
 extern char *gcvt __P ((double __value, int __ndigit, char *__buf));
 
 /* Long double versions of above functions.  */
-extern char *qecvt __P ((__long_double_t __value, int __ndigit, int *__decpt,
-			 int *__sign));
-extern char *qfcvt __P ((__long_double_t __value, int __ndigit, int *__decpt,
-			 int *__sign));
+extern char *qecvt __P ((__long_double_t __value, int __ndigit,
+			 int *__restrict __decpt, int *__restrict __sign));
+extern char *qfcvt __P ((__long_double_t __value, int __ndigit,
+			 int *__restrict __decpt, int *__restrict __sign));
 extern char *qgcvt __P ((__long_double_t __value, int __ndigit, char *__buf));
 
 
 # ifdef __USE_MISC
 /* Reentrant version of the functions above which provide their own
    buffers.  */
-extern int ecvt_r __P ((double __value, int __ndigit, int *__decpt,
-			int *__sign, char *__buf, size_t __len));
-extern int fcvt_r __P ((double __value, int __ndigit, int *__decpt,
-			int *__sign, char *__buf, size_t __len));
-
-extern int qecvt_r __P ((__long_double_t __value, int __ndigit, int *__decpt,
-			 int *__sign, char *__buf, size_t __len));
-extern int qfcvt_r __P ((__long_double_t __value, int __ndigit, int *__decpt,
-			 int *__sign, char *__buf, size_t __len));
+extern int ecvt_r __P ((double __value, int __ndigit, int *__restrict __decpt,
+			int *__restrict __sign, char *__restrict __buf,
+			size_t __len));
+extern int fcvt_r __P ((double __value, int __ndigit, int *__restrict __decpt,
+			int *__restrict __sign, char *__restrict __buf,
+			size_t __len));
+
+extern int qecvt_r __P ((__long_double_t __value, int __ndigit,
+			 int *__restrict __decpt, int *__restrict __sign,
+			 char *__restrict __buf, size_t __len));
+extern int qfcvt_r __P ((__long_double_t __value, int __ndigit,
+			 int *__restrict __decpt, int *__restrict __sign,
+			 char *__restrict __buf, size_t __len));
 # endif	/* misc */
 #endif	/* use MISC || use X/Open Unix */
 
@@ -701,8 +716,9 @@ extern int rpmatch __P ((__const char *__response));
    not part of TOKENS return in *VALUEP beginning of unknown
    suboption.  On exit *OPTIONP is set to the beginning of the next
    token or at the terminating NUL character.  */
-extern int getsubopt __P ((char **__optionp, __const char *__const *__tokens,
-			   char **__valuep));
+extern int getsubopt __P ((char **__restrict __optionp,
+			   __const char *__const *__restrict __tokens,
+			   char **__restrict __valuep));
 #endif
 
 
diff --git a/string/argz.h b/string/argz.h
index 437dba4cb6..4b25cc071b 100644
--- a/string/argz.h
+++ b/string/argz.h
@@ -40,19 +40,23 @@ __BEGIN_DECLS
 /* Make a '\0' separated arg vector from a unix argv vector, returning it in
    ARGZ, and the total length in LEN.  If a memory allocation error occurs,
    ENOMEM is returned, otherwise 0.  The result can be destroyed using free. */
-extern error_t __argz_create __P ((char *__const __argv[], char **__argz,
-				   size_t *__len));
-extern error_t argz_create __P ((char *__const __argv[], char **__argz,
-				 size_t *__len));
+extern error_t __argz_create __P ((char *__const __argv[],
+				   char **__restrict __argz,
+				   size_t *__restrict __len));
+extern error_t argz_create __P ((char *__const __argv[],
+				 char **__restrict __argz,
+				 size_t *__restrict __len));
 
 /* Make a '\0' separated arg vector from a SEP separated list in
    STRING, returning it in ARGZ, and the total length in LEN.  If a
    memory allocation error occurs, ENOMEM is returned, otherwise 0.
    The result can be destroyed using free.  */
-extern error_t __argz_create_sep __P ((__const char *__string, int __sep,
-				       char **__argz, size_t *__len));
-extern error_t argz_create_sep __P ((__const char *__string, int __sep,
-				     char **__argz, size_t *__len));
+extern error_t __argz_create_sep __P ((__const char *__restrict __string,
+				       int __sep, char **__restrict __argz,
+				       size_t *__restrict __len));
+extern error_t argz_create_sep __P ((__const char *__restrict __string,
+				     int __sep, char **__restrict __argz,
+				     size_t *__restrict __len));
 
 /* Returns the number of strings in ARGZ.  */
 extern size_t __argz_count __P ((__const char *__argz, size_t __len));
@@ -60,10 +64,10 @@ extern size_t argz_count __P ((__const char *__argz, size_t __len));
 
 /* Puts pointers to each string in ARGZ into ARGV, which must be large enough
    to hold them all.  */
-extern void __argz_extract __P ((__const char *__argz, size_t __len,
-				 char **__argv));
-extern void argz_extract __P ((__const char *__argz, size_t __len,
-			       char **__argv));
+extern void __argz_extract __P ((__const char *__restrict __argz, size_t __len,
+				 char **__restrict __argv));
+extern void argz_extract __P ((__const char *__restrict __argz, size_t __len,
+			       char **__restrict __argv));
 
 /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
    except the last into the character SEP.  */
@@ -71,29 +75,41 @@ extern void __argz_stringify __P ((char *__argz, size_t __len, int __sep));
 extern void argz_stringify __P ((char *__argz, size_t __len, int __sep));
 
 /* Append BUF, of length BUF_LEN to the argz vector in ARGZ & ARGZ_LEN.  */
-extern error_t __argz_append __P ((char **__argz, size_t *__argz_len,
-				   __const char *__buf, size_t _buf_len));
-extern error_t argz_append __P ((char **__argz, size_t *__argz_len,
-				 __const char *__buf, size_t __buf_len));
+extern error_t __argz_append __P ((char **__restrict __argz,
+				   size_t *__restrict __argz_len,
+				   __const char *__restrict __buf,
+				   size_t _buf_len));
+extern error_t argz_append __P ((char **__restrict __argz,
+				 size_t *__restrict __argz_len,
+				 __const char *__restrict __buf,
+				 size_t __buf_len));
 
 /* Append STR to the argz vector in ARGZ & ARGZ_LEN.  */
-extern error_t __argz_add __P ((char **__argz, size_t *__argz_len,
-				__const char *__str));
-extern error_t argz_add __P ((char **__argz, size_t *__argz_len,
-			      __const char *__str));
+extern error_t __argz_add __P ((char **__restrict __argz,
+				size_t *__restrict __argz_len,
+				__const char *__restrict __str));
+extern error_t argz_add __P ((char **__restrict __argz,
+			      size_t *__restrict __argz_len,
+			      __const char *__restrict __str));
 
 /* Append SEP separated list in STRING to the argz vector in ARGZ &
    ARGZ_LEN.  */
-extern error_t __argz_add_sep __P ((char **__argz, size_t *__argz_len,
-				    __const char *__string, int __delim));
-extern error_t argz_add_sep __P ((char **__argz, size_t *__argz_len,
-				  __const char *__string, int __delim));
+extern error_t __argz_add_sep __P ((char **__restrict __argz,
+				    size_t *__restrict __argz_len,
+				    __const char *__restrict __string,
+				    int __delim));
+extern error_t argz_add_sep __P ((char **__restrict __argz,
+				  size_t *__restrict __argz_len,
+				  __const char *__restrict __string,
+				  int __delim));
 
 /* Delete ENTRY from ARGZ & ARGZ_LEN, if it appears there.  */
-extern void __argz_delete __P ((char **__argz, size_t *__argz_len,
-				char *__entry));
-extern void argz_delete __P ((char **__argz, size_t *__argz_len,
-			      char *__entry));
+extern void __argz_delete __P ((char **__restrict __argz,
+				size_t *__restrict __argz_len,
+				char *__restrict __entry));
+extern void argz_delete __P ((char **__restrict __argz,
+			      size_t *__restrict __argz_len,
+			      char *__restrict __entry));
 
 /* Insert ENTRY into ARGZ & ARGZ_LEN before BEFORE, which should be an
    existing entry in ARGZ; if BEFORE is NULL, ENTRY is appended to the end.
@@ -101,20 +117,28 @@ extern void argz_delete __P ((char **__argz, size_t *__argz_len,
    ARGZ, ENTRY) will insert ENTRY at the beginning of ARGZ.  If BEFORE is not
    in ARGZ, EINVAL is returned, else if memory can't be allocated for the new
    ARGZ, ENOMEM is returned, else 0.  */
-extern error_t __argz_insert __P ((char **__argz, size_t *__argz_len,
-				   char *__before, __const char *__entry));
-extern error_t argz_insert __P ((char **__argz, size_t *__argz_len,
-				 char *__before, __const char *__entry));
+extern error_t __argz_insert __P ((char **__restrict __argz,
+				   size_t *__restrict __argz_len,
+				   char *__restrict __before,
+				   __const char *__restrict __entry));
+extern error_t argz_insert __P ((char **__restrict __argz,
+				 size_t *__restrict __argz_len,
+				 char *__restrict __before,
+				 __const char *__restrict __entry));
 
 /* Replace any occurances of the string STR in ARGZ with WITH, reallocating
    ARGZ as necessary.  If REPLACE_COUNT is non-zero, *REPLACE_COUNT will be
    incremented by number of replacements performed.  */
-extern error_t __argz_replace (char **__argz, size_t *__argz_len,
-			       __const char *__str, __const char *__with,
-			       unsigned *__replace_count);
-extern error_t argz_replace (char **__argz, size_t *__argz_len,
-			     __const char *__str, __const char *__with,
-			     unsigned *__replace_count);
+extern error_t __argz_replace (char **__restrict __argz,
+			       size_t *__restrict __argz_len,
+			       __const char *__restrict __str,
+			       __const char *__restrict __with,
+			       unsigned int *__restrict __replace_count);
+extern error_t argz_replace (char **__restrict __argz,
+			     size_t *__restrict __argz_len,
+			     __const char *__restrict __str,
+			     __const char *__restrict __with,
+			     unsigned int *__restrict __replace_count);
 
 /* Returns the next entry in ARGZ & ARGZ_LEN after ENTRY, or NULL if there
    are no more.  If entry is NULL, then the first entry is returned.  This
@@ -130,10 +154,12 @@ extern error_t argz_replace (char **__argz, size_t *__argz_len,
     for (entry = argz; entry; entry = argz_next (argz, argz_len, entry))
       ...;
 */
-extern char *__argz_next __P ((__const char *argz, size_t __argz_len,
-			       __const char *entry));
-extern char *argz_next __P ((__const char *argz, size_t __argz_len,
-			     __const char *entry));
+extern char *__argz_next __P ((__const char *__restrict __argz,
+			       size_t __argz_len,
+			       __const char *__restrict __entry));
+extern char *argz_next __P ((__const char *__restrict __argz,
+			     size_t __argz_len,
+			     __const char *__restrict __entry));
 
 #ifdef __USE_EXTERN_INLINES
 extern inline char *
diff --git a/string/envz.h b/string/envz.h
index adb8c0af40..f9a8e6934f 100644
--- a/string/envz.h
+++ b/string/envz.h
@@ -31,13 +31,14 @@
 __BEGIN_DECLS
 
 /* Returns a pointer to the entry in ENVZ for NAME, or 0 if there is none.  */
-extern char *envz_entry __P ((__const char *__envz, size_t __envz_len,
-			      __const char *__name));
+extern char *envz_entry __P ((__const char *__restrict __envz,
+			      size_t __envz_len,
+			      __const char *__restrict __name));
 
 /* Returns a pointer to the value portion of the entry in ENVZ for NAME, or 0
    if there is none.  */
-extern char *envz_get __P ((__const char *__envz, size_t __envz_len,
-			    __const char *__name));
+extern char *envz_get __P ((__const char *__restrict __envz, size_t __envz_len,
+			    __const char *__restrict __name));
 
 /* Adds an entry for NAME with value VALUE to ENVZ & ENVZ_LEN.  If an entry
    with the same name already exists in ENVZ, it is removed.  If VALUE is
@@ -45,22 +46,27 @@ extern char *envz_get __P ((__const char *__envz, size_t __envz_len,
    return NULL, although envz_entry will still return an entry; this is handy
    because when merging with another envz, the null entry can override an
    entry in the other one.  Null entries can be removed with envz_strip ().  */
-extern error_t envz_add __P ((char **__envz, size_t *__envz_len,
-			      __const char *__name, __const char *__value));
+extern error_t envz_add __P ((char **__restrict __envz,
+			      size_t *__restrict __envz_len,
+			      __const char *__restrict __name,
+			      __const char *__restrict __value));
 
 /* Adds each entry in ENVZ2 to ENVZ & ENVZ_LEN, as if with envz_add().  If
    OVERRIDE is true, then values in ENVZ2 will supersede those with the same
    name in ENV, otherwise not.  */
-extern error_t envz_merge __P ((char **__envz, size_t *__envz_len,
-				__const char *__envz2, size_t __envz2_len,
-				int __override));
+extern error_t envz_merge __P ((char **__restrict __envz,
+				size_t *__restrict __envz_len,
+				__const char *__restrict __envz2,
+				size_t __envz2_len, int __override));
 
 /* Remove the entry for NAME from ENVZ & ENVZ_LEN, if any.  */
-extern void envz_remove __P ((char **__envz, size_t *__envz_len,
-			      __const char *__name));
+extern void envz_remove __P ((char **__restrict __envz,
+			      size_t *__restrict __envz_len,
+			      __const char *__restrict __name));
 
 /* Remove null entries.  */
-extern void envz_strip __P ((char **__envz, size_t *__envz_len));
+extern void envz_strip __P ((char **__restrict __envz,
+			     size_t *__restrict __envz_len));
 
 __END_DECLS
 
diff --git a/string/string.h b/string/string.h
index 5ded08f58b..201cff5f74 100644
--- a/string/string.h
+++ b/string/string.h
@@ -167,11 +167,13 @@ extern char *strtok __P ((char *__restrict __s,
 
 /* Divide S into tokens separated by characters in DELIM.  Information
    passed between calls are stored in SAVE_PTR.  */
-extern char *__strtok_r __P ((char *__s, __const char *__delim,
-			      char **__save_ptr));
+extern char *__strtok_r __P ((char *__restrict __s,
+			      __const char *__restrict __delim,
+			      char **__restrict __save_ptr));
 #if defined __USE_POSIX || defined __USE_MISC
-extern char *strtok_r __P ((char *__s, __const char *__delim,
-			    char **__save_ptr));
+extern char *strtok_r __P ((char *__restrict __s,
+			    __const char *__restrict __delim,
+			    char **__restrict __save_ptr));
 #endif
 
 #ifdef __USE_GNU
@@ -268,7 +270,8 @@ extern int __strncasecmp_l __P ((__const char *__s1, __const char *__s2,
 #ifdef	__USE_BSD
 /* Return the next DELIM-delimited token from *STRINGP,
    terminating it with a '\0', and update *STRINGP to point past it.  */
-extern char *strsep __P ((char **__stringp, __const char *__delim));
+extern char *strsep __P ((char **__restrict __stringp,
+			  __const char *__restrict __delim));
 #endif
 
 #ifdef	__USE_GNU
@@ -279,13 +282,17 @@ extern int strverscmp __P ((__const char *__s1, __const char *__s2));
 extern char *strsignal __P ((int __sig));
 
 /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
-extern char *__stpcpy __P ((char *__dest, __const char *__src));
-extern char *stpcpy __P ((char *__dest, __const char *__src));
+extern char *__stpcpy __P ((char *__restrict __dest,
+			    __const char *__restrict __src));
+extern char *stpcpy __P ((char *__restrict __dest,
+			  __const char *__restrict __src));
 
 /* Copy no more than N characters of SRC to DEST, returning the address of
    the last character written into DEST.  */
-extern char *__stpncpy __P ((char *__dest, __const char *__src, size_t __n));
-extern char *stpncpy __P ((char *__dest, __const char *__src, size_t __n));
+extern char *__stpncpy __P ((char *__restrict __dest,
+			     __const char *__restrict __src, size_t __n));
+extern char *stpncpy __P ((char *__restrict __dest,
+			   __const char *__restrict __src, size_t __n));
 
 /* Sautee STRING briskly.  */
 extern char *strfry __P ((char *__string));
diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
index 53aa806ec2..b8a1e19359 100644
--- a/sysdeps/arm/dl-machine.h
+++ b/sysdeps/arm/dl-machine.h
@@ -284,6 +284,7 @@ _dl_start_user:
 	@ now we enter a _dl_init_next loop
 	ldr	r4, .L_MAIN_SEARCHLIST
 	ldr	r4, [sl, r4]
+	ldr	r4, [r4]
 	@ call _dl_init_next to get the address of an initalizer
 0:	mov	r0, r4
 	bl	_dl_init_next(PLT)
diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index 94c4361540..4f116b57cb 100644
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -112,16 +112,17 @@ if test $host = $build; then
     ac_prefix=$ac_default_prefix
   fi
   AC_MSG_CHECKING([for symlinks in ${ac_prefix}/include])
+  ac_message=
   if test -L ${ac_prefix}/include/net; then
-    message="   ${ac_prefix}/include/net is a symlink"
+    ac_message="$ac_message
+   ${ac_prefix}/include/net is a symlink"
   fi
   if test -L ${ac_prefix}/include/scsi; then
-    message="$message
+    ac_message="$ac_message
    ${ac_prefix}/include/scsi is a symlink"
   fi
-  if test -n "$message"; then
-    AC_MSG_ERROR([
-$message
+  if test -n "$ac_message"; then
+    AC_MSG_ERROR([$ac_message
 \`make install' will destroy the target of the link(s).
 Delete the links and re-run configure, or better still, move the entire
 ${ac_prefix}/include directory out of the way.])
diff --git a/sysdeps/unix/sysv/linux/sys/fsuid.h b/sysdeps/unix/sysv/linux/sys/fsuid.h
index fd30542e9f..cb8915a52e 100644
--- a/sysdeps/unix/sysv/linux/sys/fsuid.h
+++ b/sysdeps/unix/sysv/linux/sys/fsuid.h
@@ -25,7 +25,7 @@
 __BEGIN_DECLS
 
 /* Change uid used for file access control to UID, without affecting
-   other priveledges (such as who can send signals at the process).  */
+   other privileges (such as who can send signals at the process).  */
 extern int setfsuid __P ((__uid_t __uid));
 
 /* Ditto for group id. */
diff --git a/time/strptime.c b/time/strptime.c
index d126b14616..a26da5a88c 100644
--- a/time/strptime.c
+++ b/time/strptime.c
@@ -203,10 +203,13 @@ strptime_internal (buf, format, tm, decided)
   int cnt;
   size_t val;
   int have_I, is_pm;
+  int century, want_century;
 
   rp = buf;
   fmt = format;
   have_I = is_pm = 0;
+  century = -1;
+  want_century = 0;
 
   while (*fmt != '\0')
     {
@@ -343,7 +346,7 @@ strptime_internal (buf, format, tm, decided)
 	case 'C':
 	  /* Match century number.  */
 	  get_number (0, 99);
-	  /* We don't need the number.  */
+	  century = val;
 	  break;
 	case 'd':
 	case 'e':
@@ -548,11 +551,14 @@ strptime_internal (buf, format, tm, decided)
 	  /* The "Year 2000 :The Millennium Rollover" paper suggests that
 	     values in the range 69-99 refer to the twentieth century.  */
 	  tm->tm_year = val >= 69 ? val : val + 100;
+	  /* Indicate that we want to use the century, if specified
+	  want_century = 1;
 	  break;
 	case 'Y':
 	  /* Match year including century number.  */
 	  get_number (0, 9999);
 	  tm->tm_year = val - 1900;
+	  want_century = 0;
 	  break;
 	case 'Z':
 	  /* XXX How to handle this?  */
@@ -725,6 +731,9 @@ strptime_internal (buf, format, tm, decided)
   if (have_I && is_pm)
     tm->tm_hour += 12;
 
+  if (want_century && century != -1)
+    tm->tm_year = tm->tm_year % 100 + (century - 19) * 100;
+
   return (char *) rp;
 }
 
diff --git a/time/time.h b/time/time.h
index 374885290a..08b1da244c 100644
--- a/time/time.h
+++ b/time/time.h
@@ -214,15 +214,15 @@ extern struct tm *localtime __P ((__const time_t *__timer));
 # if defined __USE_POSIX || defined __USE_MISC
 /* Return the `struct tm' representation of *TIMER in UTC,
    using *TP to store the result.  */
-extern struct tm *__gmtime_r __P ((__const time_t *__timer,
-				   struct tm *__tp));
-extern struct tm *gmtime_r __P ((__const time_t *__timer,
-				 struct tm *__tp));
+extern struct tm *__gmtime_r __P ((__const time_t *__restrict __timer,
+				   struct tm *__restrict __tp));
+extern struct tm *gmtime_r __P ((__const time_t *__restrict __timer,
+				 struct tm *__restrict __tp));
 
 /* Return the `struct tm' representation of *TIMER in local time,
    using *TP to store the result.  */
-extern struct tm *localtime_r __P ((__const time_t *__timer,
-				    struct tm *__tp));
+extern struct tm *localtime_r __P ((__const time_t *__restrict __timer,
+				    struct tm *__restrict __tp));
 # endif	/* POSIX or misc */
 
 /* Return a string of the form "Day Mon dd hh:mm:ss yyyy\n"
@@ -237,10 +237,12 @@ extern char *ctime __P ((__const time_t *__timer));
 
 /* Return in BUF a string of the form "Day Mon dd hh:mm:ss yyyy\n"
    that is the representation of TP in this format.  */
-extern char *asctime_r __P ((__const struct tm *__tp, char *__buf));
+extern char *asctime_r __P ((__const struct tm *__restrict __tp,
+			     char *__restrict __buf));
 
 /* Equivalent to `asctime_r (localtime_r (timer, *TMP*), buf)'.  */
-extern char *ctime_r __P ((__const time_t *__timer, char *__buf));
+extern char *ctime_r __P ((__const time_t *__restrict __timer,
+			   char *__restrict __buf));
 # endif	/* POSIX or misc */
 
 
@@ -326,7 +328,8 @@ extern struct tm *getdate __P ((__const char *__string));
    variant.  The functionality is the same.  The result is returned in
    the buffer pointed to by RESBUFP and in case of an error the return
    value is != 0 with the same values as given above for `getdate_err'.  */
-extern int getdate_r __P ((__const char *__string, struct tm *__resbufp));
+extern int getdate_r __P ((__const char *__restrict __string,
+			   struct tm *__restrict __resbufp));
 # endif