diff options
| author | Adam Jackson <ajax@nwnk.net> | 2004-08-12 01:30:57 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2004-08-12 01:30:57 +0000 |
| commit | 09d0056b8bc103f67a35980934f03d28fed51164 (patch) | |
| tree | aa38885d1a309f2ed613e6989289bfcdc5b9e10f /hw | |
| parent | e30c22dbbffa2605f8d7ac010c8208a135a2293a (diff) | |
Wrap the Propolice fix in #ifdef __SSP__; Propolice doesn't define this yet
but an RFE has been submitted upstream.
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/loader/xf86sym.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index 80e453689..7a97f823c 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -235,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[] = { @@ -1097,6 +1103,12 @@ LOOKUP xfree86LookupTab[] = { #endif #endif +#ifdef __SSP__ + /* propolice */ + SYMFUNC(__stack_smash_handler) + SYMVAR(__guard) +#endif + /* Some variables. */ SYMVAR(xf86stdin) |