[emacs21 commit] a215a6bcd6b41611e95335a08d0201163dd0040b

Jérôme Marant jerome at marant.org
Wed Oct 4 14:01:28 UTC 2006


commit a215a6bcd6b41611e95335a08d0201163dd0040b
Author: Jérôme Marant <jerome at marant.org>
Date:   Wed Oct 4 16:01:28 2006 +0200

    Really add arch-mips patch

diff --git a/patches/arch-mips.diff b/patches/arch-mips.diff
new file mode 100644
index 0000000..1bbf235
--- /dev/null
+++ b/patches/arch-mips.diff
@@ -0,0 +1,267 @@
+* Support for the mips architecture has been added.
+  Patch: arch-mips.diff
+  Provided-by: Max Kellermann <max at duempel.org>
+  Added-by: Marc 'HE' Brockschmidt <he at debian.org>
+  Status: appears to be incorporated upstream
+
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ emacs21-21.4a/mips.ld	2006-09-24 16:17:03.000000000 +0100
+@@ -0,0 +1,244 @@
++/* Work around a design flaw in emacs: emacs assumes the data section
++begins on address 0x10000000, which was true up to binutils version
++2.16, but the binutils 2.17 default linker script does not use this
++alignment anymore.
++
++This is actually a patched version of the file
++/usr/lib/ldscripts/elf32btsmip.x from binutils 2.17-2.  It makes the
++data section begin at 0x10000000.
++
++- 2006/09/17 Max Kellermann <max at duempel.org> */
++
++/* Default linker script, for normal executables */
++OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips",
++	      "elf32-tradlittlemips")
++OUTPUT_ARCH(mips)
++ENTRY(__start)
++SEARCH_DIR("/usr/mips-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
++SECTIONS
++{
++  /* Read-only sections, merged into text segment: */
++  PROVIDE (__executable_start = 0x0400000); . = 0x0400000 + 52 + 8*32;
++  .interp         : { *(.interp) }
++  .reginfo        : { *(.reginfo) }
++  .dynamic        : { *(.dynamic) }
++  .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))
++  } =0
++  .plt            : { *(.plt) }
++  .text           :
++  {
++    _ftext = . ;
++    *(.text .stub .text.* .gnu.linkonce.t.*)
++    KEEP (*(.text.*personality*))
++    /* .gnu.warning sections are handled specially by elf32.em.  */
++    *(.gnu.warning)
++    *(.mips16.fn.*) *(.mips16.call.*)
++  } =0
++  .fini           :
++  {
++    KEEP (*(.fini))
++  } =0
++  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.*) }
++  .eh_frame_hdr : { *(.eh_frame_hdr) }
++  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) }
++  .gcc_except_table   : ONLY_IF_RO { *(.gcc_except_table .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 (0x10000000); . = DATA_SEGMENT_ALIGN (0x40000, 0x1000);
++  /* Exception handling  */
++  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) }
++  .gcc_except_table   : ONLY_IF_RW { *(.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_HIDDEN (__preinit_array_start = .);
++    KEEP (*(.preinit_array))
++    PROVIDE_HIDDEN (__preinit_array_end = .);
++  }
++  .init_array     :
++  {
++     PROVIDE_HIDDEN (__init_array_start = .);
++     KEEP (*(SORT(.init_array.*)))
++     KEEP (*(.init_array))
++     PROVIDE_HIDDEN (__init_array_end = .);
++  }
++  .fini_array     :
++  {
++    PROVIDE_HIDDEN (__fini_array_start = .);
++    KEEP (*(.fini_array))
++    KEEP (*(SORT(.fini_array.*)))
++    PROVIDE_HIDDEN (__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.*) }
++  . = DATA_SEGMENT_RELRO_END (0, .);
++  .data           :
++  {
++    _fdata = . ;
++    *(.data .data.* .gnu.linkonce.d.*)
++    KEEP (*(.gnu.linkonce.d.*personality*))
++    SORT(CONSTRUCTORS)
++  }
++  .data1          : { *(.data1) }
++  . = .;
++  _gp = ALIGN(16) + 0x7ff0;
++  .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.*)
++  }
++  .lit8           : { *(.lit8) }
++  .lit4           : { *(.lit4) }
++  _edata = .; PROVIDE (edata = .);
++  __bss_start = .;
++  _fbss = .;
++  .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 = .);
++  . = 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.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) }
++  .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
++  .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
++  .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) }
++  .mdebug.abiN32 : { KEEP(*(.mdebug.abiN32)) }
++  .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) }
++  .mdebug.abiO64 : { KEEP(*(.mdebug.abiO64)) }
++  .mdebug.eabi32 : { KEEP(*(.mdebug.eabi32)) }
++  .mdebug.eabi64 : { KEEP(*(.mdebug.eabi64)) }
++  .gcc_compiled_long32 : { KEEP(*(.gcc_compiled_long32)) }
++  .gcc_compiled_long64 : { KEEP(*(.gcc_compiled_long64)) }
++  /DISCARD/ : { *(.note.GNU-stack) }
++}
+--- emacs21-21.4a.orig/src/m/mips.h	2006-09-24 16:18:20.000000000 +0100
++++ emacs21-21.4a/src/m/mips.h	2006-09-24 16:19:47.000000000 +0100
+@@ -135,7 +135,12 @@
+ #define TEXT_START      0x00400000
+ #define DATA_START      0x10000000
+ #define DATA_SEG_BITS	0x10000000
++#ifdef THIS_IS_MAKEFILE
++#define LD_SWITCH_MACHINE -T "../../../mips.ld"
++#else
++#define LD_SWITCH_MACHINE -T "../../mips.ld"
++#endif
+ #else /* not __linux__ */
+ #define TEXT_START 0x400000
+ #define DATA_START 0x800000



More information about the pkg-emacs-commits mailing list