Skip to content

Commit

Permalink
sandbox: errno: avoid conflict with libc's errno
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Bin Meng <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
  • Loading branch information
elkablo authored and trini committed May 24, 2021
1 parent da48bd9 commit be1e77f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
8 changes: 7 additions & 1 deletion include/errno.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 3 additions & 1 deletion lib/errno.c
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
int errno = 0;
#include <errno.h>

int errno __errno_asm_label = 0;

0 comments on commit be1e77f

Please sign in to comment.