Sat Jul 18 07:07:42 2015 UTC ()
One more fix for SunOS - do not pollute 'as' arg space with arch flags.


(fhajny)
diff -r1.22 -r1.23 pkgsrc/lang/openjdk8/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make
cvs diff -r1.22 -r1.23 pkgsrc/lang/openjdk8/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/distinfo 2015/07/03 20:40:59 1.22
+++ pkgsrc/lang/openjdk8/distinfo 2015/07/18 07:07:42 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.22 2015/07/03 20:40:59 fhajny Exp $ 1$NetBSD: distinfo,v 1.23 2015/07/18 07:07:42 fhajny Exp $
2 2
3SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 3SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
4RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 4RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
5Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes 5Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes
6SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00 6SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00
7RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee 7RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee
8Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes 8Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes
9SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9 9SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9
10RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea 10RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea
11Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes 11Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes
12SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = a1b568394a76bfdd164042ea40e67caa94dd489d 12SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = a1b568394a76bfdd164042ea40e67caa94dd489d
13RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 7f50618a4a14ec218e886e88e76ad682b6b7fb57 13RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 7f50618a4a14ec218e886e88e76ad682b6b7fb57
14Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 26716528 bytes 14Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 26716528 bytes
@@ -46,27 +46,27 @@ SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e @@ -46,27 +46,27 @@ SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e
46SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63 46SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
47SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8 47SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
48SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892 48SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
49SHA1 (patch-common_autoconf_boot-jdk.m4) = b7f8722a25c1c7ab489a9fd65cf60fb4af9530eb 49SHA1 (patch-common_autoconf_boot-jdk.m4) = b7f8722a25c1c7ab489a9fd65cf60fb4af9530eb
50SHA1 (patch-common_autoconf_generated-configure.sh) = 51e5dc909058b8ea26833a66c1d7eb0dafc3042d 50SHA1 (patch-common_autoconf_generated-configure.sh) = 51e5dc909058b8ea26833a66c1d7eb0dafc3042d
51SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b 51SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
52SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928 52SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
53SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 6b3e2f769c754b3ee5de8c07444964414136fa81 53SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 6b3e2f769c754b3ee5de8c07444964414136fa81
54SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14 54SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
55SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239 55SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
56SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028315de351c5047d59d 56SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028315de351c5047d59d
57SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 0c9dc2b97d49cf557dc57071fd7c312b9cb8e598 57SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 0c9dc2b97d49cf557dc57071fd7c312b9cb8e598
58SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 632f96a322f1568df6f49bf31716bafe1d324976 58SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 632f96a322f1568df6f49bf31716bafe1d324976
59SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 9aef5948efd9ef11f862c00d14b4d6dfec019be4 59SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 4763215f5ce2c3d9fcadb69e52afad7c9de97417
60SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 10ecc1bd24d6d555e4730041c9dce1d3258bcab0 60SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 10ecc1bd24d6d555e4730041c9dce1d3258bcab0
61SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 58965fe7c142b67be35cab8b30f84dcee2096e39 61SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 58965fe7c142b67be35cab8b30f84dcee2096e39
62SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 2dfd843c450971ee0857cbd81b946a4d7c86ee3b 62SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 2dfd843c450971ee0857cbd81b946a4d7c86ee3b
63SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 82ac550f4c342f657834f30f87b7b359e2b7b41b 63SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 82ac550f4c342f657834f30f87b7b359e2b7b41b
64SHA1 (patch-hotspot_make_solaris_makefiles_optimized.make) = 78d64fe6cb7c3420889884a450c0803d56e44850 64SHA1 (patch-hotspot_make_solaris_makefiles_optimized.make) = 78d64fe6cb7c3420889884a450c0803d56e44850
65SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = c41b360302bffd9fbfaa34ee7a4d5d1a756ae0e2 65SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = c41b360302bffd9fbfaa34ee7a4d5d1a756ae0e2
66SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 0ca85ba72d154643b934815a0a2deb1e77371ff9 66SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 0ca85ba72d154643b934815a0a2deb1e77371ff9
67SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = 787e0c68cf976fc0df3e19fb2a22b1b7e3662c07 67SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = 787e0c68cf976fc0df3e19fb2a22b1b7e3662c07
68SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088 68SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088
69SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = dcd83b65a7d74e153a3e1c44f8c7980827ec20c7 69SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = dcd83b65a7d74e153a3e1c44f8c7980827ec20c7
70SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = e87224f8b67dc78fa411d30beff82ce5ccbb4cc5 70SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = e87224f8b67dc78fa411d30beff82ce5ccbb4cc5
71SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp) = 6311d68db9064afc470f1d9fd37e63011899659a 71SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp) = 6311d68db9064afc470f1d9fd37e63011899659a
72SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = 4fa018be66fad39aa0a922dfb86c79661a7379f2 72SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = 4fa018be66fad39aa0a922dfb86c79661a7379f2
cvs diff -r1.1 -r1.2 pkgsrc/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make 2015/07/03 20:40:59 1.1
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make 2015/07/18 07:07:42 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.1 2015/07/03 20:40:59 fhajny Exp $ 1$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.2 2015/07/18 07:07:42 fhajny Exp $
2 2
3GCC support. 3GCC support.
4 4
5--- hotspot/make/solaris/makefiles/gcc.make.orig 2015-02-02 15:32:37.000000000 +0000 5--- hotspot/make/solaris/makefiles/gcc.make.orig 2015-06-10 10:31:44.000000000 +0000
6+++ hotspot/make/solaris/makefiles/gcc.make 6+++ hotspot/make/solaris/makefiles/gcc.make
7@@ -70,11 +70,23 @@ VM_PICFLAG/LIBJVM = $(PICFLAG) 7@@ -70,11 +70,23 @@ VM_PICFLAG/LIBJVM = $(PICFLAG)
8 VM_PICFLAG/AOUT = 8 VM_PICFLAG/AOUT =
9 VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) 9 VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
10  10
11+ifeq ($(JVM_VARIANT_ZERO), true) 11+ifeq ($(JVM_VARIANT_ZERO), true)
12+ CFLAGS += $(LIBFFI_CFLAGS) 12+ CFLAGS += $(LIBFFI_CFLAGS)
13+endif 13+endif
14+ifeq ($(JVM_VARIANT_ZEROSHARK), true) 14+ifeq ($(JVM_VARIANT_ZEROSHARK), true)
15+ CFLAGS += $(LIBFFI_CFLAGS) 15+ CFLAGS += $(LIBFFI_CFLAGS)
16+ CFLAGS += $(LLVM_CFLAGS) 16+ CFLAGS += $(LLVM_CFLAGS)
17+endif 17+endif
18 CFLAGS += $(VM_PICFLAG) 18 CFLAGS += $(VM_PICFLAG)
@@ -28,34 +28,38 @@ GCC support. @@ -28,34 +28,38 @@ GCC support.
28  28
29 ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) 29 ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
30  30
31@@ -86,7 +98,8 @@ ARCHFLAG/amd64 = -m64 -march=k8 31@@ -86,7 +98,8 @@ ARCHFLAG/amd64 = -m64 -march=k8
32  32
33 # Optional sub-directory in /usr/lib where BUILDARCH libraries are kept. 33 # Optional sub-directory in /usr/lib where BUILDARCH libraries are kept.
34 ISA_DIR=$(ISA_DIR/$(BUILDARCH)) 34 ISA_DIR=$(ISA_DIR/$(BUILDARCH))
35-ISA_DIR/amd64=/amd64 35-ISA_DIR/amd64=/amd64
36+ISA_DIR/amd64= 36+ISA_DIR/amd64=
37+NOMULTIARCHISA_DIR/amd64=/amd64 37+NOMULTIARCHISA_DIR/amd64=/amd64
38 ISA_DIR/i486= 38 ISA_DIR/i486=
39 ISA_DIR/sparcv9=/64 39 ISA_DIR/sparcv9=/64
40  40
41@@ -94,7 +107,6 @@ 41@@ -94,10 +107,9 @@ ISA_DIR/sparcv9=/64
42 CFLAGS += $(ARCHFLAG) 42 CFLAGS += $(ARCHFLAG)
43 AOUT_FLAGS += $(ARCHFLAG) 43 AOUT_FLAGS += $(ARCHFLAG)
44 LFLAGS += $(ARCHFLAG) 44 LFLAGS += $(ARCHFLAG)
45-ASFLAGS += $(ARCHFLAG) 45-ASFLAGS += $(ARCHFLAG)
46 46
47 ifeq ($(BUILDARCH), amd64) 47 ifeq ($(BUILDARCH), amd64)
48 ASFLAGS += -march=k8 -march=amd64 48-ASFLAGS += -march=k8 -march=amd64
 49+ASFLAGS += -march=k8
 50 LFLAGS += -march=k8
 51 endif
 52
49@@ -107,6 +119,11 @@ ifdef CC_INTERP 53@@ -107,6 +119,11 @@ ifdef CC_INTERP
50 CFLAGS += -DCC_INTERP 54 CFLAGS += -DCC_INTERP
51 endif 55 endif
52  56
53+# Build for embedded targets 57+# Build for embedded targets
54+ifdef JAVASE_EMBEDDED 58+ifdef JAVASE_EMBEDDED
55+ CFLAGS += -DJAVASE_EMBEDDED 59+ CFLAGS += -DJAVASE_EMBEDDED
56+endif 60+endif
57+ 61+
58 # Keep temporary files (.ii, .s) 62 # Keep temporary files (.ii, .s)
59 ifdef NEED_ASM 63 ifdef NEED_ASM
60 CFLAGS += -save-temps 64 CFLAGS += -save-temps
61@@ -117,9 +134,18 @@ endif 65@@ -117,9 +134,18 @@ endif