Thu, 11 Jun 2009 15:16:20 -0400
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
6845973: Update JDK7 with deployment changes in 6u13, 6u14
4802695: Support 64-bit Java Plug-in and Java webstart on Windows/Linux on AMD64
6825019: DownloadManager should not be loaded and referenced for full JRE
6738770: REGRESSION:JSException throws when use LiveConnect javascript facility
6772884: plugin2 : java.lang.OutOfMemoryError or crash
6707535: Crossing domain hole affecting multiple sites/domains using plug-in
6728071: Non-verification of Update files may allow unintended updates
6704154: Code loaded from local filesystem should not get access to localhost
6727081: Web Start security restrictions bypass using special extension jnlp
6727079: Java Web Start Socket() restriction bypass
6727071: Cache location/user name information disclosure in SingleInstanceImpl.
6716217: AppletClassLoader adds permissions based on codebase regardless of CS
6694892: Java Webstart inclusion via system properties override [CVE-2008-2086]
6704074: localhost socket access due to cache location exposed
6703909: Java webstart arbitrary file creation using nativelib
6665315: browser crashes when deployment.properties has more slashes ( / )
6660121: Encoding values in JNLP files can cause buffer overflow
6606110: URLConnection.setProxiedHost for resources that are loaded via proxy
6581221: SSV(VISTA): Redirection FAILS to work if user does a downgrade install
6609756: Buffer Overflow in Java ActiveX component
6608712: Bypassing the same origin policy in Java with crafted names
6534630: "gnumake clobber" doesn't
6849953: JDK7 - replacement of bufferoverflowU.lib on amd64 breaks build
6849029: Need some JDK7 merge clean-up after comments on the webrev
6847582: Build problem on JDK7 with isSecureProperty in merge
6827935: JDK 7 deployment merging - problem in Compiler-msvm.gmk
6823215: latest merge fixes from 6u12 -> JDK7
6816153: further mergers for JDK7 deployment integration
6807074: Fix Java Kernel and JQS in initial JDK7 builds
Summary: Initial changeset for implementing 6uX Deployment Features into JDK7
Reviewed-by: dgu, billyh
duke@1 | 1 | # |
duke@1 | 2 | # Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved. |
duke@1 | 3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@1 | 4 | # |
duke@1 | 5 | # This code is free software; you can redistribute it and/or modify it |
duke@1 | 6 | # under the terms of the GNU General Public License version 2 only, as |
duke@1 | 7 | # published by the Free Software Foundation. Sun designates this |
duke@1 | 8 | # particular file as subject to the "Classpath" exception as provided |
duke@1 | 9 | # by Sun in the LICENSE file that accompanied this code. |
duke@1 | 10 | # |
duke@1 | 11 | # This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 12 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 13 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 14 | # version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 15 | # accompanied this code). |
duke@1 | 16 | # |
duke@1 | 17 | # You should have received a copy of the GNU General Public License version |
duke@1 | 18 | # 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 19 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 20 | # |
duke@1 | 21 | # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@1 | 22 | # CA 95054 USA or visit www.sun.com if you need additional information or |
duke@1 | 23 | # have any questions. |
duke@1 | 24 | # |
duke@1 | 25 | |
duke@1 | 26 | # |
duke@1 | 27 | # Makefile for linking with mapfiles. |
duke@1 | 28 | # |
duke@1 | 29 | # NOTE: Not using a mapfile will expose all your extern functions and |
duke@1 | 30 | # extern data symbols as part of your interface, so unless your |
duke@1 | 31 | # extern names are safe from being mistaken as names from other |
duke@1 | 32 | # libraries, you better use a mapfile, or use a unique naming |
duke@1 | 33 | # convention on all your extern symbols. |
duke@1 | 34 | # |
duke@1 | 35 | # The mapfile will establish versioning by defining the exported interface. |
duke@1 | 36 | # |
duke@1 | 37 | # The mapfile can also force certain .o files or elf sections into the |
duke@1 | 38 | # the different segments of the resulting library/program image. |
duke@1 | 39 | # |
duke@1 | 40 | # The macro FILES_m can contain any number of mapfiles. |
duke@1 | 41 | # |
duke@1 | 42 | |
duke@1 | 43 | # Always make sure 'all' is the default rule |
duke@1 | 44 | mapfile_default_rule: all |
duke@1 | 45 | |
duke@1 | 46 | ifeq ($(PLATFORM), solaris) |
duke@1 | 47 | |
duke@1 | 48 | ifeq ($(VARIANT), OPT) |
duke@1 | 49 | # OPT build MUST have a mapfile? |
duke@1 | 50 | ifndef FILES_m |
duke@1 | 51 | FILES_m = mapfile-vers |
duke@1 | 52 | endif |
duke@1 | 53 | |
duke@1 | 54 | # If we are re-ordering functions in this solaris library, we need to make |
duke@1 | 55 | # sure that -xF is added to the compile lines. This option is critical and |
duke@1 | 56 | # enables the functions to be reordered. |
duke@1 | 57 | ifdef FILES_reorder |
duke@1 | 58 | CFLAGS_OPT += -xF |
duke@1 | 59 | CXXFLAGS_OPT += -xF |
duke@1 | 60 | endif |
duke@1 | 61 | |
duke@1 | 62 | INIT += $(TEMPDIR)/mapfile-vers |
duke@1 | 63 | |
duke@1 | 64 | $(TEMPDIR)/mapfile-vers : $(FILES_m) $(FILES_reorder) |
duke@1 | 65 | $(prep-target) |
duke@1 | 66 | $(CAT) $(FILES_m) > $@ |
duke@1 | 67 | ifdef FILES_reorder |
duke@1 | 68 | $(SED) -e 's=OUTPUTDIR=$(OUTPUTDIR)=' $(FILES_reorder) >> $@ |
duke@1 | 69 | endif |
duke@1 | 70 | endif # VARIANT |
duke@1 | 71 | |
duke@1 | 72 | ifndef LDNOMAP |
duke@1 | 73 | LDMAPFLAGS_OPT = -M$(TEMPDIR)/mapfile-vers |
duke@1 | 74 | LDMAPFLAGS_DBG = $(FILES_m:%=-M%) |
duke@1 | 75 | endif |
duke@1 | 76 | |
duke@1 | 77 | endif # PLATFORM |
duke@1 | 78 | |
duke@1 | 79 | |
duke@1 | 80 | ifeq ($(PLATFORM), linux) |
duke@1 | 81 | |
duke@1 | 82 | ifeq ($(VARIANT), OPT) |
duke@1 | 83 | # OPT build MUST have a mapfile? |
duke@1 | 84 | ifndef FILES_m |
duke@1 | 85 | FILES_m = mapfile-vers |
duke@1 | 86 | endif |
duke@1 | 87 | endif # VARIANT |
duke@1 | 88 | |
duke@1 | 89 | ifndef LDNOMAP |
duke@1 | 90 | LDMAPFLAGS_OPT = $(FILES_m:%=-Xlinker -version-script=%) |
duke@1 | 91 | LDMAPFLAGS_DBG = $(FILES_m:%=-Xlinker -version-script=%) |
duke@1 | 92 | endif |
duke@1 | 93 | |
duke@1 | 94 | endif # PLATFORM |
duke@1 | 95 | |
duke@1 | 96 | LDFLAGS_OPT += $(LDMAPFLAGS_OPT) |
duke@1 | 97 | LDFLAGS_DBG += $(LDMAPFLAGS_DBG) |
duke@1 | 98 |