Make sure the Fortran specifics have real(kind=16).

This brings the library to compile with all specific functions.
It also corrects the patsubst patterns so the right files
get the flags.

It was necessary to manually add -D__powerpc64__ because apparently
this is not set for Fortran.

libgfortran/ChangeLog:

	* Makefile.am: Correct files for compilation flags. Add
	-D__powerpc64__ for Fortran sources.  Get kinds.inc from
	grep of kinds.h and kinds-override.h.
	* Makefile.in: Regenerate.
	* config.h.in: Regenerate.
	* configure: Regenerate.
	* configure.ac: Add -mno-gnu-attribute to compile flags.
	* generated/_abs_c17.F90: Regenerate.
	* generated/_abs_r17.F90: Regenerate.
	* generated/_acos_r17.F90: Regenerate.
	* generated/_acosh_r17.F90: Regenerate.
	* generated/_aimag_c17.F90: Regenerate.
	* generated/_aint_r17.F90: Regenerate.
	* generated/_anint_r17.F90: Regenerate.
	* generated/_asin_r17.F90: Regenerate.
	* generated/_asinh_r17.F90: Regenerate.
	* generated/_atan2_r17.F90: Regenerate.
	* generated/_atan_r17.F90: Regenerate.
	* generated/_atanh_r17.F90: Regenerate.
	* generated/_conjg_c17.F90: Regenerate.
	* generated/_cos_c17.F90: Regenerate.
	* generated/_cos_r17.F90: Regenerate.
	* generated/_cosh_r17.F90: Regenerate.
	* generated/_dim_r17.F90: Regenerate.
	* generated/_exp_c17.F90: Regenerate.
	* generated/_exp_r17.F90: Regenerate.
	* generated/_log10_r17.F90: Regenerate.
	* generated/_log_c17.F90: Regenerate.
	* generated/_log_r17.F90: Regenerate.
	* generated/_mod_r17.F90: Regenerate.
	* generated/_sign_r17.F90: Regenerate.
	* generated/_sin_c17.F90: Regenerate.
	* generated/_sin_r17.F90: Regenerate.
	* generated/_sinh_r17.F90: Regenerate.
	* generated/_sqrt_c17.F90: Regenerate.
	* generated/_sqrt_r17.F90: Regenerate.
	* generated/_tan_r17.F90: Regenerate.
	* generated/_tanh_r17.F90: Regenerate.
	* kinds-override.h: Adjust to trunk.
	Change condition to single line so it can be grepped.
	* m4/specific.m4: Make sure that real=kind16 is used
	for _r17.F90 and _c17.F90 files.
	* m4/specific2.m4: Likewise.

31 files changed, 88 insertions, 88 deletions

diff --git a/libgfortran/generated/_abs_c17.F90 b/libgfortran/generated/_abs_c17.F90
index 3c186a2..d450e3c 100644
--- a/libgfortran/generated/_abs_c17.F90
+++ b/libgfortran/generated/_abs_c17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_COMPLEX_17)
-#ifdef HAVE_CABS_17
+#ifdef HAVE_CABSL
 
 elemental function _gfortran_specific__abs_c17 (parm)
