WIP: fixed compilation errors

Author: Damian Rouson

src/libcaf-gfortran-descriptor.h

@@ -30,6 +30,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
 
 #include <stdint.h>	/* For int32_t.  */
 
+#if __GNUC__ >= 8
+#define GCC_GE_8 1
+#endif
+
+#if __GNUC__ >= 7
+#define GCC_GE_7 1
+#endif
+
 /* GNU Fortran's array descriptor.  Keep in sync with libgfortran.h.  To be
    replaced by TS29113's ISO_Fortran_binding.h with CFI_cdesc_t.  */
 
@@ -79,9 +87,10 @@ typedef struct gfc_descriptor_t {
 #define GFC_DTYPE_TYPE_MASK 0x70
 #define GFC_DTYPE_SIZE_SHIFT 7
 
-#define GFC_DESCRIPTOR_RANK(desc) ((desc)->dtype.rank)
-#define GFC_DESCRIPTOR_TYPE(desc) (((desc)->dtype.type)
-#define GFC_DESCRIPTOR_SIZE(desc) ((desc)->dtype.elem_len)
+#define GFC_DESCRIPTOR_RANK(desc) (desc)->dtype.rank
+#define GFC_DESCRIPTOR_TYPE(desc) (desc)->dtype.type
+#define GFC_DESCRIPTOR_SIZE(desc) (desc)->dtype.elem_len
+#define GFC_DTYPE_TYPE_SIZE(desc) (desc)->dtype.elem_len
 
 #else
 
@@ -95,15 +104,14 @@ typedef struct gfc_descriptor_t {
 #define GFC_DESCRIPTOR_TYPE(desc) (((desc)->dtype & GFC_DTYPE_TYPE_MASK) \
                                    >> GFC_DTYPE_TYPE_SHIFT)
 #define GFC_DESCRIPTOR_SIZE(desc) ((desc)->dtype >> GFC_DTYPE_SIZE_SHIFT)
+#define GFC_DTYPE_TYPE_SIZE(desc) ((desc)->dtype & GFC_DTYPE_TYPE_SIZE_MASK)
 
 #endif
 
 #define GFC_DTYPE_SIZE_MASK \
   ((~((ptrdiff_t) 0) >> GFC_DTYPE_SIZE_SHIFT) << GFC_DTYPE_SIZE_SHIFT)
 #define GFC_DTYPE_TYPE_SIZE_MASK (GFC_DTYPE_SIZE_MASK | GFC_DTYPE_TYPE_MASK)
 
-#define GFC_DTYPE_TYPE_SIZE(desc) ((desc)->dtype & GFC_DTYPE_TYPE_SIZE_MASK)
-
 #define GFC_DTYPE_INTEGER_1 ((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \
    | (sizeof(int8_t) << GFC_DTYPE_SIZE_SHIFT))
 #define GFC_DTYPE_INTEGER_2 ((BT_INTEGER << GFC_DTYPE_TYPE_SHIFT) \

src/make.inc

@@ -42,7 +42,7 @@ ifeq ($(compiler),gnu)
   MPICC = mpicc
   OSHCC = oshcc
   FFLAGS_EXTRA = -fcoarray=lib
-  MPI_EXTRA_FLAGS = -Wall -Wextra -Wno-error=cpp -Wno-error=unused-parameter -DSTRIDED#-DNONBLOCKING_PUT -DCAF_MPI_LOCK_UNLOCK
+  MPI_EXTRA_FLAGS = -Wall -Wextra -Wno-error=cpp -Wno-error=unused-parameter -DSTRIDED -DUSE_FAILED_IMAGES  #-DNONBLOCKING_PUT -DCAF_MPI_LOCK_UNLOCK
   MPI_RUN = mpiexec -np 2
 else
   ifeq ($(compiler),cray)

src/mpi/mpi_caf.c

@@ -6092,8 +6092,13 @@ PREFIX (sendget_by_ref) (caf_token_t dst_token, int dst_image_index,
   */
 
   dst_rank = size > 1 ? 1 : 0;
+#ifdef GCC_GE_8
+  temp_src_desc.base.dtype.elem_len = GFC_DTYPE_INTEGER_4;
+  temp_src_desc.base.dtype.rank = dst_rank;
+#else
   temp_src_desc.base.dtype = GFC_DTYPE_INTEGER_4 |
-                             dst_rank;
+			     dst_rank;
+#endif
   temp_src_desc.base.offset = 0;
   temp_src_desc.dim[0].lower_bound = 0;
   temp_src_desc.dim[0]._ubound = size - 1;