ia64/xen-unstable

changeset 14302:d1853a39e063

[IA64][MINIOS] cleanup ia64_boot_paramP and add ARCH_LDFLAGS

Signed-off-by: Dietmar Hahn <dietmar.hahn@fujitsu-siemens.com>
author awilliam@xenbuild2.aw
date Mon Mar 12 09:43:48 2007 -0600 (2007-03-12)
parents 9ea0c5f469c8
children cb2575cec95c
files extras/mini-os/arch/ia64/arch.mk extras/mini-os/arch/ia64/common.c extras/mini-os/include/ia64/os.h
line diff
     1.1 --- a/extras/mini-os/arch/ia64/arch.mk	Mon Mar 12 09:39:59 2007 -0600
     1.2 +++ b/extras/mini-os/arch/ia64/arch.mk	Mon Mar 12 09:43:48 2007 -0600
     1.3 @@ -3,3 +3,5 @@ ARCH_CFLAGS += -O2
     1.4  ARCH_ASFLAGS := -x assembler-with-cpp
     1.5  ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127 -fomit-frame-pointer
     1.6  ARCH_ASFLAGS += -fno-builtin -fno-common -fno-strict-aliasing -mconstant-gp
     1.7 +
     1.8 +ARCH_LDFLAGS = -warn-common
     2.1 --- a/extras/mini-os/arch/ia64/common.c	Mon Mar 12 09:39:59 2007 -0600
     2.2 +++ b/extras/mini-os/arch/ia64/common.c	Mon Mar 12 09:43:48 2007 -0600
     2.3 @@ -59,6 +59,9 @@ shared_info_t *HYPERVISOR_shared_info = 
     2.4  
     2.5  struct machine_fw machineFwG;
     2.6  
     2.7 +/* This pointer is initialized in ia64.S with the address of the boot param
     2.8 + * area passed by the bootloader. */
     2.9 +struct xen_ia64_boot_param* ia64_boot_paramP;
    2.10  
    2.11  struct xen_ia64_boot_param ia64BootParamG;
    2.12  char boot_cmd_line[COMMAND_LINE_SIZE+1];
    2.13 @@ -104,6 +107,7 @@ map_pal_code(void)
    2.14  	xen_set_virtual_psr_ic(1);
    2.15  }
    2.16  
    2.17 +/* In ivt.S */
    2.18  extern char hypervisor_callback;
    2.19  
    2.20  static void
    2.21 @@ -139,7 +143,6 @@ init_start_info(start_info_t* xen_start_
    2.22  static void
    2.23  init_boot_params(void)
    2.24  {
    2.25 -	/* ia64_boot_paramP is initialised in ia64.S!  */
    2.26  	ia64BootParamG.command_line = SWAP(ia64_boot_paramP->command_line);
    2.27  	ia64BootParamG.efi_systab = SWAP(ia64_boot_paramP->efi_systab);
    2.28  	ia64BootParamG.efi_memmap = SWAP(ia64_boot_paramP->efi_memmap);
     3.1 --- a/extras/mini-os/include/ia64/os.h	Mon Mar 12 09:39:59 2007 -0600
     3.2 +++ b/extras/mini-os/include/ia64/os.h	Mon Mar 12 09:43:48 2007 -0600
     3.3 @@ -52,7 +52,7 @@ void arch_print_info(void);		/* in commo
     3.4  /* Size of xen_ia64_boot_param.command_line */
     3.5  #define COMMAND_LINE_SIZE       512
     3.6  
     3.7 -struct xen_ia64_boot_param* ia64_boot_paramP;
     3.8 +extern struct xen_ia64_boot_param* ia64_boot_paramP;
     3.9  extern struct xen_ia64_boot_param ia64BootParamG;
    3.10  extern char boot_cmd_line[];
    3.11  extern efi_system_table_t* efiSysTableP;