# HG changeset patch
# User Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
# Date 1400619760 25200
# Node ID 17096cac036b3b977a501119dd4093bead627462
# Parent  026a5463a71ba179ae4a8822a6c700e048e0ae54
18793926 The .annotate section should be removed for wanboot-openssl.o

diff -r 026a5463a71b -r 17096cac036b components/openssl/README
--- a/components/openssl/README	Tue May 20 04:44:47 2014 -0700
+++ b/components/openssl/README	Tue May 20 14:02:40 2014 -0700
@@ -268,24 +268,27 @@
 ----
 
 With every upgrade of OpenSSL, it is necessary to make sure wanboot builds and
-works well with the new bits.
+works well with the new bits (post lullaby).
 
 Provided you have a freshly built ON workspace, you can link wanboot with new
-OpenSSL bits by redefining WAN_OPENSSL macro:
+OpenSSL bits as follows:
 
     # copy wanboot-openssl.o to ON build machine
     cp wanboot-openssl.o /var/tmp/
 
     # prepare to rebuild wanboot
     cd $ON
-    bldenv developer.sh
     cd usr/src/psm/stand/boot/sparcv9/sun4
 
     # hack to force a rebuild
-    touch wanboot.o
+    touch $ON/build.sparc/usr/src/psm/stand/boot/sparcv9/sun4/wanboot.o
 
-    # link new OpenSSL to wanboot
-    WAN_OPENSSL=/var/tmp/wanboot-openssl.o dmake all
+    # modify Makefile and assign the WAN_OPENSSL macro to your binary
+    # something like
+    WAN_OPENSSL    = /var/tmp/wanboot-openssl.o
+
+    # build a wanboot binary
+    build -i dmake all
 
 Wanboot should build without warning.
 
diff -r 026a5463a71b -r 17096cac036b components/openssl/openssl-1.0.1/patches/18-compiler_opts.patch
--- a/components/openssl/openssl-1.0.1/patches/18-compiler_opts.patch	Tue May 20 04:44:47 2014 -0700
+++ b/components/openssl/openssl-1.0.1/patches/18-compiler_opts.patch	Tue May 20 14:02:40 2014 -0700
@@ -15,7 +15,7 @@
 +# Option -xF=%all instructs the compiler to place functions and data
 +# variables into separate section fragments. This enables the link editor
 +# to discard unused sections and files when linking wanboot-openssl.o
-+"solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64",
++"solaris64-sparcv9-cc-sunw-wanboot","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -xannotate=no -xF=%all -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl:BN_LLONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text -zdefs -Bdirect -zignore -M/usr/lib/ld/map.pagealign:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/bin/ar rs::/64",
 +
  #### IRIX 5.x configs
  # -mips2 flag is added by ./config when appropriate.