--- a/ChangeLog	Mon Feb 22 00:51:50 2021 +0000
+++ b/ChangeLog	Mon Feb 22 01:27:10 2021 +0000
@@ -1,3 +1,20 @@
+2021-02-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3832: 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.
+
 2017-10-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR3831: Hotspot object_alloc tapset uses HeapWordSize incorrectly

--- a/NEWS	Mon Feb 22 00:51:50 2021 +0000
+++ b/NEWS	Mon Feb 22 01:27:10 2021 +0000
@@ -15,6 +15,7 @@
 * New features
   - PR3827: jstack.stp should support AArch64
   - PR3830: jstack.stp should support ppc64[le,be]
+  - PR3832: Populate unique SystemTap suffix from configure
 * SystemTap
   - PR3825: SystemTap is heavily confused by multiple JDKs
   - PR3828: Architectures unsupported by SystemTap tapsets throw a parse error

--- a/acinclude.m4	Mon Feb 22 00:51:50 2021 +0000
+++ b/acinclude.m4	Mon Feb 22 01:27:10 2021 +0000
@@ -1907,11 +1907,15 @@
 AC_DEFUN_ONCE([IT_DETERMINE_VERSION],
 [
   AC_MSG_CHECKING([which branch and release of IcedTea is being built])
-  JAVA_VER=1.8.0
+  JAVA_VER=11
+  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=11
   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 ${JAVA_VER}])
+  AC_MSG_RESULT([branch ${ICEDTEA_BRANCH}, release ${ICEDTEA_RELEASE} for OpenJDK ${JAVA_VER} (specification ${JAVA_SPEC_VER})])
   AC_SUBST([JAVA_VER])
+  AC_SUBST([JAVA_SPEC_VER])
   AC_SUBST([ICEDTEA_RELEASE])
   AC_SUBST([ICEDTEA_BRANCH])
 ])

--- a/tapset/hotspot.stp.in	Mon Feb 22 00:51:50 2021 +0000
+++ b/tapset/hotspot.stp.in	Mon Feb 22 01:27:10 2021 +0000
@@ -141,8 +141,8 @@
    Triggers at the end of the virtual machine initialization.
    Has no arguments.
  */
-probe hotspot_vm_init_end = hotspot.vm_init_end11 {}
-probe hotspot.vm_init_end11 =
+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 Feb 22 00:51:50 2021 +0000
+++ b/tapset/jstack.stp.in	Mon Feb 22 01:27:10 2021 +0000
@@ -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_end11
+probe hotspot.vm_init_end@JAVA_SPEC_VER@
 {
   /**
    * The CodeCache class contains the static CodeHeap _heap that