Mercurial > hg > release > icedtea6-1.11
view patches/openjdk/6980281-majorver_for_solaris.patch @ 2930:88ad9f715193
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@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.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Wed, 04 Sep 2013 00:13:08 +0100 |
parents | |
children |
line wrap: on
line source
# HG changeset patch # User bae # Date 1291553491 -10800 # Sun Dec 05 15:51:31 2010 +0300 # Node ID 15e3f6f4a43327a0baa7c7ad0f41ea62c566506b # Parent 024fe931de8c0e4b56b29d4b666fbcc69c6213e3 6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build Reviewed-by: prr, ohair 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 @@ -466,12 +466,14 @@ # On X86, make sure tail call optimization is off # The z and y are the tail call optimizations. ifeq ($(ARCH_FAMILY), i586) - ifeq ($(shell $(EXPR) $(CC_VER) \> 5.8), 1) - # Somehow, tail call optimization is creeping in. - # Make sure it is off. - # WARNING: These may cause compiler warnings about duplicate -O options - CC_XKEEPFRAME_OPTIONS += -Wu,-O$(OPT_LEVEL/$(OPTIMIZATION_LEVEL))~yz - CXX_XKEEPFRAME_OPTIONS += -Qoption ube -O$(OPT_LEVEL/$(OPTIMIZATION_LEVEL))~yz + ifeq ($(shell $(EXPR) $(CC_MAJORVER) \>= 5), 1) + ifeq ($(shell $(EXPR) $(CC_MINORVER) \> 8), 1) + # Somehow, tail call optimization is creeping in. + # Make sure it is off. + # WARNING: These may cause compiler warnings about duplicate -O options + CC_XKEEPFRAME_OPTIONS += -Wu,-O$(OPT_LEVEL/$(OPTIMIZATION_LEVEL))~yz + CXX_XKEEPFRAME_OPTIONS += -Qoption ube -O$(OPT_LEVEL/$(OPTIMIZATION_LEVEL))~yz + endif endif endif @@ -487,12 +489,15 @@ CC_XKEEPFRAME_OPTIONS += -Wu,-Z~B CXX_XKEEPFRAME_OPTIONS += -Qoption ube -Z~B endif - ifeq ($(shell $(EXPR) $(CC_VER) \> 5.6), 1) - # Do NOT use frame pointer register as a general purpose opt register - CC_OPT/NONE += -xregs=no%frameptr - CXX_OPT/NONE += -xregs=no%frameptr - CC_XKEEPFRAME_OPTIONS += -xregs=no%frameptr - CXX_XKEEPFRAME_OPTIONS += -xregs=no%frameptr + + ifeq ($(shell $(EXPR) $(CC_MAJORVER) \>= 5), 1) + ifeq ($(shell $(EXPR) $(CC_MINORVER) \> 6), 1) + # Do NOT use frame pointer register as a general purpose opt register + CC_OPT/NONE += -xregs=no%frameptr + CXX_OPT/NONE += -xregs=no%frameptr + CC_XKEEPFRAME_OPTIONS += -xregs=no%frameptr + CXX_XKEEPFRAME_OPTIONS += -xregs=no%frameptr + endif endif endif 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 @@ -61,6 +61,7 @@ # Get compiler version _CC_VER :=$(shell $(CC) -V 2>&1 | $(HEAD) -n 1) CC_VER :=$(call GetVersion,"$(_CC_VER)") +CC_MAJORVER :=$(call MajorVersion,$(CC_VER)) CC_MINORVER :=$(call MinorVersion,$(CC_VER)) # Name of compilers being used