GCC/Clang compiler intrinsics: make "int" explicit

To simplify textual comparison of declarations generated by
clang_builtins.py and the existing ones, add "int" to types "unsigned,"
"long long," etc.

Author: tautschnig

src/ansi-c/compiler_headers/clang_builtin_headers.h

@@ -20,7 +20,7 @@ void __builtin_ia32_vp2intersect_d_128(__gcc_v4si, __gcc_v4si, unsigned char *,
 
 __gcc_v16qi __builtin_ia32_selectb_128(unsigned short, __gcc_v16qi, __gcc_v16qi);
 __gcc_v32qi __builtin_ia32_selectb_256(unsigned int, __gcc_v32qi, __gcc_v32qi);
-__gcc_v64qi __builtin_ia32_selectb_512(unsigned long, __gcc_v64qi, __gcc_v64qi);
+__gcc_v64qi __builtin_ia32_selectb_512(unsigned long int, __gcc_v64qi, __gcc_v64qi);
 __gcc_v8hi __builtin_ia32_selectw_128(unsigned char, __gcc_v8hi, __gcc_v8hi);
 __gcc_v16hi __builtin_ia32_selectw_256(unsigned short, __gcc_v16hi, __gcc_v16hi);
 __gcc_v32hi __builtin_ia32_selectw_512(unsigned int, __gcc_v32hi, __gcc_v32hi);
@@ -70,7 +70,7 @@ void __builtin_ia32_tdpbsud(__tile, __tile, __tile);
 void __builtin_ia32_tdpbusd(__tile, __tile, __tile);
 void __builtin_ia32_tdpbuud(__tile, __tile, __tile);
 void __builtin_ia32_tdpbf16ps(__tile, __tile, __tile);
-void __builtin_ia32_ptwrite64(unsigned long long);
+void __builtin_ia32_ptwrite64(unsigned long long int);
 
 void __builtin_nontemporal_store();
 void __builtin_nontemporal_load();

src/ansi-c/compiler_headers/gcc_builtin_headers_ia32-2.h

@@ -7,16 +7,16 @@ __gcc_v8qi __builtin_ia32_vec_init_v8qi(char, char, char, char, char, char, char
 int __builtin_ia32_vec_ext_v2si(__gcc_v2si, int);
 __gcc_v8hi __builtin_ia32_paddusw128(__gcc_v8hi, __gcc_v8hi);
 __gcc_v8hi __builtin_ia32_psubusw128(__gcc_v8hi, __gcc_v8hi);
-void __builtin_ia32_ldmxcsr(unsigned);
-unsigned __builtin_ia32_stmxcsr(void);
+void __builtin_ia32_ldmxcsr(unsigned int);
+unsigned int __builtin_ia32_stmxcsr(void);
 __gcc_v8hi __builtin_ia32_paddsw128(__gcc_v8hi, __gcc_v8hi);
 __gcc_v8hi __builtin_ia32_psubsw128(__gcc_v8hi, __gcc_v8hi);
 __gcc_v16qi __builtin_ia32_paddsb128(__gcc_v16qi, __gcc_v16qi);
 __gcc_v16qi __builtin_ia32_psubsb128(__gcc_v16qi, __gcc_v16qi);
 __gcc_v16qi __builtin_ia32_paddusb128(__gcc_v16qi, __gcc_v16qi);
 __gcc_v16qi __builtin_ia32_psubusb128(__gcc_v16qi, __gcc_v16qi);
-long long __builtin_ia32_cvtss2si64(__gcc_v4sf);
-long long __builtin_ia32_cvttss2si64(__gcc_v4sf);
+long long int __builtin_ia32_cvtss2si64(__gcc_v4sf);
+long long int __builtin_ia32_cvttss2si64(__gcc_v4sf);
 __gcc_v4sf __builtin_ia32_cvtsi642ss(__gcc_v4sf, long long);
 
 __gcc_v4hi __builtin_ia32_pshufw(__gcc_v4hi, int);
@@ -33,28 +33,28 @@ __gcc_v16qi __builtin_ia32_vec_set_v16qi(__gcc_v16qi, char, int);
 __gcc_v4si __builtin_ia32_vec_set_v4si(__gcc_v4si, int, int);
 __gcc_v2di __builtin_ia32_vec_set_v2di(__gcc_v2di, __gcc_di, int);
 
-unsigned long long __builtin_ia32_rdtsc(void);
-unsigned long long __builtin_ia32_rdtscp(unsigned*);
+unsigned long long int __builtin_ia32_rdtsc(void);
+unsigned long long int __builtin_ia32_rdtscp(unsigned int *);
 void __builtin_ia32_fnstenv(void*);
 void __builtin_ia32_fldenv(const void*);
 unsigned short __builtin_ia32_fnstsw();
 void __builtin_ia32_fnclex();
 void __builtin_ia32_fxsave(void*);
 void __builtin_ia32_fxrstor(void*);
-void __builtin_ia32_xsave(void*, long long);
-void __builtin_ia32_xrstor(void*, long long);
-void __builtin_ia32_xsaveopt(void*, long long);
-void __builtin_ia32_xsaves(void*, long long);
-void __builtin_ia32_xrstors(void*, long long);
-void __builtin_ia32_xsavec(void*, long long);
+void __builtin_ia32_xsave(void*, long long int);
+void __builtin_ia32_xrstor(void*, long long int);
+void __builtin_ia32_xsaveopt(void*, long long int);
+void __builtin_ia32_xsaves(void*, long long int);
+void __builtin_ia32_xrstors(void*, long long int);
+void __builtin_ia32_xsavec(void*, long long int);
 void __builtin_ia32_fxsave64(void*);
 void __builtin_ia32_fxrstor64(void*);
-void __builtin_ia32_xsave64(void*, long long);
-void __builtin_ia32_xrstor64(void*, long long);
-void __builtin_ia32_xsaveopt64(void*, long long);
-void __builtin_ia32_xsaves64(void*, long long);
-void __builtin_ia32_xrstors64(void*, long long);
-void __builtin_ia32_xsavec64(void*, long long);
+void __builtin_ia32_xsave64(void*, long long int);
+void __builtin_ia32_xrstor64(void*, long long int);
+void __builtin_ia32_xsaveopt64(void*, long long int);
+void __builtin_ia32_xsaves64(void*, long long int);
+void __builtin_ia32_xrstors64(void*, long long int);
+void __builtin_ia32_xsavec64(void*, long long int);
 void __builtin_ia32_movntdq256(__gcc_v4di*, __gcc_v4di);
 void __builtin_ia32_movntpd256(double*, __gcc_v4df);
 void __builtin_ia32_movntps256(float*, __gcc_v8sf);
@@ -71,7 +71,7 @@ __gcc_v8df __builtin_ia32_expandloaddf512_maskz(const __gcc_v8df*, __gcc_v8df, u
 __gcc_v8di __builtin_ia32_expandloaddi512_mask(const __gcc_v8di*, __gcc_v8di, unsigned char);
 __gcc_v8di __builtin_ia32_expandloaddi512_maskz(const __gcc_v8di*, __gcc_v8di, unsigned char);
 __gcc_v16si __builtin_ia32_loaddqusi512_mask(const int*, __gcc_v16si, unsigned short);
-__gcc_v8di __builtin_ia32_loaddqudi512_mask(const long long*, __gcc_v8di, unsigned char);
+__gcc_v8di __builtin_ia32_loaddqudi512_mask(const long long int *, __gcc_v8di, unsigned char);
 __gcc_v8df __builtin_ia32_loadupd512_mask(const double*, __gcc_v8df, unsigned char);
 __gcc_v16sf __builtin_ia32_loadups512_mask(const float*, __gcc_v16sf, unsigned short);
 __gcc_v16sf __builtin_ia32_loadaps512_mask(const __gcc_v16sf*, __gcc_v16sf, unsigned short);
@@ -83,7 +83,7 @@ void __builtin_ia32_movntpd512(double*, __gcc_v8df);
 void __builtin_ia32_movntdq512(__gcc_v8di*, __gcc_v8di);
 __gcc_v8di __builtin_ia32_movntdqa512(__gcc_v8di*);
 void __builtin_ia32_storedqusi512_mask(int*, __gcc_v16si, unsigned short);
-void __builtin_ia32_storedqudi512_mask(long long*, __gcc_v8di, unsigned char);
+void __builtin_ia32_storedqudi512_mask(long long int *, __gcc_v8di, unsigned char);
 void __builtin_ia32_storeupd512_mask(double*, __gcc_v8df, unsigned char);
 void __builtin_ia32_pmovusqd512mem_mask(__gcc_v8si*, __gcc_v8di, unsigned char);
 void __builtin_ia32_pmovsqd512mem_mask(__gcc_v8si*, __gcc_v8di, unsigned char);
@@ -94,9 +94,9 @@ void __builtin_ia32_pmovqw512mem_mask(__gcc_v8hi*, __gcc_v8di, unsigned char);
 void __builtin_ia32_pmovusdw512mem_mask(__gcc_v16hi*, __gcc_v16si, unsigned short);
 void __builtin_ia32_pmovsdw512mem_mask(__gcc_v16hi*, __gcc_v16si, unsigned short);
 void __builtin_ia32_pmovdw512mem_mask(__gcc_v16hi*, __gcc_v16si, unsigned short);
-void __builtin_ia32_pmovqb512mem_mask(unsigned long long*, __gcc_v8di, unsigned char);
-void __builtin_ia32_pmovusqb512mem_mask(unsigned long long*, __gcc_v8di, unsigned char);
-void __builtin_ia32_pmovsqb512mem_mask(unsigned long long*, __gcc_v8di, unsigned char);
+void __builtin_ia32_pmovqb512mem_mask(unsigned long long int *, __gcc_v8di, unsigned char);
+void __builtin_ia32_pmovusqb512mem_mask(unsigned long long int *, __gcc_v8di, unsigned char);
+void __builtin_ia32_pmovsqb512mem_mask(unsigned long long int *, __gcc_v8di, unsigned char);
 void __builtin_ia32_pmovusdb512mem_mask(__gcc_v16qi*, __gcc_v16si, unsigned short);
 void __builtin_ia32_pmovsdb512mem_mask(__gcc_v16qi*, __gcc_v16si, unsigned short);
 void __builtin_ia32_pmovdb512mem_mask(__gcc_v16qi*, __gcc_v16si, unsigned short);
@@ -107,17 +107,17 @@ void __builtin_ia32_storeapd512_mask(__gcc_v8df*, __gcc_v8df, unsigned char);
 void __builtin_ia32_movdqa64store512_mask(__gcc_v8di*, __gcc_v8di, unsigned char);
 void __builtin_ia32_llwpcb(void*);
 void* __builtin_ia32_slwpcb(void);
-void __builtin_ia32_wrfsbase32(unsigned);
-void __builtin_ia32_wrfsbase64(unsigned long long);
-void __builtin_ia32_wrgsbase32(unsigned);
-void __builtin_ia32_wrgsbase64(unsigned long long);
-unsigned __builtin_ia32_xbegin(void);
+void __builtin_ia32_wrfsbase32(unsigned int);
+void __builtin_ia32_wrfsbase64(unsigned long long int);
+void __builtin_ia32_wrgsbase32(unsigned int);
+void __builtin_ia32_wrgsbase64(unsigned long long int);
+unsigned int __builtin_ia32_xbegin(void);
 void __builtin_ia32_xend(void);
-void __builtin_ia32_xabort(unsigned);
+void __builtin_ia32_xabort(unsigned int);
 int __builtin_ia32_xtest(void);
 int __builtin_ia32_bsrsi(int);
 long long __builtin_ia32_bsrdi(long long);
-unsigned long long __builtin_ia32_rdpmc(int);
+unsigned long long int __builtin_ia32_rdpmc(int);
 unsigned char __builtin_ia32_rolqi(unsigned char, int);
 unsigned short __builtin_ia32_rolhi(unsigned short, int);
 unsigned char __builtin_ia32_rorqi(unsigned char, int);
@@ -179,12 +179,12 @@ __gcc_v4sf __builtin_ia32_vcvtph2ps(__gcc_v8hi);
 __gcc_v8sf __builtin_ia32_vcvtph2ps256(__gcc_v8hi);
 __gcc_v8hi __builtin_ia32_vcvtps2ph(__gcc_v4sf, int);
 __gcc_v8hi __builtin_ia32_vcvtps2ph256(__gcc_v8sf, int);
-unsigned __builtin_ia32_bzhi_si(unsigned, unsigned);
-unsigned long long __builtin_ia32_bzhi_di(unsigned long long, unsigned long long);
-unsigned __builtin_ia32_pdep_si(unsigned, unsigned);
-unsigned long long __builtin_ia32_pdep_di(unsigned long long, unsigned long long);
-unsigned __builtin_ia32_pext_si(unsigned, unsigned);
-unsigned long long __builtin_ia32_pext_di(unsigned long long, unsigned long long);
+unsigned int __builtin_ia32_bzhi_si(unsigned int, unsigned int);
+unsigned long long int __builtin_ia32_bzhi_di(unsigned long long int, unsigned long long int);
+unsigned int __builtin_ia32_pdep_si(unsigned int, unsigned int);
+unsigned long long int __builtin_ia32_pdep_di(unsigned long long int, unsigned long long int);
+unsigned int __builtin_ia32_pext_si(unsigned int, unsigned int);
+unsigned long long int __builtin_ia32_pext_di(unsigned long long int, unsigned long long int);
 __gcc_v16si __builtin_ia32_alignd512_mask(__gcc_v16si, __gcc_v16si, int, __gcc_v16si, unsigned short);
 __gcc_v8di __builtin_ia32_alignq512_mask(__gcc_v8di, __gcc_v8di, int, __gcc_v8di, unsigned char);
 __gcc_v16si __builtin_ia32_blendmd_512_mask(__gcc_v16si, __gcc_v16si, unsigned short);
@@ -413,18 +413,18 @@ __gcc_v16si __builtin_ia32_cvtps2dq512_mask(__gcc_v16sf, __gcc_v16si, short, int
 __gcc_v8df __builtin_ia32_cvtps2pd512_mask(__gcc_v8sf, __gcc_v8df, char, int);
 __gcc_v16si __builtin_ia32_cvtps2udq512_mask(__gcc_v16sf, __gcc_v16si, short, int);
 __gcc_v4sf __builtin_ia32_cvtsd2ss_round(__gcc_v4sf, __gcc_v2df, int);
-__gcc_v2df __builtin_ia32_cvtsi2sd64(__gcc_v2df, long long, int);
+__gcc_v2df __builtin_ia32_cvtsi2sd64(__gcc_v2df, long long int, int);
 __gcc_v4sf __builtin_ia32_cvtsi2ss32(__gcc_v4sf, int, int);
-__gcc_v4sf __builtin_ia32_cvtsi2ss64(__gcc_v4sf, long long, int);
+__gcc_v4sf __builtin_ia32_cvtsi2ss64(__gcc_v4sf, long long int, int);
 __gcc_v2df __builtin_ia32_cvtss2sd_round(__gcc_v2df, __gcc_v4sf, int);
 __gcc_v8si __builtin_ia32_cvttpd2dq512_mask(__gcc_v8df, __gcc_v8si, char, int);
 __gcc_v8si __builtin_ia32_cvttpd2udq512_mask(__gcc_v8df, __gcc_v8si, char, int);
 __gcc_v16si __builtin_ia32_cvttps2dq512_mask(__gcc_v16sf, __gcc_v16si, short, int);
 __gcc_v16si __builtin_ia32_cvttps2udq512_mask(__gcc_v16sf, __gcc_v16si, short, int);
 __gcc_v16sf __builtin_ia32_cvtudq2ps512_mask(__gcc_v16si, __gcc_v16sf, short, int);
-__gcc_v2df __builtin_ia32_cvtusi2sd64(__gcc_v2df, unsigned long long, int);
-__gcc_v4sf __builtin_ia32_cvtusi2ss32(__gcc_v4sf, unsigned, int);
-__gcc_v4sf __builtin_ia32_cvtusi2ss64(__gcc_v4sf, unsigned long long, int);
+__gcc_v2df __builtin_ia32_cvtusi2sd64(__gcc_v2df, unsigned long long int, int);
+__gcc_v4sf __builtin_ia32_cvtusi2ss32(__gcc_v4sf, unsigned int, int);
+__gcc_v4sf __builtin_ia32_cvtusi2ss64(__gcc_v4sf, unsigned long long int, int);
 __gcc_v8df __builtin_ia32_divpd512_mask(__gcc_v8df, __gcc_v8df, __gcc_v8df, unsigned char, int);
 __gcc_v16sf __builtin_ia32_divps512_mask(__gcc_v16sf, __gcc_v16sf, __gcc_v16sf, short, int);
 __gcc_v2df __builtin_ia32_divsd_round(__gcc_v2df, __gcc_v2df, int);
@@ -474,21 +474,21 @@ __gcc_v16sf __builtin_ia32_subps512_mask(__gcc_v16sf, __gcc_v16sf, __gcc_v16sf,
 __gcc_v2df __builtin_ia32_subsd_round(__gcc_v2df, __gcc_v2df, int);
 __gcc_v4sf __builtin_ia32_subss_round(__gcc_v4sf, __gcc_v4sf, int);
 int __builtin_ia32_vcvtsd2si32(__gcc_v2df, int);
-long long __builtin_ia32_vcvtsd2si64(__gcc_v2df, int);
-unsigned __builtin_ia32_vcvtsd2usi32(__gcc_v2df, int);
-unsigned long long __builtin_ia32_vcvtsd2usi64(__gcc_v2df, int);
+long long int __builtin_ia32_vcvtsd2si64(__gcc_v2df, int);
+unsigned int __builtin_ia32_vcvtsd2usi32(__gcc_v2df, int);
+unsigned long long int __builtin_ia32_vcvtsd2usi64(__gcc_v2df, int);
 int __builtin_ia32_vcvtss2si32(__gcc_v4sf, int);
-long long __builtin_ia32_vcvtss2si64(__gcc_v4sf, int);
-unsigned __builtin_ia32_vcvtss2usi32(__gcc_v4sf, int);
-unsigned long long __builtin_ia32_vcvtss2usi64(__gcc_v4sf, int);
+long long int __builtin_ia32_vcvtss2si64(__gcc_v4sf, int);
+unsigned int __builtin_ia32_vcvtss2usi32(__gcc_v4sf, int);
+unsigned long long int __builtin_ia32_vcvtss2usi64(__gcc_v4sf, int);
 int __builtin_ia32_vcvttsd2si32(__gcc_v2df, int);
-long long __builtin_ia32_vcvttsd2si64(__gcc_v2df, int);
-unsigned __builtin_ia32_vcvttsd2usi32(__gcc_v2df, int);
-unsigned long long __builtin_ia32_vcvttsd2usi64(__gcc_v2df, int);
+long long int __builtin_ia32_vcvttsd2si64(__gcc_v2df, int);
+unsigned int __builtin_ia32_vcvttsd2usi32(__gcc_v2df, int);
+unsigned long long int __builtin_ia32_vcvttsd2usi64(__gcc_v2df, int);
 int __builtin_ia32_vcvttss2si32(__gcc_v4sf, int);
-long long __builtin_ia32_vcvttss2si64(__gcc_v4sf, int);
-unsigned __builtin_ia32_vcvttss2usi32(__gcc_v4sf, int);
-unsigned long long __builtin_ia32_vcvttss2usi64(__gcc_v4sf, int);
+long long int __builtin_ia32_vcvttss2si64(__gcc_v4sf, int);
+unsigned int __builtin_ia32_vcvttss2usi32(__gcc_v4sf, int);
+unsigned long long int __builtin_ia32_vcvttss2usi64(__gcc_v4sf, int);
 __gcc_v2df __builtin_ia32_vfmaddpd(__gcc_v2df,__gcc_v2df, __gcc_v2df);
 __gcc_v2df __builtin_ia32_vfmaddsd3(__gcc_v2df,__gcc_v2df, __gcc_v2df);
 __gcc_v4df __builtin_ia32_vfmaddpd256(__gcc_v4df, __gcc_v4df, __gcc_v4df);
@@ -589,7 +589,7 @@ __gcc_v8df __builtin_ia32_gathersiv8df(__gcc_v8df, const double*, __gcc_v8si, ch
 __gcc_v8sf __builtin_ia32_gatherdiv16sf(__gcc_v8sf, const float*, __gcc_v8di, char, int);
 __gcc_v8df __builtin_ia32_gatherdiv8df(__gcc_v8df, const double*, __gcc_v8di, char, int);
 __gcc_v16si __builtin_ia32_gathersiv16si(__gcc_v16si, const int*, __gcc_v16si, short, int);
-__gcc_v8di __builtin_ia32_gathersiv8di(__gcc_v8di,const long*, __gcc_v8si, char, int);
+__gcc_v8di __builtin_ia32_gathersiv8di(__gcc_v8di,const long int *, __gcc_v8si, char, int);
 __gcc_v8si __builtin_ia32_gatherdiv16si(__gcc_v8si, const int*, __gcc_v8di, char, int);
 __gcc_v8di __builtin_ia32_gatherdiv8di(__gcc_v8di,const long*, __gcc_v8di, char, int);
 __gcc_v8df __builtin_ia32_gatheraltsiv8df(__gcc_v8df, const double*, __gcc_v16si, char, int);
@@ -601,9 +601,9 @@ void __builtin_ia32_scattersiv8df(double*, char, __gcc_v8si, __gcc_v8df, int);
 void __builtin_ia32_scatterdiv16sf(float*, char, __gcc_v8di, __gcc_v8sf, int);
 void __builtin_ia32_scatterdiv8df(double*, char, __gcc_v8di, __gcc_v8df, int);
 void __builtin_ia32_scattersiv16si(int*, short, __gcc_v16si, __gcc_v16si, int);
-void __builtin_ia32_scattersiv8di(long long*, char, __gcc_v8si, __gcc_v8di, int);
+void __builtin_ia32_scattersiv8di(long long int *, char, __gcc_v8si, __gcc_v8di, int);
 void __builtin_ia32_scatterdiv16si(int*, char, __gcc_v8di, __gcc_v8si, int);
-void __builtin_ia32_scatterdiv8di(long long*, char, __gcc_v8di, __gcc_v8di, int);
+void __builtin_ia32_scatterdiv8di(long long int *, char, __gcc_v8di, __gcc_v8di, int);
 __gcc_v2df __builtin_ia32_gather3siv2df(__gcc_v2df, const double*, __gcc_v4si, char, int);
 __gcc_v4df __builtin_ia32_gather3siv4df(__gcc_v4df, const double*, __gcc_v4si, char, int);
 __gcc_v2df __builtin_ia32_gather3div2df(__gcc_v2df, const double*, __gcc_v2di, char, int);
@@ -612,10 +612,10 @@ __gcc_v4sf __builtin_ia32_gather3siv4sf(__gcc_v4sf, const float*, __gcc_v4si, ch
 __gcc_v8sf __builtin_ia32_gather3siv8sf(__gcc_v8sf, const float*, __gcc_v8si, char, int);
 __gcc_v4sf __builtin_ia32_gather3div4sf(__gcc_v4sf, const float*, __gcc_v2di, char, int);
 __gcc_v4sf __builtin_ia32_gather3div8sf(__gcc_v4sf, const float*, __gcc_v4di, char, int);
-__gcc_v2di __builtin_ia32_gather3siv2di(__gcc_v2di,const long*, __gcc_v4si, char, int);
-__gcc_v4di __builtin_ia32_gather3siv4di(__gcc_v4di,const long*, __gcc_v4si, char, int);
-__gcc_v2di __builtin_ia32_gather3div2di(__gcc_v2di,const long*, __gcc_v2di, char, int);
-__gcc_v4di __builtin_ia32_gather3div4di(__gcc_v4di,const long*, __gcc_v4di, char, int);
+__gcc_v2di __builtin_ia32_gather3siv2di(__gcc_v2di,const long int *, __gcc_v4si, char, int);
+__gcc_v4di __builtin_ia32_gather3siv4di(__gcc_v4di,const long int *, __gcc_v4si, char, int);
+__gcc_v2di __builtin_ia32_gather3div2di(__gcc_v2di,const long int *, __gcc_v2di, char, int);
+__gcc_v4di __builtin_ia32_gather3div4di(__gcc_v4di,const long int *, __gcc_v4di, char, int);
 __gcc_v4si __builtin_ia32_gather3siv4si(__gcc_v4si, const int*, __gcc_v4si, char, int);
 __gcc_v8si __builtin_ia32_gather3siv8si(__gcc_v8si, const int*, __gcc_v8si, char, int);
 __gcc_v4si __builtin_ia32_gather3div4si(__gcc_v4si, const int*, __gcc_v2di, char, int);
@@ -634,22 +634,22 @@ void __builtin_ia32_scatterdiv4df(double*, char, __gcc_v4di, __gcc_v4df, int);
 void __builtin_ia32_scatterdiv2df(double*, char, __gcc_v2di, __gcc_v2df, int);
 void __builtin_ia32_scattersiv8si(int*, char, __gcc_v8si, __gcc_v8si, int);
 void __builtin_ia32_scattersiv4si(int*, char, __gcc_v4si, __gcc_v4si, int);
-void __builtin_ia32_scattersiv4di(long long*, char, __gcc_v4si, __gcc_v4di, int);
-void __builtin_ia32_scattersiv2di(long long*, char, __gcc_v4si, __gcc_v2di, int);
+void __builtin_ia32_scattersiv4di(long long int *, char, __gcc_v4si, __gcc_v4di, int);
+void __builtin_ia32_scattersiv2di(long long int *, char, __gcc_v4si, __gcc_v2di, int);
 void __builtin_ia32_scatterdiv8si(int*, char, __gcc_v4di, __gcc_v4si, int);
 void __builtin_ia32_scatterdiv4si(int*, char, __gcc_v2di, __gcc_v4si, int);
-void __builtin_ia32_scatterdiv4di(long long*, char, __gcc_v4di, __gcc_v4di, int);
-void __builtin_ia32_scatterdiv2di(long long*, char, __gcc_v2di, __gcc_v2di, int);
+void __builtin_ia32_scatterdiv4di(long long int *, char, __gcc_v4di, __gcc_v4di, int);
+void __builtin_ia32_scatterdiv2di(long long int *, char, __gcc_v2di, __gcc_v2di, int);
 void __builtin_ia32_scatteraltsiv8df(double*, char, __gcc_v16si, __gcc_v8df, int);
 void __builtin_ia32_scatteraltdiv8sf(float*, short, __gcc_v8di, __gcc_v16sf, int);
 void __builtin_ia32_scatteraltsiv8di(long long*, char, __gcc_v16si, __gcc_v8di, int);
 void __builtin_ia32_scatteraltdiv8si(int*, short, __gcc_v8di, __gcc_v16si, int);
-void __builtin_ia32_gatherpfdpd(char, __gcc_v8si,const long*, int, int);
+void __builtin_ia32_gatherpfdpd(char, __gcc_v8si,const long int *, int, int);
 void __builtin_ia32_gatherpfdps( short, __gcc_v16si, const int*, int, int);
-void __builtin_ia32_gatherpfqpd(char, __gcc_v8di,const long*, int, int);
+void __builtin_ia32_gatherpfqpd(char, __gcc_v8di,const long int *, int, int);
 void __builtin_ia32_gatherpfqps(char, __gcc_v8di, const int*, int, int);
-void __builtin_ia32_scatterpfdpd(char, __gcc_v8si,const long*, int, int);
+void __builtin_ia32_scatterpfdpd(char, __gcc_v8si,const long int *, int, int);
 void __builtin_ia32_scatterpfdps( short, __gcc_v16si, const int*, int, int);
-void __builtin_ia32_scatterpfqpd(char, __gcc_v8di,const long*, int, int);
+void __builtin_ia32_scatterpfqpd(char, __gcc_v8di,const long int *, int, int);
 void __builtin_ia32_scatterpfqps(char, __gcc_v8di, const int*, int, int);
 // clang-format on