aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-04-11 11:27:29 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-04-11 11:27:29 +0000
commit93b8263652ac001247ff923499bdc04ab0a1a4c4 (patch)
tree9c608c11471a562bbb359ec661cb4e3a9cd5489a /shell
parent80f647c21c4457b5f74f5cdd87b789a0fa0d7c0d (diff)
downloadbusybox-93b8263652ac001247ff923499bdc04ab0a1a4c4.tar.gz
busybox-93b8263652ac001247ff923499bdc04ab0a1a4c4.tar.bz2
fix build with gcc -combine
Diffstat (limited to 'shell')
-rw-r--r--shell/ash_ptr_hack.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/shell/ash_ptr_hack.c b/shell/ash_ptr_hack.c
index 490b73b6d..68d907292 100644
--- a/shell/ash_ptr_hack.c
+++ b/shell/ash_ptr_hack.c
@@ -5,12 +5,25 @@
* Licensed under GPLv2, see file LICENSE in this tarball for details.
*/
-/* We cheat here. They are declared as const ptr in ash.c,
- * but here we make them live in R/W memory */
struct globals_misc;
struct globals_memstack;
struct globals_var;
+#ifndef GCC_COMBINE
+
+/* We cheat here. They are declared as const ptr in ash.c,
+ * but here we make them live in R/W memory */
struct globals_misc *ash_ptr_to_globals_misc;
struct globals_memstack *ash_ptr_to_globals_memstack;
struct globals_var *ash_ptr_to_globals_var;
+
+#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_misc *const ash_ptr_to_globals_misc __attribute__ ((section (".data")));
+struct globals_memstack *const ash_ptr_to_globals_memstack __attribute__ ((section (".data")));
+struct globals_var *const ash_ptr_to_globals_var __attribute__ ((section (".data")));
+
+#endif