-   complex (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__abs_c17
+   complex (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__abs_c17
 
    _gfortran_specific__abs_c17 = abs (parm)
 end function
diff --git a/libgfortran/generated/_abs_r17.F90 b/libgfortran/generated/_abs_r17.F90
index bc8f3eb..075f7ac 100644
--- a/libgfortran/generated/_abs_r17.F90
+++ b/libgfortran/generated/_abs_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_FABS_17
+#ifdef HAVE_FABSL
 
 elemental function _gfortran_specific__abs_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__abs_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__abs_r17
 
    _gfortran_specific__abs_r17 = abs (parm)
 end function
diff --git a/libgfortran/generated/_acos_r17.F90 b/libgfortran/generated/_acos_r17.F90
index f9e928c..8a1cbde 100644
--- a/libgfortran/generated/_acos_r17.F90
+++ b/libgfortran/generated/_acos_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_ACOS_17
+#ifdef HAVE_ACOSL
 
 elemental function _gfortran_specific__acos_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__acos_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__acos_r17
 
    _gfortran_specific__acos_r17 = acos (parm)
 end function
diff --git a/libgfortran/generated/_acosh_r17.F90 b/libgfortran/generated/_acosh_r17.F90
index 4508691..fc6f931 100644
--- a/libgfortran/generated/_acosh_r17.F90
+++ b/libgfortran/generated/_acosh_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_ACOSH_17
+#ifdef HAVE_ACOSHL
 
 elemental function _gfortran_specific__acosh_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__acosh_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__acosh_r17
 
    _gfortran_specific__acosh_r17 = acosh (parm)
 end function
diff --git a/libgfortran/generated/_aimag_c17.F90 b/libgfortran/generated/_aimag_c17.F90
index b5a84fa..fb24cc6 100644
--- a/libgfortran/generated/_aimag_c17.F90
+++ b/libgfortran/generated/_aimag_c17.F90
@@ -36,8 +36,8 @@
 
 
 elemental function _gfortran_specific__aimag_c17 (parm)
-   complex (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__aimag_c17
+   complex (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__aimag_c17
 
    _gfortran_specific__aimag_c17 = aimag (parm)
 end function
diff --git a/libgfortran/generated/_aint_r17.F90 b/libgfortran/generated/_aint_r17.F90
index 4e73b24..e96e755 100644
--- a/libgfortran/generated/_aint_r17.F90
+++ b/libgfortran/generated/_aint_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_TRUNC_17
+#ifdef HAVE_TRUNCL
 
 elemental function _gfortran_specific__aint_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__aint_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__aint_r17
 
    _gfortran_specific__aint_r17 = aint (parm)
 end function
diff --git a/libgfortran/generated/_anint_r17.F90 b/libgfortran/generated/_anint_r17.F90
index 6b60e11..c38a0b6 100644
--- a/libgfortran/generated/_anint_r17.F90
+++ b/libgfortran/generated/_anint_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_ROUND_17
+#ifdef HAVE_ROUNDL
 
 elemental function _gfortran_specific__anint_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__anint_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__anint_r17
 
    _gfortran_specific__anint_r17 = anint (parm)
 end function
diff --git a/libgfortran/generated/_asin_r17.F90 b/libgfortran/generated/_asin_r17.F90
index 120be04..aee1f7e 100644
--- a/libgfortran/generated/_asin_r17.F90
+++ b/libgfortran/generated/_asin_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_ASIN_17
+#ifdef HAVE_ASINL
 
 elemental function _gfortran_specific__asin_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__asin_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__asin_r17
 
    _gfortran_specific__asin_r17 = asin (parm)
 end function
diff --git a/libgfortran/generated/_asinh_r17.F90 b/libgfortran/generated/_asinh_r17.F90
index 64f18d2..0ccb9b0 100644
--- a/libgfortran/generated/_asinh_r17.F90
+++ b/libgfortran/generated/_asinh_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_ASINH_17
+#ifdef HAVE_ASINHL
 
 elemental function _gfortran_specific__asinh_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__asinh_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__asinh_r17
 
    _gfortran_specific__asinh_r17 = asinh (parm)
 end function
diff --git a/libgfortran/generated/_atan2_r17.F90 b/libgfortran/generated/_atan2_r17.F90
index f0fc9b8..87a9dba 100644
--- a/libgfortran/generated/_atan2_r17.F90
+++ b/libgfortran/generated/_atan2_r17.F90
@@ -32,11 +32,11 @@
 
 #if defined (HAVE_GFC_REAL_17)
 
-#ifdef HAVE_ATAN2_17
+#ifdef HAVE_ATAN2L
 
 elemental function _gfortran_specific__atan2_r17 (p1, p2)
-   real (kind=17), intent (in) :: p1, p2
-   real (kind=17) :: _gfortran_specific__atan2_r17
+   real (kind=16), intent (in) :: p1, p2
+   real (kind=16) :: _gfortran_specific__atan2_r17
 
    _gfortran_specific__atan2_r17 = atan2 (p1, p2)
 end function
diff --git a/libgfortran/generated/_atan_r17.F90 b/libgfortran/generated/_atan_r17.F90
index a8b0bbd..72eb76f 100644
--- a/libgfortran/generated/_atan_r17.F90
+++ b/libgfortran/generated/_atan_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_ATAN_17
+#ifdef HAVE_ATANL
 
 elemental function _gfortran_specific__atan_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__atan_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__atan_r17
 
    _gfortran_specific__atan_r17 = atan (parm)
 end function
diff --git a/libgfortran/generated/_atanh_r17.F90 b/libgfortran/generated/_atanh_r17.F90
index dc4d8a3..9ea2735 100644
--- a/libgfortran/generated/_atanh_r17.F90
+++ b/libgfortran/generated/_atanh_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_ATANH_17
+#ifdef HAVE_ATANHL
 
 elemental function _gfortran_specific__atanh_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__atanh_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__atanh_r17
 
    _gfortran_specific__atanh_r17 = atanh (parm)
 end function
diff --git a/libgfortran/generated/_conjg_c17.F90 b/libgfortran/generated/_conjg_c17.F90
index 86a237c..5e6c2c4 100644
--- a/libgfortran/generated/_conjg_c17.F90
+++ b/libgfortran/generated/_conjg_c17.F90
@@ -36,8 +36,8 @@
 
 
 elemental function _gfortran_specific__conjg_17 (parm)
-   complex (kind=17), intent (in) :: parm
-   complex (kind=17) :: _gfortran_specific__conjg_17
+   complex (kind=16), intent (in) :: parm
+   complex (kind=16) :: _gfortran_specific__conjg_17
 
    _gfortran_specific__conjg_17 = conjg (parm)
 end function
diff --git a/libgfortran/generated/_cos_c17.F90 b/libgfortran/generated/_cos_c17.F90
index 8d50ac8..2241ece 100644
--- a/libgfortran/generated/_cos_c17.F90
+++ b/libgfortran/generated/_cos_c17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_COMPLEX_17)
-#ifdef HAVE_CCOS_17
+#ifdef HAVE_CCOSL
 
 elemental function _gfortran_specific__cos_c17 (parm)
-   complex (kind=17), intent (in) :: parm
-   complex (kind=17) :: _gfortran_specific__cos_c17
+   complex (kind=16), intent (in) :: parm
+   complex (kind=16) :: _gfortran_specific__cos_c17
 
    _gfortran_specific__cos_c17 = cos (parm)
 end function
diff --git a/libgfortran/generated/_cos_r17.F90 b/libgfortran/generated/_cos_r17.F90
index fde038e..60dfac5 100644
--- a/libgfortran/generated/_cos_r17.F90
+++ b/libgfortran/generated/_cos_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_COS_17
+#ifdef HAVE_COSL
 
 elemental function _gfortran_specific__cos_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__cos_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__cos_r17
 
    _gfortran_specific__cos_r17 = cos (parm)
 end function
diff --git a/libgfortran/generated/_cosh_r17.F90 b/libgfortran/generated/_cosh_r17.F90
index c8fe7c8..81e3498 100644
--- a/libgfortran/generated/_cosh_r17.F90
+++ b/libgfortran/generated/_cosh_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_COSH_17
+#ifdef HAVE_COSHL
 
 elemental function _gfortran_specific__cosh_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__cosh_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__cosh_r17
 
    _gfortran_specific__cosh_r17 = cosh (parm)
 end function
diff --git a/libgfortran/generated/_dim_r17.F90 b/libgfortran/generated/_dim_r17.F90
index d4b78c1..cbb5f6f 100644
--- a/libgfortran/generated/_dim_r17.F90
+++ b/libgfortran/generated/_dim_r17.F90
@@ -35,8 +35,8 @@
 
 
 elemental function _gfortran_specific__dim_r17 (p1, p2)
-   real (kind=17), intent (in) :: p1, p2
-   real (kind=17) :: _gfortran_specific__dim_r17
+   real (kind=16), intent (in) :: p1, p2
+   real (kind=16) :: _gfortran_specific__dim_r17
 
    _gfortran_specific__dim_r17 = dim (p1, p2)
 end function
diff --git a/libgfortran/generated/_exp_c17.F90 b/libgfortran/generated/_exp_c17.F90
index a2672a4..fb13939 100644
--- a/libgfortran/generated/_exp_c17.F90
+++ b/libgfortran/generated/_exp_c17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_COMPLEX_17)
-#ifdef HAVE_CEXP_17
+#ifdef HAVE_CEXPL
 
 elemental function _gfortran_specific__exp_c17 (parm)
-   complex (kind=17), intent (in) :: parm
-   complex (kind=17) :: _gfortran_specific__exp_c17
+   complex (kind=16), intent (in) :: parm
+   complex (kind=16) :: _gfortran_specific__exp_c17
 
    _gfortran_specific__exp_c17 = exp (parm)
 end function
diff --git a/libgfortran/generated/_exp_r17.F90 b/libgfortran/generated/_exp_r17.F90
index 14cac70..c03986b 100644
--- a/libgfortran/generated/_exp_r17.F90
+++ b/libgfortran/generated/_exp_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_EXP_17
+#ifdef HAVE_EXPL
 
 elemental function _gfortran_specific__exp_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__exp_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__exp_r17
 
    _gfortran_specific__exp_r17 = exp (parm)
 end function
diff --git a/libgfortran/generated/_log10_r17.F90 b/libgfortran/generated/_log10_r17.F90
index ef3481a..8612360 100644
--- a/libgfortran/generated/_log10_r17.F90
+++ b/libgfortran/generated/_log10_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_LOG10_17
+#ifdef HAVE_LOG10L
 
 elemental function _gfortran_specific__log10_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__log10_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__log10_r17
 
    _gfortran_specific__log10_r17 = log10 (parm)
 end function
diff --git a/libgfortran/generated/_log_c17.F90 b/libgfortran/generated/_log_c17.F90
index 65c758d..c2f2858 100644
--- a/libgfortran/generated/_log_c17.F90
+++ b/libgfortran/generated/_log_c17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_COMPLEX_17)
-#ifdef HAVE_CLOG_17
+#ifdef HAVE_CLOGL
 
 elemental function _gfortran_specific__log_c17 (parm)
-   complex (kind=17), intent (in) :: parm
-   complex (kind=17) :: _gfortran_specific__log_c17
+   complex (kind=16), intent (in) :: parm
+   complex (kind=16) :: _gfortran_specific__log_c17
 
    _gfortran_specific__log_c17 = log (parm)
 end function
diff --git a/libgfortran/generated/_log_r17.F90 b/libgfortran/generated/_log_r17.F90
index 95cc9ef..7355bc8 100644
--- a/libgfortran/generated/_log_r17.F90
+++ b/libgfortran/generated/_log_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_LOG_17
+#ifdef HAVE_LOGL
 
 elemental function _gfortran_specific__log_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__log_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__log_r17
 
    _gfortran_specific__log_r17 = log (parm)
 end function
diff --git a/libgfortran/generated/_mod_r17.F90 b/libgfortran/generated/_mod_r17.F90
index 2397395..f174bcc 100644
--- a/libgfortran/generated/_mod_r17.F90
+++ b/libgfortran/generated/_mod_r17.F90
@@ -35,8 +35,8 @@
 
 
 elemental function _gfortran_specific__mod_r17 (p1, p2)
-   real (kind=17), intent (in) :: p1, p2
-   real (kind=17) :: _gfortran_specific__mod_r17
+   real (kind=16), intent (in) :: p1, p2
+   real (kind=16) :: _gfortran_specific__mod_r17
 
    _gfortran_specific__mod_r17 = mod (p1, p2)
 end function
diff --git a/libgfortran/generated/_sign_r17.F90 b/libgfortran/generated/_sign_r17.F90
index d8afb5e..2253140 100644
--- a/libgfortran/generated/_sign_r17.F90
+++ b/libgfortran/generated/_sign_r17.F90
@@ -35,8 +35,8 @@
 
 
 elemental function _gfortran_specific__sign_r17 (p1, p2)
-   real (kind=17), intent (in) :: p1, p2
-   real (kind=17) :: _gfortran_specific__sign_r17
+   real (kind=16), intent (in) :: p1, p2
+   real (kind=16) :: _gfortran_specific__sign_r17
 
    _gfortran_specific__sign_r17 = sign (p1, p2)
 end function
diff --git a/libgfortran/generated/_sin_c17.F90 b/libgfortran/generated/_sin_c17.F90
index 6453ec7..2f7d187 100644
--- a/libgfortran/generated/_sin_c17.F90
+++ b/libgfortran/generated/_sin_c17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_COMPLEX_17)
-#ifdef HAVE_CSIN_17
+#ifdef HAVE_CSINL
 
 elemental function _gfortran_specific__sin_c17 (parm)
