diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index 465daea912aacd11e71631ae84dd881e65d6af6f..26b9eb1b186d8d660e4367fc1f72b70e0bca9aa1 100644
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -1077,15 +1077,16 @@ $(patsubst %.F90,%.lo,$(patsubst %.f90,%.lo,$(notdir $(gfor_specific_src)))): AM
selected_real_kind.lo selected_int_kind.lo: AM_FCFLAGS += -fallow-leading-underscore
# Build *_r17.F90 and *_c17.F90 with additional -mabi=ieeelongdouble on powerpc64le-linux.
+
if HAVE_REAL_17
-$(patsubst %_r17.F90,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ieeelongdouble
-$(patsubst %_r17.c,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ieeelongdouble
-$(patsubst %_c17.F90,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ieeelongdouble
-$(patsubst %_c17.c,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ieeelongdouble
-$(patsubst %_r16.F90,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ibmlongdouble
-$(patsubst %_r16.c,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ibmlongdouble
-$(patsubst %_c16.F90,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ibmlongdouble
-$(patsubst %_c16.c,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ibmlongdouble
+$(patsubst %_r16.F90,%_r16.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ibmlongdouble
+$(patsubst %_c16.F90,%_c16.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ibmlongdouble
+$(patsubst %_r17.F90,%_r17.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ieeelongdouble -D__powerpc64__
+$(patsubst %_c17.F90,%_c17.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ieeelongdouble -D__powerpc64__
+$(patsubst %_r16.c,%_r16.lo,$(notdir $(gfor_built_src))): AM_CFLAGS += -mabi=ibmlongdouble
+$(patsubst %_c16.c,%_c16.lo,$(notdir $(gfor_built_src))): AM_CFLAGS += -mabi=ibmlongdouble
+$(patsubst %_r17.c,%_r17.lo,$(notdir $(gfor_built_src))): AM_CFLAGS += -mabi=ieeelongdouble
+$(patsubst %_c17.c,%_c17.lo,$(notdir $(gfor_built_src))): AM_CFLAGS += -mabi=ieeelongdouble
endif
if IEEE_SUPPORT
@@ -1160,8 +1161,8 @@ I_M4_DEPS9=$(I_M4_DEPS) m4/ifindloc2.m4
kinds.h: $(srcdir)/mk-kinds-h.sh
$(SHELL) $(srcdir)/mk-kinds-h.sh '@LIBGOMP_CHECKED_INT_KINDS@' '@LIBGOMP_CHECKED_REAL_KINDS@' '$(FCCOMPILE)' > $@ || rm $@
-kinds.inc: kinds.h
- grep '^#' < kinds.h > $@
+kinds.inc: kinds.h $(srcdir)/kinds-override.h
+ cat kinds.h $(srcdir)/kinds-override.h | grep '^#' | grep -v include > $@
c99_protos.inc: $(srcdir)/c99_protos.h
grep '^#' < $(srcdir)/c99_protos.h > $@
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index c16030f4a170c150db1ae60c3c0945491d061e5e..1bfb07dda6ca9a2d48efd382f7f1a10e16d37fdb 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -7630,14 +7630,15 @@ $(patsubst %.F90,%.lo,$(patsubst %.f90,%.lo,$(notdir $(gfor_specific_src)))): AM
selected_real_kind.lo selected_int_kind.lo: AM_FCFLAGS += -fallow-leading-underscore
# Build *_r17.F90 and *_c17.F90 with additional -mabi=ieeelongdouble on powerpc64le-linux.
-@HAVE_REAL_17_TRUE@$(patsubst %_r17.F90,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ieeelongdouble
-@HAVE_REAL_17_TRUE@$(patsubst %_r17.c,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ieeelongdouble
-@HAVE_REAL_17_TRUE@$(patsubst %_c17.F90,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ieeelongdouble
-@HAVE_REAL_17_TRUE@$(patsubst %_c17.c,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ieeelongdouble
-@HAVE_REAL_17_TRUE@$(patsubst %_r16.F90,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ibmlongdouble
-@HAVE_REAL_17_TRUE@$(patsubst %_r16.c,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ibmlongdouble
-@HAVE_REAL_17_TRUE@$(patsubst %_c16.F90,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ibmlongdouble
-@HAVE_REAL_17_TRUE@$(patsubst %_c16.c,%.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ibmlongdouble
+
+@HAVE_REAL_17_TRUE@$(patsubst %_r16.F90,%_r16.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ibmlongdouble
+@HAVE_REAL_17_TRUE@$(patsubst %_c16.F90,%_c16.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ibmlongdouble
+@HAVE_REAL_17_TRUE@$(patsubst %_r17.F90,%_r17.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ieeelongdouble -D__powerpc64__
+@HAVE_REAL_17_TRUE@$(patsubst %_c17.F90,%_c17.lo,$(notdir $(gfor_specific_src))): AM_FCFLAGS += -mabi=ieeelongdouble -D__powerpc64__
+@HAVE_REAL_17_TRUE@$(patsubst %_r16.c,%_r16.lo,$(notdir $(gfor_built_src))): AM_CFLAGS += -mabi=ibmlongdouble
+@HAVE_REAL_17_TRUE@$(patsubst %_c16.c,%_c16.lo,$(notdir $(gfor_built_src))): AM_CFLAGS += -mabi=ibmlongdouble
+@HAVE_REAL_17_TRUE@$(patsubst %_r17.c,%_r17.lo,$(notdir $(gfor_built_src))): AM_CFLAGS += -mabi=ieeelongdouble
+@HAVE_REAL_17_TRUE@$(patsubst %_c17.c,%_c17.lo,$(notdir $(gfor_built_src))): AM_CFLAGS += -mabi=ieeelongdouble
# Add flags for IEEE modules
@IEEE_SUPPORT_TRUE@$(patsubst %.F90,%.lo,$(notdir $(gfor_ieee_src))): AM_FCFLAGS += -Wno-unused-dummy-argument -Wno-c-binding-type -ffree-line-length-0 -fallow-leading-underscore -fsignaling-nans
@@ -7667,8 +7668,8 @@ ieee_arithmetic.mod: ieee_arithmetic.lo
kinds.h: $(srcdir)/mk-kinds-h.sh
$(SHELL) $(srcdir)/mk-kinds-h.sh '@LIBGOMP_CHECKED_INT_KINDS@' '@LIBGOMP_CHECKED_REAL_KINDS@' '$(FCCOMPILE)' > $@ || rm $@
-kinds.inc: kinds.h
- grep '^#' < kinds.h > $@
+kinds.inc: kinds.h $(srcdir)/kinds-override.h
+ cat kinds.h $(srcdir)/kinds-override.h | grep '^#' | grep -v include > $@
c99_protos.inc: $(srcdir)/c99_protos.h
grep '^#' < $(srcdir)/c99_protos.h > $@
diff --git a/libgfortran/config.h.in b/libgfortran/config.h.in
index 02dcf49c49aeb2d0f0f019e2100e18584aa1f54b..24e31ebd62547cb6410d6d73604d9918d00b09da 100644
--- a/libgfortran/config.h.in
+++ b/libgfortran/config.h.in
@@ -663,6 +663,9 @@
/* Define to 1 if you have the <pwd.h> header file. */
#undef HAVE_PWD_H
+/* Define to 1 if you have REAL(KIND=17) */
+#undef HAVE_REAL_17
+
/* Define to 1 if you have the `round' function. */
#undef HAVE_ROUND
diff --git a/libgfortran/configure b/libgfortran/configure
index 5331285e8eb9de0e7d061b8df51a58e3b54d5ab0..ae64dca31140e2502752aa9dcb2f1ef913beba88 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -6013,9 +6013,9 @@ main ()
}
_ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
- AM_FCFLAGS="$AM_FCFLAGS -mabi=ibmlongdouble";
- AM_CFLAGS="$AM_CFLAGS -mabi=ibmlongdouble";
- CFLAGS="$CFLAGS -mabi=ibmlongdouble";
+ AM_FCFLAGS="$AM_FCFLAGS -mabi=ibmlongdouble -mno-gnu-attribute";
+ AM_CFLAGS="$AM_CFLAGS -mabi=ibmlongdouble -mno-gnu-attribute";
+ CFLAGS="$CFLAGS -mabi=ibmlongdouble -mno-gnu-attribute";
have_real_17=yes
fi
rm -f conftest.err conftest.i conftest.$ac_ext
@@ -25838,6 +25838,12 @@ _ACEOF
if test "x$have_real_17" = "xyes"; then
+cat >>confdefs.h <<_ACEOF
+#define HAVE_REAL_17 1
+_ACEOF
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __acoshieee128" >&5
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
index 39f38bac4ba32131592b29b21d02e45ace1c3f5e..97cc490cb5e93af786c74da1fd607c8268292e52 100644
--- a/libgfortran/configure.ac
+++ b/libgfortran/configure.ac
@@ -163,9 +163,9 @@ if test "x$GCC" = "xyes"; then
#error long double is double
#endif]],
[[(void) 0;]])],
- [AM_FCFLAGS="$AM_FCFLAGS -mabi=ibmlongdouble";
- AM_CFLAGS="$AM_CFLAGS -mabi=ibmlongdouble";
- CFLAGS="$CFLAGS -mabi=ibmlongdouble";
+ [AM_FCFLAGS="$AM_FCFLAGS -mabi=ibmlongdouble -mno-gnu-attribute";
+ AM_CFLAGS="$AM_CFLAGS -mabi=ibmlongdouble -mno-gnu-attribute";
+ CFLAGS="$CFLAGS -mabi=ibmlongdouble -mno-gnu-attribute";
have_real_17=yes])
;;
*)
@@ -547,6 +547,9 @@ GCC_CHECK_MATH_FUNC([catanl])
# For POWER, check the ieee128 math functions
if test "x$have_real_17" = "xyes"; then
+AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_REAL_17),[1],
+ [Define to 1 if you have REAL(KIND=17)])
+
LIBGFOR_CHECK_MATH_IEEE128([__acoshieee128])
LIBGFOR_CHECK_MATH_IEEE128([__acosieee128])
LIBGFOR_CHECK_MATH_IEEE128([__asinhieee128])
diff --git a/libgfortran/generated/_abs_c17.F90 b/libgfortran/generated/_abs_c17.F90
index 3c186a298b7291579b663cf681d50b0e8a40dc37..d450e3c278c130e730aa96e205321f8b13872929 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 bc8f3eb7a2ec7e9977ec2c894dd5f16aa73055b3..075f7acb5fce737c76bb9e7c7966ce02acd13f5e 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 f9e928c5d20cdb136cde738d11a9e4c76d27b368..8a1cbdeb97de8e27bf3a849922b3c0c38f7894f6 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 4508691c4ea8eebd5b73722e4aeda7b8ef8f3034..fc6f93197a402c6b744e717b59888aebd6794b68 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 b5a84fa0a786aa9ee4f987b081ef10d6c9b459ec..fb24cc6c69fb111297bd9a518837b68bd7b18623 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 4e73b24946da62b0deac8c85f201b52c3dab54b7..e96e755399cdf71c7936af9a3ad09cd1a5978ddc 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 6b60e11e6079bf6a934b8124e349a5085305eb5c..c38a0b640f518069482468ca23149bb70145a329 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 120be0494c5a47665bf2961dc724161ee2be6552..aee1f7ef9b33117553b47156e902eddd38112755 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 64f18d2198f8c73864e5be1558ae3ff06349b337..0ccb9b087eec3028d9b7c521477b2f3e48cfa400 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 f0fc9b88648b8487c23a3b31da021bc328fb13a2..87a9dba1413b49de65c85b1c8924a2545f10b978 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 a8b0bbd2d7126272661d6800c1487031fba224d1..72eb76fa2086fe767e8da756a909837626a64011 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 dc4d8a306d2eb308cdb46e9e80dae6a5c0d5645c..9ea273570179719d975ba3b1cb1679fd5a121f1f 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 86a237c644210393f2d338b29f432518926d2875..5e6c2c48a56094eddde6e1b903e6e4b4bc49a5b1 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 8d50ac8f556d0829b3d856cd5702feaf29fc67d3..2241eceadcbee8b75d55ab4df002efc62040b9be 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 fde038e15b987591a53cae9fffd01044844babd5..60dfac513c2d254d417ff9c6abbb3a3eb78d5471 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 c8fe7c8dbb6673678d074474ccf54a645b071ab5..81e3498541cd1cf2c5b75573d4d4084519a4c353 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 d4b78c17dc508f1731861e0b806f657b136e66af..cbb5f6f2a73335c9e890a7c322a511e135f94749 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 a2672a4ab986316f503dbddae7ecba770cca8013..fb13939b2b3c06bad48d2cdd100880801aab63b9 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 14cac70375abf58f4d21186e17c079bb2f2f1a83..c03986b4dac4e1b59773da27b1cac30d52807989 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 ef3481af2730a0fbc6db9df54883cd7fd00d31f5..86123606b33aecac14382c323279de2c359d7438 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 65c758dad4cbb72d3ad62ccd3397c10e06b9cd22..c2f2858b26f5d5d4c60882b8ba699627f2942ea6 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 95cc9efeebd6b52d41dd43806bc5cd39a95445a0..7355bc8ffe2b12b3f700a29d824d7bc5d0c17c1f 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 23973950a3b84a9f34390524b10d84ca3600e80d..f174bcc0b51827a382d556abaacb261abc95445d 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 d8afb5ec599101f97a260fa3e6d2f8176fa7e24c..2253140a606880eb2f07716d3b41c72556ef6aeb 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 6453ec708388c116edc2adcf89c4e53a0372f33b..2f7d1873c263c921ee54979cfd87af7ab7dfcfbb 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 8632c4d7a80a26ec619e567c24b266335e027d6f..7b02e79fe415fb68f1792951c2f88fe5bdb930e5 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 bfe0f2a2bf674f82fa5ca319322b8fef352c98ca..43ac460a2e7df23b2f8aa06af740e856701c5895 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 5878b87c421e2c7d5e6c1a1928616c27a082c878..13d6d83bb65391094a883c1c593c3f2e4559d8d5 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 01c3a04a6d4ccb49aa88987d1d7e0396e7c5d550..eb98dda8fd44945af67bbb97c755505aa874abec 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 01f1bfa921ac7b7a2df3538088aeea3e888badcf..50b55d2fe5dbf4d958f9a378247f03c64c5de86b 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 e04aae384992480d32df4465147c35938fec33d0..5a3eee84f7ac65b62fe81c1e036538bb66d6cebe 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
diff --git a/libgfortran/kinds-override.h b/libgfortran/kinds-override.h
index efae0d034a4fcbaf3a923c78b58f882291116f1f..d1456c2ff266eb24c225ad86f4778a7fe4ad0b84 100644
--- a/libgfortran/kinds-override.h
+++ b/libgfortran/kinds-override.h
@@ -29,10 +29,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
# error "Where has __float128 gone?"
#endif
-#if defined(__powerpc64__) \
- && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ \
- && __SIZEOF_LONG_DOUBLE__ == 16 \
- && defined(GFC_REAL_16_IS_LONG_DOUBLE)
+/* Keep these conditions on one line so grep can filter it out. */
+#if defined(__powerpc64__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && __SIZEOF_LONG_DOUBLE__ == 16
typedef __float128 GFC_REAL_17;
typedef _Complex float __attribute__((mode(KC))) GFC_COMPLEX_17;
#define HAVE_GFC_REAL_17
diff --git a/libgfortran/m4/specific.m4 b/libgfortran/m4/specific.m4
index ebc89839ad48a3ac2c274f8f7f33471ba337d51d..75d916e5855f6bf3eac3e6b69b9965b0d61922c9 100644
--- a/libgfortran/m4/specific.m4
+++ b/libgfortran/m4/specific.m4
@@ -4,13 +4,28 @@ define(atype_letter,substr(atype_code, 0, 1))dnl
define(atype_kind,substr(atype_code, 1))dnl
define(get_typename2, `$1 (kind=$2)')dnl
define(get_typename, `get_typename2(ifelse($1,i,integer,ifelse($1,r,real,ifelse($1,l,logical,ifelse($1,c,complex,unknown)))),`$2')')dnl
-define(atype_name, get_typename(atype_letter,atype_kind))dnl
+dnl
+dnl KIND=17 is special: This is just a naming convention
+dnl in the library, for Fortran source code KIND=16 is needed
+dnl
+define(name_kind, ifelse(atype_kind,17,16,atype_kind))dnl
+define(atype_name, get_typename(atype_letter,name_kind))dnl
define(name, regexp(regexp(file, `[^/]*$', `\&'), `^_\([^_]*\)_', `\1'))dnl
-define(rtype_name,get_typename(ifelse(name,abs,ifelse(atype_letter,c,r,atype_letter),ifelse(name,aimag,ifelse(atype_letter,c,r,atype_letter),atype_letter)),atype_kind))dnl
-define(function_name,ifelse(name,conjg,`_gfortran_specific__conjg_'atype_kind,`_gfortran_specific__'name`_'atype_code))dnl
+define(rtype_name,get_typename(ifelse(name,abs,ifelse(atype_letter,c,r,atype_letter),ifelse(name,aimag,ifelse(atype_letter,c,r,atype_letter),atype_letter)),name_kind))dnl
+define(function_name,dnl
+ifelse(name,conjg,`_gfortran_specific__conjg_'atype_kind,`_gfortran_specific__'name`_'atype_code))dnl
-define(type,ifelse(atype_letter,l,LOGICAL,ifelse(atype_letter,i,INTEGER,ifelse(atype_letter,r,REAL,ifelse(atype_letter,c,COMPLEX,UNKNOW)))))dnl
-define(Q,ifelse(atype_kind,4,F,ifelse(atype_kind,8,`',ifelse(atype_kind,10,L,ifelse(atype_kind,16,L,`_'atype_kind)))))dnl
+define(type,dnl
+ifelse(atype_letter,l,LOGICAL,dnl
+ifelse(atype_letter,i,INTEGER,dnl
+ifelse(atype_letter,r,REAL,dnl
+ifelse(atype_letter,c,COMPLEX,UNKNOW)))))dnl
+define(Q,ifelse(atype_kind,4,F,
+ifelse(atype_kind,8,`',
+ifelse(atype_kind,10,L,
+ifelse(atype_kind,16,L,
+ifelse(atype_kind,17,L,
+`_'atype_kind))))))dnl
dnl A few specifics require a function other than their name, or
dnl nothing. The list is currently:
@@ -18,7 +33,16 @@ dnl - integer and logical specifics require no libm function
dnl - AINT requires the trunc() family functions
dnl - ANINT requires round()
dnl - AIMAG, CONJG, DIM, SIGN require no libm function
-define(needed,ifelse(atype_letter,i,`none',ifelse(atype_letter,l,`none',ifelse(name,aint,trunc,ifelse(name,anint,round,ifelse(name,aimag,none,ifelse(name,conjg,none,ifelse(name,dim,none,ifelse(name,sign,none,ifelse(name,abs,fabs,name))))))))))dnl
+define(needed,dnl
+ifelse(atype_letter,i,`none',dnl
+ifelse(atype_letter,l,`none',dnl
+ifelse(name,aint,trunc,dnl
+ifelse(name,anint,round,dnl
+ifelse(name,aimag,none,dnl
+ifelse(name,conjg,none,dnl
+ifelse(name,dim,none,dnl
+ifelse(name,sign,none,dnl
+ifelse(name,abs,fabs,name))))))))))dnl
define(prefix,ifelse(atype_letter,c,C,`'))dnl
dnl Special case for fabs, for which the corresponding complex function
diff --git a/libgfortran/m4/specific2.m4 b/libgfortran/m4/specific2.m4
index d05e8db1435a621858ab393d41735a525a91b98c..27b9c913af63569f56b376c8f3ea99fd1add4ace 100644
--- a/libgfortran/m4/specific2.m4
+++ b/libgfortran/m4/specific2.m4
@@ -4,11 +4,18 @@ define(atype_letter,substr(atype_code, 0, 1))dnl
define(atype_kind,substr(atype_code, 1))dnl
define(get_typename2, `$1 (kind=$2)')dnl
define(get_typename, `get_typename2(ifelse($1,i,integer,ifelse($1,r,real,ifelse($1,l,logical,ifelse($1,c,complex,unknown)))),`$2')')dnl
-define(atype_name, get_typename(atype_letter,atype_kind))dnl
+define(name_kind, ifelse(atype_kind,17,16,atype_kind))dnl
+define(atype_name, get_typename(atype_letter,name_kind))dnl
define(name, regexp(regexp(file, `[^/]*$', `\&'), `^_\([^_]*\)_', `\1'))dnl
define(function_name,`_gfortran_specific__'name`_'atype_code)dnl
-define(Q,ifelse(atype_kind,4,F,ifelse(atype_kind,8,`',ifelse(atype_kind,10,L,ifelse(atype_kind,16,L,`_'atype_kind)))))dnl
+define(Q,dnl
+ifelse(atype_kind,4,F,dnl
+ifelse(atype_kind,8,`',dnl
+ifelse(atype_kind,10,L,dnl
+ifelse(atype_kind,16,L,dnl
+ifelse(atype_kind,17,L,dnl
+`_'atype_kind))))))dnl
#include "config.h"
#include "kinds.inc"