[emacs-debian commit] 94d34d3f3bfd4f4d139418c5358573ec5513a102
Jérôme Marant
jerome at marant.org
Wed Oct 4 09:56:05 UTC 2006
commit 94d34d3f3bfd4f4d139418c5358573ec5513a102
Author: Jérôme Marant <jerome at marant.org>
Date: Wed Oct 4 11:56:05 2006 +0200
* Integrate previous NMUs from Marc Brockschmidt <he at debian.org>
* Separate arch-mipsel+mips patch into arch-mipsel and arch-mips
patches
* Update arch-mipsel patch for cleaner detection of the mipsel
architecture from configure.in
diff --git a/changelog b/changelog
index d26f609..bf580fa 100644
--- a/changelog
+++ b/changelog
@@ -14,7 +14,37 @@ emacs21 (21.4a+1-1) unstable; urgency=lo
- debian/replacement/yow.lines.uu
- debian/rules
- -- Rob Browning <rlb at defaultvalue.org> Sat, 2 Sep 2006 15:18:30 -0700
+ * Acknowledge NMU. Thanks Marc Brockschmidt <he at debian.org>
+ (Closes: #381452) [Jérôme Marant]
+
+ * Separate mipsel from mips autodetection in configure.in [Jérôme Marant]
+ - debian/patches/arch-mipsel.diff: update.
+
+ * Split mips and mipsel ports into two separate patches [Jérôme Marant]
+ - debian/patches/arch-mips.diff: new file. Add mips-specific code
+ from arch-mipsel+mips.diff patch
+ - debian/patches/arch-mipsel.diff: add mipsel-specific code from
+ arch-mipsel+mips.diff patch
+ - debian/patches/arch-mipsel+mips.diff: remove.
+
+ -- Jerome Marant <jerome at debian.org> Wed, 4 Oct 2006 11:09:43 +0200
+
+emacs21 (21.4a-6.2) unstable; urgency=low
+
+ * Non-maintainer brown paper bag release.
+ * Apply patch from 21.4a-6.1 properly, somehow quilt hates me.
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Wed, 27 Sep 2006 08:30:33 +0200
+
+emacs21 (21.4a-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/arch-mipsel+mips.diff:
+ Add patch from Max Kellermann <max at duempel.org> (updated by
+ Thiemo Seufer <ths at networkno.de>) to fix segfaults on mips
+ and mipsel. Thanks for the hard work! (Closes: #381452)
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Wed, 27 Sep 2006 00:13:30 +0200
emacs21 (21.4a-6) unstable; urgency=low
diff --git a/patches/arch-mipsel.diff b/patches/arch-mipsel.diff
index 4f0bb40..bb80b3d 100644
--- a/patches/arch-mipsel.diff
+++ b/patches/arch-mipsel.diff
@@ -1,17 +1,24 @@
* Support for the mipsel architecture has been added.
Patch: arch-mipsel.diff
Provided-by: Ryan Murray <rmurray at cyberhqz.com>
+ Max Kellermann <max at duempel.org>
+ Thiemo Seufer <ths at networkno.de>
Added-by: Rob Browning <rlb at defaultvalue.org>
Status: appears to be incorporated upstream
diff -urNad /home/rlb/deb/emacs21/trunk/configure.in trunk/configure.in
--- /home/rlb/deb/emacs21/trunk/configure.in 2003-09-11 01:12:30.000000000 -0500
+++ trunk/configure.in 2003-09-11 01:12:32.000000000 -0500
-@@ -1051,6 +1051,11 @@
+@@ -1048,10 +1048,15 @@
+ ;;
+
+ ## Mips Linux-based GNU system
+- mips-*-linux-gnu* | mipsel-*-linux-gnu* )
++ mips-*-linux-gnu* )
machine=mips opsys=gnu-linux
;;
-+ ## Mipsel (little endian) Linux-based GNU system
++ ## Mipsel Linux-based GNU system
+ mipsel-*-linux-gnu* )
+ machine=mipsel opsys=gnu-linux
+ ;;
@@ -19,10 +26,257 @@ diff -urNad /home/rlb/deb/emacs21/trunk/
## UXP/DS
sparc-fujitsu-sysv4* )
machine=sparc opsys=uxpds
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ emacs21-21.4a/mipsel.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/elf32ltsmip.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-tradlittlemips", "elf32-tradlittlemips",
++ "elf32-tradbigmips")
++OUTPUT_ARCH(mipsel)
++ENTRY(__start)
++SEARCH_DIR("/usr/mipsel-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) }
++}
diff -urNad /home/rlb/deb/emacs21/trunk/src/m/mipsel.h trunk/src/m/mipsel.h
--- /home/rlb/deb/emacs21/trunk/src/m/mipsel.h 1969-12-31 18:00:00.000000000 -0600
+++ trunk/src/m/mipsel.h 2003-09-11 01:12:32.000000000 -0500
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,17 @@
+/* machine description file for Mipsel (mips little endian). */
+
+#include "mips.h"
@@ -31,3 +285,12 @@ diff -urNad /home/rlb/deb/emacs21/trunk/
+ is the most significant byte. */
+
+#undef WORDS_BIG_ENDIAN
++
++#ifdef __linux__
++#undef LD_SWITCH_MACHINE
++#ifdef THIS_IS_MAKEFILE
++#define LD_SWITCH_MACHINE -T "../../../mipsel.ld"
++#else
++#define LD_SWITCH_MACHINE -T "../../mipsel.ld"
++#endif
++#endif /* __linux__ */
diff --git a/patches/series b/patches/series
index d18ff77..99f7190 100644
--- a/patches/series
+++ b/patches/series
@@ -2,6 +2,7 @@ handle-dfsg-split.diff
autoconf-updates.diff
misc-unseparated.diff
arch-hppa.diff
+arch-mips.diff
arch-mipsel.diff
arch-s390.diff
fix-batch-mode-signal-handling.diff
More information about the pkg-emacs-devel
mailing list