Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/make/common/Defs-linux.gmk	Fri Oct 02 11:26:18 2009 -0700
     1.2 +++ b/make/common/Defs-linux.gmk	Thu Oct 15 13:28:26 2009 +0100
     1.3 @@ -99,8 +99,16 @@
     1.4  LDFLAGS_COMMON_sparcv9  += -m64 -mcpu=v9
     1.5  CFLAGS_REQUIRED_sparc   += -m32 -mcpu=v9
     1.6  LDFLAGS_COMMON_sparc    += -m32 -mcpu=v9
     1.7 -CFLAGS_REQUIRED         =  $(CFLAGS_REQUIRED_$(ARCH))
     1.8 -LDFLAGS_COMMON          += $(LDFLAGS_COMMON_$(ARCH))
     1.9 +ifeq ($(ZERO_BUILD), true)
    1.10 +  CFLAGS_REQUIRED       =  $(ZERO_ARCHFLAG)
    1.11 +  ifeq ($(ZERO_ENDIANNESS), little)
    1.12 +    CFLAGS_REQUIRED     += -D_LITTLE_ENDIAN
    1.13 +  endif
    1.14 +  LDFLAGS_COMMON        += $(ZERO_ARCHFLAG)
    1.15 +else
    1.16 +  CFLAGS_REQUIRED       =  $(CFLAGS_REQUIRED_$(ARCH))
    1.17 +  LDFLAGS_COMMON        += $(LDFLAGS_COMMON_$(ARCH))
    1.18 +endif
    1.19  
    1.20  # Add in platform specific optimizations for all opt levels
    1.21  CC_HIGHEST_OPT += $(_OPT_$(ARCH))
    1.22 @@ -196,7 +204,7 @@
    1.23  
    1.24  EXTRA_LIBS += -lc
    1.25  
    1.26 -LDFLAGS_DEFS_OPTION  = -z defs
    1.27 +LDFLAGS_DEFS_OPTION  = -Xlinker -z -Xlinker defs
    1.28  LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
    1.29  
    1.30  #

     2.1 --- a/make/common/shared/Compiler-gcc.gmk	Fri Oct 02 11:26:18 2009 -0700
     2.2 +++ b/make/common/shared/Compiler-gcc.gmk	Thu Oct 15 13:28:26 2009 +0100
     2.3 @@ -70,6 +70,11 @@
     2.4    else
     2.5      CXX            = $(COMPILER_PATH)g++
     2.6    endif
     2.7 +  ifeq ($(ZERO_BUILD), true)
     2.8 +    # zero
     2.9 +    REQUIRED_CC_VER = 3.2
    2.10 +    REQUIRED_GCC_VER = 3.2.*
    2.11 +  else
    2.12    ifneq ("$(findstring sparc,$(ARCH))", "")
    2.13      # sparc or sparcv9
    2.14      REQUIRED_CC_VER = 4.0
    2.15 @@ -88,6 +93,7 @@
    2.16    endif
    2.17    endif
    2.18    endif
    2.19 +  endif
    2.20    # Option used to create a shared library
    2.21    SHARED_LIBRARY_FLAG = -shared -mimpure-text
    2.22    SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )