[FFI] Remove all code & test suites tagged with J9VM_OPT_PANAMA

The changes remove the stale code & tests tagged with J9VM_OPT_PANAMA in JDK16 given all FFI related functionalities were fully implemented in which case the code & test surrounded by or related to J9VM_OPT_PANAMA are no longer required for any reference. Signed-off-by: ChengJin01 <[email protected]>
eclipse-openj9 · Jul 17, 2024 · 950eec7 · 950eec7
1 parent 53c5b2a
commit 950eec7
Show file tree

Hide file tree

Showing 66 changed files with 4 additions and 2,216 deletions.
diff --git a/buildspecs/aix_ppc-64.spec b/buildspecs/aix_ppc-64.spec
@@ -231,7 +231,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/aix_ppc-64_cmprssptrs.spec b/buildspecs/aix_ppc-64_cmprssptrs.spec
@@ -227,7 +227,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/aix_ppc.spec b/buildspecs/aix_ppc.spec
@@ -228,7 +228,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/j9.flags b/buildspecs/j9.flags
@@ -653,10 +653,6 @@ all data is stored in their own region. It additionaly reduces footprint, mainly
 		<description>Indicates that this spec should run automated testing jobs in the nightly build</description>
 		<ifRemoved>This spec will not run any tests and will be a "build only" spec</ifRemoved>
 	</flag>
-	<flag id="graph_enableTesting_Panama">
-		<description>Indicates that this spec should run automated testing jobs in the nightly build</description>
-		<ifRemoved>This spec will not run any tests and will be a "build only" spec</ifRemoved>
-	</flag>
 	<flag id="graph_excludeAllocFib">
 		<description>Indicates that this spec wishes to not run the AllocFib test suite in the nightly build</description>
 		<ifRemoved>AllocFib test suite will be run in the nightly build, if otherwise included</ifRemoved>
@@ -1824,10 +1820,6 @@ Only available on zOS</description>
 		<description>Enables support for @Packed types (Structs)</description>
 		<ifRemoved>No support for @Packed types (Structs)</ifRemoved>
 	</flag>
-	<flag id="opt_panama">
-		<description>Enables support for Project Panama features such as native method handles</description>
-		<ifRemoved>No support for Project Panama features such as native method handles</ifRemoved>
-	</flag>
 	<flag id="opt_openjdkFfi">
 		<description>Enables support for Foreign Linker API (part of Project Panama) such as native invocations to ffi_call</description>
 		<ifRemoved>No support for Foreign Linker API</ifRemoved>

diff --git a/buildspecs/linux_390-64.spec b/buildspecs/linux_390-64.spec
@@ -229,7 +229,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_390-64_cmprssptrs.spec b/buildspecs/linux_390-64_cmprssptrs.spec
@@ -231,7 +231,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_390.spec b/buildspecs/linux_390.spec
@@ -230,7 +230,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_aarch64.spec b/buildspecs/linux_aarch64.spec
@@ -213,7 +213,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_aarch64_cmprssptrs.spec b/buildspecs/linux_aarch64_cmprssptrs.spec
@@ -213,7 +213,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_aarch64_cmprssptrs_cross.spec b/buildspecs/linux_aarch64_cmprssptrs_cross.spec
@@ -214,7 +214,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_aarch64_cross.spec b/buildspecs/linux_aarch64_cross.spec
@@ -214,7 +214,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_arm.spec b/buildspecs/linux_arm.spec
@@ -230,7 +230,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_arm_linaro.spec b/buildspecs/linux_arm_linaro.spec
@@ -229,7 +229,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_ppc-64.spec b/buildspecs/linux_ppc-64.spec
@@ -229,7 +229,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_ppc-64_cmprssptrs.spec b/buildspecs/linux_ppc-64_cmprssptrs.spec
@@ -227,7 +227,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_ppc-64_cmprssptrs_le.spec b/buildspecs/linux_ppc-64_cmprssptrs_le.spec
@@ -232,7 +232,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_ppc-64_le.spec b/buildspecs/linux_ppc-64_le.spec
@@ -232,7 +232,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_ppc.spec b/buildspecs/linux_ppc.spec
@@ -227,7 +227,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_riscv64.spec b/buildspecs/linux_riscv64.spec
@@ -223,7 +223,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_riscv64_cmprssptrs.spec b/buildspecs/linux_riscv64_cmprssptrs.spec
@@ -223,7 +223,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_riscv64_cmprssptrs_cross.spec b/buildspecs/linux_riscv64_cmprssptrs_cross.spec
@@ -224,7 +224,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_riscv64_cross.spec b/buildspecs/linux_riscv64_cross.spec
@@ -224,7 +224,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_x86-64.spec b/buildspecs/linux_x86-64.spec
@@ -230,7 +230,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_x86-64_cmprssptrs.spec b/buildspecs/linux_x86-64_cmprssptrs.spec
@@ -225,7 +225,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/linux_ztpf_390-64.spec b/buildspecs/linux_ztpf_390-64.spec
@@ -219,7 +219,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/osx_x86-64.spec b/buildspecs/osx_x86-64.spec
@@ -228,7 +228,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/osx_x86-64_cmprssptrs.spec b/buildspecs/osx_x86-64_cmprssptrs.spec
@@ -223,7 +223,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_sidecar" value="true"/>

