svn commit: r322401 - in head/emulators/qemu-devel: . files

Juergen Lock nox at FreeBSD.org
Sat Jul 6 17:09:58 UTC 2013


Author: nox
Date: Sat Jul  6 17:09:57 2013
New Revision: 322401
URL: http://svnweb.freebsd.org/changeset/ports/322401

Log:
  - Update to 1.5.1, announce message is here:
  
  	https://lists.gnu.org/archive/html/qemu-devel/2013-06/msg04798.html
  
  - Simplify bsd-user ld script handling. [1]
  - Make STATIC_LINK work again.
  - Add GTK knob.
  - Neither graphical UI can be built static, set IGNORE in that case.
  - Properly fix AES_* link errors by #defining those functions as
    QEMU_AES_* to avoid conflicts with AES_* in -lcrypto needed (at
    least) by -lcurl.
  - Add back CURL knob in the process.
  - Fix "Warning: vlan %d is not connected to host network" when using
    pcap.
  - Switch to USES= gmake.
  - Note: I did not backport sson's latest bsd-user patches which he has
    now in a github tree based on qemu git head, tho I have a seperate
    port of that tree on redports:
  
  	svn co https://svn.redports.org/nox/emulators/qemu-devel-sson/
  
    See also:
  
  	https://wiki.freebsd.org/QemuUserModeHowTo
  
  Submitted by:	emaste [1]

Added:
  head/emulators/qemu-devel/files/patch-configure-ld   (contents, props changed)
  head/emulators/qemu-devel/files/patch-configure-ld-1a1c9ef4d3da2ff1965e8037d7d30b77884c869f   (contents, props changed)
  head/emulators/qemu-devel/files/patch-include-qemu-aes.h   (contents, props changed)
Deleted:
  head/emulators/qemu-devel/files/patch-bsd-user-ld
  head/emulators/qemu-devel/files/patch-include-qemu-common.h
  head/emulators/qemu-devel/files/patch-ppc.ld
Modified:
  head/emulators/qemu-devel/Makefile
  head/emulators/qemu-devel/distinfo
  head/emulators/qemu-devel/files/patch-z9c-bsd-user-sson003c
  head/emulators/qemu-devel/files/pcap-patch

Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile	Sat Jul  6 17:00:33 2013	(r322400)
+++ head/emulators/qemu-devel/Makefile	Sat Jul  6 17:09:57 2013	(r322401)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qemu
-PORTVERSION=	1.5.0
+PORTVERSION=	1.5.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/:release \
 		LOCAL/nox:snapshot
@@ -13,12 +13,11 @@ DIST_SUBDIR=	qemu/${PORTVERSION}
 MAINTAINER=	nox at FreeBSD.org
 COMMENT=	QEMU CPU Emulator - development version
 
-LIB_DEPENDS=	pixman-1:${PORTSDIR}/x11/pixman \
-		curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	pixman-1:${PORTSDIR}/x11/pixman
 
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_PERL5_BUILD=	yes
 USE_PYTHON_BUILD=	yes
 USE_GNOME+=	glib20
@@ -30,8 +29,8 @@ ONLY_FOR_ARCHS=	amd64 i386 powerpc # XXX
 CONFLICTS_INSTALL=	qemu-[0-9]*
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS_DEFINE=	SAMBA X11 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA PCAP \
-		USBREDIR GNS3 X86_TARGETS BSD_USER \
+OPTIONS_DEFINE=	SAMBA X11 GTK OPENGL GNUTLS SASL JPEG PNG CURL \
+		CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS BSD_USER \
 		STATIC_LINK DOCS
 SAMBA_DESC=		samba dependency (for -smb)
 GNUTLS_DESC=		gnutls dependency (vnc encryption)
@@ -46,7 +45,7 @@ GNS3_DESC=		gns3 patches (promiscuous mu
 X86_TARGETS_DESC=	Don't build non-x86 system targets
 BSD_USER_DESC=		Also build bsd-user targets (for testing)
 STATIC_LINK_DESC=	Statically link the executables
-OPTIONS_DEFAULT=X11 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA PCAP
+OPTIONS_DEFAULT=X11 GTK OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP
 
 .include <bsd.port.options.mk>
 
@@ -109,11 +108,16 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc
 	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"${PREFIX}\\\"
 
 .if empty(PORT_OPTIONS:MX11)
-CONFIGURE_ARGS+=	--disable-gtk
 CONFIGURE_ARGS+=	--disable-sdl
-PLIST_SUB+=	GTK="@comment "
 .else
+CONFIGURE_ARGS+=	--enable-sdl
 USE_SDL=	sdl
+.endif
+
+.if empty(PORT_OPTIONS:MGTK)
+CONFIGURE_ARGS+=	--disable-gtk
+PLIST_SUB+=	GTK="@comment "
+.else
 USE_GNOME+=	gtk20 vte
 USES+=		gettext
 PLIST_SUB+=	GTK=""
@@ -143,6 +147,12 @@ CONFIGURE_ARGS+=	--disable-vnc-png
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 .endif
 
+.if empty(PORT_OPTIONS:MCURL)
+CONFIGURE_ARGS+=	--disable-curl
+.else
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+.endif
+
 .if empty(PORT_OPTIONS:MOPENGL)
 CONFIGURE_ARGS+=	--disable-glx
 .else
@@ -161,6 +171,9 @@ CONFIGURE_ARGS+=	--enable-pcap
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC_LINK}
+.if ${PORT_OPTIONS:MGTK} || ${PORT_OPTIONS:MX11}
+IGNORE=		X11 ui cannot be built static
+.endif
 CONFIGURE_ARGS+=	--static
 .endif
 
