Mercurial > hg > openjdk > jdk6 > corba
changeset 37:1b1ca4e4fb76
6891677: java/build integrate zero assembler JDK changes
Summary: Build changes for the Zero assembler port
Reviewed-by: ohair, tbell
author | gbenson |
---|---|
date | Thu, 15 Oct 2009 13:28:26 +0100 |
parents | c5787364fdd9 |
children | e83301fe4687 |
files | make/common/Defs-linux.gmk make/common/shared/Compiler-gcc.gmk |
diffstat | 2 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Defs-linux.gmk Tue Feb 16 18:34:42 2010 -0800 +++ b/make/common/Defs-linux.gmk Thu Oct 15 13:28:26 2009 +0100 @@ -99,8 +99,16 @@ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 LDFLAGS_COMMON_sparc += -m32 -mcpu=v9 -CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH)) -LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH)) +ifeq ($(ZERO_BUILD), true) + CFLAGS_REQUIRED = $(ZERO_ARCHFLAG) + ifeq ($(ZERO_ENDIANNESS), little) + CFLAGS_REQUIRED += -D_LITTLE_ENDIAN + endif + LDFLAGS_COMMON += $(ZERO_ARCHFLAG) +else + CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH)) + LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH)) +endif # Add in platform specific optimizations for all opt levels CC_HIGHEST_OPT += $(_OPT_$(ARCH)) @@ -196,7 +204,7 @@ EXTRA_LIBS += -lc -LDFLAGS_DEFS_OPTION = -z defs +LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) #
--- a/make/common/shared/Compiler-gcc.gmk Tue Feb 16 18:34:42 2010 -0800 +++ b/make/common/shared/Compiler-gcc.gmk Thu Oct 15 13:28:26 2009 +0100 @@ -70,6 +70,11 @@ else CXX = $(COMPILER_PATH)g++ endif + ifeq ($(ZERO_BUILD), true) + # zero + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + else ifneq ("$(findstring sparc,$(ARCH))", "") # sparc or sparcv9 REQUIRED_CC_VER = 4.0 @@ -88,6 +93,7 @@ endif endif endif + endif # Option used to create a shared library SHARED_LIBRARY_FLAG = -shared -mimpure-text SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )