head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.38 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.36 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.34 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.32 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.30 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.28 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.26 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.24 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.22 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.20 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.18 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.16 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.14 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.12 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.10 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.8 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.6 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.4 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.2 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.2.0.48 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.46 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.44 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.42 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.38 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.18 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.40 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.36 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.34 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.32 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.30 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.28 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.26 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.24 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.22 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.20 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.16 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.14 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.12 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.10 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.8 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.6 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.4 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.2 pkgsrc-2015Q3-base:1.2; locks; strict; comment @# @; 1.3 date 2021.06.27.14.54.41; author tnn; state Exp; branches; next 1.2; commitid qar5HMaFpJwouMYC; 1.2 date 2015.07.18.07.07.42; author fhajny; state Exp; branches; next 1.1; commitid woRRdRIRYkjAGJty; 1.1 date 2015.07.03.20.40.59; author fhajny; state Exp; branches; next ; commitid hLfEJ7NShOl8FSry; desc @@ 1.3 log @openjdk8: update to 1.8.292 Updated BSD port of JDK 8 Additional features include: Native HotSpot support for aarch64 (not enabled yet in pkgsrc) @ text @$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.2 2015/07/18 07:07:42 fhajny Exp $ GCC support. --- hotspot/make/solaris/makefiles/gcc.make.orig 2021-05-14 21:52:06.000000000 +0000 +++ hotspot/make/solaris/makefiles/gcc.make @@@@ -70,11 +70,23 @@@@ VM_PICFLAG/LIBJVM = $(PICFLAG) VM_PICFLAG/AOUT = VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) +ifeq ($(JVM_VARIANT_ZERO), true) + CFLAGS += $(LIBFFI_CFLAGS) +endif +ifeq ($(JVM_VARIANT_ZEROSHARK), true) + CFLAGS += $(LIBFFI_CFLAGS) + CFLAGS += $(LLVM_CFLAGS) +endif CFLAGS += $(VM_PICFLAG) CFLAGS += -fno-rtti CFLAGS += -fno-exceptions CFLAGS += -D_REENTRANT CFLAGS += -fcheck-new +# version 4 and above support fvisibility=hidden (matches jni_x86.h file) +# except 4.1.2 gives pointless warnings that can't be disabled (afaik) +ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" + CFLAGS += -fvisibility=hidden +endif ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) @@@@ -86,7 +98,8 @@@@ ARCHFLAG/amd64 = -m64 -march=k8 # Optional sub-directory in /usr/lib where BUILDARCH libraries are kept. ISA_DIR=$(ISA_DIR/$(BUILDARCH)) -ISA_DIR/amd64=/amd64 +ISA_DIR/amd64= +NOMULTIARCHISA_DIR/amd64=/amd64 ISA_DIR/i486= ISA_DIR/sparcv9=/64 @@@@ -94,10 +107,9 @@@@ ISA_DIR/sparcv9=/64 CFLAGS += $(ARCHFLAG) AOUT_FLAGS += $(ARCHFLAG) LFLAGS += $(ARCHFLAG) -ASFLAGS += $(ARCHFLAG) ifeq ($(BUILDARCH), amd64) -ASFLAGS += -march=k8 -march=amd64 +ASFLAGS += -march=k8 LFLAGS += -march=k8 endif @@@@ -107,6 +119,11 @@@@ ifdef CC_INTERP CFLAGS += -DCC_INTERP endif +# Build for embedded targets +ifdef JAVASE_EMBEDDED + CFLAGS += -DJAVASE_EMBEDDED +endif + # Keep temporary files (.ii, .s) ifdef NEED_ASM CFLAGS += -save-temps @@@@ -117,9 +134,18 @@@@ endif # Compiler warnings are treated as errors WARNINGS_ARE_ERRORS = -Werror -# Enable these warnings. See 'info gcc' about details on these options -WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef -Wformat=2 -CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS) + +# Except for a few acceptable ones +# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit +# conversions which might affect the values. To avoid that, we need to turn +# it off explicitly. +ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" + ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare +else + ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef -Wformat=2 +endif + +CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@@)) @@@@ -177,7 +203,7 @@@@ MAPFLAG = -Xlinker -M -Xlinker FILENAME endif # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj -SONAMEFLAG = -Xlinker -soname=SONAME +SONAMEFLAG = -Wl,-soname=SONAME # Build shared library SHARED_FLAG = -shared @@@@ -185,15 +211,32 @@@@ SHARED_FLAG = -shared #------------------------------------------------------------------------ # Debug flags -# Use the stabs format for debugging information (this is the default -# on gcc-2.91). It's good enough, has all the information about line -# numbers and local variables, and libjvm.so is only about 16M. -# Change this back to "-g" if you want the most expressive format. -# (warning: that could easily inflate libjvm.so to 150M!) -# Note: The Itanium gcc compiler crashes when using -gstabs. -DEBUG_CFLAGS/ia64 = -g -DEBUG_CFLAGS/amd64 = -g -DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) -ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) -DEBUG_CFLAGS += -gstabs -endif +# DEBUG_BINARIES uses full -g debug information for all configs +ifeq ($(DEBUG_BINARIES), true) + CFLAGS += -g +else +# Use the stabs format for debugging information (this is the default +# on gcc-2.91). It's good enough, has all the information about line +# numbers and local variables, and libjvm_g.so is only about 16M. +# Change this back to "-g" if you want the most expressive format. +# (warning: that could easily inflate libjvm_g.so to 150M!) +# Note: The Itanium gcc compiler crashes when using -gstabs. +DEBUG_CFLAGS/ia64 = -g +DEBUG_CFLAGS/amd64 = -g +DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) +ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) +DEBUG_CFLAGS += -gstabs +endif +endif + +# If we are building HEADLESS, pass on to VM +# so it can set the java.awt.headless property +ifdef HEADLESS + CFLAGS += -DHEADLESS +endif + +# We are building Embedded for a small device +# favor code space over speed +ifdef MINIMIZE_RAM_USAGE + CFLAGS += -DMINIMIZE_RAM_USAGE +endif @ 1.2 log @One more fix for SunOS - do not pollute 'as' arg space with arch flags. @ text @d1 1 a1 1 $NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.1 2015/07/03 20:40:59 fhajny Exp $ d5 1 a5 1 --- hotspot/make/solaris/makefiles/gcc.make.orig 2015-06-10 10:31:44.000000000 +0000 d70 1 a70 1 -WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef d80 1 a80 1 + ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef d87 1 a87 1 @@@@ -177,7 +203,7 @@@@ MAPFLAG = -Xlinker -M -Xlinker FILENAME @ 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: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ d5 1 a5 1 --- hotspot/make/solaris/makefiles/gcc.make.orig 2015-02-02 15:32:37.000000000 +0000 d41 1 a41 1 @@@@ -94,7 +107,6 @@@@ d46 1 a46 1 d48 5 a52 1 ASFLAGS += -march=k8 -march=amd64 @