From 499cdbf01d7f48cb674046e706d92c8e5545ed16 Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <malaperle@gmail.com>
Date: Thu, 29 Nov 2018 22:49:59 -0500
Subject: [PATCH] Remove JVM MaxPermSize arguments (unused since Java 8)

Change-Id: Ie33b44064429f409fa721141f14f4e519014f6aa
Signed-off-by: Marc-Andre Laperle <malaperle@gmail.com>
---
 .../debug.product                                        | 2 +-
 .../StandaloneTests.launch                               | 2 +-
 dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml            | 2 +-
 jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml    | 2 +-
 releng/CDT.setup                                         | 9 +--------
 releng/org.eclipse.cdt.target/cdt-latest-platform.target | 1 -
 releng/org.eclipse.cdt.target/cdt.target                 | 1 -
 7 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index 9fb748eadab..77d7c6b14d8 100644
--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
+++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
@@ -14,7 +14,7 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>--launcher.XXMaxPermSize 256m -data @noDefault
+      <programArgs>-data @noDefault
       </programArgs>
       <programArgsLin>--launcher.GTK_version 2
       </programArgsLin>
diff --git a/debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.launch b/debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.launch
index b56608c8092..a4b8310485b 100644
--- a/debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.launch
+++ b/debug/org.eclipse.cdt.debug.application.tests/StandaloneTests.launch
@@ -28,7 +28,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -clean"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.cdt.debug.application.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#10;-Xmx512M&#10;-XX:MaxPermSize=256m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#10;-Xmx512M"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.cdt.debug.application.product"/>
 <booleanAttribute key="run_in_ui_thread" value="false"/>
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
index aba5a1fd24a..7dac64b0537 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
@@ -60,7 +60,7 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<useUIHarness>false</useUIHarness>
-					<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine>
+					<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine>
                     <appArgLine>-debug ./dsf.debug.options</appArgLine>
 					<includes>
 						<include>**/${dsf.gdb.tests.gdbTestSuite}</include>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
index a83734e5eb0..3bc02402a31 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
@@ -60,7 +60,7 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<useUIHarness>false</useUIHarness>
-					<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine>
+					<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine>
 					<appArgLine>-debug ./dsf.debug.options</appArgLine>
 					<includes>
 						<include>**/${dsf.gdb.tests.gdbTestSuite}</include>
diff --git a/releng/CDT.setup b/releng/CDT.setup
index 0d6a4569725..57ae0324b02 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -42,13 +42,6 @@
       vm="true">
     <description>Set the heap space needed to work with the projects of ${scope.project.label}</description>
   </setupTask>
-  <setupTask
-      xsi:type="setup:EclipseIniTask"
-      option="-XX:MaxPermSize="
-      value="256m"
-      vm="true">
-    <description>Set the perm size needed to work with the projects of ${scope.project.label}</description>
-  </setupTask>
   <setupTask
       xsi:type="setup:ResourceCreationTask"
       excludedTriggers="STARTUP MANUAL"
@@ -101,7 +94,7 @@
     <setupTask
         xsi:type="setup.targlets:TargletTask"
         programArguments="-consolelog"
-        vmArguments="-Xms40m -Xmx512M -XX:MaxPermSize=256m -ea">
+        vmArguments="-Xms40m -Xmx512M -ea">
       <targlet
           name="CDT"
           activeRepositoryList="${eclipse.target.platform}">
diff --git a/releng/org.eclipse.cdt.target/cdt-latest-platform.target b/releng/org.eclipse.cdt.target/cdt-latest-platform.target
index 120c314faee..83aaba64f55 100644
--- a/releng/org.eclipse.cdt.target/cdt-latest-platform.target
+++ b/releng/org.eclipse.cdt.target/cdt-latest-platform.target
@@ -93,7 +93,6 @@
 <launcherArgs>
 <vmArgs>-Xms40m&#13;
 -Xmx512M&#13;
--XX:MaxPermSize=256m&#13;
 -ea</vmArgs>
 <programArgs>-consolelog</programArgs>
 </launcherArgs>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index d1cabc1e86e..abd786f84cf 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -93,7 +93,6 @@
 <launcherArgs>
 <vmArgs>-Xms40m&#13;
 -Xmx512M&#13;
--XX:MaxPermSize=256m&#13;
 -ea</vmArgs>
 <programArgs>-consolelog</programArgs>
 </launcherArgs>