make/hotspot/lib/CompileGtest.gmk

rev 59383 : [mq]: final

*** 1,7 ****
  #
! # Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 74,94 ****
          -I$(GTEST_FRAMEWORK_SRC)/googletest/include \
          -I$(GTEST_FRAMEWORK_SRC)/googlemock \
          -I$(GTEST_FRAMEWORK_SRC)/googlemock/include \
          $(addprefix -I,$(GTEST_TEST_SRC)), \
      CFLAGS_windows := -EHsc, \
-     CFLAGS_solaris := -DGTEST_HAS_EXCEPTIONS=0 -library=stlport4, \
      CFLAGS_macosx := -DGTEST_OS_MAC=1, \
      DISABLED_WARNINGS_gcc := $(DISABLED_WARNINGS_gcc) \
          undef, \
      DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang) \
          undef switch format-nonliteral tautological-undefined-compare \
          self-assign-overloaded, \
-     DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio) \
-         identexpected, \
      LDFLAGS := $(JVM_LDFLAGS), \
-     LDFLAGS_solaris := -library=stlport4 $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(JVM_LIBS), \
      OPTIMIZATION := $(JVM_OPTIMIZATION), \
      MAPFILE := $(GTEST_JVM_MAPFILE), \
      USE_MAPFILE_FOR_SYMBOLS := true, \
      COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \
--- 74,90 ----
*** 114,124 ****
          -I$(GTEST_FRAMEWORK_SRC)/googletest/include \
          -I$(GTEST_FRAMEWORK_SRC)/googlemock \
          -I$(GTEST_FRAMEWORK_SRC)/googlemock/include, \
      LDFLAGS := $(LDFLAGS_JDKEXE), \
      LDFLAGS_unix := -L$(JVM_OUTPUTDIR)/gtest $(call SET_SHARED_LIBRARY_ORIGIN), \
-     LDFLAGS_solaris := -library=stlport4, \
      LIBS_linux := $(LIBCXX), \
      LIBS_unix := -ljvm, \
      LIBS_windows := $(JVM_OUTPUTDIR)/gtest/objs/jvm.lib, \
      COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \
      ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \
--- 110,119 ----