head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.68 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.66 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.64 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.62 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.60 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.58 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.56 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.54 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.52 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.50 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.48 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.46 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.44 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.42 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.40 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.38 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.36 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.34 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.32 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.30 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.28 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.26 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.24 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.22 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.18 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.20 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.16 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.14 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.12 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.10 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.8 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.6 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.4 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.2 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.1.0.20 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.16 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.14 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.12 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.10 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.8 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.6 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.4 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.2 pkgsrc-2015Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2017.12.15.14.27.52; author jperkin; state Exp; branches; next 1.1; commitid ukJVUnVWmxI2OZiA; 1.1 date 2015.07.03.20.40.59; author fhajny; state Exp; branches; next ; commitid hLfEJ7NShOl8FSry; desc @@ 1.2 log @openjdk8: Support user CFLAGS. @ text @$NetBSD: patch-hotspot_make_solaris_makefiles_dtrace.make,v 1.1 2015/07/03 20:40:59 fhajny Exp $ Enable DTrace support with GCC. --- hotspot/make/solaris/makefiles/dtrace.make.orig 2017-11-28 00:13:38.000000000 +0000 +++ hotspot/make/solaris/makefiles/dtrace.make @@@@ -29,13 +29,6 @@@@ ifneq ("${TYPE}", "CORE") -ifdef USE_GCC - -dtraceCheck: - $(QUIETLY) echo "**NOTICE** Dtrace support disabled for gcc builds" - -else - JVM_DB = libjvm_db LIBJVM_DB = libjvm_db.so @@@@ -56,14 +49,23 @@@@ DTRACE_SRCDIR = $(GAMMADIR)/src/os/$(Pla DTRACE = dtrace DTRACE.o = $(DTRACE).o -# to remove '-g' option which causes link problems -# also '-z nodefs' is used as workaround -GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g';) +ifdef USE_GCC + # solaris linker does not like gcc and -fvisibility=hidden without mapfiles + GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g' -e 's/ -fvisibility=hidden / /g';) +else + # to remove '-g' option which causes link problems + # also '-z nodefs' is used as workaround + GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g';) +endif ifdef LP64 DTRACE_OPTS = -64 -D_LP64 endif +ifdef USE_GCC + DTRACE_OPTS = -D_GNU_SOURCE +endif # USE_GCC + # making libjvm_db # Use mapfile with libjvm_db.so @@@@ -99,7 +101,7 @@@@ XLIBJVM_DTRACE_DIZ = $(XLIBJVM_D $(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE) @@echo Making $@@ $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \ - $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \ + $(CC) $(CFLAGS) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \ $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) $(QUIETLY) $(OBJCOPY) --only-keep-debug $@@ $(XLIBJVM_DB_DEBUGINFO) @@@@ -125,7 +127,7 @@@@ endif $(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE) @@echo Making $@@ $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \ - $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \ + $(CC) $(CFLAGS) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \ $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) $(QUIETLY) $(OBJCOPY) --only-keep-debug $@@ $(XLIBJVM_DTRACE_DEBUGINFO) @@@@ -190,7 +192,7 @@@@ $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cp $(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE) @@echo Making $@@ - $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \ + $(QUIETLY) $(CC) $(CFLAGS) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \ $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) $(QUIETLY) $(OBJCOPY) --only-keep-debug $@@ $(LIBJVM_DB_DEBUGINFO) @@@@ -211,7 +213,7 @@@@ endif $(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE) @@echo Making $@@ - $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \ + $(QUIETLY) $(CC) $(CFLAGS) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \ $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) $(QUIETLY) $(OBJCOPY) --only-keep-debug $@@ $(LIBJVM_DTRACE_DEBUGINFO) @@@@ -352,8 +354,6 @@@@ dtraceCheck: endif # ifneq ("${dtraceFound}", "") -endif # ifdef USE_GCC - else # CORE build dtraceCheck: @ 1.1 log @Add support for building with GCC on SunOS, largely based on openjdk7 patches by jesse et al. Fixes build on SunOS. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- hotspot/make/solaris/makefiles/dtrace.make.orig 2015-06-10 10:31:44.000000000 +0000 d48 36 @