Merge branch 'busybox' into merge

1 files changed, 7 insertions, 2 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 77a9c3b7d..6ed86e12b 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -25,6 +25,11 @@
  *
  * FEATURE_INSTALLER or FEATURE_SUID will still link printf routines in. :(
  */
+
+/* Define this accessor before we #define "errno" our way */
+#include <errno.h>
+static inline int *get_perrno(void) { return &errno; }
+
 #include "busybox.h"
 
 #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
@@ -318,8 +323,8 @@ void lbb_prepare(const char *applet
 void lbb_prepare(const char *applet
                 IF_FEATURE_INDIVIDUAL(, char **argv))
 {
-#ifdef __GLIBC__
-        (*(int **)not_const_pp(&bb_errno)) = __errno_location();
+#ifdef bb_cached_errno_ptr
+        (*(int **)not_const_pp(&bb_errno)) = get_perrno();
         barrier();
 #endif
         applet_name = applet;