git: 889fbbc523e5 - stable/15 - Merge commit b0d2b57f7e47 from llvm git (by Phoebe Wang):

The branch stable/15 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=889fbbc523e52666fc27bec81e2e16a298c223bd

commit 889fbbc523e52666fc27bec81e2e16a298c223bd
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2026-03-23 14:58:06 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2026-05-29 22:57:33 +0000

    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
    
    (cherry picked from commit 20450c2e792084f06974cff9d2338e2d0406883f)
---
 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 78e8a422db4c..24ca14dba022 100644
--- a/contrib/llvm-project/clang/lib/Headers/emmintrin.h
+++ b/contrib/llvm-project/clang/lib/Headers/emmintrin.h
@@ -17,7 +17,6 @@
 #include <xmmintrin.h>
 
 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 6a6436977303..a128a64f5e7c 100644
--- a/contrib/llvm-project/clang/lib/Headers/xmmintrin.h
+++ b/contrib/llvm-project/clang/lib/Headers/xmmintrin.h
@@ -16,7 +16,6 @@
 
 #include <mmintrin.h>
 
-typedef int __v4si __attribute__((__vector_size__(16)));
 typedef float __v4sf __attribute__((__vector_size__(16)));
 typedef float __m128 __attribute__((__vector_size__(16), __aligned__(16)));