@@ -196,14 +209,21 @@ CONFIGURE_ARGS+= --sparc_cpu=v9
 
 .if ${OSVERSION} < 900033
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+CONFIGURE_ENV+=	LD=${LOCALBASE}/bin/ld
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
 
+# -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC)
+# but it shouldn't matter much
 post-patch:
 .if ${OSVERSION} < 900000
 	@${REINPLACE_CMD} -e '/LIBS/s|-lprocstat||' ${WRKSRC}/configure
+.else
+	@${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \
+		${WRKSRC}/configure
 .endif
+	@${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure
 .if ${PORT_OPTIONS:MPCAP}
 	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/pcap-patch
 .endif

Modified: head/emulators/qemu-devel/distinfo
==============================================================================
--- head/emulators/qemu-devel/distinfo	Sat Jul  6 17:00:33 2013	(r322400)
+++ head/emulators/qemu-devel/distinfo	Sat Jul  6 17:09:57 2013	(r322401)
@@ -1,2 +1,2 @@
-SHA256 (qemu/1.5.0/qemu-1.5.0.tar.bz2) = b22b30ee9712568dfb4eedf76783f4a76546e1cbc41659b909646bcf0b4867bb
-SIZE (qemu/1.5.0/qemu-1.5.0.tar.bz2) = 11931067
+SHA256 (qemu/1.5.1/qemu-1.5.1.tar.bz2) = 4c15a1ee2f387983eb5c1497f66bf567c34d14ba48517148f6eafef8ae09e3e8
+SIZE (qemu/1.5.1/qemu-1.5.1.tar.bz2) = 11931754

Added: head/emulators/qemu-devel/files/patch-configure-ld
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/qemu-devel/files/patch-configure-ld	Sat Jul  6 17:09:57 2013	(r322401)
@@ -0,0 +1,2528 @@
+diff --git a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -4198,15 +4198,7 @@ fi
+ 
+ # generate list of library paths for linker script
+ 
+-$ld --verbose -v 2> /dev/null | grep SEARCH_DIR > ${config_host_ld}
+ 
+-if test -f ${config_host_ld}~ ; then
+-  if cmp -s $config_host_ld ${config_host_ld}~ ; then
+-    mv ${config_host_ld}~ $config_host_ld
+-  else
+-    rm ${config_host_ld}~
+-  fi
+-fi
+ 
+ # use included Linux headers
+ if test "$linux" = "yes" ; then
+@@ -4578,21 +4578,33 @@ if test "$gprof" = "yes" ; then
+   fi
+ fi
+ 
+-if test "$ARCH" = "tci"; then
+-  linker_script=""
+-else
+-  linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/ldscripts/\$(ARCH).ld"
+-fi
+-
+ if test "$target_linux_user" = "yes" -o "$target_bsd_user" = "yes" ; then
++  textseg_addr=
+   case "$ARCH" in
+-  alpha | s390x)
+-    # The default placement of the application is fine.
+-    ;;
+-  *)
+-    ldflags="$linker_script $ldflags"
++  arm | hppa | i386 | ia64 | m68k | ppc | ppc64 | s390 | sparc | sparc64 | x86_64)
++    default_textseg_addr=0x400000
++    textseg_addr=0x60000000
++    ;;
++  mips)
++    default_textseg_addr=0x120000000
++    textseg_addr=0x400000
+     ;;
+   esac
++  if [ -n "$textseg_addr" ]; then
++    try_ldflags="-Ttext-segment=$textseg_addr"
++    if $ld $try_ldflags /dev/null >/dev/null 2>&1; then
++      ldflags="$ldflags $try_ldflags"
++    else
++      # In case ld does not support -Ttext-segment, edit the default linker
++      # script via sed to set the .text start addr.  This is needed on FreeBSD
++      # at least.
++      $ld --verbose | sed \
++        -e '1,/==================================================/d' \
++        -e '/==================================================/,$d' \
++        -e "s/$default_textseg_addr/$textseg_addr/g" > config-host.ld
++      ldflags="$ldflags -Wl,-T../config-host.ld"
++    fi
++  fi
+ fi
+ 
+ echo "LDFLAGS+=$ldflags" >> $config_target_mak
+diff --git a/ldscripts/alpha.ld b/ldscripts/alpha.ld
+deleted file mode 100644
+index 906d76b..0000000
+--- a/ldscripts/alpha.ld
++++ /dev/null
+@@ -1,127 +0,0 @@
+-OUTPUT_FORMAT("elf64-alpha", "elf64-alpha",
+-	      "elf64-alpha")
+-OUTPUT_ARCH(alpha)
+-ENTRY(__start)
+-SECTIONS
+-{
+-  /* Read-only sections, merged into text segment: */
+-  . = 0x60000000 + SIZEOF_HEADERS;
+-  .interp     : { *(.interp) 	}
+-  .hash          : { *(.hash)		}
+-  .dynsym        : { *(.dynsym)		}
+-  .dynstr        : { *(.dynstr)		}
+-  .gnu.version   : { *(.gnu.version)	}
+-  .gnu.version_d   : { *(.gnu.version_d)	}
+-  .gnu.version_r   : { *(.gnu.version_r)	}
+-  .rel.text      :
+-    { *(.rel.text) *(.rel.gnu.linkonce.t*) }
+-  .rela.text     :
+-    { *(.rela.text) *(.rela.gnu.linkonce.t*) }
+-  .rel.data      :
+-    { *(.rel.data) *(.rel.gnu.linkonce.d*) }
+-  .rela.data     :
+-    { *(.rela.data) *(.rela.gnu.linkonce.d*) }
+-  .rel.rodata    :
+-    { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
+-  .rela.rodata   :
+-    { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
+-  .rel.got       : { *(.rel.got)		}
+-  .rela.got      : { *(.rela.got)		}
+-  .rel.ctors     : { *(.rel.ctors)	}
+-  .rela.ctors    : { *(.rela.ctors)	}
+-  .rel.dtors     : { *(.rel.dtors)	}
+-  .rela.dtors    : { *(.rela.dtors)	}
+-  .rel.init      : { *(.rel.init)	}
+-  .rela.init     : { *(.rela.init)	}
+-  .rel.fini      : { *(.rel.fini)	}
+-  .rela.fini     : { *(.rela.fini)	}
+-  .rel.bss       : { *(.rel.bss)		}
+-  .rela.bss      : { *(.rela.bss)		}
+-  .rel.plt       : { *(.rel.plt)		}
+-  .rela.plt      : { *(.rela.plt)		}
+-  .init          : { *(.init)	} =0x47ff041f
+-  .text      :
+-  {
+-    *(.text)
+-    /* .gnu.warning sections are handled specially by elf32.em.  */
+-    *(.gnu.warning)
+-    *(.gnu.linkonce.t*)
+-  } =0x47ff041f
+-  _etext = .;
+-  PROVIDE (etext = .);
+-  .fini      : { *(.fini)    } =0x47ff041f
+-  .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
+-  .rodata1   : { *(.rodata1) }
+-  .reginfo : { *(.reginfo) }
+-  /* Adjust the address for the data segment.  We want to adjust up to
+-     the same address within the page on the next page up.  */
+-  . = ALIGN(0x100000) + (. & (0x100000 - 1));
+-  .data    :
+-  {
+-    *(.data)
+-    *(.gnu.linkonce.d*)
+-    CONSTRUCTORS
+-  }
+-  .data1   : { *(.data1) }
+-  .ctors         :
+-  {
+-    *(.ctors)
+-  }
+-  .dtors         :
+-  {
+-    *(.dtors)
+-  }
+-  .plt      : { *(.plt)	}
+-  .got           : { *(.got.plt) *(.got) }
+-  .dynamic       : { *(.dynamic) }
+-  /* We want the small data sections together, so single-instruction offsets
+-     can access them all, and initialized data all before uninitialized, so
+-     we can shorten the on-disk segment size.  */
+-  .sdata     : { *(.sdata) }
+-  _edata  =  .;
+-  PROVIDE (edata = .);
+-  __bss_start = .;
+-  .sbss      : { *(.sbss) *(.scommon) }
+-  .bss       :
+-  {
+-   *(.dynbss)
+-   *(.bss)
+-   *(COMMON)
+-  }
+-  _end = . ;
+-  PROVIDE (end = .);
+-  /* Stabs debugging sections.  */
+-  .stab 0 : { *(.stab) }
+-  .stabstr 0 : { *(.stabstr) }
+-  .stab.excl 0 : { *(.stab.excl) }
+-  .stab.exclstr 0 : { *(.stab.exclstr) }
+-  .stab.index 0 : { *(.stab.index) }
+-  .stab.indexstr 0 : { *(.stab.indexstr) }
+-  .comment 0 : { *(.comment) }
+-  /* DWARF debug sections.
+-     Symbols in the DWARF debugging sections are relative to the beginning
+-     of the section so we begin them at 0.  */
+-  /* DWARF 1 */
+-  .debug          0 : { *(.debug) }
+-  .line           0 : { *(.line) }
+-  /* GNU DWARF 1 extensions */
+-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+-  .debug_sfnames  0 : { *(.debug_sfnames) }
+-  /* DWARF 1.1 and DWARF 2 */
+-  .debug_aranges  0 : { *(.debug_aranges) }
+-  .debug_pubnames 0 : { *(.debug_pubnames) }
+-  /* DWARF 2 */
+-  .debug_info     0 : { *(.debug_info) }
+-  .debug_abbrev   0 : { *(.debug_abbrev) }
+-  .debug_line     0 : { *(.debug_line) }
+-  .debug_frame    0 : { *(.debug_frame) }
+-  .debug_str      0 : { *(.debug_str) }
+-  .debug_loc      0 : { *(.debug_loc) }
+-  .debug_macinfo  0 : { *(.debug_macinfo) }
+-  /* SGI/MIPS DWARF 2 extensions */
+-  .debug_weaknames 0 : { *(.debug_weaknames) }
+-  .debug_funcnames 0 : { *(.debug_funcnames) }
+-  .debug_typenames 0 : { *(.debug_typenames) }
+-  .debug_varnames  0 : { *(.debug_varnames) }
+-  /* These must appear regardless of  .  */
+-}
+diff --git a/ldscripts/arm.ld b/ldscripts/arm.ld
+deleted file mode 100644
+index 7f13da9..0000000
+--- a/ldscripts/arm.ld
++++ /dev/null
+@@ -1,153 +0,0 @@
+-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm",
+-	      "elf32-littlearm")
+-OUTPUT_ARCH(arm)
+-ENTRY(_start)
+-SECTIONS
+-{
+-  /* Read-only sections, merged into text segment: */
+-  . = 0x60000000 + SIZEOF_HEADERS;
+-  .interp     : { *(.interp) 	}
+-  .hash          : { *(.hash)		}
+-  .dynsym        : { *(.dynsym)		}
+-  .dynstr        : { *(.dynstr)		}
+-  .gnu.version   : { *(.gnu.version)	}
+-  .gnu.version_d   : { *(.gnu.version_d)	}
+-  .gnu.version_r   : { *(.gnu.version_r)	}
+-  .rel.text      :
+-    { *(.rel.text) *(.rel.gnu.linkonce.t*) }
+-  .rela.text     :
+-    { *(.rela.text) *(.rela.gnu.linkonce.t*) }
+-  .rel.data      :
+-    { *(.rel.data) *(.rel.gnu.linkonce.d*) }
+-  .rela.data     :
+-    { *(.rela.data) *(.rela.gnu.linkonce.d*) }
+-  .rel.rodata    :
+-    { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
+-  .rela.rodata   :
+-    { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
+-  .rel.got       : { *(.rel.got)		}
+-  .rela.got      : { *(.rela.got)		}
+-  .rel.ctors     : { *(.rel.ctors)	}
+-  .rela.ctors    : { *(.rela.ctors)	}
+-  .rel.dtors     : { *(.rel.dtors)	}
+-  .rela.dtors    : { *(.rela.dtors)	}
+-  .rel.init      : { *(.rel.init)	}
+-  .rela.init     : { *(.rela.init)	}
+-  .rel.fini      : { *(.rel.fini)	}
+-  .rela.fini     : { *(.rela.fini)	}
+-  .rel.bss       : { *(.rel.bss)		}
+-  .rela.bss      : { *(.rela.bss)		}
+-  .rel.plt       : { *(.rel.plt)		}
+-  .rela.plt      : { *(.rela.plt)		}
+-  .init          : { *(.init)	} =0x47ff041f
+-  .text      :
+-  {
+-    *(.text)
+-    /* .gnu.warning sections are handled specially by elf32.em.  */
+-    *(.gnu.warning)
+-    *(.gnu.linkonce.t*)
+-  } =0x47ff041f
+-  _etext = .;
+-  PROVIDE (etext = .);
+-  .fini      : { *(.fini)    } =0x47ff041f
+-  .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
+-  .rodata1   : { *(.rodata1) }
+-  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
+-   __exidx_start = .;
+-  .ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
+-   __exidx_end = .;
+-  .reginfo : { *(.reginfo) }
+-  /* Adjust the address for the data segment.  We want to adjust up to
+-     the same address within the page on the next page up.  */
+-  . = ALIGN(0x100000) + (. & (0x100000 - 1));
+-  .data    :
+-  {
+-    *(.gen_code)
+-    *(.data)
+-    *(.gnu.linkonce.d*)
+-    CONSTRUCTORS
+-  }
+-  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
+-  .data1   : { *(.data1) }
+-  .preinit_array     :
+-  {
+-    PROVIDE (__preinit_array_start = .);
+-    KEEP (*(.preinit_array))
+-    PROVIDE (__preinit_array_end = .);
+-  }
+-  .init_array     :
+-  {
+-     PROVIDE (__init_array_start = .);
+-     KEEP (*(SORT(.init_array.*)))
+-     KEEP (*(.init_array))
+-     PROVIDE (__init_array_end = .);
+-  }
+-  .fini_array     :
+-  {
+-    PROVIDE (__fini_array_start = .);
+-    KEEP (*(.fini_array))
+-    KEEP (*(SORT(.fini_array.*)))
+-    PROVIDE (__fini_array_end = .);
+-  }
+-  .ctors         :
+-  {
+-    *(.ctors)
+-  }
+-  .dtors         :
+-  {
+-    *(.dtors)
+-  }
+-  .plt      : { *(.plt)	}
+-  .got           : { *(.got.plt) *(.got) }
+-  .dynamic       : { *(.dynamic) }
+-  /* We want the small data sections together, so single-instruction offsets
+-     can access them all, and initialized data all before uninitialized, so
+-     we can shorten the on-disk segment size.  */
+-  .sdata     : { *(.sdata) }
+-  _edata  =  .;
+-  PROVIDE (edata = .);
+-  __bss_start = .;
+-  .sbss      : { *(.sbss) *(.scommon) }
+-  .bss       :
+-  {
+-   *(.dynbss)
+-   *(.bss)
+-   *(COMMON)
+-  }
+-  _end = . ;
+-  PROVIDE (end = .);
+-  /* Stabs debugging sections.  */
+-  .stab 0 : { *(.stab) }
+-  .stabstr 0 : { *(.stabstr) }
+-  .stab.excl 0 : { *(.stab.excl) }
+-  .stab.exclstr 0 : { *(.stab.exclstr) }
+-  .stab.index 0 : { *(.stab.index) }
+-  .stab.indexstr 0 : { *(.stab.indexstr) }
+-  .comment 0 : { *(.comment) }
+-  /* DWARF debug sections.
+-     Symbols in the DWARF debugging sections are relative to the beginning
+-     of the section so we begin them at 0.  */
+-  /* DWARF 1 */
+-  .debug          0 : { *(.debug) }
+-  .line           0 : { *(.line) }
+-  /* GNU DWARF 1 extensions */
+-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+-  .debug_sfnames  0 : { *(.debug_sfnames) }
+-  /* DWARF 1.1 and DWARF 2 */
+-  .debug_aranges  0 : { *(.debug_aranges) }
+-  .debug_pubnames 0 : { *(.debug_pubnames) }
+-  /* DWARF 2 */
+-  .debug_info     0 : { *(.debug_info) }
+-  .debug_abbrev   0 : { *(.debug_abbrev) }
+-  .debug_line     0 : { *(.debug_line) }
+-  .debug_frame    0 : { *(.debug_frame) }
+-  .debug_str      0 : { *(.debug_str) }
+-  .debug_loc      0 : { *(.debug_loc) }
+-  .debug_macinfo  0 : { *(.debug_macinfo) }
+-  /* SGI/MIPS DWARF 2 extensions */
+-  .debug_weaknames 0 : { *(.debug_weaknames) }
+-  .debug_funcnames 0 : { *(.debug_funcnames) }
+-  .debug_typenames 0 : { *(.debug_typenames) }
+-  .debug_varnames  0 : { *(.debug_varnames) }
+-  /* These must appear regardless of  .  */
+-}
+diff --git a/ldscripts/hppa.ld b/ldscripts/hppa.ld
+deleted file mode 100644
+index 3555b3e..0000000
+--- a/ldscripts/hppa.ld
++++ /dev/null
+@@ -1,211 +0,0 @@
+-/* Default linker script, for normal executables */
+-OUTPUT_FORMAT("elf32-hppa-linux", "elf32-hppa-linux",
+-	      "elf32-hppa-linux")
+-OUTPUT_ARCH(hppa:hppa1.1)
+-ENTRY(_start)
+-SECTIONS
+-{
+-  /* Read-only sections, merged into text segment: */
+-  PROVIDE (__executable_start = 0x60000000); . = 0x60000000 + SIZEOF_HEADERS;
+-  .interp         : { *(.interp) }
+-  .hash           : { *(.hash) }
+-  .dynsym         : { *(.dynsym) }
+-  .dynstr         : { *(.dynstr) }
+-  .gnu.version    : { *(.gnu.version) }
+-  .gnu.version_d  : { *(.gnu.version_d) }
+-  .gnu.version_r  : { *(.gnu.version_r) }
+-  .rel.init       : { *(.rel.init) }
+-  .rela.init      : { *(.rela.init) }
+-  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
+-  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
+-  .rel.fini       : { *(.rel.fini) }
+-  .rela.fini      : { *(.rela.fini) }
+-  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
+-  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
+-  .rel.data.rel.ro   : { *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*) }
+-  .rela.data.rel.ro   : { *(.rela.data.rel.ro* .rela.gnu.linkonce.d.rel.ro.*) }
+-  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
+-  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
+-  .rel.tdata	  : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
+-  .rela.tdata	  : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
+-  .rel.tbss	  : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
+-  .rela.tbss	  : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
+-  .rel.ctors      : { *(.rel.ctors) }
+-  .rela.ctors     : { *(.rela.ctors) }
+-  .rel.dtors      : { *(.rel.dtors) }
+-  .rela.dtors     : { *(.rela.dtors) }
+-  .rel.got        : { *(.rel.got) }
+-  .rela.got       : { *(.rela.got) }
+-  .rel.sdata      : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
+-  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
+-  .rel.sbss       : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
+-  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) }
+-  .rel.sdata2     : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
+-  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
+-  .rel.sbss2      : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
+-  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
+-  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
+-  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
+-  .rel.plt        : { *(.rel.plt) }
+-  .rela.plt       : { *(.rela.plt) }
+-  .init           :
+-  {
+-    KEEP (*(.init))
+-  } =0x08000240
+-  .text           :
+-  {
+-    *(.text .stub .text.* .gnu.linkonce.t.*)
+-    KEEP (*(.text.*personality*))
+-    /* .gnu.warning sections are handled specially by elf32.em.  */
+-    *(.gnu.warning)
+-  } =0x08000240
+-  .fini           :
+-  {
+-    KEEP (*(.fini))
+-  } =0x08000240
+-  PROVIDE (__etext = .);
+-  PROVIDE (_etext = .);
+-  PROVIDE (etext = .);
+-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+-  .rodata1        : { *(.rodata1) }
+-  .sdata2         :
+-  {
+-    *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
+-  }
+-  .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
+-  .PARISC.unwind   : { *(.PARISC.unwind) }
+-  .eh_frame_hdr : { *(.eh_frame_hdr) }
+-  /* Adjust the address for the data segment.  We want to adjust up to
+-     the same address within the page on the next page up.  */
+-  . = ALIGN(0x10000) + (. & (0x10000 - 1));
+-  /* Exception handling  */
+-  .eh_frame       : { KEEP (*(.eh_frame)) }
+-  .gcc_except_table   : { *(.gcc_except_table .gcc_except_table.*) }
+-  /* Thread Local Storage sections  */
+-  .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
+-  .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
+-  .preinit_array     :
+-  {
+-    PROVIDE (__preinit_array_start = .);
+-    KEEP (*(.preinit_array))
+-    PROVIDE (__preinit_array_end = .);
+-  }
+-  .init_array     :
+-  {
+-     PROVIDE (__init_array_start = .);
+-     KEEP (*(SORT(.init_array.*)))
+-     KEEP (*(.init_array))
+-     PROVIDE (__init_array_end = .);
+-  }
+-  .fini_array     :
+-  {
+-    PROVIDE (__fini_array_start = .);
+-    KEEP (*(.fini_array))
+-    KEEP (*(SORT(.fini_array.*)))
+-    PROVIDE (__fini_array_end = .);
+-  }
+-  .ctors          :
+-  {
+-    /* gcc uses crtbegin.o to find the start of
+-       the constructors, so we make sure it is
+-       first.  Because this is a wildcard, it
+-       doesn't matter if the user does not
+-       actually link against crtbegin.o; the
+-       linker won't look for a file to match a
+-       wildcard.  The wildcard also means that it
+-       doesn't matter which directory crtbegin.o
+-       is in.  */
+-    KEEP (*crtbegin*.o(.ctors))
+-    /* We don't want to include the .ctor section from
+-       the crtend.o file until after the sorted ctors.
+-       The .ctor section from the crtend file contains the
+-       end of ctors marker and it must be last */
+-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
+-    KEEP (*(SORT(.ctors.*)))
+-    KEEP (*(.ctors))
+-  }
+-  .dtors          :
+-  {
+-    KEEP (*crtbegin*.o(.dtors))
+-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
+-    KEEP (*(SORT(.dtors.*)))
+-    KEEP (*(.dtors))
+-  }
+-  .jcr            : { KEEP (*(.jcr)) }
+-  .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }
+-  .dynamic        : { *(.dynamic) }
+-  .data           :
+-  {
+-    PROVIDE ($global$ = .);
+-    *(.data .data.* .gnu.linkonce.d.*)
+-    KEEP (*(.gnu.linkonce.d.*personality*))
+-    SORT(CONSTRUCTORS)
+-  }
+-  .data1          : { *(.data1) }
+-  .plt            : { *(.plt) }
+-  .got            : { *(.got.plt) *(.got) }
+-  /* We want the small data sections together, so single-instruction offsets
+-     can access them all, and initialized data all before uninitialized, so
+-     we can shorten the on-disk segment size.  */
+-  .sdata          :
+-  {
+-    *(.sdata .sdata.* .gnu.linkonce.s.*)
+-  }
+-  _edata = .; PROVIDE (edata = .);
+-  __bss_start = .;
+-  .sbss           :
+-  {
+-    *(.dynsbss)
+-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
+-    *(.scommon)
+-  }
+-  .bss            :
+-  {
+-   *(.dynbss)
+-   *(.bss .bss.* .gnu.linkonce.b.*)
+-   *(COMMON)
+-   /* Align here to ensure that the .bss section occupies space up to
+-      _end.  Align after .bss to ensure correct alignment even if the
+-      .bss section disappears because there are no input sections.
+-      FIXME: Why do we need it? When there is no .bss section, we don't
+-      pad the .data section.  */
+-   . = ALIGN(. != 0 ? 32 / 8 : 1);
+-  }
+-  . = ALIGN(32 / 8);
+-  . = ALIGN(32 / 8);
+-  _end = .; PROVIDE (end = .);
+-  /* Stabs debugging sections.  */
+-  .stab          0 : { *(.stab) }
+-  .stabstr       0 : { *(.stabstr) }
+-  .stab.excl     0 : { *(.stab.excl) }
+-  .stab.exclstr  0 : { *(.stab.exclstr) }
+-  .stab.index    0 : { *(.stab.index) }
+-  .stab.indexstr 0 : { *(.stab.indexstr) }
+-  .comment       0 : { *(.comment) }
+-  /* DWARF debug sections.
+-     Symbols in the DWARF debugging sections are relative to the beginning
+-     of the section so we begin them at 0.  */
+-  /* DWARF 1 */
+-  .debug          0 : { *(.debug) }
+-  .line           0 : { *(.line) }
+-  /* GNU DWARF 1 extensions */
+-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+-  .debug_sfnames  0 : { *(.debug_sfnames) }
+-  /* DWARF 1.1 and DWARF 2 */
+-  .debug_aranges  0 : { *(.debug_aranges) }
+-  .debug_pubnames 0 : { *(.debug_pubnames) }
+-  /* DWARF 2 */
+-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
+-  .debug_abbrev   0 : { *(.debug_abbrev) }
+-  .debug_line     0 : { *(.debug_line) }
+-  .debug_frame    0 : { *(.debug_frame) }
+-  .debug_str      0 : { *(.debug_str) }
+-  .debug_loc      0 : { *(.debug_loc) }
+-  .debug_macinfo  0 : { *(.debug_macinfo) }
+-  /* SGI/MIPS DWARF 2 extensions */
+-  .debug_weaknames 0 : { *(.debug_weaknames) }
+-  .debug_funcnames 0 : { *(.debug_funcnames) }
+-  .debug_typenames 0 : { *(.debug_typenames) }
+-  .debug_varnames  0 : { *(.debug_varnames) }
+-  /DISCARD/ : { *(.note.GNU-stack) }
+-}
+diff --git a/ldscripts/i386.ld b/ldscripts/i386.ld
+deleted file mode 100644
+index cc3f160..0000000
+--- a/ldscripts/i386.ld
++++ /dev/null
+@@ -1,153 +0,0 @@
+-/* ld script to make i386 Linux kernel
+- * Written by Martin Mares <mj at atrey.karlin.mff.cuni.cz>;
+- */
+-OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+-OUTPUT_ARCH(i386)
+-ENTRY(_start)
+-SECTIONS
+-{
+-  /* Read-only sections, merged into text segment: */
+-  . = 0x60000000 + SIZEOF_HEADERS;
+-  .interp     : { *(.interp) 	}
+-  .hash          : { *(.hash)		}
+-  .dynsym        : { *(.dynsym)		}
+-  .dynstr        : { *(.dynstr)		}
+-  .gnu.version   : { *(.gnu.version)	}
+-  .gnu.version_d   : { *(.gnu.version_d)	}
+-  .gnu.version_r   : { *(.gnu.version_r)	}
+-  .rel.text      :
+-    { *(.rel.text) *(.rel.gnu.linkonce.t*) }
+-  .rela.text     :
+-    { *(.rela.text) *(.rela.gnu.linkonce.t*) }
+-  .rel.data      :
+-    { *(.rel.data) *(.rel.gnu.linkonce.d*) }
+-  .rela.data     :
+-    { *(.rela.data) *(.rela.gnu.linkonce.d*) }
+-  .rel.rodata    :
+-    { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
+-  .rela.rodata   :
+-    { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
+-  .rel.got       : { *(.rel.got)		}
+-  .rela.got      : { *(.rela.got)		}
+-  .rel.ctors     : { *(.rel.ctors)	}
+-  .rela.ctors    : { *(.rela.ctors)	}
+-  .rel.dtors     : { *(.rel.dtors)	}
+-  .rela.dtors    : { *(.rela.dtors)	}
+-  .rel.init      : { *(.rel.init)	}
+-  .rela.init     : { *(.rela.init)	}
+-  .rel.fini      : { *(.rel.fini)	}
+-  .rela.fini     : { *(.rela.fini)	}
+-  .rel.bss       : { *(.rel.bss)		}
+-  .rela.bss      : { *(.rela.bss)		}
+-  .rel.plt      :
+-  {
+-    *(.rel.plt)
+-    PROVIDE (__rel_iplt_start = .);
+-    *(.rel.iplt)
+-    PROVIDE (__rel_iplt_end = .);
+-  }
+-  .rela.plt       :
+-  {
+-    *(.rela.plt)
+-    PROVIDE (__rela_iplt_start = .);
+-    *(.rela.iplt)
+-    PROVIDE (__rela_iplt_end = .);
+-  }
+-  .init          : { *(.init)	} =0x47ff041f
+-  .text      :
+-  {
+-    *(.text)
+-    /* .gnu.warning sections are handled specially by elf32.em.  */
+-    *(.gnu.warning)
+-    *(.gnu.linkonce.t*)
+-  } =0x47ff041f
+-  _etext = .;
+-  PROVIDE (etext = .);
+-  .fini      : { *(.fini)    } =0x47ff041f
+-  . = ALIGN(32 / 8);
+-  PROVIDE (__preinit_array_start = .);
+-  .preinit_array     : { *(.preinit_array) }
+-  PROVIDE (__preinit_array_end = .);
+-  PROVIDE (__init_array_start = .);
+-  .init_array     : { *(.init_array) }
+-  PROVIDE (__init_array_end = .);
+-  PROVIDE (__fini_array_start = .);
+-  .fini_array     : { *(.fini_array) }
+-  PROVIDE (__fini_array_end = .);
+-  .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
+-  .rodata1   : { *(.rodata1) }
+-  .reginfo : { *(.reginfo) }
+-  /* Adjust the address for the data segment.  We want to adjust up to
+-     the same address within the page on the next page up.  */
+-  . = ALIGN(0x100000) + (. & (0x100000 - 1));
+-  .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
+-  .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
+-  .data    :
+-  {
+-    *(.data)
+-    *(.gnu.linkonce.d*)
+-    CONSTRUCTORS
+-  }
+-  .data1   : { *(.data1) }
+-  .ctors         :
+-  {
+-    *(.ctors)
+-  }
+-  .dtors         :
+-  {
+-    *(.dtors)
+-  }
+-  .plt      : { *(.plt)	}
+-  .got           : { *(.got.plt) *(.got) }
+-  .dynamic       : { *(.dynamic) }
+-  /* We want the small data sections together, so single-instruction offsets
+-     can access them all, and initialized data all before uninitialized, so
+-     we can shorten the on-disk segment size.  */
+-  .sdata     : { *(.sdata) }
+-  _edata  =  .;
+-  PROVIDE (edata = .);
+-  __bss_start = .;
+-  .sbss      : { *(.sbss) *(.scommon) }
+-  .bss       :
+-  {
+-   *(.dynbss)
+-   *(.bss)
+-   *(COMMON)
+-  }
+-  _end = . ;
+-  PROVIDE (end = .);
+-  /* Stabs debugging sections.  */
+-  .stab 0 : { *(.stab) }
+-  .stabstr 0 : { *(.stabstr) }
+-  .stab.excl 0 : { *(.stab.excl) }
+-  .stab.exclstr 0 : { *(.stab.exclstr) }
+-  .stab.index 0 : { *(.stab.index) }
+-  .stab.indexstr 0 : { *(.stab.indexstr) }
+-  .comment 0 : { *(.comment) }
+-  /* DWARF debug sections.
+-     Symbols in the DWARF debugging sections are relative to the beginning
+-     of the section so we begin them at 0.  */
+-  /* DWARF 1 */
+-  .debug          0 : { *(.debug) }
+-  .line           0 : { *(.line) }
+-  /* GNU DWARF 1 extensions */
+-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
+-  .debug_sfnames  0 : { *(.debug_sfnames) }
+-  /* DWARF 1.1 and DWARF 2 */
+-  .debug_aranges  0 : { *(.debug_aranges) }
+-  .debug_pubnames 0 : { *(.debug_pubnames) }
+-  /* DWARF 2 */
+-  .debug_info     0 : { *(.debug_info) }
+-  .debug_abbrev   0 : { *(.debug_abbrev) }
+-  .debug_line     0 : { *(.debug_line) }
+-  .debug_frame    0 : { *(.debug_frame) }
+-  .debug_str      0 : { *(.debug_str) }
+-  .debug_loc      0 : { *(.debug_loc) }
+-  .debug_macinfo  0 : { *(.debug_macinfo) }
+-  /* SGI/MIPS DWARF 2 extensions */
+-  .debug_weaknames 0 : { *(.debug_weaknames) }
+-  .debug_funcnames 0 : { *(.debug_funcnames) }
+-  .debug_typenames 0 : { *(.debug_typenames) }
+-  .debug_varnames  0 : { *(.debug_varnames) }
+-  /* These must appear regardless of  .  */
+-}
+diff --git a/ldscripts/ia64.ld b/ldscripts/ia64.ld
+deleted file mode 100644
+index 0c37796..0000000
+--- a/ldscripts/ia64.ld
++++ /dev/null
+@@ -1,209 +0,0 @@
+-/* Default linker script, for normal executables */
+-OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little",
+-	      "elf64-ia64-little")
+-OUTPUT_ARCH(ia64)
+-ENTRY(_start)
+-/* __DYNAMIC = 0;    */
+-SECTIONS
+-{
+-  /* Read-only sections, merged into text segment: */
+-  PROVIDE (__executable_start = 0x60000000); . = 0x60000000 + SIZEOF_HEADERS;
+-  .interp         : { *(.interp) }
+-  .hash           : { *(.hash) }
+-  .dynsym         : { *(.dynsym) }
+-  .dynstr         : { *(.dynstr) }
+-  .gnu.version    : { *(.gnu.version) }
+-  .gnu.version_d  : { *(.gnu.version_d) }
+-  .gnu.version_r  : { *(.gnu.version_r) }
+-  .rel.init       : { *(.rel.init) }
+-  .rela.init      : { *(.rela.init) }
+-  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
+-  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
+-  .rel.fini       : { *(.rel.fini) }
+-  .rela.fini      : { *(.rela.fini) }
+-  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
+-  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
+-  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
+-  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
+-  .rel.tdata	  : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
+-  .rela.tdata	  : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
+-  .rel.tbss	  : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
+-  .rela.tbss	  : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
+-  .rel.ctors      : { *(.rel.ctors) }
+-  .rela.ctors     : { *(.rela.ctors) }
+-  .rel.dtors      : { *(.rel.dtors) }
+-  .rela.dtors     : { *(.rela.dtors) }
+-  .rel.got        : { *(.rel.got) }
+-  .rela.got       : { *(.rela.got) }
+-  .rel.sdata      : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
+-  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
+-  .rel.sbss       : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
+-  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) }
+-  .rel.sdata2     : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
+-  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
+-  .rel.sbss2      : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
+-  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
+-  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
+-  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
+-  .rel.plt        : { *(.rel.plt) }
+-  .rela.plt       : { *(.rela.plt) }
+-  .rela.IA_64.pltoff   : { *(.rela.IA_64.pltoff) }
+-  .init           :
+-  {
+-    KEEP (*(.init))
+-  } =0x00300000010070000002000001000400
+-  .plt            : { *(.plt) }
+-  .text           :
+-  {
+-    *(.text .stub .text.* .gnu.linkonce.t.*)
+-    /* .gnu.warning sections are handled specially by elf32.em.  */
+-    *(.gnu.warning)
+-  } =0x00300000010070000002000001000400
+-  .fini           :
+-  {
+-    KEEP (*(.fini))
+-  } =0x00300000010070000002000001000400
+-  PROVIDE (__etext = .);
+-  PROVIDE (_etext = .);
+-  PROVIDE (etext = .);
+-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+-  .rodata1        : { *(.rodata1) }
+-  .sdata2         : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) }
+-  .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
+-  .opd            : { *(.opd) }
+-  .IA_64.unwind_info   : { *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) }
+-  .IA_64.unwind   : { *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) }
+-  .eh_frame_hdr : { *(.eh_frame_hdr) }
+-  /* Adjust the address for the data segment.  We want to adjust up to
+-     the same address within the page on the next page up.  */
+-  . = ALIGN(0x10000) + (. & (0x10000 - 1));
+-  /* Ensure the __preinit_array_start label is properly aligned.  We
+-     could instead move the label definition inside the section, but
+-     the linker would then create the section even if it turns out to
+-     be empty, which isn't pretty.  */
+-  . = ALIGN(64 / 8);
+-  PROVIDE (__preinit_array_start = .);
+-  .preinit_array     : { *(.preinit_array) }
+-  PROVIDE (__preinit_array_end = .);
+-  PROVIDE (__init_array_start = .);
+-  .init_array     : { *(.init_array) }
+-  PROVIDE (__init_array_end = .);
+-  PROVIDE (__fini_array_start = .);
+-  .fini_array     : { *(.fini_array) }
+-  PROVIDE (__fini_array_end = .);
+-  .data           :
+-  {
+-    *(.data .data.* .gnu.linkonce.d.*)
+-    SORT(CONSTRUCTORS)
+-  }
+-  .data1          : { *(.data1) }
+-  .tdata	  : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
+-  .tbss		  : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
+-  .eh_frame       : { KEEP (*(.eh_frame)) }
+-  .gcc_except_table   : { *(.gcc_except_table) }
+-  .dynamic        : { *(.dynamic) }
+-  .ctors          :
+-  {
+-    /* gcc uses crtbegin.o to find the start of
+-       the constructors, so we make sure it is
+-       first.  Because this is a wildcard, it
+-       doesn't matter if the user does not
+-       actually link against crtbegin.o; the
+-       linker won't look for a file to match a
+-       wildcard.  The wildcard also means that it
+-       doesn't matter which directory crtbegin.o
+-       is in.  */
+-    KEEP (*crtbegin*.o(.ctors))
+-    /* We don't want to include the .ctor section from
+-       from the crtend.o file until after the sorted ctors.
+-       The .ctor section from the crtend file contains the
+-       end of ctors marker and it must be last */
+-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
+-    KEEP (*(SORT(.ctors.*)))
+-    KEEP (*(.ctors))
+-  }
+-  .dtors          :
+-  {
+-    KEEP (*crtbegin*.o(.dtors))
+-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
+-    KEEP (*(SORT(.dtors.*)))
+-    KEEP (*(.dtors))
+-  }
+-  .jcr            : { KEEP (*(.jcr)) }
+-  /* Ensure __gp is outside the range of any normal data.  We need to
+-     do this to avoid the linker optimizing the code in op.o and getting
+-     it out of sync with the relocs that we read when processing that
+-     file.  A better solution might be to ensure that the dynamically
+-     generated code and static qemu code share a single gp-value.  */
+-  __gp = . + 0x200000;
+-  .got            : { *(.got.plt) *(.got) }
+-  .IA_64.pltoff   : { *(.IA_64.pltoff) }
+-  /* We want the small data sections together, so single-instruction offsets
+-     can access them all, and initialized data all before uninitialized, so

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-ports-all mailing list