pixman: Branch 'master' - 2 commits

[GitLab Mirror]

 configure.ac               |    2 +-
 meson.build                |    2 +-
 pixman/loongson-mmintrin.h |   18 ++++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 9976d2c099db028f24a09cef6f1686b3b5ab9975
Author: Matt Turner <mattst88 at gmail.com>
Date:   Sun Mar 8 17:45:29 2020 -0700

    loongson: Avoid C90 mixing-code-and-decls warning

diff --git a/pixman/loongson-mmintrin.h b/pixman/loongson-mmintrin.h
index 086c6e0..0e79e86 100644
--- a/pixman/loongson-mmintrin.h
+++ b/pixman/loongson-mmintrin.h
@@ -209,12 +209,13 @@ _mm_set_pi16 (uint16_t __w3, uint16_t __w2, uint16_t __w1, uint16_t __w0)
 		    : "f" (*(__m64 *)&val), "f" (*(__m64 *)&imm)
 		);
 		return ret;
+	} else {
+		uint64_t val = ((uint64_t)__w3 << 48)
+			     | ((uint64_t)__w2 << 32)
+			     | ((uint64_t)__w1 << 16)
+			     | ((uint64_t)__w0 <<  0);
+		return *(__m64 *)&val;
 	}
-	uint64_t val = ((uint64_t)__w3 << 48)
-		     | ((uint64_t)__w2 << 32)
-		     | ((uint64_t)__w1 << 16)
-		     | ((uint64_t)__w0 <<  0);
-	return *(__m64 *)&val;
 }
 
 extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
@@ -236,10 +237,11 @@ _mm_set_pi32 (unsigned __i1, unsigned __i0)
 		    : "f" (*(__m32 *)&__i1), "f" (*(__m64 *)&imm)
 		);
 		return ret;
+	} else {
+		uint64_t val = ((uint64_t)__i1 << 32)
+			     | ((uint64_t)__i0 <<  0);
+		return *(__m64 *)&val;
 	}
-	uint64_t val = ((uint64_t)__i1 << 32)
-		     | ((uint64_t)__i0 <<  0);
-	return *(__m64 *)&val;
 }
 #undef _MM_SHUFFLE
 
commit 5330640025aec74ecdcdebdd1a27531c13437bd5
Author: Shiyou Yin <yinshiyou-hf at loongson.cn>
Date:   Mon Mar 23 12:35:16 2020 +0800

    configure.ac: use '-mloongson-mmi' for Loongson MMI
    
    It's recommended to use '-mloongson-mmi' for MMI.
    
    Reviewed-by: Matt Turner <mattst88 at gmail.com>

diff --git a/configure.ac b/configure.ac
index 1ca3974..fd7df47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,7 +273,7 @@ dnl ===========================================================================
 dnl Check for Loongson Multimedia Instructions
 
 if test "x$LS_CFLAGS" = "x" ; then
-    LS_CFLAGS="-march=loongson2f"
+    LS_CFLAGS="-mloongson-mmi"
 fi
 
 have_loongson_mmi=no
diff --git a/meson.build b/meson.build
index 15d3409..a45c969 100644
--- a/meson.build
+++ b/meson.build
@@ -51,7 +51,7 @@ endforeach
 
 use_loongson_mmi = get_option('loongson-mmi')
 have_loongson_mmi = false
-loongson_mmi_flags = ['-march=loongson2f']
+loongson_mmi_flags = ['-mloongson-mmi']
 if not use_loongson_mmi.disabled()
   if host_machine.cpu_family() == 'mips64' and cc.compiles('''
       #ifndef __mips_loongson_vector_rev