diff options
| author | awilliam@xenbuild2.aw <awilliam@xenbuild2.aw> | 2007-03-12 09:43:48 -0600 |
|---|---|---|
| committer | awilliam@xenbuild2.aw <awilliam@xenbuild2.aw> | 2007-03-12 09:43:48 -0600 |
| commit | 5340bb29c57a4fca7a19ddd8f5f8ede0ea90506e (patch) | |
| tree | 5f287f9d32c0a5d53fc6b4a74cc5d42289e17aa3 /extras/mini-os/arch | |
| parent | 5171dd3120776e556dd75b20a94b6489a922498e (diff) | |
| download | xen-5340bb29c57a4fca7a19ddd8f5f8ede0ea90506e.tar.gz xen-5340bb29c57a4fca7a19ddd8f5f8ede0ea90506e.tar.bz2 xen-5340bb29c57a4fca7a19ddd8f5f8ede0ea90506e.zip | |
[IA64][MINIOS] cleanup ia64_boot_paramP and add ARCH_LDFLAGS
Signed-off-by: Dietmar Hahn <dietmar.hahn@fujitsu-siemens.com>
Diffstat (limited to 'extras/mini-os/arch')
| -rw-r--r-- | extras/mini-os/arch/ia64/arch.mk | 2 | ||||
| -rw-r--r-- | extras/mini-os/arch/ia64/common.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/extras/mini-os/arch/ia64/arch.mk b/extras/mini-os/arch/ia64/arch.mk index 167e3a1f50..066fad36fd 100644 --- a/extras/mini-os/arch/ia64/arch.mk +++ b/extras/mini-os/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/extras/mini-os/arch/ia64/common.c b/extras/mini-os/arch/ia64/common.c index ee496338a2..7d99a4c191 100644 --- a/extras/mini-os/arch/ia64/common.c +++ b/extras/mini-os/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); |