--- a/ChangeLog	Mon May 03 02:35:35 2021 +0100
+++ b/ChangeLog	Mon May 03 12:51:28 2021 +0100
@@ -1,3 +1,20 @@
+2021-02-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3835: Populate unique SystemTap suffix
+	from configure
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_DETERMINE_VERSION): Update JAVA_VER
+	to match this version of IcedTea (11).
+	Introduce JAVA_SPEC_VER, which is no
+	different here, but will be for
+	IcedTea <= 3 (OpenJDK <= 8)
+	* tapset/hotspot.stp.in,
+	* tapset/jstack.stp.in:
+	Replace "end11" with "end@JAVA_SPEC_VER@"
+	so that the unique suffix is completed
+	by configure.
+
 2021-05-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump aarch32 to jdk8u292-ga-aarch32-20210423.

--- a/NEWS	Mon May 03 02:35:35 2021 +0100
+++ b/NEWS	Mon May 03 12:51:28 2021 +0100
@@ -20,6 +20,8 @@
   - JDK-8249906, CVE-2021-2163: Enhance opening JARs
   - JDK-8250568, CVE-2021-2161: Less ambiguous processing
   - JDK-8253799: Make lists of normal filenames
+* New features
+  - PR3835: Populate unique SystemTap suffix from configure
 * Import of OpenJDK 8 u292 build 01
   - JDK-6949753: [TEST BUG]: java/awt/print/PageFormat/PDialogTest.java needs update by removing a infinite loop
   - JDK-8031126: java/lang/management/ThreadMXBean/ThreadUserTime.java fails intermittently

--- a/acinclude.m4	Mon May 03 02:35:35 2021 +0100
+++ b/acinclude.m4	Mon May 03 12:51:28 2021 +0100
@@ -2088,6 +2088,9 @@
 [
   AC_MSG_CHECKING([which branch and release of IcedTea is being built])
   JAVA_VER=1.8.0
+  dnl JAVA_SPEC_VER is the same for OpenJDK >= 9, but not for earlier versions
+  dnl (e.g. 1.8.0 = 8, 1.7.0 = 7, etc.)
+  JAVA_SPEC_VER=8
   JAVA_VENDOR=openjdk
   JDK_UPDATE_VERSION=292
   BUILD_VERSION=b10
@@ -2100,8 +2103,9 @@
   OPENJDK_VER=${JAVA_VER}_${COMBINED_VERSION}
   ICEDTEA_RELEASE=$(echo ${PACKAGE_VERSION} | sed 's#pre.*##')
   ICEDTEA_BRANCH=$(echo ${ICEDTEA_RELEASE}|sed 's|\.[[0-9]]$||')
-  AC_MSG_RESULT([branch ${ICEDTEA_BRANCH}, release ${ICEDTEA_RELEASE} for OpenJDK ${OPENJDK_VER}])
+  AC_MSG_RESULT([branch ${ICEDTEA_BRANCH}, release ${ICEDTEA_RELEASE} for OpenJDK ${OPENJDK_VER} (specification ${JAVA_SPEC_VER})])
   AC_SUBST([JAVA_VER])
+  AC_SUBST([JAVA_SPEC_VER])
   AC_SUBST([JAVA_VENDOR])
   AC_SUBST([JDK_UPDATE_VERSION])
   AC_SUBST([BUILD_VERSION])

--- a/tapset/hotspot.stp.in	Mon May 03 02:35:35 2021 +0100
+++ b/tapset/hotspot.stp.in	Mon May 03 12:51:28 2021 +0100
@@ -141,8 +141,8 @@
    Triggers at the end of the virtual machine initialization.
    Has no arguments.
  */
-probe hotspot_vm_init_end = hotspot.vm_init_end8 {}
-probe hotspot.vm_init_end8 =
+probe hotspot_vm_init_end = hotspot.vm_init_end@JAVA_SPEC_VER@ {}
+probe hotspot.vm_init_end@JAVA_SPEC_VER@ =
   process("@ABS_CLIENT_LIBJVM_SO@").mark("vm__init__end"),
   process("@ABS_SERVER_LIBJVM_SO@").mark("vm__init__end")
 {

--- a/tapset/jstack.stp.in	Mon May 03 02:35:35 2021 +0100
+++ b/tapset/jstack.stp.in	Mon May 03 12:51:28 2021 +0100
@@ -72,7 +72,7 @@
 
 /* We need to collect some global symbol addresses that cannot be resolved
    in a bare function and vm_init_end seems a good place to use. */
-probe hotspot.vm_init_end8
+probe hotspot.vm_init_end@JAVA_SPEC_VER@
 {
   /**
    * The CodeCache class contains the static CodeHeap _heap that