# HG changeset patch
# User Stefan Anzinger <stefan.anzinger@oracle.com>
# Date 1433164353 -7200
# Node ID 06d12473ed61e02b7f71d85386dc1c35831703b4
# Parent  ca3c6538bcecf838b0149705d06313f8cf2566af
Fix build for JVMCI on Solaris (JBS:GRAAL-53)

diff -r ca3c6538bcec -r 06d12473ed61 make/solaris/makefiles/debug.make
--- a/make/solaris/makefiles/debug.make	Mon Jun 01 14:17:05 2015 +0200
+++ b/make/solaris/makefiles/debug.make	Mon Jun 01 15:12:33 2015 +0200
@@ -47,7 +47,7 @@
 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
           $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug
 #ifdef JVMCI
-MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug
+MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-JVMCI
 #endif
 
 # This mapfile is only needed when compiling with dtrace support,
diff -r ca3c6538bcec -r 06d12473ed61 make/solaris/makefiles/fastdebug.make
--- a/make/solaris/makefiles/fastdebug.make	Mon Jun 01 14:17:05 2015 +0200
+++ b/make/solaris/makefiles/fastdebug.make	Mon Jun 01 15:12:33 2015 +0200
@@ -118,7 +118,7 @@
 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
 	  $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug
 #ifdef JVMCI
-MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-fastdebug
+MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-JVMCI
 #endif
 
 # This mapfile is only needed when compiling with dtrace support,
diff -r ca3c6538bcec -r 06d12473ed61 make/solaris/makefiles/mapfile-vers-GRAAL
--- a/make/solaris/makefiles/mapfile-vers-GRAAL	Mon Jun 01 14:17:05 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-
-#
-# Copyright (c) 2006, 2008, 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.
-#  
-#
-
-# Define public interface.
-SUNWprivate_1.1 {
-        global:
-};
diff -r ca3c6538bcec -r 06d12473ed61 make/solaris/makefiles/mapfile-vers-JVMCI
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/solaris/makefiles/mapfile-vers-JVMCI	Mon Jun 01 15:12:33 2015 +0200
@@ -0,0 +1,30 @@
+#
+
+#
+# Copyright (c) 2006, 2008, 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.
+#  
+#
+
+# Define public interface.
+SUNWprivate_1.1 {
+        global:
+};
diff -r ca3c6538bcec -r 06d12473ed61 make/solaris/makefiles/optimized.make
--- a/make/solaris/makefiles/optimized.make	Mon Jun 01 14:17:05 2015 +0200
+++ b/make/solaris/makefiles/optimized.make	Mon Jun 01 15:12:33 2015 +0200
@@ -55,7 +55,7 @@
 # Linker mapfiles
 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers
 #ifdef JVMCI
-MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-optimized
+MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-JVMCI
 #endif
 
 # This mapfile is only needed when compiling with dtrace support, 
diff -r ca3c6538bcec -r 06d12473ed61 make/solaris/makefiles/product.make
--- a/make/solaris/makefiles/product.make	Mon Jun 01 14:17:05 2015 +0200
+++ b/make/solaris/makefiles/product.make	Mon Jun 01 15:12:33 2015 +0200
@@ -67,7 +67,7 @@
 # Linker mapfiles
 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers
 ifdef JVMCI
-MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-product
+MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-JVMCI
 endif
 
 ifndef USE_GCC
diff -r ca3c6538bcec -r 06d12473ed61 make/solaris/makefiles/reorder_GRAAL_amd64
diff -r ca3c6538bcec -r 06d12473ed61 make/solaris/makefiles/reorder_JVMCI_amd64