-   complex (kind=17), intent (in) :: parm
-   complex (kind=17) :: _gfortran_specific__sin_c17
+   complex (kind=16), intent (in) :: parm
+   complex (kind=16) :: _gfortran_specific__sin_c17
 
    _gfortran_specific__sin_c17 = sin (parm)
 end function
diff --git a/libgfortran/generated/_sin_r17.F90 b/libgfortran/generated/_sin_r17.F90
index 8632c4d..7b02e79 100644
--- a/libgfortran/generated/_sin_r17.F90
+++ b/libgfortran/generated/_sin_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_SIN_17
+#ifdef HAVE_SINL
 
 elemental function _gfortran_specific__sin_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__sin_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__sin_r17
 
    _gfortran_specific__sin_r17 = sin (parm)
 end function
diff --git a/libgfortran/generated/_sinh_r17.F90 b/libgfortran/generated/_sinh_r17.F90
index bfe0f2a..43ac460 100644
--- a/libgfortran/generated/_sinh_r17.F90
+++ b/libgfortran/generated/_sinh_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_SINH_17
+#ifdef HAVE_SINHL
 
 elemental function _gfortran_specific__sinh_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__sinh_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__sinh_r17
 
    _gfortran_specific__sinh_r17 = sinh (parm)
 end function
