Author: Maurice Heumann Date: 2024-11-27T10:05:22Z New Revision: 74392bde2e603c8ca3f0956d4c55ba181fe9989b
URL: https://github.com/llvm/llvm-project/commit/74392bde2e603c8ca3f0956d4c55ba181fe9989b DIFF: https://github.com/llvm/llvm-project/commit/74392bde2e603c8ca3f0956d4c55ba181fe9989b.diff LOG: [X86] Consistently use __inline__ keyword in intrin.h (#117856) Using `inline` instead of `__inline__` may cause duplicate symbol errors in some scenarios. This fixes #117854 Added: Modified: clang/lib/Headers/intrin.h Removed: ################################################################################ diff --git a/clang/lib/Headers/intrin.h b/clang/lib/Headers/intrin.h index 6308c865ca9136..8e2b95b52442db 100644 --- a/clang/lib/Headers/intrin.h +++ b/clang/lib/Headers/intrin.h @@ -330,33 +330,33 @@ static __inline__ void __DEFAULT_FN_ATTRS __halt(void) { __asm__ volatile("hlt"); } -static inline unsigned char __inbyte(unsigned short port) { +static __inline__ unsigned char __inbyte(unsigned short port) { unsigned char ret; __asm__ __volatile__("inb %w1, %b0" : "=a"(ret) : "Nd"(port)); return ret; } -static inline unsigned short __inword(unsigned short port) { +static __inline__ unsigned short __inword(unsigned short port) { unsigned short ret; __asm__ __volatile__("inw %w1, %w0" : "=a"(ret) : "Nd"(port)); return ret; } -static inline unsigned long __indword(unsigned short port) { +static __inline__ unsigned long __indword(unsigned short port) { unsigned long ret; __asm__ __volatile__("inl %w1, %k0" : "=a"(ret) : "Nd"(port)); return ret; } -static inline void __outbyte(unsigned short port, unsigned char data) { +static __inline__ void __outbyte(unsigned short port, unsigned char data) { __asm__ __volatile__("outb %b0, %w1" : : "a"(data), "Nd"(port)); } -static inline void __outword(unsigned short port, unsigned short data) { +static __inline__ void __outword(unsigned short port, unsigned short data) { __asm__ __volatile__("outw %w0, %w1" : : "a"(data), "Nd"(port)); } -static inline void __outdword(unsigned short port, unsigned long data) { +static __inline__ void __outdword(unsigned short port, unsigned long data) { __asm__ __volatile__("outl %k0, %w1" : : "a"(data), "Nd"(port)); } #endif _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
