diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-11 11:27:29 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-11 11:27:29 +0000 |
| commit | 93b8263652ac001247ff923499bdc04ab0a1a4c4 (patch) | |
| tree | 9c608c11471a562bbb359ec661cb4e3a9cd5489a /shell/ash_ptr_hack.c | |
| parent | 80f647c21c4457b5f74f5cdd87b789a0fa0d7c0d (diff) | |
| download | busybox-93b8263652ac001247ff923499bdc04ab0a1a4c4.tar.gz | |
fix build with gcc -combine
Diffstat (limited to 'shell/ash_ptr_hack.c')
| -rw-r--r-- | shell/ash_ptr_hack.c | 17 |
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 |