diff options
| author | tsi <tsi> | 2008-10-15 20:56:03 +0000 |
|---|---|---|
| committer | tsi <tsi> | 2008-10-15 20:56:03 +0000 |
| commit | 413c1009da9e4c0e3dc4a92592c0b8249c4568f1 (patch) | |
| tree | a584db850eeb5b602668b79aebcebad972ff6a3f | |
| parent | 4b650cedcc734b8f9dbf000995e7bf7646f7865a (diff) | |
No need to worry about PIC on x86_64. Done just in case vm86 is ever
supported by a x86_64 linux kernel.
| -rw-r--r-- | programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c | 8 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c b/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c index 6bc54d1a4..7182ab1ec 100644 --- a/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c +++ b/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.34tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.35tsi Exp $ */ /* * linux specific part of the int10 module * Copyright 1999 Egbert Eich @@ -609,10 +609,10 @@ vm86_tst(void) { int __res; -#ifdef __PIC__ +#if defined(__PIC__) && !defined(__amd64__) && !defined(__x86_64__) /* - * When compiling with -fPIC, we can't use asm constraint "b" because - * %ebx is already taken by gcc. + * When compiling with -fPIC on i386, we can't use asm constraint "b" + * because %ebx is already taken by gcc to hold the GOT address. */ __asm__ __volatile__ ( diff --git a/programs/Xserver/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/programs/Xserver/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c index 9dfb32060..4c229f20f 100644 --- a/programs/Xserver/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c +++ b/programs/Xserver/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c,v 1.4tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c,v 1.5tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" @@ -268,10 +268,10 @@ vm86_rep(struct vm86_struct *ptr) { int __res; -#ifdef __PIC__ +#if defined(__PIC__) && !defined(__amd64__) && !defined(__x86_64__) /* - * When compiling with -fPIC, we can't use asm constraint "b" because - * %ebx is already taken by gcc. + * When compiling with -fPIC on i386, we can't use asm constraint "b" + * because %ebx is already taken by gcc to hold the GOT address. */ __asm__ __volatile__ ( |