Snap for 8426163 from 38ff772f60dd2fba919dc8bebb9c349364c1a61a to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I2514400bae555f55f468829581137b851c5e1c81

4 files changed, 12 insertions, 29 deletions

diff --git a/Android.bp b/Android.bp
index 2e6828b..3b967ed 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,26 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["external_psimd_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "external_psimd_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-MIT",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
 cc_library_headers {
     name: "psimd_headers",
     export_include_dirs: ["include"],
     vendor_available: true,
     sdk_version: "current",
 }
+
diff --git a/METADATA b/METADATA
index 364e59b..5b1c1a4 100644
--- a/METADATA
+++ b/METADATA
@@ -1,5 +1,7 @@
 name: "psimd"
-description: "Portable 128-bit SIMD intrinsics"
+description:
+    "Portable 128-bit SIMD intrinsics"
+
 third_party {
   url {
     type: HOMEPAGE
@@ -9,11 +11,7 @@ third_party {
     type: GIT
     value: "https://github.com/Maratyszcza/psimd"
   }
-  version: "072586a71b55b7f8c584153d223e95687148a900"
+  version: "10b4ffc6ea9e2e11668f86969586f88bc82aaefa"
+  last_upgrade_date { year: 2020 month: 2 day: 3 }
   license_type: NOTICE
-  last_upgrade_date {
-    year: 2020
-    month: 5
-    day: 18
-  }
 }
diff --git a/NOTICE b/NOTICE
new file mode 120000
index 0000000..7a694c9
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1 @@
+LICENSE
\ No newline at end of file
diff --git a/include/psimd.h b/include/psimd.h
index b7cb65d..1aa1014 100644
--- a/include/psimd.h
+++ b/include/psimd.h
@@ -28,7 +28,7 @@
 	#define PSIMD_INTRINSIC static
 #endif
 
-#if defined(__GNUC__) || defined(__clang__)
+#if defined(__GNUC__)
 	#if defined(__ARM_NEON__) || defined(__ARM_NEON)
 		#include <arm_neon.h>
 	#endif
@@ -78,7 +78,7 @@
 	#include <stdint.h>
 #endif
 
-#if defined(__GNUC__) || defined(__clang__)
+#if defined(__GNUC__)
 	#define PSIMD_HAVE_F64 0
 	#define PSIMD_HAVE_F32 1
 	#define PSIMD_HAVE_U8 1
@@ -664,10 +664,10 @@
 		#if defined(__aarch64__) || defined(__ARM_NEON__) && defined(__ARM_FEATURE_FMA)
 			return (psimd_f32) vfmaq_f32((float32x4_t) a, (float32x4_t) b, (float32x4_t) c);
 		#elif (defined(__x86_64__) || defined(__i386__) || defined(__i686__)) && defined(__FMA__)
-			return (psimd_f32) _mm_fmadd_ps((__m128) b, (__m128) c, (__m128) a);
+			return (psimd_f32) _mm_fmadd_ps((__m128) c, (__m128) a, (__m128) b);
 		#elif (defined(__x86_64__) || defined(__i386__) || defined(__i686__)) && defined(__FMA4__)
-			return (psimd_f32) _mm_macc_ps((__m128) b, (__m128) c, (__m128) a);
-		#elif defined(__wasm__) && defined(__wasm_simd128__) && defined(__clang__) && PSIMD_ENABLE_WASM_QFMA
+			return (psimd_f32) _mm_macc_ps((__m128) c, (__m128) a, (__m128) b);
+		#elif defined(__wasm__) && defined(__wasm_simd128__) && defined(__clang__)
 			return (psimd_f32) __builtin_wasm_qfma_f32x4(a, b, c);
 		#else
 			return a + b * c;