Skip to content

Commit

Permalink
[libc][AArch64] Fix fullbuild when using G++/GCC
Browse files Browse the repository at this point in the history
The libc uses some functions that GCC does not currently
implement, that come from Arm's ACLE header usually.

These are:
```
__arm_wsr64
__arm_rsr64
__arm_wsr
__arm_rsr
```

This issue was reported to us (llvm/llvm-project#60473)
and I've then reported that back to GCC (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108642).

Even if these functions are added, clang has some non standard extensions
to them that gcc may not take. So we're looking at a fix in gcc 13 at best,
and that may not be enough for what we're doing with them.

So I've added ifdefs to use alternatives with gcc.

For handling the stack pointer, inline assembly is unfortunately the only option.
I have verified that the single mov is essentially what __arm_rsr64 generates.

For fpsr and fpcr the gcc devs suggested using
https://gcc.gnu.org/onlinedocs/gcc-12.2.0/gcc/AArch64-Built-in-Functions.html#AArch64-Built-in-Functions.

Reviewed By: sivachandra

Differential Revision: https://reviews.llvm.org/D143261
  • Loading branch information
DavidSpickett authored and CarlosAlbertoEnciso committed Feb 21, 2023
1 parent 3685040 commit 354295c
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 4 deletions.
34 changes: 30 additions & 4 deletions libc/src/__support/FPUtil/aarch64/FEnvImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,39 @@ struct FEnv {
(status & INEXACT ? FE_INEXACT : 0);
}

static uint32_t getControlWord() { return __arm_rsr("fpcr"); }
static uint32_t getControlWord() {
#ifdef __clang__
// GCC does not currently support __arm_rsr.
return __arm_rsr("fpcr");
#else
return __builtin_aarch64_get_fpcr();
#endif
}

static void writeControlWord(uint32_t fpcr) { __arm_wsr("fpcr", fpcr); }
static void writeControlWord(uint32_t fpcr) {
#ifdef __clang__
// GCC does not currently support __arm_wsr.
__arm_wsr("fpcr", fpcr);
#else
__builtin_aarch64_set_fpcr(fpcr);
#endif
}

static uint32_t getStatusWord() { return __arm_rsr("fpsr"); }
static uint32_t getStatusWord() {
#ifdef __clang__
return __arm_rsr("fpsr");
#else
return __builtin_aarch64_get_fpsr();
#endif
}

static void writeStatusWord(uint32_t fpsr) { __arm_wsr("fpsr", fpsr); }
static void writeStatusWord(uint32_t fpsr) {
#ifdef __clang__
__arm_wsr("fpsr", fpsr);
#else
__builtin_aarch64_set_fpsr(fpsr);
#endif
}
};

LIBC_INLINE int enable_except(int excepts) {
Expand Down
5 changes: 5 additions & 0 deletions libc/src/__support/threads/linux/thread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,12 @@ int Thread::run(ThreadStyle style, ThreadRunner runner, void *arg, void *stack,
#ifdef LIBC_TARGET_ARCH_IS_AARCH64
// We set the frame pointer to be the same as the "sp" so that start args
// can be sniffed out from start_thread.
#ifdef __clang__
// GCC does not currently implement __arm_wsr64/__arm_rsr64.
__arm_wsr64("x29", __arm_rsr64("sp"));
#else
asm volatile("mov x29, sp");
#endif
#endif
start_thread();
} else if (clone_result < 0) {
Expand Down

0 comments on commit 354295c

Please sign in to comment.