diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:47:27 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:47:27 +0000 |
| commit | 075f984a3aa393417f049bddd5afcee83396dde0 (patch) | |
| tree | 62170b965c34ed46b18567ceb847141d3aac15ef /sysdeps/i386/crti.S | |
| parent | 64c3bdb6f9bb3e5ebd004acf08d89371f4c0d26e (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/ifaddrs_v6' into t/ifaddrs_v6t/ifaddrs_v6
Diffstat (limited to 'sysdeps/i386/crti.S')
| -rw-r--r-- | sysdeps/i386/crti.S | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sysdeps/i386/crti.S b/sysdeps/i386/crti.S index 2fbc5711e3..65ddc1c934 100644 --- a/sysdeps/i386/crti.S +++ b/sysdeps/i386/crti.S @@ -1,5 +1,5 @@ /* Special .init and .fini section support for x86. - Copyright (C) 1995-2016 Free Software Foundation, Inc. + Copyright (C) 1995-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -58,8 +58,10 @@ .section .init,"ax",@progbits .p2align 2 .globl _init + .hidden _init .type _init, @function _init: + _CET_ENDBR pushl %ebx /* Maintain 16-byte stack alignment for called functions. */ subl $8, %esp @@ -68,7 +70,7 @@ _init: movl PREINIT_FUNCTION@GOT(%ebx), %eax testl %eax, %eax je .Lno_weak_fn - call PREINIT_FUNCTION@PLT + call *%eax .Lno_weak_fn: #else call PREINIT_FUNCTION @@ -77,8 +79,10 @@ _init: .section .fini,"ax",@progbits .p2align 2 .globl _fini + .hidden _fini .type _fini, @function _fini: + _CET_ENDBR pushl %ebx subl $8, %esp LOAD_PIC_REG (bx) |