X Strike Force XFree86 SVN commit: r1105 - in trunk/debian: . patches
Author: branden
Date: 2004-02-24 03:51:51 -0500 (Tue, 24 Feb 2004)
New Revision: 1105
Added:
trunk/debian/patches/202_alpha_elfloader_support_R_ALPHA_SREL32.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/303_arm_cache_flush.diff
Log:
Add support for R_ALPHA_SREL32 relocations in XFree86 X server's ELF
object loader; fixes "Elf_RelocateEntry() Unsupported relocation type 10"
warnings on Alpha; see #234073 (thanks, Falk Hueffner!).
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-02-23 23:03:30 UTC (rev 1104)
+++ trunk/debian/changelog 2004-02-24 08:51:51 UTC (rev 1105)
@@ -130,8 +130,14 @@
- debian/xlibs.bug: new file
- debian/rules: ship bug script as part of xlibs package
- -- Branden Robinson <branden@debian.org> Mon, 23 Feb 2004 17:59:44 -0500
+ * Add support for R_ALPHA_SREL32 relocations in XFree86 X server's ELF
+ object loader; fixes "Elf_RelocateEntry() Unsupported relocation type 10"
+ warnings on Alpha; see #234073 (thanks, Falk Hueffner!).
+ - debian/patches/202_alpha_elfloader_support_R_ALPHA_SREL32.diff: new file
+ - debian/patches/303_arm_cache_flush.diff: resynced
+ -- Branden Robinson <branden@debian.org> Tue, 24 Feb 2004 03:49:00 -0500
+
xfree86 (4.3.0-2) unstable; urgency=low
* The "It's like I have a shotgun in my mouth, I've got my finger on the
Added: trunk/debian/patches/202_alpha_elfloader_support_R_ALPHA_SREL32.diff
===================================================================
--- trunk/debian/patches/202_alpha_elfloader_support_R_ALPHA_SREL32.diff 2004-02-23 23:03:30 UTC (rev 1104)
+++ trunk/debian/patches/202_alpha_elfloader_support_R_ALPHA_SREL32.diff 2004-02-24 08:51:51 UTC (rev 1105)
@@ -0,0 +1,30 @@
+$Id$
+
+Fix spew from XFree86 ELF loader on Alpha: "Elf_RelocateEntry() Unsupported
+relocation type 10". See Debian #234073.
+
+This patch by Falk Hueffner.
+
+--- xc/programs/Xserver/hw/xfree86/loader/elfloader.c~ 2004-02-24 03:18:23.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c 2004-02-24 03:21:14.000000000 -0500
+@@ -1612,6 +1612,20 @@
+ break;
+ }
+
++ case R_ALPHA_SREL32:
++ {
++ dest32 = (unsigned int *)(secp + rel->r_offset);
++ symval += rel->r_addend;
++ symval -= (unsigned long) dest32;
++ if ((long)symval >= 0x80000000
++ || (long)symval < -(long)0x80000000)
++ FatalError("R_ALPHA_SREL32 overflow for %s: %lx\n",
++ ElfGetSymbolName(elffile, ELF_R_SYM(rel->r_info)),
++ symval);
++ *dest32 = symval;
++ break;
++ }
++
+ #endif /* alpha */
+ #if defined(__mc68000__)
+ case R_68K_32:
Property changes on: trunk/debian/patches/202_alpha_elfloader_support_R_ALPHA_SREL32.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/debian/patches/303_arm_cache_flush.diff
===================================================================
--- trunk/debian/patches/303_arm_cache_flush.diff 2004-02-23 23:03:30 UTC (rev 1104)
+++ trunk/debian/patches/303_arm_cache_flush.diff 2004-02-24 08:51:51 UTC (rev 1105)
@@ -4,8 +4,8 @@
off?
--- xc/programs/Xserver/hw/xfree86/loader/elfloader.c~ 2003-09-18 12:13:12.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c 2003-09-18 12:13:19.000000000 -0500
-@@ -2424,9 +2424,7 @@
++++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c 2004-02-24 03:30:10.000000000 -0500
+@@ -2438,9 +2438,7 @@
val = symval - (unsigned long)dest32 + val;
val >>= 2;
*dest32 = (*dest32 & 0xff000000) | (val & 0x00ffffff);
Reply to: