mips: fix some mcount nits

The symbol version for _mcount was removed 12 years ago in r169525 from
gmon/Symbol.map, to be added to the per-arch Symbol.map. mips was overlooked
in this, so _mcount has no symver. Add it back to where it should have been,
rather than where it would go if it were added today, since we're correcting
a historical mistake.

Additionally, _mcount is getting thrown into .mdebug.abi32 in the llvm80/90
world as it's not getting explicitly thrown into .text, so do this now. This
fixes the libc build that was previously failing due to relocations in
.mdebug.abi32. This is specifically due to the way clang's integrated AS
works and that they emit the .mdebug.abiNN section early in the process. An
LLVM bug has been submitted[0] and an agreement has been made that the
mips backend should switch to .text following .mdebug.abiNN for
compatibility.

[0] https://bugs.llvm.org/show_bug.cgi?id=43119

Reviewed by:	imp, arichardson
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D21435
This commit is contained in:
kevans 2019-09-02 01:55:55 +00:00
parent 5451b35f06
commit 6bddb149b5
2 changed files with 3 additions and 1 deletions

View File

@ -11,6 +11,7 @@ FBSD_1.0 {
/* PSEUDO syscalls */ /* PSEUDO syscalls */
_exit; _exit;
_mcount;
_setjmp; _setjmp;
_longjmp; _longjmp;
alloca; alloca;

View File

@ -46,7 +46,8 @@
/*XXX This is not MIPS64 safe. */ /*XXX This is not MIPS64 safe. */
#define MCOUNT \ #define MCOUNT \
__asm(".globl _mcount;" \ __asm(".text;" \
".globl _mcount;" \
".type _mcount,@function;" \ ".type _mcount,@function;" \
"_mcount:;" \ "_mcount:;" \
".set noreorder;" \ ".set noreorder;" \