From: Andreas Schwab Date: Mon, 13 Sep 2021 08:30:16 +0000 (+0200) Subject: libgfortran: Handle m68k extended real format in ISO_Fortran_binding.h X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab98e36f6db3cd9a2df0b6dc666b1a5267054956;p=thirdparty%2Fgcc.git 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 6d96355ebb40..015f1088d060 100644 --- a/gcc/ChangeLog.omp +++ b/gcc/ChangeLog.omp @@ -1,4 +1,4 @@ -2021-08-13 Tobias Burnus +2021-09-13 Tobias Burnus Backported from master: 2021-09-10 Jakub Jelinek @@ -41,10 +41,10 @@ (expand_omp_atomic): Attempt to optimize atomic compare and exchange using expand_omp_atomic_cas. -2021-08-13 Tobias Burnus +2021-09-13 Tobias Burnus Backported from master: - 2021-08-06 Tobias Burnus + 2021-09-06 Tobias Burnus * doc/invoke.texi (-foffload-options): Fix @opindex. diff --git a/gcc/c-family/ChangeLog.omp b/gcc/c-family/ChangeLog.omp index 671e22800935..64e3e58ddd9e 100644 --- a/gcc/c-family/ChangeLog.omp +++ b/gcc/c-family/ChangeLog.omp @@ -1,4 +1,4 @@ -2021-08-13 Tobias Burnus +2021-09-13 Tobias Burnus Backported from master: 2021-09-10 Jakub Jelinek diff --git a/gcc/c/ChangeLog.omp b/gcc/c/ChangeLog.omp index 1e662e970655..1616774d7e04 100644 --- a/gcc/c/ChangeLog.omp +++ b/gcc/c/ChangeLog.omp @@ -1,4 +1,4 @@ -2021-08-13 Tobias Burnus +2021-09-13 Tobias Burnus Backported from master: 2021-09-10 Jakub Jelinek diff --git a/gcc/cp/ChangeLog.omp b/gcc/cp/ChangeLog.omp index a156cae91ced..14ee9e6b1796 100644 --- a/gcc/cp/ChangeLog.omp +++ b/gcc/cp/ChangeLog.omp @@ -1,4 +1,4 @@ -2021-08-13 Tobias Burnus +2021-09-13 Tobias Burnus Backported from master: 2021-09-10 Jakub Jelinek diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp index c3a11ae579ac..62c8e024eadc 100644 --- a/gcc/fortran/ChangeLog.omp +++ b/gcc/fortran/ChangeLog.omp @@ -1,7 +1,7 @@ -2021-08-13 Tobias Burnus +2021-09-13 Tobias Burnus Backported from master: - 2021-08-03 Tobias Burnus + 2021-09-03 Tobias Burnus * 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 bc8e5544f4bc..78e5ef10408c 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,4 +1,4 @@ -2021-08-13 Tobias Burnus +2021-09-13 Tobias Burnus Backported from master: 2021-09-01 Sandra Loosemore @@ -14,7 +14,7 @@ * gfortran.dg/PR100915.c: New file. * gfortran.dg/PR100915.f90: New file. -2021-08-13 Tobias Burnus +2021-09-13 Tobias Burnus Backported from master: 2021-09-10 Jakub Jelinek @@ -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 +2021-09-13 Tobias Burnus Backported from master: - 2021-08-03 Tobias Burnus + 2021-09-03 Tobias Burnus * 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 2929d6f7a1bb..a97a9c96254a 100644 --- a/libgfortran/ChangeLog.omp +++ b/libgfortran/ChangeLog.omp @@ -1,7 +1,16 @@ -2021-08-13 Tobias Burnus +2021-09-13 Tobias Burnus Backported from master: - 2021-08-07 Tobias Burnus + 2021-09-13 Andreas Schwab + + * 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 + + Backported from master: + 2021-09-07 Tobias Burnus * 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 +2021-09-13 Tobias Burnus Backported from master: 2021-09-06 Sandra Loosemore @@ -24,7 +33,7 @@ * mk-kinds-h.sh: Revert pieces no longer needed for ISO_Fortran_binding.h. -2021-08-13 Tobias Burnus +2021-09-13 Tobias Burnus Backported from master: 2021-09-01 Sandra Loosemore diff --git a/libgfortran/ISO_Fortran_binding.h b/libgfortran/ISO_Fortran_binding.h index 5335ea471c73..9c42464affab 100644 --- 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 a68cd8aac9a7..250b29b4f8ad 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,4 +1,4 @@ -2021-08-13 Tobias Burnus +2021-09-13 Tobias Burnus Backported from master: 2021-09-10 Jakub Jelinek @@ -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 +2021-09-13 Tobias Burnus Backported from master: - 2021-08-07 Tobias Burnus + 2021-09-07 Tobias Burnus * libgomp.texi (OpenMP Implementation Status): Extend OpenMP 5.0 section. (OpenACC Profiling Interface): Fix typo. -2021-08-13 Tobias Burnus +2021-09-13 Tobias Burnus Backported from master: - 2021-08-07 Tobias Burnus + 2021-09-07 Tobias Burnus * 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 +2021-09-03 Tobias Burnus Backported from master: 2021-09-03 Tobias Burnus