libgomp external ABI prototypes maintenance (was: Openacc launch API)

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

On Mon, 28 Sep 2015 15:38:57 -0400, Nathan Sidwell <nathan@acm.org> wrote:
> --- libgomp/libgomp_g.h	(revision 228086)
> +++ libgomp/libgomp_g.h	(working copy)
> @@ -222,9 +222,8 @@ extern void GOACC_data_start (int, size_
>  extern void GOACC_data_end (void);
>  extern void GOACC_enter_exit_data (int, size_t, void **,
>  				   size_t *, unsigned short *, int, int, ...);
> -extern void GOACC_parallel (int, void (*) (void *), size_t,
> -			    void **, size_t *, unsigned short *, int, int, int,
> -			    int, int, ...);

Even if no longer a GCC builtin, we should still keep that one: it's
still part of the libgomp ABI.

> +extern void GOACC_parallel_keyd (int, void (*) (void *), size_t,
> +			          void **, size_t *, unsigned short *, ...);

Typo: should be GOACC_parallel_keyed.

Additionally, I found GOACC_declare missing.

Committed in r234901, as obvious:

commit 1e312f40ebbad3c47d5ad5ec8375b717eed40dc7
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Tue Apr 12 13:13:53 2016 +0000

    libgomp external ABI prototypes maintenance
    
    	libgomp/
    	* libgomp_g.h: Rename GOACC_parallel_keyd prototype to
    	GOACC_parallel_keyed, restore GOACC_parallel prototype, new
    	GOACC_declare prototype.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234901 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libgomp/ChangeLog   | 4 ++++
 libgomp/libgomp_g.h | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git libgomp/ChangeLog libgomp/ChangeLog
index 1716ba0..7628c93 100644
--- libgomp/ChangeLog
+++ libgomp/ChangeLog
@@ -1,5 +1,9 @@
 2016-04-12  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* libgomp_g.h: Rename GOACC_parallel_keyd prototype to
+	GOACC_parallel_keyed, restore GOACC_parallel prototype, new
+	GOACC_declare prototype.
+
 	* testsuite/libgomp.oacc-c-c++-common/loop-reduction-gang-np-1.c:
 	Merge this file, and...
 	* testsuite/libgomp.oacc-c-c++-common/loop-reduction-gv-np-1.c:
diff --git libgomp/libgomp_g.h libgomp/libgomp_g.h
index 24eebb6..20454e6 100644
--- libgomp/libgomp_g.h
+++ libgomp/libgomp_g.h
@@ -295,17 +295,20 @@ extern void GOMP_teams (unsigned int, unsigned int);
 
 /* oacc-parallel.c */
 
+extern void GOACC_parallel_keyed (int, void (*) (void *), size_t,
+				  void **, size_t *, unsigned short *, ...);
+extern void GOACC_parallel (int, void (*) (void *), size_t, void **, size_t *,
+			    unsigned short *, int, int, int, int, int, ...);
 extern void GOACC_data_start (int, size_t, void **, size_t *,
 			      unsigned short *);
 extern void GOACC_data_end (void);
 extern void GOACC_enter_exit_data (int, size_t, void **,
 				   size_t *, unsigned short *, int, int, ...);
-extern void GOACC_parallel_keyd (int, void (*) (void *), size_t,
-			          void **, size_t *, unsigned short *, ...);
 extern void GOACC_update (int, size_t, void **, size_t *,
 			  unsigned short *, int, int, ...);
 extern void GOACC_wait (int, int, ...);
 extern int GOACC_get_num_threads (void);
 extern int GOACC_get_thread_num (void);
+extern void GOACC_declare (int, size_t, void **, size_t *, unsigned short *);
 
 #endif /* LIBGOMP_G_H */


GrÃÃe
 Thomas

Attachment: signature.asc
Description: PGP signature