diff --git a/libgfortran/generated/_sqrt_c17.F90 b/libgfortran/generated/_sqrt_c17.F90
index 5878b87..13d6d83 100644
--- a/libgfortran/generated/_sqrt_c17.F90
+++ b/libgfortran/generated/_sqrt_c17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_COMPLEX_17)
-#ifdef HAVE_CSQRT_17
+#ifdef HAVE_CSQRTL
 
 elemental function _gfortran_specific__sqrt_c17 (parm)
-   complex (kind=17), intent (in) :: parm
-   complex (kind=17) :: _gfortran_specific__sqrt_c17
+   complex (kind=16), intent (in) :: parm
+   complex (kind=16) :: _gfortran_specific__sqrt_c17
 
    _gfortran_specific__sqrt_c17 = sqrt (parm)
 end function
diff --git a/libgfortran/generated/_sqrt_r17.F90 b/libgfortran/generated/_sqrt_r17.F90
index 01c3a04..eb98dda 100644
--- a/libgfortran/generated/_sqrt_r17.F90
+++ b/libgfortran/generated/_sqrt_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_SQRT_17
+#ifdef HAVE_SQRTL
 
 elemental function _gfortran_specific__sqrt_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__sqrt_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__sqrt_r17
 
    _gfortran_specific__sqrt_r17 = sqrt (parm)
 end function
