libgfortran: Handle m68k extended real format in ISO_Fortran_binding.h

libgfortran/
	* ISO_Fortran_binding.h (CFI_type_long_double)
	(CFI_type_long_double_Complex) [LDBL_MANT_DIG == 64 &&
	LDBL_MIN_EXP == -16382 && LDBL_MAX_EXP == 16384]: Define.

(cherry picked from commit fc4a29c0781186269dc5f668e76ecea82030dde3)

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 6d96355ebb404fd48412922c8e16a608d408101c..015f1088d0604aa4c9693bfbb4f075f18944ddaf 100644 (file)
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,4 +1,4 @@
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
        2021-09-10  Jakub Jelinek  <jakub@redhat.com>
@@ -41,10 +41,10 @@
        (expand_omp_atomic): Attempt to optimize atomic compare and exchange
        using expand_omp_atomic_cas.
 
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
-       2021-08-06  Tobias Burnus  <tobias@codesourcery.com>
+       2021-09-06  Tobias Burnus  <tobias@codesourcery.com>
 
        * doc/invoke.texi (-foffload-options): Fix @opindex.
 

diff --git a/gcc/c-family/ChangeLog.omp b/gcc/c-family/ChangeLog.omp
index 671e228009356009fc6c6a7e7ca8925182a85c03..64e3e58ddd9e7f172f21583816a4c894539bd7f2 100644 (file)
--- a/gcc/c-family/ChangeLog.omp
+++ b/gcc/c-family/ChangeLog.omp
@@ -1,4 +1,4 @@
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
        2021-09-10  Jakub Jelinek  <jakub@redhat.com>

diff --git a/gcc/c/ChangeLog.omp b/gcc/c/ChangeLog.omp
index 1e662e97065577f9c8dbb06a6eba6b40aeb9b4b7..1616774d7e0409e526a693f8dca0191dbee0991b 100644 (file)
--- a/gcc/c/ChangeLog.omp
+++ b/gcc/c/ChangeLog.omp
@@ -1,4 +1,4 @@
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
        2021-09-10  Jakub Jelinek  <jakub@redhat.com>

diff --git a/gcc/cp/ChangeLog.omp b/gcc/cp/ChangeLog.omp
index a156cae91ced1dc33a4c96ccc9336c959629c10c..14ee9e6b179625468bcebfe859247a51e109e869 100644 (file)
--- a/gcc/cp/ChangeLog.omp
+++ b/gcc/cp/ChangeLog.omp
@@ -1,4 +1,4 @@
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
        2021-09-10  Jakub Jelinek  <jakub@redhat.com>

diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index c3a11ae579ace0ff1b8bb28c1966efdf894b558a..62c8e024eadc8f35959ee26d70d478a70f13f44c 100644 (file)
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,7 +1,7 @@
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
-       2021-08-03  Tobias Burnus  <tobias@codesourcery.com>
+       2021-09-03  Tobias Burnus  <tobias@codesourcery.com>
 
        * decl.c (gfc_verify_c_interop_param): Reject pointer with
        CONTIGUOUS attributes as dummy arg. Reject character len > 1

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index bc8e5544f4bc296a9a71a94f070f35e6100c439b..78e5ef10408cb539f3b16c1986e490cbb3de8cef 100644 (file)
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,4 +1,4 @@
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
        2021-09-01  Sandra Loosemore  <sandra@codesourcery.com>
@@ -14,7 +14,7 @@
        * gfortran.dg/PR100915.c: New file.
        * gfortran.dg/PR100915.f90: New file.
 
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
        2021-09-10  Jakub Jelinek  <jakub@redhat.com>
@@ -37,10 +37,10 @@
        * g++.dg/gomp/atomic-18.C:Expect 4 omp atomic release and
        1 omp atomic_acq_rel instead of 5 omp atomic release directives.
 
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
-       2021-08-03  Tobias Burnus  <tobias@codesourcery.com>
+       2021-09-03  Tobias Burnus  <tobias@codesourcery.com>
 
        * gfortran.dg/bind_c_char_6.f90: Update dg-error.
        * gfortran.dg/bind_c_char_7.f90: Likewise.

