diff options
| author | Fangrui Song <maskray@google.com> | 2021-10-10 22:32:12 -0700 |
|---|---|---|
| committer | Fangrui Song <maskray@google.com> | 2021-10-10 22:32:12 -0700 |
| commit | e3d3fb2f6a622a8ca29079ebbc3a3794830a24f7 (patch) | |
| tree | a4d1f28d109f210bf787df1393e443a42ebdc12c /sysdeps/i386/dl-trampoline.S | |
| parent | 5d26d12f4ab59c67399c4d5ddcad91704fb737f9 (diff) | |
| download | glibc-e3d3fb2f6a622a8ca29079ebbc3a3794830a24f7.tar.gz glibc-e3d3fb2f6a622a8ca29079ebbc3a3794830a24f7.tar.xz glibc-e3d3fb2f6a622a8ca29079ebbc3a3794830a24f7.zip | |
elf: Remove Intel MPX support (lazy PLT, ld.so profile, and LD_AUDIT) maskray/x86-mpx
Intel MPX failed to gain wide adoption and has been deprecated for a while. GCC 9.1 removed Intel MPX support. Linux kernel removed MPX in 2019. This patch removes the support code from the dynamic loader.
Diffstat (limited to 'sysdeps/i386/dl-trampoline.S')
| -rw-r--r-- | sysdeps/i386/dl-trampoline.S | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/sysdeps/i386/dl-trampoline.S b/sysdeps/i386/dl-trampoline.S index b5ec0326df..5669ab18f5 100644 --- a/sysdeps/i386/dl-trampoline.S +++ b/sysdeps/i386/dl-trampoline.S @@ -19,12 +19,6 @@ #include <sysdep.h> #include <link-defines.h> -#ifdef HAVE_MPX_SUPPORT -# define PRESERVE_BND_REGS_PREFIX bnd -#else -# define PRESERVE_BND_REGS_PREFIX .byte 0xf2 -#endif - .text .globl _dl_runtime_resolve .type _dl_runtime_resolve, @function @@ -250,13 +244,6 @@ _dl_runtime_profile: movl %edx, LRV_EDX_OFFSET(%esp) fstpt LRV_ST0_OFFSET(%esp) fstpt LRV_ST1_OFFSET(%esp) -#ifdef HAVE_MPX_SUPPORT - bndmov %bnd0, LRV_BND0_OFFSET(%esp) - bndmov %bnd1, LRV_BND1_OFFSET(%esp) -#else - .byte 0x66,0x0f,0x1b,0x44,0x24,LRV_BND0_OFFSET - .byte 0x66,0x0f,0x1b,0x4c,0x24,LRV_BND1_OFFSET -#endif pushl %esp cfi_adjust_cfa_offset (4) # Address of La_i86_regs area. @@ -270,17 +257,9 @@ _dl_runtime_profile: movl LRV_EDX_OFFSET(%esp), %edx fldt LRV_ST1_OFFSET(%esp) fldt LRV_ST0_OFFSET(%esp) -#ifdef HAVE_MPX_SUPPORT - bndmov LRV_BND0_OFFSET(%esp), %bnd0 - bndmov LRV_BND1_OFFSET(%esp), %bnd1 -#else - .byte 0x66,0x0f,0x1a,0x44,0x24,LRV_BND0_OFFSET - .byte 0x66,0x0f,0x1a,0x4c,0x24,LRV_BND1_OFFSET -#endif # Restore stack before return. addl $(LRV_SIZE + 4 + LR_SIZE + 4), %esp cfi_adjust_cfa_offset (-(LRV_SIZE + 4 + LR_SIZE + 4)) - PRESERVE_BND_REGS_PREFIX ret cfi_endproc .size _dl_runtime_profile, .-_dl_runtime_profile |