diff options
| -rwxr-xr-x | ldso/include/ldso.h | 2 | ||||
| -rw-r--r-- | libc/misc/internals/__uClibc_main.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h index 60e0a5bec..a2c3ec040 100755 --- a/ldso/include/ldso.h +++ b/ldso/include/ldso.h @@ -34,6 +34,7 @@ #include <stdarg.h> #include <stddef.h> /* for ptrdiff_t */ #include <stdbool.h> +#if !defined(_FCNTL_H) #define _FCNTL_H /* We need this if arch has only new syscalls defined */ #ifndef AT_FDCWD @@ -190,6 +191,7 @@ extern void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE loa #include <dl-elf.h> #endif +#endif /* _FCNTL_H */ #define AUX_MAX_AT_ID 40 extern ElfW(auxv_t) _dl_auxvt[AUX_MAX_AT_ID]; /* Cache frequently accessed auxiliary vector entries */ diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index a84492248..87f80d4f2 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -84,6 +84,8 @@ static void fdpic_init_array_jump(void *addr) #ifndef SHARED void *__libc_stack_end = NULL; +#include "ldso.h" /* Needed for _dl_auxvt */ + # ifdef __UCLIBC_HAS_SSP__ # include <dl-osinfo.h> static uintptr_t stack_chk_guard; |