X Strike Force XFree86 SVN commit: r2153 - in trunk/debian: . patches
Author: branden
Date: 2005-01-24 13:14:33 -0500 (Mon, 24 Jan 2005)
New Revision: 2153
Added:
trunk/debian/patches/304_arm_Xlib.h_kludge_around_ARM_ABI_brain_damage.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
Log:
Add __attribute__ ((packed)) to declaration of XChar2b structure in
Xlib.h, for GCC/ARM systems only. This is a kludge to work around a bad
design decision in the GCC ARM ABI, and has been discussed with Jim
Gettys, Keith Packard, and Phil Blundell. Thanks to Nicolas George and
Ga?\195?\171tan LEURENT for bringing this issue to my attention. (Closes: #285396)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-01-24 16:57:00 UTC (rev 2152)
+++ trunk/debian/CHANGESETS 2005-01-24 18:14:33 UTC (rev 2153)
@@ -205,4 +205,11 @@
+ Update and clarify comments.
2151
+Add __attribute__ ((packed)) to declaration of XChar2b structure in
+Xlib.h, for GCC/ARM systems only. This is a kludge to work around a bad
+design decision in the GCC ARM ABI, and has been discussed with Jim
+Gettys, Keith Packard, and Phil Blundell. Thanks to Nicolas George and
+Gaëtan LEURENT for bringing this issue to my attention. (Closes: #285396)
+ 2152
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-01-24 16:57:00 UTC (rev 2152)
+++ trunk/debian/TODO 2005-01-24 18:14:33 UTC (rev 2153)
@@ -17,7 +17,6 @@
4.3.0.dfsg.1-11
---------------
-* Kludge Xlib.h for the sake of ARM's broken ABI. (see #285396)
* Migrate the bug scripts to the more sophisticated world order now in use.
+ Move current scripts from /usr/share/bug/$PACKAGE to
/usr/share/bug/$PACKAGE/script (renaming in SVN from $PACKAGE.bug to
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-01-24 16:57:00 UTC (rev 2152)
+++ trunk/debian/changelog 2005-01-24 18:14:33 UTC (rev 2153)
@@ -153,8 +153,14 @@
functionality caused by overly aggressive validation of filespec strings
in OpenReadFile() and OpenWriteFile(). (Closes: #286164)
- -- Branden Robinson <branden@debian.org> Mon, 24 Jan 2005 11:48:04 -0500
+ * Add __attribute__ ((packed)) to declaration of XChar2b structure in
+ Xlib.h, for GCC/ARM systems only. This is a kludge to work around a bad
+ design decision in the GCC ARM ABI, and has been discussed with Jim
+ Gettys, Keith Packard, and Phil Blundell. Thanks to Nicolas George and
+ Gaëtan LEURENT for bringing this issue to my attention. (Closes: #285396)
+ -- Branden Robinson <branden@debian.org> Mon, 24 Jan 2005 12:11:08 -0500
+
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
* Upload urgency set to medium due to fix for stable-release-critical bugs
Added: trunk/debian/patches/304_arm_Xlib.h_kludge_around_ARM_ABI_brain_damage.diff
===================================================================
--- trunk/debian/patches/304_arm_Xlib.h_kludge_around_ARM_ABI_brain_damage.diff 2005-01-24 16:57:00 UTC (rev 2152)
+++ trunk/debian/patches/304_arm_Xlib.h_kludge_around_ARM_ABI_brain_damage.diff 2005-01-24 18:14:33 UTC (rev 2153)
@@ -0,0 +1,25 @@
+$Id$
+
+We have to do this to kludge around a bad decision made long ago in the
+design of the GCC ARM ABI.
+
+For extensive discussion and rationale, please see
+<URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=285396 >.
+
+Not submitted upstream to XFree86 or X.Org.
+
+--- xc/lib/X11/Xlib.h~ 2005-01-24 12:06:01.000000000 -0500
++++ xc/lib/X11/Xlib.h 2005-01-24 12:07:59.000000000 -0500
+@@ -1059,7 +1059,11 @@
+ typedef struct { /* normal 16 bit characters are two bytes */
+ unsigned char byte1;
+ unsigned char byte2;
+-} XChar2b;
++}
++#if defined(__GNUC__) && defined(__arm__) && !defined(__ARM_EABI__)
++__attribute__ ((packed))
++#endif
++XChar2b;
+
+ typedef struct {
+ XChar2b *chars; /* two byte characters */
Property changes on: trunk/debian/patches/304_arm_Xlib.h_kludge_around_ARM_ABI_brain_damage.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: