[gomp4] Resolve bootstrap failure in expand_GOACC_FORK, expand_GOACC_JOIN (was: Move openacc vector& worker single handling to RTL)

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

On Thu, 09 Jul 2015 20:25:22 -0400, Nathan Sidwell <nathan@acm.org> wrote:
> This is the patch I committed.

> --- internal-fn.c	(revision 225323)
> +++ internal-fn.c	(working copy)

> +static void
> +expand_GOACC_FORK (gcall *stmt)
> +{
> +  rtx mode = expand_normal (gimple_call_arg (stmt, 0));
> +  
> +#ifdef HAVE_oacc_fork
> +  emit_insn (gen_oacc_fork (mode));
> +#endif
> +}
> +
> +static void
> +expand_GOACC_JOIN (gcall *stmt)
> +{
> +  rtx mode = expand_normal (gimple_call_arg (stmt, 0));
> +  
> +#ifdef HAVE_oacc_join
> +  emit_insn (gen_oacc_join (mode));
> +#endif
> +}

Committed in r225715:

commit f9d00ca614a8dc28f21ab4a16d7cdbbe16668ca3
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Sat Jul 11 21:17:46 2015 +0000

    Resolve bootstrap failure in expand_GOACC_FORK, expand_GOACC_JOIN
    
        [...]/source-gcc/gcc/internal-fn.c: In function 'void expand_GOACC_FORK(gcall*)':
        [...]/source-gcc/gcc/internal-fn.c:1970:7: error: unused variable 'mode' [-Werror=unused-variable]
           rtx mode = expand_normal (gimple_call_arg (stmt, 0));
               ^
        [...]/source-gcc/gcc/internal-fn.c: In function 'void expand_GOACC_JOIN(gcall*)':
        [...]/source-gcc/gcc/internal-fn.c:1980:7: error: unused variable 'mode' [-Werror=unused-variable]
           rtx mode = expand_normal (gimple_call_arg (stmt, 0));
               ^
    
    	gcc/
    	* internal-fn.c (expand_GOACC_FORK, expand_GOACC_JOIN)
    	[!HAVE_oacc_fork]: Keep quiet.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@225715 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog.gomp |    3 +++
 gcc/internal-fn.c  |   12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp
index 1f57a9d..ea3ea6b 100644
--- gcc/ChangeLog.gomp
+++ gcc/ChangeLog.gomp
@@ -1,5 +1,8 @@
 2015-07-11  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* internal-fn.c (expand_GOACC_FORK, expand_GOACC_JOIN)
+	[!HAVE_oacc_fork]: Keep quiet.
+
 	* df-core.c (df_analyze_1): Don't disable df_verify call.
 
 2015-07-10  Nathan Sidwell  <nathan@codesourcery.com>
diff --git gcc/internal-fn.c gcc/internal-fn.c
index e1c4c9a..b507208 100644
--- gcc/internal-fn.c
+++ gcc/internal-fn.c
@@ -2005,21 +2005,21 @@ expand_GOACC_DATA_END_WITH_ARG (gcall *stmt ATTRIBUTE_UNUSED)
 }
 
 static void
-expand_GOACC_FORK (gcall *stmt)
+expand_GOACC_FORK (gcall *stmt ATTRIBUTE_UNUSED)
 {
-  rtx mode = expand_normal (gimple_call_arg (stmt, 0));
-  
 #ifdef HAVE_oacc_fork
+  rtx mode = expand_normal (gimple_call_arg (stmt, 0));
+  
   emit_insn (gen_oacc_fork (mode));
 #endif
 }
 
 static void
-expand_GOACC_JOIN (gcall *stmt)
+expand_GOACC_JOIN (gcall *stmt ATTRIBUTE_UNUSED)
 {
-  rtx mode = expand_normal (gimple_call_arg (stmt, 0));
-  
 #ifdef HAVE_oacc_join
+  rtx mode = expand_normal (gimple_call_arg (stmt, 0));
+  
   emit_insn (gen_oacc_join (mode));
 #endif
 }


GrÃÃe,
 Thomas

Attachment: signature.asc
Description: PGP signature