Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 9936:ab6cd5af67f0 jdk7u261-b02 jdk7u261-ga jdk7u271-b00
8238960: linux-i586 builds are inconsistent as the newly build jdk is not able to reserve enough space for object heap
Reviewed-by: mbalao
| author | andrew |
|---|---|
| date | Mon, 13 Apr 2020 06:12:15 +0100 |
| parents | d8fc2b8d4e09 |
| children | 60639d35dba6 |
| files | make/com/sun/java/pack/Makefile make/common/Program.gmk make/java/jexec/Makefile |
| diffstat | 3 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/make/com/sun/java/pack/Makefile Mon Apr 13 05:08:41 2020 +0100 +++ b/make/com/sun/java/pack/Makefile Mon Apr 13 06:12:15 2020 +0100 @@ -81,9 +81,11 @@ endif # Add -fPIE in place of -fPIC for building executables ifeq ($(CC_VERSION), gcc) - LDDFLAGS += -pie - CFLAGS := $(subst -fPIC,-fPIE,$(CFLAGS)) - CXXFLAGS := $(subst -fPIC,-fPIE,$(CXXFLAGS)) + ifneq ($(ARCH_DATA_MODEL), 32) + LDDFLAGS += -pie + CFLAGS := $(subst -fPIC,-fPIE,$(CFLAGS)) + CXXFLAGS := $(subst -fPIC,-fPIE,$(CXXFLAGS)) + endif # ARCH_DATA_MODEL != 32 endif # CC_VERSION gcc else OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
--- a/make/common/Program.gmk Mon Apr 13 05:08:41 2020 +0100 +++ b/make/common/Program.gmk Mon Apr 13 06:12:15 2020 +0100 @@ -133,9 +133,11 @@ # Add -fPIE in place of -fPIC for building executables ifeq ($(CC_VERSION), gcc) - LDFLAGS += -pie - CFLAGS := $(subst -fPIC,-fPIE,$(CFLAGS)) - CXXFLAGS := $(subst -fPIC,-fPIE,$(CXXFLAGS)) + ifneq ($(ARCH_DATA_MODEL), 32) + LDFLAGS += -pie + CFLAGS := $(subst -fPIC,-fPIE,$(CFLAGS)) + CXXFLAGS := $(subst -fPIC,-fPIE,$(CXXFLAGS)) + endif # ARCH_DATA_MODEL != 32 endif # CC_VERSION gcc #
--- a/make/java/jexec/Makefile Mon Apr 13 05:08:41 2020 +0100 +++ b/make/java/jexec/Makefile Mon Apr 13 06:12:15 2020 +0100 @@ -63,9 +63,11 @@ # Add -fPIE in place of -fPIC for building executables ifeq ($(CC_VERSION), gcc) - LDFLAGS += -pie - CFLAGS := $(subst -fPIC,-fPIE,$(CFLAGS)) - CXXFLAGS := $(subst -fPIC,-fPIE,$(CXXFLAGS)) + ifneq ($(ARCH_DATA_MODEL), 32) + LDFLAGS += -pie + CFLAGS := $(subst -fPIC,-fPIE,$(CFLAGS)) + CXXFLAGS := $(subst -fPIC,-fPIE,$(CXXFLAGS)) + endif # ARCH_DATA_MODEL != 32 endif # CC_VERSION gcc build: $(LIB_LOCATION)/$(PROGRAM)