18793926 The .annotate section should be removed for wanboot-openssl.o s11-update
authorMisaki Miyashita <Misaki.Miyashita@Oracle.COM>
Thu, 23 Apr 2015 17:23:45 -0400
branchs11-update
changeset 4180 5cd36902893c
parent 4179 d3168ead33bd
child 4182 edb1ea7d72bc
18793926 The .annotate section should be removed for wanboot-openssl.o
components/openssl/openssl-1.0.1/patches/18-compiler_opts.patch
--- a/components/openssl/openssl-1.0.1/patches/18-compiler_opts.patch	Thu Apr 23 12:34:24 2015 -0700
+++ b/components/openssl/openssl-1.0.1/patches/18-compiler_opts.patch	Thu Apr 23 17:23:45 2015 -0400
@@ -4,7 +4,7 @@
 #
 --- openssl-1.0.0d/Configure	Thu Feb 10 20:02:41 2011
 +++ /tmp/Configure	Thu Feb 10 20:01:51 2011
-@@ -257,6 +257,19 @@
+@@ -257,6 +257,20 @@
  #"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::",
  "sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:${no_asm}::",
  
@@ -17,9 +17,10 @@
 +#
 +"solaris64-sparcv9-cc-sunw","cc:-xtarget=ultra -m64 -Qoption cg -xregs=no%appl -xO5 -xstrconst -xdepend -xspace -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -lc: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",
 +# 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",
++# variables into separate section fragments, and option -xannotate=no removes
++# the .annotate section. 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 -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.