* grub-core/kern/mips/arc/init.c (grub_total_modules_size): Mark as

	being in .text to avoid dprel references.
	* include/grub/mips/loongson/kernel.h (grub_arch_machine): Likewise.
	* include/grub/mips/loongson/memory.h (grub_arch_memsize): Likewise.
	(grub_arch_highmemsize): Likewise.
	* include/grub/mips/loongson/time.h (grub_arch_busclock): Likewise.
	* include/grub/mips/qemu_mips/memory.h (grub_arch_memsize): Likewise.
	* include/grub/mips/time.h (grub_arch_cpuclock): Likewise.

diff --git a/ChangeLog b/ChangeLog
index eb86e5d693aa67bd9945b4b96c99f8250bf0d3b2..0693a826a5f4d808f143828314dd043c000685ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/mips/arc/init.c (grub_total_modules_size): Mark as
+       being in .text to avoid dprel references.
+       * include/grub/mips/loongson/kernel.h (grub_arch_machine): Likewise.
+       * include/grub/mips/loongson/memory.h (grub_arch_memsize): Likewise.
+       (grub_arch_highmemsize): Likewise.
+       * include/grub/mips/loongson/time.h (grub_arch_busclock): Likewise.
+       * include/grub/mips/qemu_mips/memory.h (grub_arch_memsize): Likewise.
+       * include/grub/mips/time.h (grub_arch_cpuclock): Likewise.
+
 2012-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Support powerpc with GCC that defines __PPC__ but not __powerpc__.

diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
index 41545b11fbeec61853ef7687e67a501bd92f9326..657a68ecd328ca8c9f5f3db7f33b4abaf20664fd 100644 (file)
--- a/grub-core/kern/mips/arc/init.c
+++ b/grub-core/kern/mips/arc/init.c
@@ -125,7 +125,7 @@ grub_machine_mmap_iterate (grub_memory_hook_t hook)
     }
 }
 
-extern grub_uint32_t grub_total_modules_size;
+extern grub_uint32_t grub_total_modules_size __attribute__ ((section(".text")));
 grub_addr_t grub_modbase;
 
 void

diff --git a/include/grub/mips/loongson/kernel.h b/include/grub/mips/loongson/kernel.h
index ba94e43319168dbaed30846e5555c46580b46953..5e6e6fdfb4008fad47f0a68967f06163cf32e48d 100644 (file)
--- a/include/grub/mips/loongson/kernel.h
+++ b/include/grub/mips/loongson/kernel.h
@@ -28,7 +28,7 @@
 
 #ifndef ASM_FILE
 
-extern grub_uint32_t EXPORT_VAR (grub_arch_machine);
+extern grub_uint32_t EXPORT_VAR (grub_arch_machine) __attribute__ ((section(".text")));
 
 #endif
 

diff --git a/include/grub/mips/loongson/memory.h b/include/grub/mips/loongson/memory.h
index a288eb6ab1f1d493dcd1b4732d9d13a674791b98..aa41fa626be5a381ef51388795b8a163f4a08368 100644 (file)
--- a/include/grub/mips/loongson/memory.h
+++ b/include/grub/mips/loongson/memory.h
@@ -43,8 +43,8 @@ grub_machine_mmap_unregister (int handle  __attribute__ ((unused)))
   return GRUB_ERR_NONE;
 }
 
-extern grub_uint32_t EXPORT_VAR (grub_arch_memsize);
-extern grub_uint32_t EXPORT_VAR (grub_arch_highmemsize);
+extern grub_uint32_t EXPORT_VAR (grub_arch_memsize) __attribute__ ((section(".text")));
+extern grub_uint32_t EXPORT_VAR (grub_arch_highmemsize) __attribute__ ((section(".text")));
 
 #endif
 

diff --git a/include/grub/mips/loongson/time.h b/include/grub/mips/loongson/time.h
index 8b8ee42c4823634112ecf160611b9a5cc79ad4f5..0985732618f009c741d896702739f679b0b0c4fa 100644 (file)
--- a/include/grub/mips/loongson/time.h
+++ b/include/grub/mips/loongson/time.h
@@ -22,6 +22,6 @@
 #include <grub/symbol.h>
 #include <grub/cpu/time.h>
 
-extern grub_uint32_t EXPORT_VAR (grub_arch_busclock);
+extern grub_uint32_t EXPORT_VAR (grub_arch_busclock) __attribute__ ((section(".text")));
 
 #endif /* ! KERNEL_MACHINE_TIME_HEADER */

diff --git a/include/grub/mips/qemu_mips/memory.h b/include/grub/mips/qemu_mips/memory.h
index 48a9b69f03f51742991d53f07073aaac4b22c8d6..29b04a5ad9327516a20e92e3ba872a57a1571617 100644 (file)
--- a/include/grub/mips/qemu_mips/memory.h
+++ b/include/grub/mips/qemu_mips/memory.h
@@ -30,7 +30,7 @@
 
 #ifndef ASM_FILE
 
-extern grub_uint32_t grub_arch_memsize;
+extern grub_uint32_t grub_arch_memsize __attribute__ ((section(".text")));
 
 static inline grub_err_t
 grub_machine_mmap_register (grub_uint64_t start __attribute__ ((unused)),

diff --git a/include/grub/mips/time.h b/include/grub/mips/time.h
index 1139b24bb71c6081b0b99a57ceb181ad339822e5..f5c891a3a4f87027b77f13d0c2be16cf442664c9 100644 (file)
--- a/include/grub/mips/time.h
+++ b/include/grub/mips/time.h
@@ -26,7 +26,7 @@
 /* Return the real time in ticks.  */
 grub_uint64_t EXPORT_FUNC (grub_get_rtc) (void);
 
-extern grub_uint32_t EXPORT_VAR (grub_arch_cpuclock);
+extern grub_uint32_t EXPORT_VAR (grub_arch_cpuclock) __attribute__ ((section(".text")));
 #endif
 
 static inline void