opal: Update portable_platform file

Update the portable platform file from GASNet, as we had last
pulled changes sometime before 2013.  At the same time, make
the infrastructure slightly easier to make future updates.

To simplify updates, we move the GASNet header to
opal_portable_platform_real.h and provide wrappers in
opal_portable_platform.h and mpi.h to avoid compiler warnings from
the GASNet header.  In theory, future updates should be as somple
as copying gasnet_portable_platform.h into
opal_portable_platform_real.h.

Somewhere in the last decade, GASNet switched from _STRINGIFY
to PLATFORM_STRINGIFY, so update all the places we used _STRINGIFY.

Signed-off-by: Brian Barrett <[email protected]>

Author: bwbarrett

config/opal_check_compiler_version.m4

@@ -105,7 +105,7 @@ AC_DEFUN([OPAL_CHECK_COMPILER_STRINGIFY], [
     FILE * f;
     f=fopen("conftestval", "w");
     if (!f) exit(1);
-    fprintf (f, "%s", _STRINGIFY(PLATFORM_COMPILER_$1));
+    fprintf (f, "%s", PLATFORM_STRINGIFY(PLATFORM_COMPILER_$1));
             ]])], [
                 opal_cv_compiler_$1=`cat conftestval`
             ], [

ompi/include/Makefile.am

@@ -127,6 +127,6 @@ distclean-local:
 	    mpif-sizeof.h \
 	    mpif-c-constants-decl.h mpif-c-constants.h mpif-f08-types.h
 
-mpi_portable_platform.h: $(top_srcdir)/opal/include/opal/opal_portable_platform.h
+mpi_portable_platform.h: $(top_srcdir)/opal/include/opal/opal_portable_platform_real.h
 	-@rm -f mpi_portable_platform.h
-	$(OMPI_V_LN_S) $(LN_S) $(top_srcdir)/opal/include/opal/opal_portable_platform.h mpi_portable_platform.h
+	$(OMPI_V_LN_S) $(LN_S) $(top_srcdir)/opal/include/opal/opal_portable_platform_real.h mpi_portable_platform.h

ompi/include/mpi.h.in

@@ -22,6 +22,8 @@
  * Copyright (c) 2017-2019 IBM Corporation.  All rights reserved.
  * Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
  * Copyright (c) 2021      Google, LLC. All rights reserved.
+ * Copyright (c) 2021      Amazon.com, Inc. or its affiliates.  All Rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -78,6 +80,9 @@
 /* The size of a `int', as computed by sizeof. */
 #undef OPAL_SIZEOF_INT
 
+/* The size of a `void*', as computed by sizeof. */
+#undef OPAL_SIZEOF_VOID_P
+
 /* Maximum length of datarep string (default is 128) */
 #undef OPAL_MAX_DATAREP_STRING
 
@@ -249,10 +254,29 @@
 #if !OMPI_BUILDING
      /*
       * Figure out which compiler is being invoked (in order to compare if
-      * it was different than what OMPI was built with).
+      * it was different than what OMPI was built with).  Do some preprocessor
+      * hacks to eliminate warnings in the portable_platform.h file.
       */
+#    ifndef SIZEOF_VOID_P
+#    define CLEANUP_SIZEOF_VOID_P 1
+#    define SIZEOF_VOID_P OPAL_SIZEOF_VOID_P
+#    else
+#    define CLEANUP_SIZEOF_VOID_P 0
+#    endif
+
+#    ifndef _PORTABLE_PLATFORM_H
+#    define _PORTABLE_PLATFORM_H 0
+#    endif
+#    ifndef PLATFORM_HEADER_VERSION
+#    define PLATFORM_HEADER_VERSION 0
+#    endif
+
 #    include "mpi_portable_platform.h"
 
+#if CLEANUP_SIZEOF_VOID_P
+#undef SIZEOF_VOID_P
+#endif
+
      /*
       * If we're currently using the same compiler that was used to
       * build Open MPI, enable compile-time warning of user-level code

ompi/tools/ompi_info/param.c

@@ -14,7 +14,7 @@
  * Copyright (c) 2014-2019 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2015-2019 Intel, Inc.  All rights reserved.
- * Copyright (c) 2018      Amazon.com, Inc. or its affiliates.  All Rights reserved.
+ * Copyright (c) 2018-2021 Amazon.com, Inc. or its affiliates.  All Rights reserved.
  * Copyright (c) 2018      FUJITSU LIMITED.  All rights reserved.
  * $COPYRIGHT$
  *
@@ -287,7 +287,7 @@ void ompi_info_do_config(bool want_all)
 
     if (OMPI_FORTRAN_HAVE_IGNORE_TKR) {
         /* OMPI_FORTRAN_IGNORE_TKR_PREDECL is already in quotes; it
-           didn't work consistently to put it in _STRINGIFY because
+           didn't work consistently to put it in PLATFORM_STRINGIFY because
            sometimes the compiler would actually interpret the pragma
            in there before stringify-ing it. */
         (void)opal_asprintf(&fortran_have_ignore_tkr, "yes (%s)",
@@ -336,9 +336,9 @@ void ompi_info_do_config(bool want_all)
     opal_info_out("C compiler absolute", "compiler:c:absolute",
                   OPAL_CC_ABSOLUTE);
     opal_info_out("C compiler family name", "compiler:c:familyname",
-                  _STRINGIFY(OPAL_BUILD_PLATFORM_COMPILER_FAMILYNAME));
+                  PLATFORM_STRINGIFY(OPAL_BUILD_PLATFORM_COMPILER_FAMILYNAME));
     opal_info_out("C compiler version", "compiler:c:version",
-                  _STRINGIFY(OPAL_BUILD_PLATFORM_COMPILER_VERSION_STR));
+                  PLATFORM_STRINGIFY(OPAL_BUILD_PLATFORM_COMPILER_VERSION_STR));
 
     if (want_all) {
         opal_info_out_int("C char size", "compiler:c:sizeof:char", sizeof(char));

opal/include/opal/Makefile.am

@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2021      Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -27,7 +28,8 @@ headers += \
 	opal/prefetch.h \
         opal/hash_string.h \
 	opal/frameworks.h \
-	opal/opal_portable_platform.h
+	opal/opal_portable_platform.h \
+	opal/opal_portable_platform_real.h
 
 nodist_headers += \
 	opal/version.h