summaryrefslogtreecommitdiff
path: root/hw/xfree86
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2004-08-11 23:10:02 +0000
committerAdam Jackson <ajax@nwnk.net>2004-08-11 23:10:02 +0000
commiteb607030e32cbad846696a20cfb3045c5f8f65c1 (patch)
tree0a24f1131b25580afb263423f38c5216829c6b23 /hw/xfree86
parentfd439afdfe7ba451aff19b62d1764e4dfd0b782f (diff)
downloadxserver-eb607030e32cbad846696a20cfb3045c5f8f65c1.tar.gz
Teach the loader about the extra symbols needed for Propolice-protected
modules to work under elfloader. From Travis Tilley (Gentoo).
Diffstat (limited to 'hw/xfree86')
-rw-r--r--hw/xfree86/loader/xf86sym.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index 80e453689..337e43a62 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -235,6 +235,10 @@ extern unsigned long ldl_brx(volatile unsigned char *, int);
extern unsigned short ldw_brx(volatile unsigned char *, int);
#endif
+/* Propolice! */
+extern long __guard[];
+extern void __stack_smash_handler(char [], int);
+
/* XFree86 things */
LOOKUP xfree86LookupTab[] = {
@@ -1097,6 +1101,10 @@ LOOKUP xfree86LookupTab[] = {
#endif
#endif
+ /* propolice */
+ SYMFUNC(__stack_smash_handler)
+ SYMVAR(__guard)
+
/* Some variables. */
SYMVAR(xf86stdin)