--- a/src/gpu/hsail/vm/gpu_hsail.hpp	Thu Jan 30 17:27:04 2014 +0100
+++ b/src/gpu/hsail/vm/gpu_hsail.hpp	Thu Jan 30 21:11:38 2014 +0100
@@ -32,13 +32,13 @@
   static JNINativeMethod HSAIL_methods[];
 
   // static native boolean initialize();
-  static jboolean initialize(JNIEnv *env, jclass);
+  JNIEXPORT static jboolean initialize(JNIEnv *env, jclass);
 
   // static native long generateKernel(byte[] targetCode, String name);
-  static jlong generate_kernel(JNIEnv *env, jclass, jbyteArray code_handle, jstring name_handle);
+  JNIEXPORT static jlong generate_kernel(JNIEnv *env, jclass, jbyteArray code_handle, jstring name_handle);
 
   // static native boolean executeKernel0(HotSpotInstalledCode kernel, int jobSize, Object[] args);
-  static jboolean execute_kernel_void_1d(JNIEnv *env, jclass, jobject hotspotInstalledCode, jint dimX, jobject args);
+  JNIEXPORT static jboolean execute_kernel_void_1d(JNIEnv *env, jclass, jobject hotspotInstalledCode, jint dimX, jobject args);
 
   static void register_heap();
 

--- a/src/gpu/ptx/vm/gpu_ptx.hpp	Thu Jan 30 17:27:04 2014 +0100
+++ b/src/gpu/ptx/vm/gpu_ptx.hpp	Thu Jan 30 21:11:38 2014 +0100
@@ -95,16 +95,16 @@
   static JNINativeMethod PTX_methods[];
 
   // static native boolean initialize();
-  static jboolean initialize(JNIEnv* env, jclass);
+  JNIEXPORT static jboolean initialize(JNIEnv* env, jclass);
 
   // static native long generateKernel(byte[] targetCode, String name);
-  static jlong generate_kernel(JNIEnv *env, jclass, jbyteArray code_handle, jstring name_handle);
+  JNIEXPORT static jlong generate_kernel(JNIEnv *env, jclass, jbyteArray code_handle, jstring name_handle);
 
   // static native long getLaunchKernelAddress();
-  static jlong get_execute_kernel_from_vm_address(JNIEnv *env, jclass);
+  JNIEXPORT static jlong get_execute_kernel_from_vm_address(JNIEnv *env, jclass);
 
   // static native int getAvailableProcessors0();
-  static jint get_total_cores(JNIEnv *env, jobject);
+  JNIEXPORT static jint get_total_cores(JNIEnv *env, jobject);
 
   // Links the CUDA driver library functions
   static bool link();

--- a/src/os_gpu/bsd_ptx/vm/gpu_bsd.cpp	Thu Jan 30 17:27:04 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "runtime/gpu.hpp"
-#include "utilities/ostream.hpp"
-
-
-void gpu::probe_gpu() {
-#ifdef __APPLE__
-  /*
-   * Let the CUDA driver initialization be the gate to GPU for now, pending
-   * a better detection solution for NVIDA PTX and AMD HSAIL.
-   */
-  set_available(true);
-  set_target_il_type(gpu::PTX);
-  if (TraceGPUInteraction) {
-    tty->print_cr("gpu_bsd::probe_gpu(APPLE): %d", gpu::is_available());
-  }
-#else
-  if (TraceGPUInteraction) {
-    tty->print_cr("gpu_bsd::probe_gpu(not APPLE)");
-  }
-  set_available(false);
-#endif
-}
-

--- a/src/os_gpu/linux_ptx/vm/gpu_linux.cpp	Thu Jan 30 17:27:04 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "runtime/gpu.hpp"
-#include "utilities/ostream.hpp"
-
-void gpu::probe_gpu() {
-  set_available(gpu::Linux::probe_gpu());
-  if (TraceGPUInteraction) {
-    tty->print_cr("gpu_linux::probe_gpu(): %d", gpu::is_available());
-  }
-}
-
-/*
- * Probe for CUDA device on PCI bus using /proc/bus/pci/devices. Do
- * not rely on CUDA tool kit being installed. We will check if CUDA
- * library is installed later.
- */
-
-static unsigned int nvidia_vendor_id = 0x10de;
-static unsigned int amd_vendor_id = 0x1002;
-
-bool gpu::Linux::probe_gpu() {
-
-  /*
-   * The simulator only depends on shared libraries.
-   * That linkage is checked in a later step.
-   */
-  if (UseHSAILSimulator) {
-      set_target_il_type(gpu::HSAIL);
-      if (TraceGPUInteraction) {
-        tty->print_cr("Setup HSAIL Simulator");
-      }
-      return true;
-  }
-
-  /* 
-   * Open /proc/bus/pci/devices to look for the first GPU device. For
-   * now, we will just find the first GPU device. Will need to revisit
-   * this to support execution on multiple GPU devices, if they exist.
-   */
-  FILE *pci_devices = fopen("/proc/bus/pci/devices", "r");
-  char contents[4096];
-  unsigned int bus_num_devfn_ign;
-  unsigned int vendor;
-  unsigned int device;
-  bool gpu_device_exists = false;
-  if (pci_devices == NULL) {
-    tty->print_cr("*** Failed to open /proc/bus/pci/devices");
-    return gpu_device_exists;
-  }
-
-  while (fgets(contents, sizeof(contents)-1, pci_devices)) {
-    sscanf(contents, "%04x%04x%04x", &bus_num_devfn_ign, &vendor, &device);
-    /* Break after finding the first GPU device. */
-    if (vendor == nvidia_vendor_id) {
-      gpu_device_exists = true;
-      set_target_il_type(gpu::PTX);
-      if (TraceGPUInteraction) {
-        tty->print_cr("Found supported nVidia GPU device vendor : 0x%04x device 0x%04x", vendor, device);
-      }
-      break;
-       /*
-        * Remove AMD detection until we decide how to detect real HSA hardware.
-        * In the current form this check does not work correctly on AMD CPU system with 
-        * Nvidia GPU.
-        *
-        * } else if (vendor == amd_vendor_id) {
-        *   gpu_device_exists = true;
-        *   set_target_il_type(gpu::HSAIL);
-        *   if (TraceGPUInteraction) {
-        *     tty->print_cr("Found supported AMD GPU device vendor : 0x%04x device 0x%04x", vendor, device);
-        *   }
-        *   break;
-        */
-    }
-  }
-
-  // Close file pointer.
-  fclose(pci_devices);
-
-  return gpu_device_exists;
-}

--- a/src/os_gpu/windows_hsail/vm/gpu_windows.cpp	Thu Jan 30 17:27:04 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "runtime/gpu.hpp"
-#include "utilities/ostream.hpp"
-
-void gpu::probe_gpu() {
-  set_available(gpu::Windows::probe_gpu());
-  if (TraceGPUInteraction) {
-    tty->print_cr("probe_gpu(): %d", gpu::is_available());
-  }
-}
-
-bool gpu::Windows::probe_gpu() {
-    
-  /*
-   * We will check the HSA environment in the libraries,
-   * so nothing to do here.
-   * The HSA library linkage is checked in a later step.
-   */  
-  bool gpu_device_exists = true;
-  set_target_il_type(gpu::HSAIL);
-
-  return gpu_device_exists;
-}