# HG changeset patch
# User erikj
# Date 1450363398 -3600
# Node ID 83c270cae5e176537d762dabdb65e6f9022488bf
# Parent  60c12f0860d64188b669dd7db639cf895fe8bea7
8145670: New Solaris devkits are missing gobjcopy
Reviewed-by: ihse

diff -r 60c12f0860d6 -r 83c270cae5e1 make/devkit/createSolarisDevkit.sh
--- a/make/devkit/createSolarisDevkit.sh	Wed Dec 16 15:50:40 2015 +0100
+++ b/make/devkit/createSolarisDevkit.sh	Thu Dec 17 15:43:18 2015 +0100
@@ -96,12 +96,13 @@
   echo "Copying from $INSTALL_ROOT to $SYSROOT"
   mkdir -p $SYSROOT
   cp -rH $INSTALL_ROOT/lib $SYSROOT/
-  mkdir $SYSROOT/usr
+  mkdir $SYSROOT/usr $DEVKIT_ROOT/gnu
   # Some of the tools in sysroot are needed in the OpenJDK build but cannot be
   # run from their current location due to relative runtime paths in the
   # binaries. Move the sysroot/usr/bin directory to the outer bin and have them
   # be runnable from there to force them to link to the system libraries
   cp -rH $INSTALL_ROOT/usr/bin $DEVKIT_ROOT
+  cp -rH $INSTALL_ROOT/usr/gnu/bin $DEVKIT_ROOT/gnu/
   cp -rH $INSTALL_ROOT/usr/lib $SYSROOT/usr/
   cp -rH $INSTALL_ROOT/usr/include $SYSROOT/usr/
   pkg -R $INSTALL_ROOT list > $SYSROOT/pkg-list.txt
diff -r 60c12f0860d6 -r 83c270cae5e1 make/devkit/solaris11.1-package-list.txt
--- a/make/devkit/solaris11.1-package-list.txt	Wed Dec 16 15:50:40 2015 +0100
+++ b/make/devkit/solaris11.1-package-list.txt	Thu Dec 17 15:43:18 2015 +0100
@@ -13,6 +13,7 @@
 database/mysql-51/library@5.1.37-0.175.1.10.0.5.0
 database/sqlite-3@3.7.14.1-0.175.1.10.0.4.0
 developer/base-developer-utilities@0.5.11-0.175.1.11.0.1.2
+developer/gnu-binutils@2.21.1-0.175.1.0.0.24.0
 developer/macro/cpp@0.5.11-0.175.1.19.0.4.0
 driver/management/bmc@0.5.11-0.175.1.0.0.24.2
 driver/management/ipmi@0.5.11-0.175.1.6.0.3.2