diff mbox

[gomp4] Merge trunk r217500 (2014-11-13) into gomp-4_0-branch

Message ID 87ppbby67e.fsf@schwinge.name
State New
Headers show

Commit Message

Thomas Schwinge Dec. 22, 2014, 4:55 p.m. UTC 
Hi!

On Fri, 12 Dec 2014 16:59:21 +0100, I wrote:
> In r218677, I have committed a merge from trunk r217500 (2014-11-13) into
> gomp-4_0-branch.
> 
> This spans the "offloading" commits in trunk (plus two interleaved
> non-"offloading" commits).

This failed to update the (new) intelmic plugin in liboffloadmic;
committed to gomp-4_0-branch in r219021:

commit 1838e83800f9e1cf12b09e27e4cd7beec54fe4bf
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Mon Dec 22 16:55:18 2014 +0000

    liboffloadmic: Add missing GOMP_OFFLOAD_* functions to the intelmic plugin.
    
    	liboffloadmic/
    	* plugin/libgomp-plugin-intelmic.cpp (GOMP_OFFLOAD_get_name)
    	(GOMP_OFFLOAD_get_caps, GOMP_OFFLOAD_fini_device): New functions.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@219021 138bc75d-0d04-0410-961f-82ee72b054a4
---
 liboffloadmic/ChangeLog.gomp                     |  4 ++++
 liboffloadmic/plugin/libgomp-plugin-intelmic.cpp | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+)



Grüße,
 Thomas
diff mbox

Patch

diff --git liboffloadmic/ChangeLog.gomp liboffloadmic/ChangeLog.gomp
new file mode 100644
index 0000000..1c88817
--- /dev/null
+++ liboffloadmic/ChangeLog.gomp
@@ -0,0 +1,4 @@ 
+2014-12-22  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* plugin/libgomp-plugin-intelmic.cpp (GOMP_OFFLOAD_get_name)
+	(GOMP_OFFLOAD_get_caps, GOMP_OFFLOAD_fini_device): New functions.
diff --git liboffloadmic/plugin/libgomp-plugin-intelmic.cpp liboffloadmic/plugin/libgomp-plugin-intelmic.cpp
index 0428b79..b5aff92 100644
--- liboffloadmic/plugin/libgomp-plugin-intelmic.cpp
+++ liboffloadmic/plugin/libgomp-plugin-intelmic.cpp
@@ -135,6 +135,22 @@  set_mic_lib_path (void)
     }
 }
 
+extern "C" const char *
+GOMP_OFFLOAD_get_name (void)
+{
+  const char *res = "intelmic";
+  TRACE ("(): return %s", res);
+  return res;
+}
+
+extern "C" unsigned int
+GOMP_OFFLOAD_get_caps (void)
+{
+  unsigned int res = GOMP_OFFLOAD_CAP_OPENMP_400;
+  TRACE ("(): return %x", res);
+  return res;
+}
+
 extern "C" enum offload_target_type
 GOMP_OFFLOAD_get_type (void)
 {
@@ -190,6 +206,14 @@  GOMP_OFFLOAD_init_device (int device)
 	   NULL, NULL);
 }
 
+extern "C" void
+GOMP_OFFLOAD_fini_device (int device)
+{
+  TRACE ("");
+  /* Unreachable for GOMP_OFFLOAD_CAP_OPENMP_400.  */
+  abort ();
+}
+
 static void
 get_target_table (int device, int &num_funcs, int &num_vars, void **&table)
 {