fix build with gcc -combine

1 files changed, 15 insertions, 2 deletions

diff --git a/shell/ash_ptr_hack.c b/shell/ash_ptr_hack.c
index 490b73b..68d9072 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