tar: support -T - and -X -

[oweals/busybox.git] / libbb / ptr_to_globals.c

diff --git a/libbb/ptr_to_globals.c b/libbb/ptr_to_globals.c
index f8ccbf142185c60db3acb4abc84297063b893cea..1074538f3bad71f99bcbf5eb7448d0d539befbfb 100644 (file)
--- a/libbb/ptr_to_globals.c
+++ b/libbb/ptr_to_globals.c
@@ -2,10 +2,34 @@
 /*
  * Copyright (C) 2008 by Denys Vlasenko <vda.linux@googlemail.com>
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
+#include <errno.h>
+
+struct globals;
+
+#ifndef GCC_COMBINE
+
 /* We cheat here. It is declared as const ptr in libbb.h,
  * but here we make it live in R/W memory */
-struct globals;
 struct globals *ptr_to_globals;
+
+#ifdef __GLIBC__
+int *bb_errno;
+#endif
+
+
+#else
+
+
+/* gcc -combine will see through and complain */
+/* Using alternative method which is more likely to break
+ * on weird architectures, compilers, linkers and so on */
+struct globals *const ptr_to_globals __attribute__ ((section (".data")));
+
+#ifdef __GLIBC__
+int *const bb_errno __attribute__ ((section (".data")));
+#endif
+
+#endif