2552b8e5f9
Ports changes: - Drop dependency on x11/wrapper. X server already contains this code (programs/Xserver/os/utils.c rev. 3.58). - Install default SecurityPolicy with XFree86-4-libraries, thus avoiding plists and who-owns-what complications between different fooServer ports. Copy default file to real one if that doesn't exist and remove both upon uninstall if they are the same. - Revert change to Imake.rules rev. 3.132 in devel/imake-4 port, since couple of ports break with this change (devel/imake-4/files/patch-Imake.rules) - Add grehans patches for PPC [1] - Several of directories that were previously in /etc/mtree/BSD.x11-4.dist were moved to respective ports pkg-plists PR: [1] 78345, 78346, 78348, 78352, 78353, 78354, 78355, 78356
82 lines
2.2 KiB
C
82 lines
2.2 KiB
C
--- programs/Xserver/hw/xfree86/loader/elfloader.c.orig Mon Mar 28 19:12:53 2005
|
|
+++ programs/Xserver/hw/xfree86/loader/elfloader.c Mon Mar 28 19:22:51 2005
|
|
@@ -203,6 +203,7 @@
|
|
#if defined (__alpha__) || \
|
|
defined (__ia64__) || \
|
|
defined (__AMD64__) || \
|
|
+ defined (__amd64__) || \
|
|
(defined (__sparc__) && \
|
|
(defined (__arch64__) || \
|
|
defined (__sparcv9)))
|
|
@@ -294,7 +295,8 @@
|
|
defined(__alpha__) || \
|
|
defined(__sparc__) || \
|
|
defined(__ia64__) || \
|
|
- defined(__AMD64__)
|
|
+ defined(__AMD64__) || \
|
|
+ defined(__amd64__)
|
|
typedef Elf_Rela Elf_Rel_t;
|
|
#else
|
|
typedef Elf_Rel Elf_Rel_t;
|
|
@@ -488,7 +490,8 @@
|
|
defined(__alpha__) || \
|
|
defined(__sparc__) || \
|
|
defined(__ia64__) || \
|
|
- defined(__AMD64__)
|
|
+ defined(__AMD64__) || \
|
|
+ defined(__amd64__)
|
|
ELFDEBUG(", r_addend 0x%lx", rel->r_addend);
|
|
# endif
|
|
ELFDEBUG("\n");
|
|
@@ -524,6 +527,7 @@
|
|
#if defined(__alpha__) || \
|
|
defined(__ia64__) || \
|
|
defined(__AMD64__) || \
|
|
+ defined(__amd64__) || \
|
|
(defined(__sparc__) && \
|
|
(defined(__arch64__) || \
|
|
defined(__sparcv9)))
|
|
@@ -548,6 +552,7 @@
|
|
#if defined(__alpha__) || \
|
|
defined(__ia64__) || \
|
|
defined(__AMD64__) || \
|
|
+ defined(__amd64__) || \
|
|
(defined(__sparc__) && \
|
|
(defined(__arch64__) || \
|
|
defined(__sparcv9)))
|
|
@@ -603,6 +608,7 @@
|
|
#if defined(__alpha__) || \
|
|
defined(__ia64__) || \
|
|
defined(__AMD64__) || \
|
|
+ defined(__amd64__) || \
|
|
(defined(__sparc__) && \
|
|
(defined(__arch64__) || \
|
|
defined(__sparcv9)))
|
|
@@ -1263,7 +1269,7 @@
|
|
unsigned long *dest64;
|
|
unsigned short *dest16;
|
|
#endif
|
|
-#if defined(__AMD64__)
|
|
+#if defined(__AMD64__) || defined(__amd64__)
|
|
unsigned long *dest64;
|
|
int *dest32s;
|
|
#endif
|
|
@@ -1281,7 +1287,8 @@
|
|
defined(__alpha__) || \
|
|
defined(__sparc__) || \
|
|
defined(__ia64__) || \
|
|
- defined(__AMD64__)
|
|
+ defined(__AMD64__) || \
|
|
+ defined(__amd64__)
|
|
ELFDEBUG("%lx", rel->r_addend);
|
|
# endif
|
|
ELFDEBUG("\n");
|
|
@@ -1340,7 +1347,7 @@
|
|
|
|
break;
|
|
#endif /* i386 */
|
|
-#if defined(__AMD64__)
|
|
+#if defined(__AMD64__) || defined(__amd64__)
|
|
case R_X86_64_32:
|
|
dest32 = (unsigned int *)(secp + rel->r_offset);
|
|
# ifdef ELFDEBUG
|