diff --git a/libgfortran/ChangeLog.omp b/libgfortran/ChangeLog.omp
index 2929d6f7a1bbdc428949100509645bf13a5ef1e0..a97a9c96254a6c26887fa8c937d4ff1885497f67 100644 (file)
--- a/libgfortran/ChangeLog.omp
+++ b/libgfortran/ChangeLog.omp
@@ -1,7 +1,16 @@
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
-       2021-08-07  Tobias Burnus  <tobias@codesourcery.com>
+       2021-09-13  Andreas Schwab   <schwab@linux-m68k.org>
+
+       * ISO_Fortran_binding.h (CFI_type_long_double)
+       (CFI_type_long_double_Complex) [LDBL_MANT_DIG == 64 &&
+       LDBL_MIN_EXP == -16382 && LDBL_MAX_EXP == 16384]: Define.
+
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backported from master:
+       2021-09-07  Tobias Burnus  <tobias@codesourcery.com>
 
        * Makefile.am (gfor_built_src): Depend on
        include/ISO_Fortran_binding.h not on ISO_Fortran_binding.h.
@@ -9,7 +18,7 @@
        (include/ISO_Fortran_binding.h): ... this.
        * Makefile.in: Regenerate.
 
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
        2021-09-06  Sandra Loosemore  <sandra@codesourcery.com>
@@ -24,7 +33,7 @@
        * mk-kinds-h.sh: Revert pieces no longer needed for
        ISO_Fortran_binding.h.
 
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
        2021-09-01  Sandra Loosemore  <sandra@codesourcery.com>

diff --git a/libgfortran/ISO_Fortran_binding.h b/libgfortran/ISO_Fortran_binding.h
index 5335ea471c73ac8fe6b6dd00c163038ff749000b..9c42464affabd12e78dd259de46db8d66a85fdfa 100644 (file)
--- a/libgfortran/ISO_Fortran_binding.h
+++ b/libgfortran/ISO_Fortran_binding.h
@@ -233,6 +233,13 @@ extern int CFI_setpointer (CFI_cdesc_t *, CFI_cdesc_t *, const CFI_index_t []);
 #define CFI_type_long_double (CFI_type_Real + (10 << CFI_type_kind_shift))
 #define CFI_type_long_double_Complex (CFI_type_Complex + (10 << CFI_type_kind_shift))
 
+/* This is the 96-bit encoding on m68k; Fortran assigns it kind 10.  */
+#elif (LDBL_MANT_DIG == 64 \
+       && LDBL_MIN_EXP == -16382 \
+       && LDBL_MAX_EXP == 16384)
+#define CFI_type_long_double (CFI_type_Real + (10 << CFI_type_kind_shift))
+#define CFI_type_long_double_Complex (CFI_type_Complex + (10 << CFI_type_kind_shift))
+
 /* This is the IEEE 128-bit encoding, same as float128.  */
 #elif (LDBL_MANT_DIG == 113 \
        && LDBL_MIN_EXP == -16381 \

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index a68cd8aac9a7abc6ff28a119dc37bfad2fdd85f4..250b29b4f8adc875265354779e55226c14b5efbd 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,4 +1,4 @@
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
        2021-09-10  Jakub Jelinek  <jakub@redhat.com>
@@ -7,19 +7,19 @@
        * testsuite/libgomp.c-c++-common/atomic-20.c: New test.
        * testsuite/libgomp.c-c++-common/atomic-21.c: New test.
 
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
-       2021-08-07  Tobias Burnus  <tobias@codesourcery.com>
+       2021-09-07  Tobias Burnus  <tobias@codesourcery.com>
 
        * libgomp.texi (OpenMP Implementation Status): Extend
        OpenMP 5.0 section.
        (OpenACC Profiling Interface): Fix typo.
 
-2021-08-13  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-13  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
-       2021-08-07  Tobias Burnus  <tobias@codesourcery.com>
+       2021-09-07  Tobias Burnus  <tobias@codesourcery.com>
 
        * libgomp.texi (Enabling OpenMP): Refer to OMP spec in general
        not to 4.5; link to new section.
@@ -32,7 +32,7 @@
 
        * testsuite/libgomp.c/target-43.c: '-latomic' for nvptx offloading.
 
-2021-08-03  Tobias Burnus  <tobias@codesourcery.com>
+2021-09-03  Tobias Burnus  <tobias@codesourcery.com>
 
        Backported from master:
        2021-09-03  Tobias Burnus  <tobias@codesourcery.com>