diff --git a/buildspecs/win_x86-64.spec b/buildspecs/win_x86-64.spec
@@ -233,7 +233,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_nativeCharacterConverter" value="true"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>

diff --git a/buildspecs/win_x86-64_cmprssptrs.spec b/buildspecs/win_x86-64_cmprssptrs.spec
@@ -228,7 +228,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_nativeCharacterConverter" value="true"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>

diff --git a/buildspecs/win_x86.spec b/buildspecs/win_x86.spec
@@ -240,7 +240,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_nativeCharacterConverter" value="true"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>

diff --git a/buildspecs/zos_390-64.spec b/buildspecs/zos_390-64.spec
@@ -230,7 +230,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_shrMsyncSupport" value="true"/>

diff --git a/buildspecs/zos_390-64_cmprssptrs.spec b/buildspecs/zos_390-64_cmprssptrs.spec
@@ -230,7 +230,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_reflect" value="true"/>
 		<flag id="opt_sharedClasses" value="true"/>
 		<flag id="opt_shrMsyncSupport" value="true"/>

diff --git a/buildspecs/zos_390.spec b/buildspecs/zos_390.spec
@@ -227,7 +227,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="opt_jxeLoadSupport" value="true"/>
 		<flag id="opt_memoryCheckSupport" value="true"/>
 		<flag id="opt_multiVm" value="true"/>
-		<flag id="opt_panama" value="false"/>
 		<flag id="opt_valhallaValueTypes" value="false"/>
 		<flag id="opt_valhallaFlattenableValueTypes" value="false"/>
 		<flag id="opt_reflect" value="true"/>

diff --git a/debugtools/DDR_VM/data/superset-constants.dat b/debugtools/DDR_VM/data/superset-constants.dat
@@ -951,7 +951,6 @@ C|opt_noClassloaders
 C|opt_nrr
 C|opt_paas
 C|opt_packed
-C|opt_panama
 C|opt_phpSupport
 C|opt_reflect
 C|opt_remoteConsoleSupport
@@ -4154,7 +4153,6 @@ C|JCL_RTFLAG_DEFAULT
 C|JCL_RTFLAG_INTERP_HOT_CODE_REPLACEMENT
 C|JCL_RTFLAG_JIT_NEW_INSTANCE_PROTOTYPE
 C|JCL_RTFLAG_OPT_METHOD_HANDLE
-C|JCL_RTFLAG_OPT_PANAMA
 C|JCL_RTFLAG_OPT_REFLECT
 S|J9VmlsConstants|J9VmlsConstantsPointer|
 C|J9VMLS_MAX_KEYS

diff --git a/debugtools/DDR_VM/generate.properties b/debugtools/DDR_VM/generate.properties
@@ -39,14 +39,14 @@ linux_x86-64,linux_x86-64_cmprssptrs,linux_x86-64_cmprssptrs_tarok,\
 linux_x86-64_tarok,linux_x86,linux_x86_rtj,win_x86-64,win_x86-64_cmprssptrs,\
 win_x86-64_cmprssptrs_tarok,win_x86-64_tarok,win_x86,win_x86_tarok,zos_390-64,\
 zos_390-64_cmprssptrs,zos_390-64_cmprssptrs_tarok,zos_390-64_tarok,zos_390,\
