RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 07:44:59 +00:00
Code Issues Activity Actions

LibC: Implement errno via a __errno_location() function

Browse source 
This matches how some other systems implement errno, and makes 3rd party
software that expect us to have __errno_location() work.
This commit is contained in:
Andreas Kling 2022-04-21 11:09:05 +02:00
parent 99c0b895fe
commit a353ceecf1
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibC/errno.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2022, Andreas Kling <kling@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -29,6 +29,7 @@ extern int errno;
extern __thread int errno; extern __thread int errno;
#endif #endif
#define errno errno int* __errno_location() __attribute__((const));
#define errno (*__errno_location())
__END_DECLS __END_DECLS

12
Userland/Libraries/LibC/libcinit.cpp
View file

@ -1,20 +1,21 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2022, Andreas Kling <kling@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/Types.h> #include <AK/Types.h>
#include <assert.h> #include <assert.h>
#include <errno.h>
#include <sys/internals.h> #include <sys/internals.h>
#include <unistd.h> #include <unistd.h>
extern "C" { extern "C" {
#ifdef NO_TLS #ifdef NO_TLS
int errno; int errno_storage;
#else #else
__thread int errno; __thread int errno_storage;
#endif #endif
char** environ; char** environ;
bool __environ_is_malloced; bool __environ_is_malloced;
@ -24,6 +25,11 @@ void* __auxiliary_vector;
static void __auxiliary_vector_init(); static void __auxiliary_vector_init();
int* __errno_location()
{
return &errno_storage;
}
void __libc_init() void __libc_init()
{ {
__auxiliary_vector_init(); __auxiliary_vector_init();