aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Sayle <roger@nextmovesoftware.com>2022-02-10 13:32:07 +0000
committerRoger Sayle <roger@nextmovesoftware.com>2022-02-10 13:32:07 +0000
commit3881e1823c5a59d988ddcddcc1e25c5738e228fb (patch)
treea4dcb8a36cb8745a0abe7e381bfdd4fd9b886dda
parent3e539985cc7a28516054cc080ffd9681aa745afa (diff)
downloadgcc-3881e1823c5a59d988ddcddcc1e25c5738e228fb.zip
gcc-3881e1823c5a59d988ddcddcc1e25c5738e228fb.tar.gz
gcc-3881e1823c5a59d988ddcddcc1e25c5738e228fb.tar.bz2
gfortran: Respect target's NO_DOT_IN_LABEL in trans-common.cc
This patch fixes 9 unexpected failures in the gfortran testsuite on nvptx-none. The issue is that gfortran's EQUIVALENCE internally uses symbols such as "equiv.0" even on platforms that define NO_DOT_IN_LABEL. On nvptx-none, this then results in the following error message(s): ptxas application ptx input, fatal: Parsing error near '.0': syntax error ptxas fatal: Ptx assembly aborted due to errors The fix is to tweak trans-common.cc to respect the target's NO_DOT_IN_LABEL (and NO_DOLLAR_IN_LABEL) when generating internal equiv.%d symbols. Only the nvptx, mmix and xtensa backends define NO_DOT_IN_LABEL which explains why no-one has spotted/fixed this issue since the problematic code was last changed back in 2005(!). 2022-02-10 Roger Sayle <roger@nextmovesoftware.com> Tobias Burnus <tobias@codesourcery.com> gcc/fortran/ChangeLog * trans-common.cc (GFC_EQUIV_FMT): New macro respecting the target's NO_DOT_IN_LABEL and NO_DOLLAR_IN_LABEL preferences. (build_equiv_decl): Use GFC_EQUIV_FMT here.
-rw-r--r--gcc/fortran/trans-common.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/gcc/fortran/trans-common.cc b/gcc/fortran/trans-common.cc
index 7b4d198..7c8cba0 100644
--- a/gcc/fortran/trans-common.cc
+++ b/gcc/fortran/trans-common.cc
@@ -338,6 +338,13 @@ build_field (segment_info *h, tree union_type, record_layout_info rli)
h->field = field;
}
+#if !defined (NO_DOT_IN_LABEL)
+#define GFC_EQUIV_FMT "equiv.%d"
+#elif !defined (NO_DOLLAR_IN_LABEL)
+#define GFC_EQUIV_FMT "_Equiv$%d"
+#else
+#define GFC_EQUIV_FMT "_Equiv_%d"
+#endif
/* Get storage for local equivalence. */
@@ -356,7 +363,7 @@ build_equiv_decl (tree union_type, bool is_init, bool is_saved, bool is_auto)
return decl;
}
- snprintf (name, sizeof (name), "equiv.%d", serial++);
+ snprintf (name, sizeof (name), GFC_EQUIV_FMT, serial++);
decl = build_decl (input_location,
VAR_DECL, get_identifier (name), union_type);
DECL_ARTIFICIAL (decl) = 1;