diff --git a/llvm-no-visibility.patch b/llvm-no-visibility.patch
new file mode 100644
index 0000000..1f3ae01
--- /dev/null
+++ b/llvm-no-visibility.patch
@@ -0,0 +1,18 @@
+Index: llvm-3.3/cmake/modules/HandleLLVMOptions.cmake
+===================================================================
+--- llvm-3.3.orig/cmake/modules/HandleLLVMOptions.cmake
++++ llvm-3.3/cmake/modules/HandleLLVMOptions.cmake
+@@ -104,13 +104,6 @@ if( LLVM_ENABLE_PIC )
+     # On Windows all code is PIC. MinGW warns if -fPIC is used.
+   else()
+     add_flag_or_print_warning("-fPIC")
+-
+-    if( WIN32 OR CYGWIN)
+-      # MinGW warns if -fvisibility-inlines-hidden is used.
+-    else()
+-      check_cxx_compiler_flag("-fvisibility-inlines-hidden" SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG)
+-      append_if(SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG "-fvisibility-inlines-hidden" CMAKE_CXX_FLAGS)
+-    endif()
+   endif()
+ endif()
+ 
diff --git a/llvm.spec b/llvm.spec
index 733ca3b..2e38889 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -58,6 +58,8 @@ Patch7:         unreachable-code.patch
 Patch8:         cmake-host-triple.patch
 # PATCH-FIX-OPENSUSE aarch64-suse-support.patch -- Enable AArch64 suse toolchain support
 Patch9:         aarch64-suse-support.patch
+# PATCH-FIX-OPENSUSE llvm-no-visibility.patch -- Disable visibility
+Patch10:        llvm-no-visibility.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -166,6 +168,9 @@ This package contains vim plugins for LLVM like syntax highlighting.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%ifarch s390 s390x
+%patch10 -p1
+%endif
 
 # We hardcode i586
 rm tools/clang/test/Driver/x86_features.c
@@ -306,6 +311,11 @@ for i in crash-narrowfunctiontest metadata remove_arguments_test; do
     rm ../test/BugPoint/$i.ll;
 done
 
+%ifarch s390 s390x
+for i in TestClassDecl.m TestClassForwardDecl.m c-index-getCursor-test.m; do
+    rm ../tools/clang/test/Index/$i
+%endif
+
 make check
 make clang-test
 %endif