-linux_x86-64_combo,linux_x86-64_cmprssptrs_combo,linux_x86-64_cmprssptrs_panama
+linux_x86-64_combo,linux_x86-64_cmprssptrs_combo
 
 ddr.order=aix_ppc-64,aix_ppc-64_cmprssptrs,aix_ppc,\
 linux_390-64,linux_390-64_cmprssptrs,linux_390,\
 linux_aarch64,linux_aarch64_cmprssptrs,\
 linux_arm,\
 linux_ppc-64,linux_ppc-64_cmprssptrs,linux_ppc,\
 linux_ppc-64_le,linux_ppc-64_cmprssptrs_le,\
-linux_x86-64,linux_x86-64_cmprssptrs,linux_x86-64_cmprssptrs_panama,\
+linux_x86-64,linux_x86-64_cmprssptrs,\
 linux_x86,win_x86-64,win_x86-64_cmprssptrs,\
 win_x86,zos_390-64,zos_390-64_cmprssptrs,zos_390
diff --git a/runtime/cmake/options.cmake b/runtime/cmake/options.cmake
@@ -141,7 +141,6 @@ option(J9VM_OPT_METHOD_HANDLE_COMMON "Enables common dependencies between OpenJ9
 option(J9VM_OPT_MULTI_VM "Decides if multiple VMs can be created in the same address space")
 option(J9VM_OPT_OPENJDK_METHODHANDLE "Enables support for OpenJDK MethodHandles. J9VM_OPT_METHOD_HANDLE should be disabled.")
 
-option(J9VM_OPT_PANAMA "Enables support for Project Panama features such as native method handles")
 option(J9VM_OPT_VALHALLA_VALUE_TYPES "Enables support for Project Valhalla Value Object")
 option(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES "Enables support for Project Valhalla Flattenable Value Types")
 

diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_x86.mk b/runtime/gc_glue_java/configure_includes/configure_linux_x86.mk
@@ -43,21 +43,6 @@ ifeq (linux_x86-64_cmprssptrs, $(SPEC))
 		OMR_GC_POINTER_MODE=compressed
 endif
 
-ifeq (linux_x86-64_cmprssptrs_panama, $(SPEC))
-	CONFIGURE_ARGS += \
-		--enable-OMRTHREAD_LIB_UNIX \
-		--enable-OMR_ARCH_X86 \
-		--enable-OMR_ENV_DATA64 \
-		--enable-OMR_GC_DOUBLE_MAP_ARRAYLETS \
-		--enable-OMR_ENV_LITTLE_ENDIAN \
-		--enable-OMR_GC_IDLE_HEAP_MANAGER \
-		--enable-OMR_GC_TLH_PREFETCH_FTA \
-		--enable-OMR_PORT_CAN_RESERVE_SPECIFIC_ADDRESS \
-		--enable-OMR_PORT_NUMA_SUPPORT \
-		--enable-OMR_JITBUILDER \
-		OMR_GC_POINTER_MODE=compressed
-endif
-
 ifeq (linux_x86-64, $(SPEC))
 	CONFIGURE_ARGS += \
 		--enable-OMRTHREAD_LIB_UNIX \

diff --git a/runtime/include/j9cfg.h.in b/runtime/include/j9cfg.h.in
@@ -236,7 +236,6 @@ extern "C" {
 #cmakedefine J9VM_OPT_NRR
 #cmakedefine J9VM_OPT_OPENJDK_METHODHANDLE
 #cmakedefine J9VM_OPT_PACKED
-#cmakedefine J9VM_OPT_PANAMA
 #cmakedefine J9VM_OPT_PHP_SUPPORT
 #cmakedefine J9VM_OPT_REFLECT
 #cmakedefine J9VM_OPT_RESOURCE_MANAGED

diff --git a/runtime/j9jitbuilder/JavaMethodCallbackGen.cpp b/runtime/j9jitbuilder/JavaMethodCallbackGen.cpp