diff --git a/cplusplus-interpreter.patch b/cplusplus-interpreter.patch
deleted file mode 100644
index 4fba05f..0000000
--- a/cplusplus-interpreter.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- jdk8/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Sat Dec 13 01:24:10 2014 +0300
-+++ jdk8/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp	Mon Dec 15 09:36:46 2014 +0100
-@@ -394,7 +394,11 @@
-     // during deoptimization so the interpreter needs to skip it when
-     // the frame is popped.
-     thread->set_do_not_unlock_if_synchronized(true);
-+#ifdef CC_INTERP
-+    return (address) -1;
-+#else
-     return Interpreter::remove_activation_entry();
-+#endif
-   }
- 
-   // Need to do this check first since when _do_not_unlock_if_synchronized
-
diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 6b2a84e..2dc00a3 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -3,6 +3,8 @@ Thu Apr 16 15:47:54 UTC 2015 - fstrba@suse.com
 
 - Update the aarch64 tarball to the recent tip
   * The revision has merged changes up to jdk8u45-b14
+- Remove upstreamed patch:
+  * cplusplus-interpreter.patch
 
 -------------------------------------------------------------------
 Wed Apr 15 08:27:37 UTC 2015 - fstrba@suse.com
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 4cd29aa..547b777 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -221,8 +221,6 @@ Patch12:        adlc-parser.patch
 Patch13:        implicit-pointer-decl.patch
 # Avoid triggering inactivity timeout while generating javadoc in zero VM
 Patch14:        zero-javadoc-verbose.patch
-# Fix to build the C++ interpreter that does not have Interpreter::remove_activation_entry
-Patch15:        cplusplus-interpreter.patch
 #
 # OpenJDK specific patches
 #
@@ -514,8 +512,6 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
 %patch14 -p1
 %endif
 
-%patch15 -p1
-
 %patch99 -p1
 
 # s390 build fixes