diff --git a/package/classpath/0003-add-or1k-endian.patch b/package/classpath/0003-add-or1k-endian.patch
deleted file mode 100644
index 8bc87841db..0000000000
--- a/package/classpath/0003-add-or1k-endian.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Set endianess for or1k
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur classpath-0.98.orig/native/fdlibm/ieeefp.h classpath-0.98/native/fdlibm/ieeefp.h
---- classpath-0.98.orig/native/fdlibm/ieeefp.h	2008-01-13 18:33:50.000000000 +0100
-+++ classpath-0.98/native/fdlibm/ieeefp.h	2017-02-26 12:39:12.316327363 +0100
-@@ -123,6 +123,10 @@
- #define __IEEE_BIG_ENDIAN
- #endif
- 
-+#ifdef __or1k__
-+#define __IEEE_BIG_ENDIAN
-+#endif
-+
- #ifdef __v800
- #define __IEEE_LITTLE_ENDIAN
- #endif
diff --git a/package/classpath/Config.in b/package/classpath/Config.in
index caab619868..c49ff7a620 100644
--- a/package/classpath/Config.in
+++ b/package/classpath/Config.in
@@ -1,7 +1,15 @@
+config BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
+	bool
+	default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k \
+		|| BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \
+		|| BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le \
+		|| BR2_sh || BR2_x86_64
+
 config BR2_PACKAGE_CLASSPATH
 	bool "classpath"
 	select BR2_NEEDS_HOST_JAR
 	select BR2_NEEDS_HOST_JAVAC
+	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	help
 	  GNU Classpath, Essential Libraries for Java, is a GNU
 	  project to create free core class libraries for use with
diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in
index 2cc97a1398..57e1a8e6f4 100644
--- a/package/jamvm/Config.in
+++ b/package/jamvm/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_JAMVM
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
 		|| BR2_mips || BR2_mipsel || BR2_powerpc
+	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_CLASSPATH
 	help
@@ -15,4 +16,5 @@ config BR2_PACKAGE_JAMVM
 comment "jamvm needs a toolchain w/ threads, dynamic library"
 	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
 		|| BR2_mips || BR2_mipsel || BR2_powerpc
+	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS