|
61 | 61 | #define LOCAL_LABEL(name) .L ## name |
62 | 62 | #define FILE_LEVEL_DIRECTIVE |
63 | 63 | #define SYMBOL_IS_FUNC(name) \ |
64 | | - .def name SEPARATOR \ |
| 64 | + .def FUNC_SYMBOL(name) SEPARATOR \ |
65 | 65 | .scl 2 SEPARATOR \ |
66 | 66 | .type 32 SEPARATOR \ |
67 | 67 | .endef |
|
71 | 71 |
|
72 | 72 | #endif |
73 | 73 |
|
74 | | -#if defined(__arm__) || defined(__aarch64__) |
| 74 | +#if defined(__arm__) || defined(__aarch64__) || defined(__arm64ec__) |
75 | 75 | #define FUNC_ALIGN \ |
76 | 76 | .text SEPARATOR \ |
77 | 77 | .balign 16 SEPARATOR |
|
208 | 208 | #define GLUE4(a, b, c, d) GLUE4_(a, b, c, d) |
209 | 209 |
|
210 | 210 | #define SYMBOL_NAME(name) GLUE(__USER_LABEL_PREFIX__, name) |
| 211 | +#ifndef __arm64ec__ |
| 212 | +#define FUNC_SYMBOL(name) name |
| 213 | +#else |
| 214 | +// On ARM64EC, function names and calls (but not address-taking or data symbol |
| 215 | +// references) use symbols prefixed with "#". |
| 216 | +#define QUOTE(a) #a |
| 217 | +#define STR(a) QUOTE(a) |
| 218 | +#define HASH # |
| 219 | +#define FUNC_SYMBOL(name) STR(GLUE2(HASH, name)) |
| 220 | +#endif |
211 | 221 |
|
212 | 222 | #ifdef VISIBILITY_HIDDEN |
213 | 223 | #define DECLARE_SYMBOL_VISIBILITY(name) \ |
|
222 | 232 | #define DEFINE_COMPILERRT_FUNCTION(name) \ |
223 | 233 | DEFINE_CODE_STATE \ |
224 | 234 | FILE_LEVEL_DIRECTIVE SEPARATOR \ |
225 | | - .globl SYMBOL_NAME(name) SEPARATOR \ |
| 235 | + .globl FUNC_SYMBOL(SYMBOL_NAME(name)) SEPARATOR \ |
226 | 236 | SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ |
227 | 237 | DECLARE_SYMBOL_VISIBILITY(name) \ |
228 | 238 | DECLARE_FUNC_ENCODING \ |
229 | | - SYMBOL_NAME(name): |
| 239 | + FUNC_SYMBOL(SYMBOL_NAME(name)): |
230 | 240 |
|
231 | 241 | #define DEFINE_COMPILERRT_THUMB_FUNCTION(name) \ |
232 | 242 | DEFINE_CODE_STATE \ |
233 | 243 | FILE_LEVEL_DIRECTIVE SEPARATOR \ |
234 | | - .globl SYMBOL_NAME(name) SEPARATOR \ |
| 244 | + .globl FUNC_SYMBOL(SYMBOL_NAME(name)) SEPARATOR \ |
235 | 245 | SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ |
236 | 246 | DECLARE_SYMBOL_VISIBILITY(name) SEPARATOR \ |
237 | 247 | .thumb_func SEPARATOR \ |
238 | | - SYMBOL_NAME(name): |
| 248 | + FUNC_SYMBOL(SYMBOL_NAME(name)): |
239 | 249 |
|
240 | 250 | #define DEFINE_COMPILERRT_PRIVATE_FUNCTION(name) \ |
241 | 251 | DEFINE_CODE_STATE \ |
242 | 252 | FILE_LEVEL_DIRECTIVE SEPARATOR \ |
243 | | - .globl SYMBOL_NAME(name) SEPARATOR \ |
| 253 | + .globl FUNC_SYMBOL(SYMBOL_NAME(name)) SEPARATOR \ |
244 | 254 | SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ |
245 | 255 | HIDDEN(SYMBOL_NAME(name)) SEPARATOR \ |
246 | 256 | DECLARE_FUNC_ENCODING \ |
247 | | - SYMBOL_NAME(name): |
| 257 | + FUNC_SYMBOL(SYMBOL_NAME(name)): |
248 | 258 |
|
249 | 259 | #define DEFINE_COMPILERRT_PRIVATE_FUNCTION_UNMANGLED(name) \ |
250 | 260 | DEFINE_CODE_STATE \ |
251 | | - .globl name SEPARATOR \ |
| 261 | + .globl FUNC_SYMBOL(name) SEPARATOR \ |
252 | 262 | SYMBOL_IS_FUNC(name) SEPARATOR \ |
253 | 263 | HIDDEN(name) SEPARATOR \ |
254 | 264 | DECLARE_FUNC_ENCODING \ |
255 | | - name: |
| 265 | + FUNC_SYMBOL(name): |
256 | 266 |
|
257 | 267 | #define DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(name) \ |
258 | 268 | DEFINE_CODE_STATE \ |
259 | 269 | FUNC_ALIGN \ |
260 | | - .globl name SEPARATOR \ |
| 270 | + .globl FUNC_SYMBOL(name) SEPARATOR \ |
261 | 271 | SYMBOL_IS_FUNC(name) SEPARATOR \ |
262 | | - DECLARE_SYMBOL_VISIBILITY_UNMANGLED(name) SEPARATOR \ |
| 272 | + DECLARE_SYMBOL_VISIBILITY_UNMANGLED(FUNC_SYMBOL(name)) SEPARATOR \ |
263 | 273 | DECLARE_FUNC_ENCODING \ |
264 | | - name: \ |
| 274 | + FUNC_SYMBOL(name): \ |
265 | 275 | SEPARATOR CFI_START \ |
266 | 276 | SEPARATOR BTI_C |
267 | 277 |
|
268 | 278 | #define DEFINE_COMPILERRT_FUNCTION_ALIAS(name, target) \ |
269 | | - .globl SYMBOL_NAME(name) SEPARATOR \ |
| 279 | + .globl FUNC_SYMBOL(SYMBOL_NAME(name)) SEPARATOR \ |
270 | 280 | SYMBOL_IS_FUNC(SYMBOL_NAME(name)) SEPARATOR \ |
271 | 281 | DECLARE_SYMBOL_VISIBILITY(name) SEPARATOR \ |
272 | | - .set SYMBOL_NAME(name), SYMBOL_NAME(target) SEPARATOR |
| 282 | + .set FUNC_SYMBOL(SYMBOL_NAME(name)), FUNC_SYMBOL(target) SEPARATOR |
273 | 283 |
|
274 | 284 | #if defined(__ARM_EABI__) |
275 | 285 | #define DEFINE_AEABI_FUNCTION_ALIAS(aeabi_name, name) \ |
|
0 commit comments