[IA64][MINIOS] cleanup ia64_boot_paramP and add ARCH_LDFLAGS

Signed-off-by: Dietmar Hahn <dietmar.hahn@fujitsu-siemens.com>

diff --git a/arch/ia64/arch.mk b/arch/ia64/arch.mk
index 167e3a1f50261667a8dc41776ae4e5dd964a2865..066fad36fdef6df3956bc3b24db32c40b1ba7a73 100644 (file)
--- a/arch/ia64/arch.mk
+++ b/arch/ia64/arch.mk
@@ -3,3 +3,5 @@ ARCH_CFLAGS += -O2
 ARCH_ASFLAGS := -x assembler-with-cpp
 ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127 -fomit-frame-pointer
 ARCH_ASFLAGS += -fno-builtin -fno-common -fno-strict-aliasing -mconstant-gp
+
+ARCH_LDFLAGS = -warn-common

diff --git a/arch/ia64/common.c b/arch/ia64/common.c
index ee496338a23bf04bd9f58691c1486a0c8b04d4f2..7d99a4c19123a5b137428050810a0a4ff37dd90d 100644 (file)
--- a/arch/ia64/common.c
+++ b/arch/ia64/common.c
@@ -59,6 +59,9 @@ shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)XSI_BASE;
 
 struct machine_fw machineFwG;
 
+/* This pointer is initialized in ia64.S with the address of the boot param
+ * area passed by the bootloader. */
+struct xen_ia64_boot_param* ia64_boot_paramP;
 
 struct xen_ia64_boot_param ia64BootParamG;
 char boot_cmd_line[COMMAND_LINE_SIZE+1];
@@ -104,6 +107,7 @@ map_pal_code(void)
        xen_set_virtual_psr_ic(1);
 }
 
+/* In ivt.S */
 extern char hypervisor_callback;
 
 static void
@@ -139,7 +143,6 @@ init_start_info(start_info_t* xen_start_info)
 static void
 init_boot_params(void)
 {
-       /* ia64_boot_paramP is initialised in ia64.S!  */
        ia64BootParamG.command_line = SWAP(ia64_boot_paramP->command_line);
        ia64BootParamG.efi_systab = SWAP(ia64_boot_paramP->efi_systab);
        ia64BootParamG.efi_memmap = SWAP(ia64_boot_paramP->efi_memmap);

diff --git a/include/ia64/os.h b/include/ia64/os.h
index 6c928f2103dc1a18d302c4cc17be23dcb837f687..4e9f595f38be6ae9093f4081026e93b60710bf8d 100644 (file)
--- a/include/ia64/os.h
+++ b/include/ia64/os.h
@@ -52,7 +52,7 @@ void arch_print_info(void);           /* in common.c */
 /* Size of xen_ia64_boot_param.command_line */
 #define COMMAND_LINE_SIZE       512
 
-struct xen_ia64_boot_param* ia64_boot_paramP;
+extern struct xen_ia64_boot_param* ia64_boot_paramP;
 extern struct xen_ia64_boot_param ia64BootParamG;
 extern char boot_cmd_line[];
 extern efi_system_table_t* efiSysTableP;