diff --git a/ChangeLog b/ChangeLog index eb86e5d69..0693a826a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2012-01-20 Vladimir Serbinenko + + * 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 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 41545b11f..657a68ecd 100644 --- 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 ba94e4331..5e6e6fdfb 100644 --- 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 a288eb6ab..aa41fa626 100644 --- 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 8b8ee42c4..098573261 100644 --- a/include/grub/mips/loongson/time.h +++ b/include/grub/mips/loongson/time.h @@ -22,6 +22,6 @@ #include #include -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 48a9b69f0..29b04a5ad 100644 --- 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 1139b24bb..f5c891a3a 100644 --- 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