/hg/icedtea6: Backport various Makefile changes so -Wno-clobbere...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Sep 2 12:59:30 PDT 2013
changeset 782a87f782f3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=782a87f782f3
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Sep 02 20:59:15 2013 +0100
Backport various Makefile changes so -Wno-clobbered is only used with GCC >= 4.3.
S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
S6799141: Build with --hash-style=both so that binaries can work on SuSE 10
S6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches)
S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build
S7000225: Sanity check on sane-alsa-headers is broken
S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber
2013-09-02 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new backports. Move
disable-cc-incompatible-sanity-checks and freetypeversion
to the end.
* patches/disable-cc-incompatible-sanity-checks.patch,
* patches/freetypeversion.patch:
Regenerated to work after new backports.
* patches/openjdk/6563752-ss12_support.patch,
* patches/openjdk/6729772-opt_cleanup.patch,
* patches/openjdk/6799141-split_out_versions.patch,
* patches/openjdk/6816311-compiler_name.patch,
* patches/openjdk/6974017-minorver_for_solaris.patch,
* patches/openjdk/6980281-majorver_for_solaris.patch,
* patches/openjdk/7000225-bad_tabs.patch,
* patches/openjdk/7038711-fix_no-clobber_usage.patch:
Backports from OpenJDK 7 to bring in latest Makefile
updates.
* NEWS: Update and order backports numerically.
diffstat:
ChangeLog | 21 +
Makefile.am | 15 +-
NEWS | 12 +-
patches/disable-cc-incompatible-sanity-checks.patch | 54 +-
patches/freetypeversion.patch | 23 +-
patches/openjdk/6563752-ss12_support.patch | 173 +++
patches/openjdk/6729772-opt_cleanup.patch | 847 ++++++++++++++++++
patches/openjdk/6799141-split_out_versions.patch | 915 ++++++++++++++++++++
patches/openjdk/6816311-compiler_name.patch | 417 +++++++++
patches/openjdk/6974017-minorver_for_solaris.patch | 24 +
patches/openjdk/6980281-majorver_for_solaris.patch | 66 +
patches/openjdk/7000225-bad_tabs.patch | 48 +
patches/openjdk/7038711-fix_no-clobber_usage.patch | 125 ++
13 files changed, 2682 insertions(+), 58 deletions(-)
diffs (truncated from 2878 to 500 lines):
diff -r de0023a3d26d -r 782a87f782f3 ChangeLog
--- a/ChangeLog Sat Aug 31 17:42:12 2013 +0100
+++ b/ChangeLog Mon Sep 02 20:59:15 2013 +0100
@@ -1,3 +1,24 @@
+2013-09-02 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new backports. Move
+ disable-cc-incompatible-sanity-checks and freetypeversion
+ to the end.
+ * patches/disable-cc-incompatible-sanity-checks.patch,
+ * patches/freetypeversion.patch:
+ Regenerated to work after new backports.
+ * patches/openjdk/6563752-ss12_support.patch,
+ * patches/openjdk/6729772-opt_cleanup.patch,
+ * patches/openjdk/6799141-split_out_versions.patch,
+ * patches/openjdk/6816311-compiler_name.patch,
+ * patches/openjdk/6974017-minorver_for_solaris.patch,
+ * patches/openjdk/6980281-majorver_for_solaris.patch,
+ * patches/openjdk/7000225-bad_tabs.patch,
+ * patches/openjdk/7038711-fix_no-clobber_usage.patch:
+ Backports from OpenJDK 7 to bring in latest Makefile
+ updates.
+ * NEWS: Update and order backports numerically.
+
2013-08-30 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r de0023a3d26d -r 782a87f782f3 Makefile.am
--- a/Makefile.am Sat Aug 31 17:42:12 2013 +0100
+++ b/Makefile.am Mon Sep 02 20:59:15 2013 +0100
@@ -510,7 +510,6 @@
patches/libraries.patch \
$(SPECIAL_SECURITY_PATCH_2) \
patches/uname.patch \
- patches/freetypeversion.patch \
patches/nomotif-6706121.patch \
patches/nomotif.patch \
patches/nomotif-mtoolkit.patch \
@@ -532,7 +531,6 @@
patches/jtreg-jrunscript.patch \
patches/network-unreachable.patch \
patches/dnd-filelists.patch \
- patches/disable-cc-incompatible-sanity-checks.patch \
patches/explicit-target-arch.patch \
patches/parisc.patch \
patches/policy-evaluation.patch \
@@ -752,7 +750,17 @@
patches/openjdk/8014469-tzdata2013c.patch \
patches/openjdk/8020054-tzdata2013d.patch \
patches/imageiojpeg_sync.patch \
- patches/openjdk/8005194-scale_memory_leak.patch
+ patches/openjdk/8005194-scale_memory_leak.patch \
+ patches/openjdk/6563752-ss12_support.patch \
+ patches/openjdk/6729772-opt_cleanup.patch \
+ patches/openjdk/6799141-split_out_versions.patch \
+ patches/freetypeversion.patch \
+ patches/openjdk/6816311-compiler_name.patch \
+ patches/openjdk/6974017-minorver_for_solaris.patch \
+ patches/openjdk/6980281-majorver_for_solaris.patch \
+ patches/openjdk/7000225-bad_tabs.patch \
+ patches/openjdk/7038711-fix_no-clobber_usage.patch \
+ patches/disable-cc-incompatible-sanity-checks.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
@@ -899,7 +907,6 @@
patches/ecj/spp.patch \
patches/ecj/jopt.patch \
patches/ecj/jaxp-dependency.patch \
- patches/ecj/bootver.patch \
patches/ecj/getannotation-cast.patch \
patches/ecj/override.patch \
patches/ecj/xsltproc.patch \
diff -r de0023a3d26d -r 782a87f782f3 NEWS
--- a/NEWS Sat Aug 31 17:42:12 2013 +0100
+++ b/NEWS Mon Sep 02 20:59:15 2013 +0100
@@ -18,19 +18,27 @@
- PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional
- PR718: Backport LCMS2 support from IcedTea7
* Backports
- - S8009641: OpenJDK 6 build broken via 8007675 fix
- OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build
- - S7022999: Can't build with FORCE_TIERED=0 (bundled HotSpot only)
- S4893408: JPEGReader throws IllegalArgException when setting the destination to BYTE_GRAY
+ - S6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
- S6631559: Registration of ImageIO plugins should not cause loading of jpeg.dlli and cmm.dll
+ - S6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
- S6791502: IIOException "Invalid icc profile" on jpeg after update from JDK5 to JDK6
- S6793818: JpegImageReader is too greedy creating color profiles
+ - S6799141: Build with --hash-style=both so that binaries can work on SuSE 10
+ - S6816311: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
- S6888215: memory leak in jpeg plugin
+ - S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches)
+ - S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build
- S6989760: cmm native compiler warnings
- S6989774: imageio compiler warnings in native code
+ - S7000225: Sanity check on sane-alsa-headers is broken
- S7013519: [parfait] Integer overflows in 2D code
- S7018912: [parfait] potential buffer overruns in imageio jpeg
+ - S7022999: Can't build with FORCE_TIERED=0 (bundled HotSpot only)
+ - S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber
- S8005194: [parfait] #353 sun/awt/image/jpeg/imageioJPEG.c Memory leak of pointer 'scale' allocated with calloc()
+ - S8009641: OpenJDK 6 build broken via 8007675 fix
- S8020983, RH976897: OutOfMemoryError caused by non garbage collected JPEGImageWriter Instances
* Bug fixes
- PR1188: ASM Interpreter and Thumb2 JIT javac miscompile modulo reminder on armel.
diff -r de0023a3d26d -r 782a87f782f3 patches/disable-cc-incompatible-sanity-checks.patch
--- a/patches/disable-cc-incompatible-sanity-checks.patch Sat Aug 31 17:42:12 2013 +0100
+++ b/patches/disable-cc-incompatible-sanity-checks.patch Mon Sep 02 20:59:15 2013 +0100
@@ -1,7 +1,7 @@
diff -Nru openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk
---- openjdk.orig/jdk/make/common/Sanity.gmk 2009-10-01 18:31:50.000000000 +0100
-+++ openjdk/jdk/make/common/Sanity.gmk 2009-10-02 17:51:35.000000000 +0100
-@@ -92,8 +92,11 @@
+--- openjdk.orig/jdk/make/common/Sanity.gmk 2012-10-26 19:25:40.000000000 +0100
++++ openjdk/jdk/make/common/Sanity.gmk 2013-09-02 17:26:52.257169562 +0100
+@@ -91,8 +91,11 @@
sane-ld_options \
sane-ld_run_path \
sane-alt_bootdir \
@@ -15,7 +15,7 @@
ifdef OPENJDK
sanity-all:: sane-freetype
-@@ -109,17 +112,21 @@
+@@ -108,17 +111,21 @@
# (Which only happens with a full control build. The control makefiles are
# the files that set BUILD_MOTIF).
# We cannot sanity check something that has not been built yet.
@@ -42,64 +42,36 @@
# Always check hotspot binary paths even if we are building them from scratch
diff -Nru openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
---- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2009-10-02 17:36:09.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Sanity.gmk 2009-10-02 17:52:37.000000000 +0100
-@@ -75,9 +75,14 @@
- fi )
- endif
- ifneq ($(ARCH), ia64)
-- # dummy program that outputs ALSA's version (created in target sane-alsa-versioncheck)
-- ALSA_VERSION_CHECK = $(TEMPDIR)/alsaversioncheck
-- ALSA_VERSION = `if [ -f "$(ALSA_VERSION_CHECK)" ] ; then $(ALSA_VERSION_CHECK) ; fi`
-+ ifdef CROSS_COMPILATION
-+ # assume alsa version is correct and do not check it
-+ ALSA_VERSION = 1.0.0
-+ else
-+ # dummy program that outputs ALSA's version (created in target sane-alsa-versioncheck)
-+ ALSA_VERSION_CHECK = $(TEMPDIR)/alsaversioncheck
-+ ALSA_VERSION = `if [ -f "$(ALSA_VERSION_CHECK)" ] ; then $(ALSA_VERSION_CHECK) ; fi`
-+ endif
- endif
- endif
-
-@@ -120,6 +125,15 @@
+--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2013-09-02 17:03:28.039330395 +0100
++++ openjdk/jdk/make/common/shared/Sanity.gmk 2013-09-02 17:32:35.854512833 +0100
+@@ -159,6 +159,11 @@
# Get ALL_SETTINGS defined
include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk
+ifndef CROSS_COMPILATION
+MORE_PHONY_RULES = \
-+ sane-freetype \
-+ sane-cups \
-+ sane-motif \
-+ sane-alsa-versioncheck \
-+ sane-alsa-headers
++ sane-freetype
+endif
+
.PHONY: \
sane-copyrightyear\
sane-settings \
-@@ -149,8 +163,6 @@
+@@ -187,8 +192,7 @@
sane-outputdir \
sane-alt_bootdir \
sane-bootdir \
- sane-motif \
- sane-cups \
++ sane-cups \
sane-devtools_path \
sane-compiler_path \
sane-unixcommand_path \
-@@ -168,13 +180,11 @@
- sane-compiler \
- sane-link \
- sane-cacerts \
-- sane-alsa-versioncheck \
-- sane-alsa-headers \
- sane-ant_version \
+@@ -211,7 +215,7 @@
sane-zip_version \
sane-unzip_version \
-- sane-msvcrt_path \
+ sane-msvcrt_path \
- sane-freetype
-+ sane-msvcrt_path \
-+ $(MORE_PHONY_RULES)
++ $(MORE_PHONY_RULES)
######################################################
# check for COPYRIGHT_YEAR variable
diff -r de0023a3d26d -r 782a87f782f3 patches/freetypeversion.patch
--- a/patches/freetypeversion.patch Sat Aug 31 17:42:12 2013 +0100
+++ b/patches/freetypeversion.patch Mon Sep 02 20:59:15 2013 +0100
@@ -1,11 +1,12 @@
---- openjdk/jdk/make/common/shared/Platform.gmk.orig
-+++ openjdk/jdk/make/common/shared/Platform.gmk
-@@ -94,7 +94,7 @@
- REQUIRED_BOOT_VER = 1.5
-
- # If we are using freetype, this is the required version
--REQUIRED_FREETYPE_VERSION=2.3.0
-+REQUIRED_FREETYPE_VERSION=2.2.1
-
- #
- # Prune out all known SCM (Source Code Management) directories
+diff -Nru openjdk.orig/jdk/make/common/shared/Defs-versions.gmk openjdk/jdk/make/common/shared/Defs-versions.gmk
+--- openjdk.orig/jdk/make/common/shared/Defs-versions.gmk 2013-09-02 15:32:33.490472903 +0100
++++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2013-09-02 15:33:00.154887749 +0100
+@@ -176,7 +176,7 @@
+ # Generic
+ REQUIRED_ANT_VER = 1.6.3
+ REQUIRED_BOOT_VER = 1.5
+-REQUIRED_FREETYPE_VERSION = 2.3.0
++REQUIRED_FREETYPE_VERSION = 2.2.1
+ REQUIRED_MAKE_VER = 3.78
+ REQUIRED_UNZIP_VER = 5.12
+ REQUIRED_ZIP_VER = 2.2
diff -r de0023a3d26d -r 782a87f782f3 patches/openjdk/6563752-ss12_support.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6563752-ss12_support.patch Mon Sep 02 20:59:15 2013 +0100
@@ -0,0 +1,173 @@
+# HG changeset patch
+# User ohair
+# Date 1212597498 25200
+# Wed Jun 04 09:38:18 2008 -0700
+# Node ID f9467b4496dc3731d73dbc5a42fd84cc9b1faaab
+# Parent b6601ba7f6dfe0d93e40b2891c581c30fdd92289
+6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
+Summary: Changes to support building with SS12.
+Reviewed-by: tbell
+
+diff --git a/make/common/Defs-solaris.gmk b/make/common/Defs-solaris.gmk
+--- openjdk/jdk/make/common/Defs-solaris.gmk
++++ openjdk/jdk/make/common/Defs-solaris.gmk
+@@ -197,7 +197,6 @@
+
+ # Lint Flags:
+ # -Xa ANSI C plus K&R, favor ANSI rules
+-# -Xarch=XXX Same as 'cc -xarch=XXX'
+ # -fd report on old style func defs
+ # -errchk=structarg report on 64bit struct args by value
+ # -errchk=longptr64 report on 64bit to 32bit issues (ignores casts)
+@@ -206,6 +205,7 @@
+ # -x suppress unused externs
+ # -u suppress extern func/vars used/defined
+ # -errfmt=simple use one line errors with position info
++# $(LINT_XARCH_OPTION) See Compiler-sun.gwk
+
+ LINTFLAGS_COMMON = -Xa
+ LINTFLAGS_COMMON += -fd
+@@ -224,42 +224,12 @@
+ # Tell the compilers to never generate globalized names, all the time.
+ CFLAGS_COMMON += -W0,-noglobal
+
+-# Arch specific settings (determines type of .o files and instruction set)
+-ifeq ($(ARCH_FAMILY), sparc)
+- ifdef VIS_NEEDED
+- XARCH_VALUE/32=v8plusa
+- XARCH_VALUE/64=v9a
+- else
+- # Someday this should change to improve optimization on UltraSPARC
+- # and abandon the old v8-only machines like the SPARCstation 10.
+- # Indications with Mustang is that alacrity runs do not show a
+- # big improvement using v8plus over v8, but other benchmarks might.
+- XARCH_VALUE/32=v8
+- XARCH_VALUE/64=v9
+- endif
+-endif
+-ifeq ($(ARCH_FAMILY), i586)
+- XARCH_VALUE/64=amd64
+- XARCH_VALUE/32=
+-endif
+-
+-# Arch value based on current data model being built
+-XARCH_VALUE=$(XARCH_VALUE/$(ARCH_DATA_MODEL))
+-ifneq ($(XARCH_VALUE), )
+- # The actual compiler -xarch options to use
+- XARCH_OPTION/32 = -xarch=$(XARCH_VALUE/32)
+- XARCH_OPTION/64 = -xarch=$(XARCH_VALUE/64)
+- XARCH_OPTION = $(XARCH_OPTION/$(ARCH_DATA_MODEL))
+-endif
+-
+-# If we have a specific -xarch value to use, add it
+-ifdef XARCH_OPTION
+- CFLAGS_COMMON += $(XARCH_OPTION)
+- CXXFLAGS_COMMON += $(XARCH_OPTION)
+- ASFLAGS_COMMON += $(XARCH_OPTION)
+- EXTRA_LIBS += $(XARCH_OPTION)
+- LINTFLAGS_COMMON += -Xarch=$(XARCH_VALUE)
+-endif
++# If we have a specific arch value to use, add it
++CFLAGS_COMMON += $(XARCH_OPTION)
++CXXFLAGS_COMMON += $(XARCH_OPTION)
++ASFLAGS_COMMON += $(AS_XARCH_OPTION)
++EXTRA_LIBS += $(XARCH_OPTION)
++LINTFLAGS_COMMON += $(LINT_XARCH_OPTION)
+
+ #
+ # uncomment the following to build with PERTURBALOT set
+diff --git a/make/common/shared/Compiler-sun.gmk b/make/common/shared/Compiler-sun.gmk
+--- openjdk/jdk/make/common/shared/Compiler-sun.gmk
++++ openjdk/jdk/make/common/shared/Compiler-sun.gmk
+@@ -31,6 +31,9 @@
+
+ # Sun Studio Compiler settings specific to Solaris
+ ifeq ($(PLATFORM), solaris)
++ # FIXUP: Change to SS12 when validated
++ #COMPILER_VERSION=SS12
++ #REQUIRED_CC_VER=5.9
+ COMPILER_VERSION=SS11
+ REQUIRED_CC_VER=5.8
+ CC = $(COMPILER_PATH)cc
+@@ -51,8 +54,8 @@
+ # Sun Studio Compiler settings specific to Linux
+ ifeq ($(PLATFORM), linux)
+ # This has not been tested
+- COMPILER_VERSION=SS11
+- REQUIRED_CC_VER=5.8
++ COMPILER_VERSION=SS12
++ REQUIRED_CC_VER=5.9
+ CC = $(COMPILER_PATH)cc
+ CPP = $(COMPILER_PATH)cc -E
+ CXX = $(COMPILER_PATH)CC
+@@ -74,3 +77,58 @@
+ _CC_VER :=$(shell $(CC) -V 2>&1 | $(HEAD) -n 1)
+ CC_VER :=$(call GetVersion,"$(_CC_VER)")
+
++# Arch specific settings (determines type of .o files and instruction set)
++# Starting in SS12 (5.9), the arch options changed.
++# The assembler /usr/ccs/bin/as wants older SS11 (5.8) style options.
++# Note: We need to have both 32 and 64 values at all times for awt Makefiles.
++#
++XARCH_OPTION_OLD/32 =
++XARCH_OPTION_OLD/64 =
++XARCH_OPTION_NEW/32 = -m32
++XARCH_OPTION_NEW/64 = -m64
++# Lint options are slightly different
++LINT_XARCH_OPTION_OLD/32 =
++LINT_XARCH_OPTION_OLD/64 =
++LINT_XARCH_OPTION_NEW/32 = -m32
++LINT_XARCH_OPTION_NEW/64 = -m64
++ifeq ($(ARCH_FAMILY), sparc)
++ ifdef VIS_NEEDED
++ XARCH_OPTION_OLD/32 += -xarch=v8plusa
++ XARCH_OPTION_OLD/64 += -xarch=v9a
++ XARCH_OPTION_NEW/32 += -xarch=sparcvis
++ XARCH_OPTION_NEW/64 += -xarch=sparcvis
++ else
++ # Someday this should change to improve optimization on UltraSPARC
++ # and abandon v8, even change to sparcvis or sparcvis2, this
++ # abandons machines like the SPARCstation 10.
++ # Indications with jdk6 is that alacrity runs do not show a
++ # big improvement using v8plus over v8, but other benchmarks might.
++ XARCH_OPTION_OLD/32 += -xarch=v8
++ XARCH_OPTION_OLD/64 += -xarch=v9
++ # Note that this new option (SS12+) effectively means v8plus
++ XARCH_OPTION_NEW/32 += -xarch=sparc
++ XARCH_OPTION_NEW/64 += -xarch=sparc
++ endif
++ LINT_XARCH_OPTION_OLD/64 += -Xarch=v9
++endif
++ifeq ($(ARCH_FAMILY), i586)
++ XARCH_OPTION_OLD/64 += -xarch=amd64
++ LINT_XARCH_OPTION_OLD/64 += -Xarch=amd64
++endif
++# Pick the options we want based on the compiler being used.
++ifeq ($(shell expr $(CC_VER) \>= 5.9), 1)
++ XARCH_OPTION/32 = $(XARCH_OPTION_NEW/32)
++ XARCH_OPTION/64 = $(XARCH_OPTION_NEW/64)
++ LINT_XARCH_OPTION/32 = $(LINT_XARCH_OPTION_NEW/32)
++ LINT_XARCH_OPTION/64 = $(LINT_XARCH_OPTION_NEW/64)
++else
++ XARCH_OPTION/32 = $(XARCH_OPTION_OLD/32)
++ XARCH_OPTION/64 = $(XARCH_OPTION_OLD/64)
++ LINT_XARCH_OPTION/32 = $(LINT_XARCH_OPTION_OLD/32)
++ LINT_XARCH_OPTION/64 = $(LINT_XARCH_OPTION_OLD/64)
++endif
++XARCH_OPTION = $(XARCH_OPTION/$(ARCH_DATA_MODEL))
++LINT_XARCH_OPTION = $(LINT_XARCH_OPTION/$(ARCH_DATA_MODEL))
++# The /usr/ccs/bin/as assembler always wants the older SS11 (5.8) options.
++AS_XARCH_OPTION = $(XARCH_OPTION_OLD/$(ARCH_DATA_MODEL))
++
+diff --git a/make/jdk_generic_profile.sh b/make/jdk_generic_profile.sh
+--- openjdk/jdk/make/jdk_generic_profile.sh
++++ openjdk/jdk/make/jdk_generic_profile.sh
+@@ -119,7 +119,7 @@
+ # System place where JDK installed images are stored?
+ jdk_instances=/usr/jdk/instances
+
+- # Get the SS11 compilers (and latest patches for them too)
++ # Get the Sun Studio compilers (and latest patches for them too)
+ if [ "${ALT_COMPILER_PATH}" = "" ] ; then
+ ALT_COMPILER_PATH=/opt/SUNWspro/bin
+ export ALT_COMPILER_PATH
diff -r de0023a3d26d -r 782a87f782f3 patches/openjdk/6729772-opt_cleanup.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6729772-opt_cleanup.patch Mon Sep 02 20:59:15 2013 +0100
@@ -0,0 +1,847 @@
+# HG changeset patch
+# User ohair
+# Date 1217472057 25200
+# Wed Jul 30 19:40:57 2008 -0700
+# Node ID b374f6174534071d4305a91fbc2b913e7bc64396
+# Parent b7474b739d13bacd9972f88ac91f6350b7b0be12
+6729772: 64-bit build with SS12 compiler: SIGSEGV (0xb) at pc=0x0000000000000048, pid=14826, tid=2
+Reviewed-by: tbell
+
+diff --git a/make/common/Defs-linux.gmk b/make/common/Defs-linux.gmk
+--- openjdk/jdk/make/common/Defs-linux.gmk
++++ openjdk/jdk/make/common/Defs-linux.gmk
+@@ -86,18 +86,22 @@
+ #
+ # Default optimization
+ #
+-CC_HIGHEST_OPT = -O3
+-CC_HIGHER_OPT = -O3
+-CC_LOWER_OPT = -O2
+-CC_NO_OPT =
+
+-ifeq ($(PRODUCT), java)
+- _OPT = $(CC_HIGHER_OPT)
+-else
+- _OPT = $(CC_LOWER_OPT)
+- CPPFLAGS_DBG += -DLOGGING
++ifndef OPTIMIZATION_LEVEL
++ ifeq ($(PRODUCT), java)
++ OPTIMIZATION_LEVEL = HIGHER
++ else
++ OPTIMIZATION_LEVEL = LOWER
++ endif
+ endif
+
++CC_OPT/NONE =
++CC_OPT/LOWER = -O2
++CC_OPT/HIGHER = -O3
++CC_OPT/HIGHEST = -O3
++
++CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
++
+ # For all platforms, do not omit the frame pointer register usage.
+ # We need this frame pointer to make it easy to walk the stacks.
+ # This should be the default on X86, but ia64 and amd64 may not have this
+@@ -112,18 +116,6 @@
+ CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
+ LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
+
+-# Add in platform specific optimizations for all opt levels
+-CC_HIGHEST_OPT += $(_OPT_$(ARCH))
+-CC_HIGHER_OPT += $(_OPT_$(ARCH))
+-CC_LOWER_OPT += $(_OPT_$(ARCH))
+-
+-# If NO_OPTIMIZATIONS is defined in the environment, turn all optimzations off
+-ifdef NO_OPTIMIZATIONS
+- CC_HIGHEST_OPT = $(CC_NO_OPT)
+- CC_HIGHER_OPT = $(CC_NO_OPT)
+- CC_LOWER_OPT = $(CC_NO_OPT)
+-endif
+-
+ #
+ # Selection of warning messages
+ #
+@@ -163,19 +155,19 @@
+ endif
+ endif
+
+-CFLAGS_OPT = $(POPT)
++CFLAGS_OPT = $(CC_OPT)
+ CFLAGS_DBG = $(DEBUG_FLAG)
+ CFLAGS_COMMON += $(CFLAGS_REQUIRED)
+
+ CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
+-CXXFLAGS_OPT = $(POPT)
++CXXFLAGS_OPT = $(CC_OPT)
+ CXXFLAGS_DBG = $(DEBUG_FLAG)
+ CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
+
+ # FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java
+ ifeq ($(FASTDEBUG), true)
+- CFLAGS_DBG += $(CC_LOWER_OPT)
+- CXXFLAGS_DBG += $(CC_LOWER_OPT)
++ CFLAGS_DBG += $(CC_OPT/LOWER)
++ CXXFLAGS_DBG += $(CC_OPT/LOWER)
+ endif
+
+ CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \
+@@ -187,6 +179,9 @@
More information about the distro-pkg-dev
mailing list