Merge remote-tracking branch 'upstream/3.4' into merge-3.4

cmake/checks/cpu_vsx_asm.cpp

@@ -0,0 +1,21 @@
+#if defined(__VSX__)
+    #if defined(__PPC64__) && defined(__LITTLE_ENDIAN__)
+        #include <altivec.h>
+    #else
+        #error "OpenCV only supports little-endian mode"
+    #endif
+#else
+    #error "VSX is not supported"
+#endif
+
+/*
+ * xlc and wide versions of clang don't support %x<n> in the inline asm template which fixes register number
+ * when using any of the register constraints wa, wd, wf
+*/
+int main()
+{
+    __vector float vf;
+    __vector signed int vi;
+    __asm__ __volatile__ ("xvcvsxwsp %x0,%x1" : "=wf" (vf) : "wa" (vi));
+    return 0;
+}

cmake/checks/runtime/cpu_vsx_aligned.cpp

@@ -2,6 +2,7 @@
 // https://github.com/opencv/opencv/issues/13211
 
 #include <altivec.h>
+#undef bool
 
 #define vsx_ld vec_vsx_ld
 #define vsx_st vec_vsx_st