[gomp4] Backport from trunk

[gomp4] Backport from trunk

[James Norris]

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

Hi,

The attached patch was backported from trunk.

commit 140722d9d2d574574c982f4616a80bb0ef766276
Author: jnorris <jnorris@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Mon Oct 12 20:22:30 2015 +0000

         * testsuite/libgomp.oacc-c-c++-common/vector-loop.c: Fix loop
         initializer.


Jim

[-- Attachment #2: test.patch --]
[-- Type: text/x-patch, Size: 668 bytes --]

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/vector-loop.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/vector-loop.c
index cc915a9..8a51ee3 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/vector-loop.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/vector-loop.c
@@ -12,7 +12,7 @@ unsigned int n = N;
 int
 main (void)
 {
-  for (unsigned int i; i < n; ++i)
+  for (unsigned int i = 0; i < n; ++i)
     {
       a[i] = i % 3;
       b[i] = i % 5;
@@ -25,7 +25,7 @@ main (void)
       c[i] = a[i] + b[i];
   }
 
-  for (unsigned int i; i < n; ++i)
+  for (unsigned int i = 0; i < n; ++i)
     if (c[i] != (i % 3) + (i % 5))
       abort ();
 

[gomp4] Backport from trunk

[James Norris]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

Hi,

The attached patch was backported from trunk.

commit 13d478244d380d1564eefc204201b7f681218ce3
Author: jnorris <jnorris@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Fri Oct 9 12:35:58 2015 +0000

         * config/rs6000/rs6000.c (rs6000_offload_options): New.
         (TARGET_OFFLOAD_OPTIONS): New.


Jim

[-- Attachment #2: ppc.patch --]
[-- Type: text/x-patch, Size: 924 bytes --]

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 023f622..2dce709 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -1688,6 +1688,9 @@ static const struct attribute_spec rs6000_attribute_table[] =
 #define TARGET_LIBGCC_SHIFT_COUNT_MODE rs6000_abi_word_mode
 #undef TARGET_UNWIND_WORD_MODE
 #define TARGET_UNWIND_WORD_MODE rs6000_abi_word_mode
+
+#undef TARGET_OFFLOAD_OPTIONS
+#define TARGET_OFFLOAD_OPTIONS rs6000_offload_options
 \f
 
 /* Processor table.  */
@@ -9532,6 +9535,16 @@ rs6000_abi_word_mode (void)
   return TARGET_32BIT ? SImode : DImode;
 }
 
+/* Implement the TARGET_OFFLOAD_OPTIONS hook.  */
+static char *
+rs6000_offload_options (void)
+{
+  if (TARGET_64BIT)
+    return xstrdup ("-foffload-abi=lp64");
+  else
+    return xstrdup ("-foffload-abi=ilp32");
+}
+
 /* On rs6000, function arguments are promoted, as are function return
    values.  */