Merge branch 'master' into macos

Author: isuruf

.github/workflows/build_flang.yml

@@ -21,13 +21,8 @@ jobs:
         cc: [clang]
         cpp: [clang++]
         version: [10, 11]
-        llvm_branch: [release_100, release_11x, release_12x]
+        llvm_branch: [release_11x, release_12x]
         include:
-          - target: X86
-            cc: gcc
-            cpp: g++
-            version: 10
-            llvm_branch: release_100
           - target: X86
             cc: gcc
             cpp: g++

CMakeLists.txt

@@ -46,6 +46,7 @@ elseif (${TARGET_ARCHITECTURE} MATCHES "^(aarch64|arm64)$")
   set(TARGET_ARCHITECTURE aarch64)
   set(ARCHNAME aarch64)
   set(ARCH ARM)
+  set(TARGET_SUPPORTS_QUADFP True)
 elseif( ${TARGET_ARCHITECTURE} STREQUAL "ppc64le" )
   set(ARCHNAME ppc64le)
   set(ARCH POWER)

include/flang/ArgParser/arg_parser.h

@@ -58,7 +58,7 @@ void destroy_arg_parser(arg_parser_t **parser);
  * \param default_value  value to intialize the target
  */
 void register_string_arg(arg_parser_t *parser, const char *arg_name,
-                         char **target, const char *default_value);
+                         const char **target, const char *default_value);
 
 /** \brief Register a string list argument
  *
@@ -91,7 +91,7 @@ void register_string_list_arg(arg_parser_t *parser, const char *arg_name,
  */
 void register_combined_bool_string_arg(arg_parser_t *parser,
                                        const char *arg_name, bool *bool_target,
-                                       char **string_target);
+                                       const char **string_target);
 
 /** \brief Register an integer argument
  *
@@ -205,7 +205,7 @@ void register_action_map_arg(arg_parser_t *parser, const char *arg_name,
  * \param parser argument parser data structure
  * \param target location to set the result (pointer to the string)
  */
-void register_filename_arg(arg_parser_t *parser, char **target);
+void register_filename_arg(arg_parser_t *parser, const char **target);
 
 /** \brief Parse arguments
  *

include/flang/Error/pgerror.h

@@ -55,6 +55,7 @@ char * getDeduceStr(char * ptoken);
  * active in both debug and release builds, and expands to a statement,
  * not an expression.
  */
+void interr(const char *txt, int val, enum error_severity sev);
 #define assert(cond, txt, val, sev) \
   if (cond)                         \
     ;                               \

include/legacy-util-api.h

