6891677: java/build integrate zero assembler JDK changes
Summary: Build changes for the Zero assembler port
Reviewed-by: ohair, tbell
--- a/corba/make/common/Defs-linux.gmk Wed Jul 05 17:01:55 2017 +0200
+++ b/corba/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/corba/make/common/shared/Compiler-gcc.gmk Wed Jul 05 17:01:55 2017 +0200
+++ b/corba/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 )