summaryrefslogtreecommitdiff
path: root/hw/xfree86/loader/xf86sym.c
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/loader/xf86sym.c')
-rw-r--r--hw/xfree86/loader/xf86sym.c32
1 files changed, 30 insertions, 2 deletions
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index b2823c2e5..a622b505e 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -75,7 +75,9 @@
#include "xf86cmap.h"
#include "xf86fbman.h"
#include "dgaproc.h"
+#ifdef DPMSExtension
#include "dpmsproc.h"
+#endif
#include "vidmodeproc.h"
#include "xf86miscproc.h"
#include "loader.h"
@@ -233,6 +235,12 @@ extern unsigned long ldl_brx(volatile unsigned char *, int);
extern unsigned short ldw_brx(volatile unsigned char *, int);
#endif
+#ifdef __SSP__
+/* Propolice! */
+extern long __guard[];
+extern void __stack_smash_handler(char [], int);
+#endif
+
/* XFree86 things */
LOOKUP xfree86LookupTab[] = {
@@ -695,9 +703,11 @@ LOOKUP xfree86LookupTab[] = {
SYMFUNC(xf86XInputSetSendCoreEvents)
/* End merged segment */
#endif
+#ifdef DPMSExtension
SYMFUNC(DPMSGet)
SYMFUNC(DPMSSet)
SYMFUNC(DPMSSupported)
+#endif
/* xf86Debug.c */
#ifdef BUILDDEBUG
SYMFUNC(xf86Break1)
@@ -1045,27 +1055,39 @@ LOOKUP xfree86LookupTab[] = {
# endif
#endif
#if defined(__GNUC__)
-#ifndef __UNIXOS2__
+#if !defined(__UNIXOS2__) && !defined(Lynx)
SYMFUNC(__div64)
#endif
+#if !defined(Lynx) /* FIXME: test on others than x86 and !3.1.0a/x86 */
SYMFUNC(__divdf3)
+#endif
SYMFUNC(__divdi3)
+#if !defined(Lynx)
SYMFUNC(__divsf3)
SYMFUNC(__divsi3)
+#endif
SYMFUNC(__moddi3)
+#if !defined(Lynx)
SYMFUNC(__modsi3)
-#ifndef __UNIXOS2__
+#endif
+#if !defined(__UNIXOS2__) && !defined(Lynx)
SYMFUNC(__mul64)
#endif
+#if !defined(Lynx)
SYMFUNC(__muldf3)
+#endif
SYMFUNC(__muldi3)
+#if !defined(Lynx)
SYMFUNC(__mulsf3)
SYMFUNC(__mulsi3)
SYMFUNC(__udivdi3)
SYMFUNC(__udivsi3)
+#endif
SYMFUNC(__umoddi3)
+#if !defined(Lynx)
SYMFUNC(__umodsi3)
#endif
+#endif
#if defined(__ia64__)
SYMFUNC(_outw)
SYMFUNC(_outb)
@@ -1093,6 +1115,12 @@ LOOKUP xfree86LookupTab[] = {
#endif
#endif
+#ifdef __SSP__
+ /* propolice */
+ SYMFUNC(__stack_smash_handler)
+ SYMVAR(__guard)
+#endif
+
/* Some variables. */
SYMVAR(xf86stdin)