ia64/xen-unstable

changeset 5069:5ee1dd151ac2

bitkeeper revision 1.1499 (428f07695kp2_AbrdFwruhvfdJ6ZvQ)

[PATCH] x86-64-qemu-fix.patch

Unbreak x86-64 build.

Signed-off-by: Arun Sharma <arun.sharma@intel.com>
author arun.sharma@intel.com[kaf24]
date Sat May 21 10:03:21 2005 +0000 (2005-05-21)
parents 43d7cfe99358
children 387d226daf5b
files .rootkeys tools/ioemu/configure tools/ioemu/target-i386-dm/Makefile tools/ioemu/x86_64.ld
line diff
     1.1 --- a/.rootkeys	Sat May 21 09:51:43 2005 +0000
     1.2 +++ b/.rootkeys	Sat May 21 10:03:21 2005 +0000
     1.3 @@ -675,6 +675,7 @@ 428d0d8bfvbYQwj6MgDr958m4_SfRA tools/ioe
     1.4  428d0d8bgAojEQcAcTV2gj2E_eG4Lw tools/ioemu/vl.c
     1.5  428d0d8bXiCY4iTjoSPxGry8jXdAtg tools/ioemu/vl.h
     1.6  428d0d8bQVKedvN5EIPm39s33TXkpA tools/ioemu/vnc.c
     1.7 +428f0763_67jCiHbdgfGlgAOJqfg9A tools/ioemu/x86_64.ld
     1.8  3fbba6dbDfYvJSsw9500b4SZyUhxjQ tools/libxc/Makefile
     1.9  41dde8afKYRKxS4XtLv1KUegGQy_bg tools/libxc/linux_boot_params.h
    1.10  41cc934abX-QLXJXW_clV_wRjM0zYg tools/libxc/plan9a.out.h
     2.1 --- a/tools/ioemu/configure	Sat May 21 09:51:43 2005 +0000
     2.2 +++ b/tools/ioemu/configure	Sat May 21 10:03:21 2005 +0000
     2.3 @@ -515,6 +515,7 @@ echo "#include \"../config-host.h\"" >> 
     2.4  
     2.5  if test "$target_cpu" = "i386" ; then
     2.6    echo "TARGET_ARCH=i386" >> $config_mak
     2.7 +  echo "HOST_ARCH=`uname -i`" >> $config_mak
     2.8    echo "#define TARGET_ARCH \"i386\"" >> $config_h
     2.9    echo "#define TARGET_I386 1" >> $config_h
    2.10  fi
     3.1 --- a/tools/ioemu/target-i386-dm/Makefile	Sat May 21 09:51:43 2005 +0000
     3.2 +++ b/tools/ioemu/target-i386-dm/Makefile	Sat May 21 10:03:21 2005 +0000
     3.3 @@ -300,9 +300,7 @@ VL_LDFLAGS=
     3.4  ifdef CONFIG_STATIC
     3.5  VL_LDFLAGS+=-static
     3.6  endif
     3.7 -ifndef CONFIG_SOFTMMU
     3.8 -VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld
     3.9 -endif
    3.10 +VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(HOST_ARCH).ld
    3.11  ifndef CONFIG_DARWIN
    3.12  ifndef CONFIG_WIN32
    3.13  VL_LIBS=-lutil
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/tools/ioemu/x86_64.ld	Sat May 21 10:03:21 2005 +0000
     4.3 @@ -0,0 +1,171 @@
     4.4 +/* Default linker script, for normal executables */
     4.5 +OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
     4.6 +OUTPUT_ARCH(i386:x86-64)
     4.7 +ENTRY(_start)
     4.8 +SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/local/lib64");
     4.9 +SECTIONS
    4.10 +{
    4.11 +  /* Read-only sections, merged into text segment: */
    4.12 +  . = 0x60000000 + SIZEOF_HEADERS;
    4.13 +  .interp         : { *(.interp) }
    4.14 +  .hash           : { *(.hash) }
    4.15 +  .dynsym         : { *(.dynsym) }
    4.16 +  .dynstr         : { *(.dynstr) }
    4.17 +  .gnu.version    : { *(.gnu.version) }
    4.18 +  .gnu.version_d  : { *(.gnu.version_d) }
    4.19 +  .gnu.version_r  : { *(.gnu.version_r) }
    4.20 +  .rel.init       : { *(.rel.init) }
    4.21 +  .rela.init      : { *(.rela.init) }
    4.22 +  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
    4.23 +  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
    4.24 +  .rel.fini       : { *(.rel.fini) }
    4.25 +  .rela.fini      : { *(.rela.fini) }
    4.26 +  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
    4.27 +  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
    4.28 +  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
    4.29 +  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
    4.30 +  .rel.tdata	  : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
    4.31 +  .rela.tdata	  : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
    4.32 +  .rel.tbss	  : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
    4.33 +  .rela.tbss	  : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
    4.34 +  .rel.ctors      : { *(.rel.ctors) }
    4.35 +  .rela.ctors     : { *(.rela.ctors) }
    4.36 +  .rel.dtors      : { *(.rel.dtors) }
    4.37 +  .rela.dtors     : { *(.rela.dtors) }
    4.38 +  .rel.got        : { *(.rel.got) }
    4.39 +  .rela.got       : { *(.rela.got) }
    4.40 +  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
    4.41 +  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
    4.42 +  .rel.plt        : { *(.rel.plt) }
    4.43 +  .rela.plt       : { *(.rela.plt) }
    4.44 +  .init           :
    4.45 +  {
    4.46 +    KEEP (*(.init))
    4.47 +  } =0x90909090
    4.48 +  .plt            : { *(.plt) }
    4.49 +  .text           :
    4.50 +  {
    4.51 +    *(.text .stub .text.* .gnu.linkonce.t.*)
    4.52 +    /* .gnu.warning sections are handled specially by elf32.em.  */
    4.53 +    *(.gnu.warning)
    4.54 +  } =0x90909090
    4.55 +  .fini           :
    4.56 +  {
    4.57 +    KEEP (*(.fini))
    4.58 +  } =0x90909090
    4.59 +  PROVIDE (__etext = .);
    4.60 +  PROVIDE (_etext = .);
    4.61 +  PROVIDE (etext = .);
    4.62 +  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
    4.63 +  .rodata1        : { *(.rodata1) }
    4.64 +  .eh_frame_hdr : { *(.eh_frame_hdr) }
    4.65 +  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
    4.66 +  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table) }
    4.67 +  /* Adjust the address for the data segment.  We want to adjust up to
    4.68 +     the same address within the page on the next page up.  */
    4.69 +  . = ALIGN (0x100000) - ((0x100000 - .) & (0x100000 - 1)); . = DATA_SEGMENT_ALIGN (0x100000, 0x1000);
    4.70 +  /* Ensure the __preinit_array_start label is properly aligned.  We
    4.71 +     could instead move the label definition inside the section, but
    4.72 +     the linker would then create the section even if it turns out to
    4.73 +     be empty, which isn't pretty.  */
    4.74 +  . = ALIGN(64 / 8);
    4.75 +  PROVIDE (__preinit_array_start = .);
    4.76 +  .preinit_array     : { *(.preinit_array) }
    4.77 +  PROVIDE (__preinit_array_end = .);
    4.78 +  PROVIDE (__init_array_start = .);
    4.79 +  .init_array     : { *(.init_array) }
    4.80 +  PROVIDE (__init_array_end = .);
    4.81 +  PROVIDE (__fini_array_start = .);
    4.82 +  .fini_array     : { *(.fini_array) }
    4.83 +  PROVIDE (__fini_array_end = .);
    4.84 +  .data           :
    4.85 +  {
    4.86 +    *(.data .data.* .gnu.linkonce.d.*)
    4.87 +    SORT(CONSTRUCTORS)
    4.88 +  }
    4.89 +  .data1          : { *(.data1) }
    4.90 +  .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
    4.91 +  .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
    4.92 +  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
    4.93 +  .gcc_except_table   : ONLY_IF_RW { *(.gcc_except_table) }
    4.94 +  .dynamic        : { *(.dynamic) }
    4.95 +  .ctors          :
    4.96 +  {
    4.97 +    /* gcc uses crtbegin.o to find the start of
    4.98 +       the constructors, so we make sure it is
    4.99 +       first.  Because this is a wildcard, it
   4.100 +       doesn't matter if the user does not
   4.101 +       actually link against crtbegin.o; the
   4.102 +       linker won't look for a file to match a
   4.103 +       wildcard.  The wildcard also means that it
   4.104 +       doesn't matter which directory crtbegin.o
   4.105 +       is in.  */
   4.106 +    KEEP (*crtbegin.o(.ctors))
   4.107 +    /* We don't want to include the .ctor section from
   4.108 +       from the crtend.o file until after the sorted ctors.
   4.109 +       The .ctor section from the crtend file contains the
   4.110 +       end of ctors marker and it must be last */
   4.111 +    KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
   4.112 +    KEEP (*(SORT(.ctors.*)))
   4.113 +    KEEP (*(.ctors))
   4.114 +  }
   4.115 +  .dtors          :
   4.116 +  {
   4.117 +    KEEP (*crtbegin.o(.dtors))
   4.118 +    KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
   4.119 +    KEEP (*(SORT(.dtors.*)))
   4.120 +    KEEP (*(.dtors))
   4.121 +  }
   4.122 +  .jcr            : { KEEP (*(.jcr)) }
   4.123 +  .got            : { *(.got.plt) *(.got) }
   4.124 +  _edata = .;
   4.125 +  PROVIDE (edata = .);
   4.126 +  __bss_start = .;
   4.127 +  .bss            :
   4.128 +  {
   4.129 +   *(.dynbss)
   4.130 +   *(.bss .bss.* .gnu.linkonce.b.*)
   4.131 +   *(COMMON)
   4.132 +   /* Align here to ensure that the .bss section occupies space up to
   4.133 +      _end.  Align after .bss to ensure correct alignment even if the
   4.134 +      .bss section disappears because there are no input sections.  */
   4.135 +   . = ALIGN(64 / 8);
   4.136 +  }
   4.137 +  . = ALIGN(64 / 8);
   4.138 +  _end = .;
   4.139 +  PROVIDE (end = .);
   4.140 +  . = DATA_SEGMENT_END (.);
   4.141 +  /* Stabs debugging sections.  */
   4.142 +  .stab          0 : { *(.stab) }
   4.143 +  .stabstr       0 : { *(.stabstr) }
   4.144 +  .stab.excl     0 : { *(.stab.excl) }
   4.145 +  .stab.exclstr  0 : { *(.stab.exclstr) }
   4.146 +  .stab.index    0 : { *(.stab.index) }
   4.147 +  .stab.indexstr 0 : { *(.stab.indexstr) }
   4.148 +  .comment       0 : { *(.comment) }
   4.149 +  /* DWARF debug sections.
   4.150 +     Symbols in the DWARF debugging sections are relative to the beginning
   4.151 +     of the section so we begin them at 0.  */
   4.152 +  /* DWARF 1 */
   4.153 +  .debug          0 : { *(.debug) }
   4.154 +  .line           0 : { *(.line) }
   4.155 +  /* GNU DWARF 1 extensions */
   4.156 +  .debug_srcinfo  0 : { *(.debug_srcinfo) }
   4.157 +  .debug_sfnames  0 : { *(.debug_sfnames) }
   4.158 +  /* DWARF 1.1 and DWARF 2 */
   4.159 +  .debug_aranges  0 : { *(.debug_aranges) }
   4.160 +  .debug_pubnames 0 : { *(.debug_pubnames) }
   4.161 +  /* DWARF 2 */
   4.162 +  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
   4.163 +  .debug_abbrev   0 : { *(.debug_abbrev) }
   4.164 +  .debug_line     0 : { *(.debug_line) }
   4.165 +  .debug_frame    0 : { *(.debug_frame) }
   4.166 +  .debug_str      0 : { *(.debug_str) }
   4.167 +  .debug_loc      0 : { *(.debug_loc) }
   4.168 +  .debug_macinfo  0 : { *(.debug_macinfo) }
   4.169 +  /* SGI/MIPS DWARF 2 extensions */
   4.170 +  .debug_weaknames 0 : { *(.debug_weaknames) }
   4.171 +  .debug_funcnames 0 : { *(.debug_funcnames) }
   4.172 +  .debug_typenames 0 : { *(.debug_typenames) }
   4.173 +  .debug_varnames  0 : { *(.debug_varnames) }
   4.174 +}