ia64/xen-unstable

changeset 5065:fada74b4becd

bitkeeper revision 1.1496 (428e6f07Mp3t6GGKitdrBLluBQ32Nw)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Fri May 20 23:13:11 2005 +0000 (2005-05-20)
parents 2562daa95e37 ba07aa456da4
children 6640eb3cb41d
files .rootkeys linux-2.6.11-xen-sparse/arch/xen/Makefile linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile linux-2.6.11-xen-sparse/arch/xen/i386/kernel/vsyscall.lds
line diff
     1.1 --- a/.rootkeys	Fri May 20 23:10:13 2005 +0000
     1.2 +++ b/.rootkeys	Fri May 20 23:13:11 2005 +0000
     1.3 @@ -247,7 +247,6 @@ 40f56238NzTgeO63RGoxHrW5NQeO3Q linux-2.6
     1.4  40f56238BMqG5PuSHufpjbvp_helBw linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c
     1.5  40f562389xNa78YBZciUibQjyRU_Lg linux-2.6.11-xen-sparse/arch/xen/i386/kernel/traps.c
     1.6  40f56238JypKAUG01ZojFwH7qnZ5uA linux-2.6.11-xen-sparse/arch/xen/i386/kernel/vsyscall.S
     1.7 -40f56238wi6AdNQjm0RT57bSkwb6hg linux-2.6.11-xen-sparse/arch/xen/i386/kernel/vsyscall.lds
     1.8  427245dboQBkhq841wIPqlRD-AG9Jw linux-2.6.11-xen-sparse/arch/xen/i386/mach-default/Makefile
     1.9  40f56238a3w6-byOzexIlMgni76Lcg linux-2.6.11-xen-sparse/arch/xen/i386/mm/Makefile
    1.10  40f56238ILx8xlbywNbzTdv5Zr4xXQ linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/Makefile	Fri May 20 23:10:13 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/Makefile	Fri May 20 23:13:11 2005 +0000
     2.3 @@ -37,8 +37,14 @@ arch/xen/arch:
     2.4  	@rm -f $@
     2.5  	@ln -fsn $(XENARCH) $@
     2.6  
     2.7 +arch/$(XENARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
     2.8 +				   include/config/MARKER
     2.9 +
    2.10 +include/asm-$(ARCH)/asm_offsets.h: arch/$(XENARCH)/kernel/asm-offsets.s
    2.11 +	$(call filechk,gen-asm-offsets)
    2.12 +
    2.13  prepare: include/.asm-ignore include/asm-xen/asm \
    2.14 -	arch/xen/arch ;
    2.15 +	arch/xen/arch include/asm-$(ARCH)/asm_offsets.h ;
    2.16  
    2.17  all: vmlinuz
    2.18  
     3.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile	Fri May 20 23:10:13 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/Makefile	Fri May 20 23:13:11 2005 +0000
     3.3 @@ -52,18 +52,21 @@ c-obj-$(CONFIG_SCx200)		+= scx200.o
     3.4  # Note: kbuild does not track this dependency due to usage of .incbin
     3.5  $(obj)/vsyscall.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so
     3.6  targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
     3.7 +targets += vsyscall.lds
     3.8  
     3.9  # The DSO images are built using a special linker script.
    3.10  quiet_cmd_syscall = SYSCALL $@
    3.11        cmd_syscall = $(CC) -nostdlib -m32 $(SYSCFLAGS_$(@F)) \
    3.12  		          -Wl,-T,$(filter-out FORCE,$^) -o $@
    3.13  
    3.14 +export CPPFLAGS_vsyscall.lds += -P -C -U$(ARCH)
    3.15 +
    3.16  vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1
    3.17  SYSCFLAGS_vsyscall-sysenter.so	= $(vsyscall-flags)
    3.18  SYSCFLAGS_vsyscall-int80.so	= $(vsyscall-flags)
    3.19  
    3.20  $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so: \
    3.21 -$(obj)/vsyscall-%.so: $(obj)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
    3.22 +$(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
    3.23  	$(call if_changed,syscall)
    3.24  
    3.25  # We also create a special relocatable object that should mirror the symbol
    3.26 @@ -74,11 +77,11 @@ extra-y += vsyscall-syms.o
    3.27  $(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o
    3.28  
    3.29  SYSCFLAGS_vsyscall-syms.o = -r
    3.30 -$(obj)/vsyscall-syms.o: $(obj)/vsyscall.lds $(obj)/vsyscall-sysenter.o FORCE
    3.31 +$(obj)/vsyscall-syms.o: $(src)/vsyscall.lds $(obj)/vsyscall-sysenter.o FORCE
    3.32  	$(call if_changed,syscall)
    3.33  
    3.34  c-link	:= init_task.o
    3.35 -s-link	:= vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o
    3.36 +s-link	:= vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o vsyscall.lds.o
    3.37  
    3.38  $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)):
    3.39  	@ln -fsn $(srctree)/arch/i386/kernel/$(notdir $@) $@
     4.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/vsyscall.lds	Fri May 20 23:10:13 2005 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,69 +0,0 @@
     4.4 -/*
     4.5 - * Linker script for vsyscall DSO.  The vsyscall page is an ELF shared
     4.6 - * object prelinked to its virtual address, and with only one read-only
     4.7 - * segment (that fits in one page).  This script controls its layout.
     4.8 - */
     4.9 -
    4.10 -/* This must match <asm/fixmap.h>.  */
    4.11 -/* = FIXADDR_TOP - PAGE_SIZE
    4.12 -   = HYPERVISOR_VIRT_START - 2 * PAGE_SIZE - PAGE_SIZE */
    4.13 -VSYSCALL_BASE = 0xfbffd000;
    4.14 -
    4.15 -SECTIONS
    4.16 -{
    4.17 -  . = VSYSCALL_BASE + SIZEOF_HEADERS;
    4.18 -
    4.19 -  .hash           : { *(.hash) }		:text
    4.20 -  .dynsym         : { *(.dynsym) }
    4.21 -  .dynstr         : { *(.dynstr) }
    4.22 -  .gnu.version    : { *(.gnu.version) }
    4.23 -  .gnu.version_d  : { *(.gnu.version_d) }
    4.24 -  .gnu.version_r  : { *(.gnu.version_r) }
    4.25 -
    4.26 -  /* This linker script is used both with -r and with -shared.
    4.27 -     For the layouts to match, we need to skip more than enough
    4.28 -     space for the dynamic symbol table et al.  If this amount
    4.29 -     is insufficient, ld -shared will barf.  Just increase it here.  */
    4.30 -  . = VSYSCALL_BASE + 0x400;
    4.31 -
    4.32 -  .text           : { *(.text) }		:text =0x90909090
    4.33 -
    4.34 -  .eh_frame_hdr   : { *(.eh_frame_hdr) }	:text :eh_frame_hdr
    4.35 -  .eh_frame       : { KEEP (*(.eh_frame)) }	:text
    4.36 -  .dynamic        : { *(.dynamic) }		:text :dynamic
    4.37 -  .useless        : {
    4.38 -  	*(.got.plt) *(.got)
    4.39 -	*(.data .data.* .gnu.linkonce.d.*)
    4.40 -	*(.dynbss)
    4.41 -	*(.bss .bss.* .gnu.linkonce.b.*)
    4.42 -  }						:text
    4.43 -}
    4.44 -
    4.45 -/*
    4.46 - * We must supply the ELF program headers explicitly to get just one
    4.47 - * PT_LOAD segment, and set the flags explicitly to make segments read-only.
    4.48 - */
    4.49 -PHDRS
    4.50 -{
    4.51 -  text PT_LOAD FILEHDR PHDRS FLAGS(5); /* PF_R|PF_X */
    4.52 -  dynamic PT_DYNAMIC FLAGS(4); /* PF_R */
    4.53 -  eh_frame_hdr 0x6474e550; /* PT_GNU_EH_FRAME, but ld doesn't match the name */
    4.54 -}
    4.55 -
    4.56 -/*
    4.57 - * This controls what symbols we export from the DSO.
    4.58 - */
    4.59 -VERSION
    4.60 -{
    4.61 -  LINUX_2.5 {
    4.62 -    global:
    4.63 -    	__kernel_vsyscall;
    4.64 -    	__kernel_sigreturn;
    4.65 -    	__kernel_rt_sigreturn;
    4.66 -
    4.67 -    local: *;
    4.68 -  };
    4.69 -}
    4.70 -
    4.71 -/* The ELF entry point can be used to set the AT_SYSINFO value.  */
    4.72 -ENTRY(__kernel_vsyscall);