Skip to content

Commit 74392bd

Browse files
authored
[X86] Consistently use __inline__ keyword in intrin.h (llvm#117856)
Using `inline` instead of `__inline__` may cause duplicate symbol errors in some scenarios. This fixes llvm#117854
1 parent eb00182 commit 74392bd

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

clang/lib/Headers/intrin.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -330,33 +330,33 @@ static __inline__ void __DEFAULT_FN_ATTRS __halt(void) {
330330
__asm__ volatile("hlt");
331331
}
332332

333-
static inline unsigned char __inbyte(unsigned short port) {
333+
static __inline__ unsigned char __inbyte(unsigned short port) {
334334
unsigned char ret;
335335
__asm__ __volatile__("inb %w1, %b0" : "=a"(ret) : "Nd"(port));
336336
return ret;
337337
}
338338

339-
static inline unsigned short __inword(unsigned short port) {
339+
static __inline__ unsigned short __inword(unsigned short port) {
340340
unsigned short ret;
341341
__asm__ __volatile__("inw %w1, %w0" : "=a"(ret) : "Nd"(port));
342342
return ret;
343343
}
344344

345-
static inline unsigned long __indword(unsigned short port) {
345+
static __inline__ unsigned long __indword(unsigned short port) {
346346
unsigned long ret;
347347
__asm__ __volatile__("inl %w1, %k0" : "=a"(ret) : "Nd"(port));
348348
return ret;
349349
}
350350

351-
static inline void __outbyte(unsigned short port, unsigned char data) {
351+
static __inline__ void __outbyte(unsigned short port, unsigned char data) {
352352
__asm__ __volatile__("outb %b0, %w1" : : "a"(data), "Nd"(port));
353353
}
354354

355-
static inline void __outword(unsigned short port, unsigned short data) {
355+
static __inline__ void __outword(unsigned short port, unsigned short data) {
356356
__asm__ __volatile__("outw %w0, %w1" : : "a"(data), "Nd"(port));
357357
}
358358

359-
static inline void __outdword(unsigned short port, unsigned long data) {
359+
static __inline__ void __outdword(unsigned short port, unsigned long data) {
360360
__asm__ __volatile__("outl %k0, %w1" : : "a"(data), "Nd"(port));
361361
}
362362
#endif

0 commit comments

Comments
 (0)