diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 20:07:48 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 20:07:48 +0000 |
commit | ad19c620767174a56d7b25615d3a54b7486f1cca (patch) | |
tree | 113406f3d7178f4979abc5a4960bb6f979648e9b /sysdeps/x86_64/crti.S | |
parent | e1777dde9106cbd223b56d6ddcf8464093679c81 (diff) | |
parent | 5fbd1a9aad274b17f2788dd22e5306cba07dab71 (diff) |
Merge commit 'refs/top-bases/tschwinge/Roger_Whittaker' into tschwinge/Roger_Whittaker
Diffstat (limited to 'sysdeps/x86_64/crti.S')
-rw-r--r-- | sysdeps/x86_64/crti.S | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sysdeps/x86_64/crti.S b/sysdeps/x86_64/crti.S index a34525974a..067ac14884 100644 --- a/sysdeps/x86_64/crti.S +++ b/sysdeps/x86_64/crti.S @@ -1,5 +1,5 @@ /* Special .init and .fini section support for x86-64. - Copyright (C) 2012-2016 Free Software Foundation, Inc. + Copyright (C) 2012-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,15 +58,17 @@ .section .init,"ax",@progbits .p2align 2 .globl _init + .hidden _init .type _init, @function _init: + _CET_ENDBR /* Maintain 16-byte stack alignment for called functions. */ subq $8, %rsp #if PREINIT_FUNCTION_WEAK movq PREINIT_FUNCTION@GOTPCREL(%rip), %rax testq %rax, %rax je .Lno_weak_fn - call PREINIT_FUNCTION@PLT + call *%rax .Lno_weak_fn: #else call PREINIT_FUNCTION @@ -75,6 +77,8 @@ _init: .section .fini,"ax",@progbits .p2align 2 .globl _fini + .hidden _fini .type _fini, @function _fini: + _CET_ENDBR subq $8, %rsp |