summaryrefslogtreecommitdiff
path: root/emulators/qemu-devel/files/patch-bsd-user-ld
diff options
context:
space:
mode:
authorJuergen Lock <nox@FreeBSD.org>2010-01-17 16:20:56 +0000
committerJuergen Lock <nox@FreeBSD.org>2010-01-17 16:20:56 +0000
commitd4e517700042730d5420402bec25ccfa88fed6c8 (patch)
treefa8e73dd336e8f03ab2c5b0677215cf74cc8885a /emulators/qemu-devel/files/patch-bsd-user-ld
parentAdd cl-trivial-features, which ensures consistent *FEATURES* across multiple (diff)
Finally bring qemu 0.12.1 into ports as the new emulators/qemu-devel,
release announcement is here: http://lists.gnu.org/archive/html/qemu-devel/2009-12/msg02151.html Quoting from pkg-message: - kqemu is no longer supported in qemu upstream after the 0.11 branch was created, which means also not in this version. (Linux has moved on to kvm now for qemu(-like) virtualization needs, so if you want qemu to go faster and don't want to switch to virtualbox or stick to the older emulators/qemu port which is at 0.11.1 atm and as such still supports kqemu you should help getting the FreeBSD kvm port updated and completed: http://wiki.freebsd.org/FabioChecconi/PortingLinuxKVMToFreeBSD )
Notes
Notes: svn path=/head/; revision=248018
Diffstat (limited to 'emulators/qemu-devel/files/patch-bsd-user-ld')
-rw-r--r--emulators/qemu-devel/files/patch-bsd-user-ld269
1 files changed, 269 insertions, 0 deletions
diff --git a/emulators/qemu-devel/files/patch-bsd-user-ld b/emulators/qemu-devel/files/patch-bsd-user-ld
new file mode 100644
index 000000000000..0528d68f8806
--- /dev/null
+++ b/emulators/qemu-devel/files/patch-bsd-user-ld
@@ -0,0 +1,269 @@
+--- a/x86_64.ld
++++ b/x86_64.ld
+@@ -59,8 +59,6 @@
+ .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+ .rodata1 : { *(.rodata1) }
+ .eh_frame_hdr : { *(.eh_frame_hdr) }
+- .eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) }
+- .gcc_except_table : ONLY_IF_RO { *(.gcc_except_table) }
+ /* 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 - .) & (0x100000 - 1)); . = DATA_SEGMENT_ALIGN (0x100000, 0x1000);
+@@ -86,8 +84,8 @@
+ .data1 : { *(.data1) }
+ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
+ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
+- .eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) }
+- .gcc_except_table : ONLY_IF_RW { *(.gcc_except_table) }
++ .eh_frame : { KEEP (*(.eh_frame)) }
++ .gcc_except_table : { *(.gcc_except_table) }
+ .dynamic : { *(.dynamic) }
+ .ctors :
+ {
+--- a/i386.ld
++++ b/i386.ld
+@@ -1,57 +1,76 @@
+-/* ld script to make i386 Linux kernel
+- * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>;
+- */
+-OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
++OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd",
++ "elf32-i386-freebsd")
+ 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) }
+- .rela.plt : { *(.rela.plt) }
+- .init : { *(.init) } =0x47ff041f
+- .text :
++ 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.dyn :
++ {
++ *(.rel.init)
++ *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
++ *(.rel.fini)
++ *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
++ *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
++ *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*)
++ *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*)
++ *(.rel.ctors)
++ *(.rel.dtors)
++ *(.rel.got)
++ *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
++ }
++ .rela.dyn :
++ {
++ *(.rela.init)
++ *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
++ *(.rela.fini)
++ *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
++ *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
++ *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
++ *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
++ *(.rela.ctors)
++ *(.rela.dtors)
++ *(.rela.got)
++ *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
++ }
++ .rel.plt : { *(.rel.plt) }
++ .rela.plt : { *(.rela.plt) }
++ .init :
+ {
+- *(.text)
++ KEEP (*(.init))
++ } =0x90909090
++ .plt : { *(.plt) }
++ .text :
++ {
++ *(.text .stub .text.* .gnu.linkonce.t.*)
+ /* .gnu.warning sections are handled specially by elf32.em. */
+ *(.gnu.warning)
+- *(.gnu.linkonce.t*)
+- } =0x47ff041f
+- _etext = .;
++ } =0x90909090
++ .fini :
++ {
++ KEEP (*(.fini))
++ } =0x90909090
++ PROVIDE (__etext = .);
++ PROVIDE (_etext = .);
+ PROVIDE (etext = .);
+- .fini : { *(.fini) } =0x47ff041f
++ .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
++ .rodata1 : { *(.rodata1) }
++ .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 (0x1000) - ((0x1000 - .) & (0x1000 - 1)); . = DATA_SEGMENT_ALIGN (0x1000, 0x1000);
++ /* 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(32 / 8);
+ PROVIDE (__preinit_array_start = .);
+ .preinit_array : { *(.preinit_array) }
+@@ -62,56 +81,71 @@
+ 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 :
+ {
+- *(.data)
+- *(.gnu.linkonce.d*)
+- CONSTRUCTORS
++ *(.data .data.* .gnu.linkonce.d.*)
++ SORT(CONSTRUCTORS)
+ }
+- .data1 : { *(.data1) }
+- .ctors :
++ .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 :
+ {
+- *(.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 :
++ .dtors :
+ {
+- *(.dtors)
++ KEEP (*crtbegin*.o(.dtors))
++ KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
++ KEEP (*(SORT(.dtors.*)))
++ KEEP (*(.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 = .;
++ .jcr : { KEEP (*(.jcr)) }
++ .got : { *(.got.plt) *(.got) }
++ _edata = .;
+ PROVIDE (edata = .);
+ __bss_start = .;
+- .sbss : { *(.sbss) *(.scommon) }
+- .bss :
++ .bss :
+ {
+ *(.dynbss)
+- *(.bss)
++ *(.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. */
++ . = ALIGN(32 / 8);
+ }
+- _end = . ;
++ . = ALIGN(32 / 8);
++ _end = .;
+ PROVIDE (end = .);
++ . = DATA_SEGMENT_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 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) }
++ .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. */
+@@ -125,7 +159,7 @@
+ .debug_aranges 0 : { *(.debug_aranges) }
+ .debug_pubnames 0 : { *(.debug_pubnames) }
+ /* DWARF 2 */
+- .debug_info 0 : { *(.debug_info) }
++ .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) }
+ .debug_abbrev 0 : { *(.debug_abbrev) }
+ .debug_line 0 : { *(.debug_line) }
+ .debug_frame 0 : { *(.debug_frame) }
+@@ -137,5 +171,5 @@
+ .debug_funcnames 0 : { *(.debug_funcnames) }
+ .debug_typenames 0 : { *(.debug_typenames) }
+ .debug_varnames 0 : { *(.debug_varnames) }
+- /* These must appear regardless of . */
++ /DISCARD/ : { *(.note.GNU-stack) }
+ }