Author: ishikawa
Date: 2003-06-01 19:06:23 -0500 (Sun, 01 Jun 2003)
New Revision: 119
Removed:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/453_ia64_gcc3.1_relocations.diff
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/454_ia64_no_int10.diff
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/500_s390_support.diff
Log:
sync with current 4.3.0 branch
Modified:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/500_s390_support.diff
==============================================================================
---
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/500_s390_support.diff
2003-06-02 00:00:49 UTC (rev 118)
+++
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/500_s390_support.diff
2003-06-02 00:06:23 UTC (rev 119)
@@ -1,6 +1,6 @@
--- xc/config/cf/xfree86.cf.orig 2002-09-13 03:50:06.000000000 -0500
+++ xc/config/cf/xfree86.cf 2002-09-13 03:50:41.000000000 -0500
-@@ -1122,6 +1122,15 @@
+@@ -1117,6 +1117,15 @@
# endif
#endif
Deleted:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/453_ia64_gcc3.1_relocations.diff
==============================================================================
---
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/453_ia64_gcc3.1_relocations.diff
2003-06-02 00:00:49 UTC (rev 118)
+++
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/453_ia64_gcc3.1_relocations.diff
2003-06-02 00:06:23 UTC (rev 119)
@@ -1,27 +0,0 @@
-This patch from Mike A. Harris.
-
---- xc/programs/Xserver/hw/xfree86/loader/elfloader.c.ia64-gcc3.1 Thu Sep
19 09:22:02 2002
-+++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c Thu Oct 10 14:47:08 2002
-@@ -2191,7 +2191,21 @@
- #endif
- *dest64 = symval + rel->r_addend - (unsigned long)dest64;
- break;
--
-+
-+ case R_IA64_PCREL64LSB:
-+ dest64=(unsigned long *)(secp+rel->r_offset);
-+#ifdef ELFDEBUG
-+ ELFDEBUG( "R_IA64_PCREL64LSB %s\t",
-+ ElfGetSymbolName(elffile,ELF_R_SYM(rel->r_info)) );
-+ ELFDEBUG( "secp=%lx\t", secp );
-+ ELFDEBUG( "symval=%lx\t", symval );
-+ ELFDEBUG( "dest64=%lx\n", dest64 );
-+#endif
-+ *dest64 = symval + rel->r_addend - ((unsigned long)dest64 & -16);
-+ ia64_flush_cache(dest64);
-+ break;
-+
-+
- case R_IA64_GPREL22:
- dest128=(unsigned long *)(secp+(rel->r_offset&~3));
- # ifdef ELFDEBUG
Deleted:
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/454_ia64_no_int10.diff
==============================================================================
---
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/454_ia64_no_int10.diff
2003-06-02 00:00:49 UTC (rev 118)
+++
people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/454_ia64_no_int10.diff
2003-06-02 00:06:23 UTC (rev 119)
@@ -1,19 +0,0 @@
-It was never wonderful, but now with GCC 3.2 it really sucks, per Bdale
-Garbee.
-
---- xc/config/cf/xfree86.cf~ 2003-03-04 15:50:15.000000000 -0500
-+++ xc/config/cf/xfree86.cf 2003-03-04 15:51:44.000000000 -0500
-@@ -329,7 +329,12 @@
- # endif
- /* int10 module */
- # ifndef XF86Int10
--# define XF86Int10 YES
-+/* Int10 doesn't work very well on IA-64 */
-+# ifdef ia64Architecture
-+# define XF86Int10 NO
-+# else
-+# define XF86Int10 YES
-+# endif
- # endif
- /* vbe module */
- # ifndef XF86VBE
