--- a/ChangeLog	Mon Jul 18 06:21:45 2016 +0100
+++ b/ChangeLog	Mon Jul 18 06:27:50 2016 +0100
@@ -1,3 +1,18 @@
+2016-07-17  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	PR3096: Remove dead
+	--disable-optimizations option
+	* INSTALL: Remove documentation of
+	--disable-optimizations.
+	* Makefile.am:
+	(ICEDTEA_ENV): Drop additions when
+	DISABLE_OPTIMIZATIONS is set.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_DISABLE_OPTIMIZATIONS): Removed.
+	* configure.ac:
+	Don't invoke IT_DISABLE_OPTIMIZATIONS.
+
 2016-07-17  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	PR3090: SystemTap is heavily confused

--- a/INSTALL	Mon Jul 18 06:21:45 2016 +0100
+++ b/INSTALL	Mon Jul 18 06:27:50 2016 +0100
@@ -89,7 +89,6 @@
 * --enable-warnings: Produce warnings from the Java compiler during the build.
 * --with-openjdk-src-dir: Copy the specified OpenJDK tree, rather than
   downloading and extracting a tarball.
-* --disable-optimizations: Build with -O0.
 * --enable-hg: Checkout the OpenJDK tree from Mercurial, rather than
   downloading and extracting a tarball.
 * --enable-system-lcms: Build using the system installation of LCMS2, not

--- a/Makefile.am	Mon Jul 18 06:21:45 2016 +0100
+++ b/Makefile.am	Mon Jul 18 06:27:50 2016 +0100
@@ -566,12 +566,6 @@
 	JOBS="$(PARALLEL_JOBS)" \
 	INSTALL_LOCATION="${prefix}"
 
-if DISABLE_OPTIMIZATIONS
-ICEDTEA_ENV += \
-	NO_OPTIMIZATIONS="true" \
-	CC_NO_OPT="-O0 -g"
-endif
-
 if USE_ALT_JAR
 ICEDTEA_ENV += \
 	ALT_JAR_CMD="$(ALT_JAR_CMD)"

--- a/NEWS	Mon Jul 18 06:21:45 2016 +0100
+++ b/NEWS	Mon Jul 18 06:27:50 2016 +0100
@@ -189,6 +189,7 @@
   - PR3083, RH1346460: Regression in SSL debug output without an ECC provider
   - PR3089: Remove old memory limits patch
   - PR3090: SystemTap is heavily confused by multiple JDKs
+  - PR3096: Remove dead --disable-optimizations option
 * AArch64 port
   - S8145320, PR3078: Create unsafe_arraycopy and generic_arraycopy for AArch64
   - S8148328, PR3078: aarch64: redundant lsr instructions in stub code.

--- a/acinclude.m4	Mon Jul 18 06:21:45 2016 +0100
+++ b/acinclude.m4	Mon Jul 18 06:27:50 2016 +0100
@@ -585,28 +585,6 @@
   AC_SUBST(ALT_JAR_CMD)
 ])
 
-AC_DEFUN([IT_DISABLE_OPTIMIZATIONS],
-[
-  AC_MSG_CHECKING([whether to disable optimizations and build with -O0 -g])
-  AC_ARG_ENABLE([optimizations],
-                [AS_HELP_STRING(--disable-optimizations,build with -O0 -g [[default=no]])],
-  [
-    case "${enableval}" in
-      no)
-        disable_optimizations=yes
-        ;;
-      *)
-        disable_optimizations=no
-        ;;
-    esac
-  ],
-  [
-    disable_optimizations=no
-  ])
-  AC_MSG_RESULT([$disable_optimizations])
-  AM_CONDITIONAL([DISABLE_OPTIMIZATIONS], test x"${disable_optimizations}" = "xyes")
-])
-
 AC_DEFUN([IT_FIND_TOOL],
 [AC_PATH_TOOL([$1],[$2])
  if test x"$$1" = x ; then

--- a/configure.ac	Mon Jul 18 06:21:45 2016 +0100
+++ b/configure.ac	Mon Jul 18 06:27:50 2016 +0100
@@ -118,7 +118,6 @@
 IT_ENABLE_JAMVM
 IT_ENABLE_JAMVM_CHECKSUM
 
-IT_DISABLE_OPTIMIZATIONS
 IT_ENABLE_WERROR
 IT_ENABLE_JAR_COMPRESSION
 IT_ENABLE_ZERO_BUILD