From 20450c2e792084f06974cff9d2338e2d0406883f Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 23 Mar 2026 15:58:06 +0100 Subject: [PATCH] Merge commit b0d2b57f7e47 from llvm git (by Phoebe Wang): [Headers][X86] Remove more duplicated typedefs (#153820) They are defined in mmintrin.h This fixes a -Werror warning in openzfs, which compiles for C99, and C99 does not allow for typedef redefinitions. PR: 292067 MFC after: 1 month --- contrib/llvm-project/clang/lib/Headers/emmintrin.h | 4 ---- contrib/llvm-project/clang/lib/Headers/xmmintrin.h | 1 - 2 files changed, 5 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Headers/emmintrin.h b/contrib/llvm-project/clang/lib/Headers/emmintrin.h index 78e8a422db4..24ca14dba02 100644 --- a/contrib/llvm-project/clang/lib/Headers/emmintrin.h +++ b/contrib/llvm-project/clang/lib/Headers/emmintrin.h @@ -17,7 +17,6 @@ #include typedef double __m128d __attribute__((__vector_size__(16), __aligned__(16))); -typedef long long __m128i __attribute__((__vector_size__(16), __aligned__(16))); typedef double __m128d_u __attribute__((__vector_size__(16), __aligned__(1))); typedef long long __m128i_u @@ -25,9 +24,6 @@ typedef long long __m128i_u /* Type defines. */ typedef double __v2df __attribute__((__vector_size__(16))); -typedef long long __v2di __attribute__((__vector_size__(16))); -typedef short __v8hi __attribute__((__vector_size__(16))); -typedef char __v16qi __attribute__((__vector_size__(16))); /* Unsigned types */ typedef unsigned long long __v2du __attribute__((__vector_size__(16))); diff --git a/contrib/llvm-project/clang/lib/Headers/xmmintrin.h b/contrib/llvm-project/clang/lib/Headers/xmmintrin.h index 6a643697730..a128a64f5e7 100644 --- a/contrib/llvm-project/clang/lib/Headers/xmmintrin.h +++ b/contrib/llvm-project/clang/lib/Headers/xmmintrin.h @@ -16,7 +16,6 @@ #include -typedef int __v4si __attribute__((__vector_size__(16))); typedef float __v4sf __attribute__((__vector_size__(16))); typedef float __m128 __attribute__((__vector_size__(16), __aligned__(16)));