Commit 0301c3e7 authored by Joe Perches's avatar Joe Perches Committed by Stephen Rothwell
Browse files

treewide: remove stringification from __alias macro definition

Like the old __section macro, the __alias macro uses macro #
stringification to create quotes around the symbol name used in the
__attribute__.

This can cause differences between gcc and clang when the stringification
itself contains a quote character.  So avoid these differences by always
using quotes to define the aliased symbol.

Remove the stringification and add quotes and when necessary a
stringification when existing uses have a ## concatenation.

Unlike the __section macro conversion in commit 33def849 ("treewide:
Convert macro and uses of __section(foo) to __section("foo")") this one
was done by hand.

No other use of __alias exists in the kernel.

This patch does _not_ convert any uses of __attribute__((alias("<foo>")))
so it should not cause any compilation issues.

Link: https://lkml.kernel.org/r/8451df41359b52f048780d19e07b6fa4445b6392.1604026698.git.joe@perches.com

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: Marco Elver <elver@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 4b2904f3
......@@ -75,7 +75,7 @@ void *memcpy(void *dest, const void *src, size_t n)
}
#ifdef CONFIG_KASAN
extern void *__memset(void *s, int c, size_t n) __alias(memset);
extern void *__memmove(void *dest, const void *src, size_t n) __alias(memmove);
extern void *__memcpy(void *dest, const void *src, size_t n) __alias(memcpy);
extern void *__memset(void *s, int c, size_t n) __alias("memset");
extern void *__memmove(void *dest, const void *src, size_t n) __alias("memmove");
extern void *__memcpy(void *dest, const void *src, size_t n) __alias("memcpy");
#endif
......@@ -69,7 +69,7 @@ extern long __ia32_sys_ni_syscall(const struct pt_regs *regs);
long __##abi##_##name(const struct pt_regs *regs); \
ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \
long __##abi##_##name(const struct pt_regs *regs) \
__alias(__do_##name);
__alias("__do_" #name);
#define __SYS_STUBx(abi, name, ...) \
long __##abi##_##name(const struct pt_regs *regs); \
......
......@@ -162,7 +162,7 @@ static DEFINE_SEMAPHORE(efi_runtime_lock);
* Expose the EFI runtime lock to the UV platform
*/
#ifdef CONFIG_X86_UV
extern struct semaphore __efi_uv_runtime_lock __alias(efi_runtime_lock);
extern struct semaphore __efi_uv_runtime_lock __alias("efi_runtime_lock");
#endif
/*
......
......@@ -42,7 +42,7 @@
/*
* gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-alias-function-attribute
*/
#define __alias(symbol) __attribute__((__alias__(#symbol)))
#define __alias(symbol) __attribute__((__alias__(symbol)))
/*
* gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-aligned-function-attribute
......
......@@ -814,7 +814,7 @@ EXPORT_SYMBOL(__kcsan_check_access);
} \
EXPORT_SYMBOL(__tsan_read##size); \
void __tsan_unaligned_read##size(void *ptr) \
__alias(__tsan_read##size); \
__alias("__tsan_read" #size); \
EXPORT_SYMBOL(__tsan_unaligned_read##size); \
void __tsan_write##size(void *ptr); \
void __tsan_write##size(void *ptr) \
......@@ -823,7 +823,7 @@ EXPORT_SYMBOL(__kcsan_check_access);
} \
EXPORT_SYMBOL(__tsan_write##size); \
void __tsan_unaligned_write##size(void *ptr) \
__alias(__tsan_write##size); \
__alias("__tsan_write" #size); \
EXPORT_SYMBOL(__tsan_unaligned_write##size); \
void __tsan_read_write##size(void *ptr); \
void __tsan_read_write##size(void *ptr) \
......@@ -833,7 +833,7 @@ EXPORT_SYMBOL(__kcsan_check_access);
} \
EXPORT_SYMBOL(__tsan_read_write##size); \
void __tsan_unaligned_read_write##size(void *ptr) \
__alias(__tsan_read_write##size); \
__alias("__tsan_read_write" #size); \
EXPORT_SYMBOL(__tsan_unaligned_read_write##size)
DEFINE_TSAN_READ_WRITE(1);
......@@ -877,7 +877,7 @@ EXPORT_SYMBOL(__tsan_write_range);
} \
EXPORT_SYMBOL(__tsan_volatile_read##size); \
void __tsan_unaligned_volatile_read##size(void *ptr) \
__alias(__tsan_volatile_read##size); \
__alias("__tsan_volatile_read" #size); \
EXPORT_SYMBOL(__tsan_unaligned_volatile_read##size); \
void __tsan_volatile_write##size(void *ptr); \
void __tsan_volatile_write##size(void *ptr) \
......@@ -892,7 +892,7 @@ EXPORT_SYMBOL(__tsan_write_range);
} \
EXPORT_SYMBOL(__tsan_volatile_write##size); \
void __tsan_unaligned_volatile_write##size(void *ptr) \
__alias(__tsan_volatile_write##size); \
__alias("__tsan_volatile_write" #size); \
EXPORT_SYMBOL(__tsan_unaligned_volatile_write##size)
DEFINE_TSAN_VOLATILE_READ_WRITE(1);
......
......@@ -206,8 +206,8 @@ u32 __pure __weak __crc32c_le(u32 crc, unsigned char const *p, size_t len)
EXPORT_SYMBOL(crc32_le);
EXPORT_SYMBOL(__crc32c_le);
u32 __pure crc32_le_base(u32, unsigned char const *, size_t) __alias(crc32_le);
u32 __pure __crc32c_le_base(u32, unsigned char const *, size_t) __alias(__crc32c_le);
u32 __pure crc32_le_base(u32, unsigned char const *, size_t) __alias("crc32_le");
u32 __pure __crc32c_le_base(u32, unsigned char const *, size_t) __alias("__crc32c_le");
/*
* This multiplies the polynomials x and y modulo the given modulus.
......
......@@ -82,8 +82,8 @@ static volatile const u8 __cacheline_aligned aes_inv_sbox[] = {
0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d,
};
extern const u8 crypto_aes_sbox[256] __alias(aes_sbox);
extern const u8 crypto_aes_inv_sbox[256] __alias(aes_inv_sbox);
extern const u8 crypto_aes_sbox[256] __alias("aes_sbox");
extern const u8 crypto_aes_inv_sbox[256] __alias("aes_inv_sbox");
EXPORT_SYMBOL(crypto_aes_sbox);
EXPORT_SYMBOL(crypto_aes_inv_sbox);
......
......@@ -235,7 +235,7 @@ EXPORT_SYMBOL(__asan_unregister_globals);
check_memory_region_inline(addr, size, false, _RET_IP_);\
} \
EXPORT_SYMBOL(__asan_load##size); \
__alias(__asan_load##size) \
__alias("__asan_load" #size) \
void __asan_load##size##_noabort(unsigned long); \
EXPORT_SYMBOL(__asan_load##size##_noabort); \
void __asan_store##size(unsigned long addr) \
......@@ -243,7 +243,7 @@ EXPORT_SYMBOL(__asan_unregister_globals);
check_memory_region_inline(addr, size, true, _RET_IP_); \
} \
EXPORT_SYMBOL(__asan_store##size); \
__alias(__asan_store##size) \
__alias("__asan_store" #size) \
void __asan_store##size##_noabort(unsigned long); \
EXPORT_SYMBOL(__asan_store##size##_noabort)
......@@ -259,7 +259,7 @@ void __asan_loadN(unsigned long addr, size_t size)
}
EXPORT_SYMBOL(__asan_loadN);
__alias(__asan_loadN)
__alias("__asan_loadN")
void __asan_loadN_noabort(unsigned long, size_t);
EXPORT_SYMBOL(__asan_loadN_noabort);
......@@ -269,7 +269,7 @@ void __asan_storeN(unsigned long addr, size_t size)
}
EXPORT_SYMBOL(__asan_storeN);
__alias(__asan_storeN)
__alias("__asan_storeN")
void __asan_storeN_noabort(unsigned long, size_t);
EXPORT_SYMBOL(__asan_storeN_noabort);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment