diff options
| author | Marek Behún <marek.behun@nic.cz> | 2021-05-20 13:24:05 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-24 14:21:30 -0400 |
| commit | be1e77f2868f288a219090ee81427a9b800bb158 (patch) | |
| tree | d407144c575dfcc0315e7d48980f7dcd5d6413d6 /include | |
| parent | da48bd9ee5768e9811e4fbbab964c7f9d64fce3d (diff) | |
| download | u-boot-be1e77f2868f288a219090ee81427a9b800bb158.tar.gz u-boot-be1e77f2868f288a219090ee81427a9b800bb158.tar.xz u-boot-be1e77f2868f288a219090ee81427a9b800bb158.zip | |
sandbox: errno: avoid conflict with libc's errno
When building with LTO, the system libc's `errno` variable used in
arch/sandbox/cpu/os.c conflicts with U-Boot's `errno` (defined in
lib/errno.c) with the following error:
.../ld: errno@@GLIBC_PRIVATE: TLS definition in /lib64/libc.so.6
section .tbss mismatches non-TLS reference in
/tmp/u-boot.EQlEXz.ltrans0.ltrans.o
To avoid this conflict use different asm label for this variable when
CONFIG_SANDBOX is enabled.
Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/errno.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/errno.h b/include/errno.h index 3af539b9e9..652ad67306 100644 --- a/include/errno.h +++ b/include/errno.h @@ -8,7 +8,13 @@ #include <linux/errno.h> -extern int errno; +#ifdef __SANDBOX__ +#define __errno_asm_label asm("__u_boot_errno") +#else +#define __errno_asm_label +#endif + +extern int errno __errno_asm_label; #define __set_errno(val) do { errno = val; } while (0) |