diff --git a/libgfortran/generated/_tan_r17.F90 b/libgfortran/generated/_tan_r17.F90
index 01f1bfa..50b55d2 100644
--- a/libgfortran/generated/_tan_r17.F90
+++ b/libgfortran/generated/_tan_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_TAN_17
+#ifdef HAVE_TANL
 
 elemental function _gfortran_specific__tan_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__tan_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__tan_r17
 
    _gfortran_specific__tan_r17 = tan (parm)
 end function
diff --git a/libgfortran/generated/_tanh_r17.F90 b/libgfortran/generated/_tanh_r17.F90
index e04aae3..5a3eee8 100644
--- a/libgfortran/generated/_tanh_r17.F90
+++ b/libgfortran/generated/_tanh_r17.F90
@@ -33,11 +33,11 @@
 #include "c99_protos.inc"
 
 #if defined (HAVE_GFC_REAL_17)
-#ifdef HAVE_TANH_17
+#ifdef HAVE_TANHL
 
 elemental function _gfortran_specific__tanh_r17 (parm)
-   real (kind=17), intent (in) :: parm
-   real (kind=17) :: _gfortran_specific__tanh_r17
+   real (kind=16), intent (in) :: parm
+   real (kind=16) :: _gfortran_specific__tanh_r17
 
    _gfortran_specific__tanh_r17 = tanh (parm)
 end function