[nvptx] Add support for CUDA 9

Backport trunk r256891:

	gcc/
	2018-01-19  Cesar Philippidis  <cesar@codesourcery.com>

	PR target/83790
	* config/nvptx/nvptx.c (output_init_frag): Don't use generic address
	spaces for function labels.

	gcc/testsuite/
	2018-01-19  Cesar Philippidis  <cesar@codesourcery.com>

	PR target/83790
	* gcc.target/nvptx/indirect_call.c: New test.

From-SVN: r258127

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cebcf8500bd151c99a0b8c1a3e8c0489bea6b1ca..23296f274122c430d77c5a382dd7bc9db26e81c8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-02  Thomas Schwinge  <thomas@codesourcery.com>
+
+       Backport from trunk r256891:
+       2018-01-19  Cesar Philippidis  <cesar@codesourcery.com>
+
+       PR target/83790
+       * config/nvptx/nvptx.c (output_init_frag): Don't use generic address
+       spaces for function labels.
+
 2018-02-21  Sudakshina Das  <sudi.das@arm.com>
 
        Backport from trunk

diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index 2262005ae7a085fe52fa85593bd6a1fe5c7896d1..16e80421f6906971b95a67fd6697ccb70a09eb95 100644 (file)
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -1483,9 +1483,15 @@ output_init_frag (rtx sym)
   
   if (sym)
     {
-      fprintf (asm_out_file, "generic(");
+      bool function = (SYMBOL_REF_DECL (sym)
+                      && (TREE_CODE (SYMBOL_REF_DECL (sym)) == FUNCTION_DECL));
+      if (!function)
+       fprintf (asm_out_file, "generic(");
       output_address (VOIDmode, sym);
-      fprintf (asm_out_file, val ? ") + " : ")");
+      if (!function)
+       fprintf (asm_out_file, ")");
+      if (val)
+       fprintf (asm_out_file, " + ");
     }
 
   if (!sym || val)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b1abb943e576894dc6eead4ae35fc19d1b9e0538..e2c0b7a613510474fcd04dfee8c4fa11a25c235f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2017-03-02  Thomas Schwinge  <thomas@codesourcery.com>
+
+       Backport from trunk r256891:
+       2018-01-19  Cesar Philippidis  <cesar@codesourcery.com>
+
+       PR target/83790
+       * gcc.target/nvptx/indirect_call.c: New test.
+
 2018-02-28  Alan Modra  <amodra@gmail.com>
 
        * lib/prune.exp (prune_gcc_output): Match lower case "in function"

diff --git a/gcc/testsuite/gcc.target/nvptx/indirect_call.c b/gcc/testsuite/gcc.target/nvptx/indirect_call.c
new file mode 100644 (file)
index 0000000..5ac939e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/nvptx/indirect_call.c
@@ -0,0 +1,19 @@
+/* { dg-options "-O2" } */
+/* { dg-do run } */
+
+int
+f1 (int a)
+{
+  return a + 1;
+}
+  
+int (*f2)(int) = f1;
+
+int
+main ()
+{
+  if (f2 (100) != 101)
+    __builtin_abort();
+
+  return 0;
+}