| commit | 777756d21d13bc2bf377594a67533cb347ae15fb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Oct 19 18:03:22 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Oct 19 18:03:22 2023 +0000 |
| tree | 21c4129b80a606187dda1f1e8ccae8e78e36f045 | |
| parent | b8021fbe21d1c57f33ce512e80b6a2966ae52113 [diff] | |
| parent | c6c3e8614fad8cdb9807fd311516d70a754bb441 [diff] |
Merge "Use the R_RISCV_TLSDESC constant in the linker." into main
diff --git a/libc/include/elf.h b/libc/include/elf.h index 1dfc008..04a73f7 100644 --- a/libc/include/elf.h +++ b/libc/include/elf.h
@@ -266,4 +266,6 @@ /* TODO: upstream these to FreeBSD? */ #define R_ARM_TLS_DESC 13 #define R_ARM_IRELATIVE 160 -#define R_X86_64_JUMP_SLOT 7 + +/* BSD spells this slightly differently to Linux. */ +#define R_X86_64_JUMP_SLOT R_X86_64_JMP_SLOT