SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-07-23 01:59:08 +00:00
parent 174b61403d
commit e0e35f76e8
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/libc/dlfcn/init.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: init.c,v 1.23 2024/07/14 09:48:48 jca Exp $ */ /* $OpenBSD: init.c,v 1.24 2024/07/22 22:06:27 kettenis Exp $ */
/* /*
* Copyright (c) 2014,2015 Philip Guenther <guenther@openbsd.org> * Copyright (c) 2014,2015 Philip Guenther <guenther@openbsd.org>
* *
@ -189,14 +189,16 @@ _libc_preinit(int argc, char **argv, char **envp, dl_cb_cb *cb)
# endif # endif
#endif #endif
#define ADD_TO_ARRAY(func, which) \
__asm( " .section ."#which",\"a\","TYPE#which"\n " \
VALUE_ALIGN"\n "VALUE_DIRECTIVE" "#func"\n .previous")
#ifdef PIC #ifdef PIC
ADD_TO_ARRAY(_libc_preinit, init_array); /*
* Set a priority so _libc_preinit gets called before the constructor
* on libcompiler_rt that may use elf_aux_info(3).
*/
__asm(" .section .init_array.50,\"a\","TYPE"init_array\n " \
VALUE_ALIGN"\n "VALUE_DIRECTIVE" _libc_preinit\n .previous");
#else #else
ADD_TO_ARRAY(_libc_preinit, preinit_array); __asm(" .section .preinit_array,\"a\","TYPE"preinit_array\n " \
VALUE_ALIGN"\n "VALUE_DIRECTIVE" _libc_preinit\n .previous");
#endif #endif
/* /*