components/runtime/openjdk-8/patches/0022-patch-hotspot_make_solaris_makefiles_vm.make.patch

   1 $NetBSD: patch-hotspot_make_solaris_makefiles_vm.make,v 1.1 2015/07/03 20:40:59 fhajny Exp $
   2
   3 GCC support.
   4
   5 --- hotspot/make/solaris/makefiles/vm.make.orig 2015-02-02 15:32:37.000000000 +0000
   6 +++ hotspot/make/solaris/makefiles/vm.make
   7 @@ -59,7 +59,11 @@ INCLUDES += $(Src_Dirs_I:%=-I%)
   8  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
   9    # always build with debug info when we can create .debuginfo files
  10    # and disable 'lazy debug info' so the .so has everything.
  11 -  SYMFLAG = -g -xs
  12 +  ifdef USE_GCC
  13 +    SYMFLAG = -g
  14 +  else
  15 +    SYMFLAG = -g -xs
  16 +  endif
  17  else
  18    ifeq (${VERSION}, debug)
  19      SYMFLAG = -g
  20 @@ -271,16 +275,19 @@ ifeq ($(LINK_INTO),AOUT)
  21    LIBS_VM                  = $(LIBS)
  22  else
  23    LIBJVM.o                 = $(JVM_OBJ_FILES)
  24 -  LIBJVM_MAPFILE$(LDNOMAP) = mapfile_extended
  25 -  LFLAGS_VM$(LDNOMAP)      += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
  26    LFLAGS_VM                += $(SONAMEFLAG:SONAME=$(LIBJVM))
  27  ifndef USE_GCC
  28    LIBS_VM                  = $(LIBS)
  29 +  LIBJVM_MAPFILE$(LDNOMAP) = mapfile_extended
  30 +  LFLAGS_VM$(LDNOMAP)      += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
  31  else
  32    # JVM is statically linked with libgcc[_s] and libstdc++; this is needed to
  33    # get around library dependency and compatibility issues. Must use gcc not
  34    # g++ to link.
  35    LFLAGS_VM                += $(STATIC_LIBGCC)
  36 +  ifeq ($(BUILDARCH),i486)
  37 +    LFLAGS_VM              += -mimpure-text
  38 +  endif
  39    LIBS_VM                  += $(STATIC_STDCXX) $(LIBS)
  40  endif
  41  endif