@@ -31,10 +31,11 @@ extern "C" {
 #include <stdlib.h>
 #include <string.h>
 #include <time.h> /* time() */
+#ifndef _WIN64
 #include <unistd.h> /* getcwd() */
-
-/* See tmpfile(3). */
-FILE *tmpf(char *ignored);
+#else
+#include <direct.h>
+#endif
 
 /* Copy to 'basename' the final path component, less any undesirable suffix. */
 void basenam(const char *orig_path, const char *optional_suffix,

lib/ArgParser/arg_parser.c

@@ -29,18 +29,18 @@ struct arg_parser_ {
    * continue parsing */
   bool fail_on_unknown_args;
   /** Where to write input file name */
-  char **input_file_name_ptr;
+  const char **input_file_name_ptr;
 };
 
 /** \brief Link a bool * and a char ** value together */
 typedef struct bool_string_ {
   bool *bool_ptr;
-  char **string_ptr;
+  const char **string_ptr;
 } bool_string_t;
 
 /** \brief Combine input and output for action map arguments */
 typedef struct action_map_bundle_ {
-  action_map_t *input;
+  const action_map_t *input;
   action_map_t *output;
 } action_map_bundle_t;
 
@@ -129,11 +129,11 @@ deallocate_arg_value(hash_key_t key, hash_data_t value_ptr, void *key_context)
 
 /** Register a string argument */
 void
-register_string_arg(arg_parser_t *parser, const char *arg_name, char **target,
-                    const char *default_value)
+register_string_arg(arg_parser_t *parser, const char *arg_name,
+                    const char **target, const char *default_value)
 {
   /* Set default value */
-  *target = (char *)default_value;
+  *target = default_value;
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic warning "-Wcast-qual"
@@ -189,7 +189,7 @@ register_boolean_arg(arg_parser_t *parser, const char *arg_name, bool *target,
 /** Register a combines bool and string argument */
 void
 register_combined_bool_string_arg(arg_parser_t *parser, const char *arg_name,
-                                  bool *bool_target, char **string_target)
+                                  bool *bool_target, const char **string_target)
 {
   /* Boolean target defaults to false (not set) */
   *bool_target = false;
@@ -252,15 +252,15 @@ register_action_map_arg(arg_parser_t *parser, const char *arg_name,
 {
   action_map_bundle_t *value = (action_map_bundle_t*) malloc(
       sizeof(action_map_bundle_t));
-  value->input = (action_map_t *)input;
+  value->input = input;
   value->output = target;
 
   add_generic_argument(parser, arg_name, ARG_ActionMap, (void *)value);
 }
 
 /** Register input file name */
 void
-register_filename_arg(arg_parser_t *parser, char **target)
+register_filename_arg(arg_parser_t *parser, const char **target)
 {
   parser->input_file_name_ptr = target;
 }
@@ -359,7 +359,7 @@ parse_arguments(const arg_parser_t *parser, int argc, char **argv)
     /* Parse argument type */
     switch (value->type) {
     case ARG_ActionMap: {
-      action_map_t *from = ((action_map_bundle_t *)value->location)->input;
+      const action_map_t *from = ((action_map_bundle_t *)value->location)->input;
       action_map_t *to = ((action_map_bundle_t *)value->location)->output;
 
       /* TODO parse lists of arguments */

lib/scutil/path-utils.c

@@ -95,12 +95,6 @@ fndpath(const char *target, char *path, size_t max_length, const char *dirlist)
   return -1;
 }
 
-FILE *
-tmpf(char *ignored)
-{
-  return tmpfile();
-}
-
 char *
 mkperm(char *pattern, const char *oldext, const char *newext)
 {

runtime/flang/allo.c

@@ -391,9 +391,8 @@ I8(__alloc04)(__NELEM_T nelem, dtype kind, size_t len,
   if (*pointer && I8(__fort_allocated)(*pointer)
       && ISPRESENT(stat) && *stat == 2) {
     int i;
-    char *mp;
+    const char *mp = "array already allocated";
     MP_P_STDIO;
-    mp = "array already allocated";
     for (i = 0; i < errlen; i++)
       errmsg[i] = (*mp ? *mp++ : ' ');
     MP_V_STDIO;

runtime/flang/atol.c

@@ -36,7 +36,7 @@ __fort_atol(char *p)
 }
 
 long
-__fort_strtol(char *str, char **ptr, int base)
+__fort_strtol(const char *str, char **ptr, int base)
 {
   long val;
   char *end;
@@ -61,7 +61,7 @@ __fort_strtol(char *str, char **ptr, int base)
     }
   } else {
     val = 0;
-    end = str;
+    end = NULL;
   }
   if (ptr)
     *ptr = end;

runtime/flang/cnfg.c

@@ -31,19 +31,16 @@ extern char *__fort_getenv();
  *                Default is 1 (VAX-style)
  */
 
-FIO_CNFG __fortio_cnfg_ = {
-/* ending '_' so it can be accessed by user */
-/* default_name */
-    "fort.%d",
-
-    /* vax-style */
-    1,  /* odd => true */
-    -1, /* internal value of .TRUE. */
+FIO_CNFG __fortio_cnfg_ = { /* ending '_' so it can be accessed by user */
+    "fort.%d",              /* default_name */
+                            /* vax-style */
+    1,                      /* odd => true */
+    -1,                     /* internal value of .TRUE. */
 };
 
 /* fio access routines */
 
-char *
+const char *
 __get_fio_cnfg_default_name(void)
 {
   return __fortio_cnfg_.default_name;