diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/nvptx/nvptx.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1643888..332523c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-12-30 Nathan Sidwell <nathan@acm.org> + + * config/nvptx/nvptx.c (nvptx_assemble_undefined_decl): Check + it's not a constant pool object. + 2015-12-29 Michael Meissner <meissner@linux.vnet.ibm.com> * config/rs6000/rs6000.c (init_float128_ieee): Remove IEEE 128-bit diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c index 0f232a3..5f953a1 100644 --- a/gcc/config/nvptx/nvptx.c +++ b/gcc/config/nvptx/nvptx.c @@ -1718,6 +1718,11 @@ nvptx_globalize_label (FILE *, const char *) static void nvptx_assemble_undefined_decl (FILE *file, const char *name, const_tree decl) { + /* The middle end can place constant pool decls into the varpool as + undefined. Until that is fixed, catch the problem here. */ + if (DECL_IN_CONSTANT_POOL (decl)) + return; + write_var_marker (file, false, TREE_PUBLIC (decl), name); fprintf (file, "\t.extern "); |