r226157 - in /branches/gomp-4_0-branch: gcc/Cha...

[nathan@gcc.gnu.org]

Author: nathan
Date: Fri Jul 24 13:31:07 2015
New Revision: 226157

URL: https://gcc.gnu.org/viewcvs?rev=226157&root=gcc&view=rev
Log:
	include/
	* gomp-constants.h (GOMP_VERSION, GOMP_VERSION_NVIDIA_PTX): New.
	(GOMP_VERSION_PACK, GOMP_VERSION_LIB, GOMP_VERSION_DEV): New.

	libgomp/
	* plugin/plugin-nvptx.c: Include gomp-constants.h.
	(GOMP_OFFLOAD_load_image): Replace with stub function.  Move bulk
	to ....
	(GOMP_OFFLOAD_load_image_2): ... here.  Add version argument and
	check it.
	(GOMP_OFFLOAD_unload_image): Replace with stub function.  Move bulk
	to ....
	(GOMP_OFFLOAD_unload_image_2): ... here.  Add version argument and
	check it.
	* libgomp.map: Add 4.0.2 version.
	* target.c (offload_image_descr): Add versionn field.
	(gomp_offload_image_to_device): Add version argument.  Forward to
	load_image_func_2 if available.  Improve load mismatch diagnostic.
	(GOMP_offload_regster): Make stub function, move bulk to ...
	(GOMP_offload_register_2): ... here.  Process version argument.
	(GOMP_offload_unregister): Make stub function, move bulk to ...
	(GOMP_offload_unregister_2): ... here.  Process version argument.
	(gomp_init_device): Process version field.
	(gomp_load_plugin_for_device): Search for load_image_2 and
	unload_image_2 entry points.
	* libgomp.h (gomp_device_descr) Add load_image_2 and
	unload_image_2 fields.

	gcc/ 
	* config/nvptx/mkoffload.c (process): Replace
	GOMP_offload_register with GOMP_offload_register_2.

Modified:
    branches/gomp-4_0-branch/gcc/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/config/nvptx/mkoffload.c
    branches/gomp-4_0-branch/include/ChangeLog.gomp
    branches/gomp-4_0-branch/include/gomp-constants.h
    branches/gomp-4_0-branch/libgomp/ChangeLog.gomp
    branches/gomp-4_0-branch/libgomp/libgomp.h
    branches/gomp-4_0-branch/libgomp/libgomp.map
    branches/gomp-4_0-branch/libgomp/plugin/plugin-nvptx.c
    branches/gomp-4_0-branch/libgomp/target.c