[Mesa-dev] [PATCH 1/2] mesa: remove last DJGPP remains

[Ian Romanick]

And I was just going to start working on the Mesa software rasterizer
for DOS.  Oh well.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

On 09/26/2014 02:14 PM, Emil Velikov wrote:
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  src/mapi/glapi/gen/gl_x86_asm.py  | 2 +-
>  src/mesa/main/dlopen.h            | 7 -------
>  src/mesa/main/texcompress_s3tc.c  | 2 --
>  src/mesa/x86/assyntax.h           | 6 +++---
>  src/mesa/x86/read_rgba_span_x86.S | 4 ++--
>  5 files changed, 6 insertions(+), 15 deletions(-)
> 
> diff --git a/src/mapi/glapi/gen/gl_x86_asm.py b/src/mapi/glapi/gen/gl_x86_asm.py
> index 919bbc0..d87d0bd 100644
> --- a/src/mapi/glapi/gen/gl_x86_asm.py
> +++ b/src/mapi/glapi/gen/gl_x86_asm.py
> @@ -72,7 +72,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
>          print ''
>          print '#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))'
>          print ''
> -        print '#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)'
> +        print '#if defined(GNU_ASSEMBLER) && !defined(__MINGW32__) && !defined(__APPLE__)'
>          print '#define GLOBL_FN(x) GLOBL x ; .type x, @function'
>          print '#else'
>          print '#define GLOBL_FN(x) GLOBL x'
> diff --git a/src/mesa/main/dlopen.h b/src/mesa/main/dlopen.h
> index 55a56f0..3754ec1 100644
> --- a/src/mesa/main/dlopen.h
> +++ b/src/mesa/main/dlopen.h
> @@ -73,13 +73,6 @@ _mesa_dlsym(void *handle, const char *fname)
>     } u;
>  #if defined(__blrts)
>     u.v = NULL;
> -#elif defined(__DJGPP__)
> -   /* need '_' prefix on symbol names */
> -   char fname2[1000];
> -   fname2[0] = '_';
> -   strncpy(fname2 + 1, fname, 998);
> -   fname2[999] = 0;
> -   u.v = dlsym(handle, fname2);
>  #elif defined(HAVE_DLOPEN)
>     u.v = dlsym(handle, fname);
>  #elif defined(__MINGW32__)
> diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
> index 5b275ef..254f84e 100644
> --- a/src/mesa/main/texcompress_s3tc.c
> +++ b/src/mesa/main/texcompress_s3tc.c
> @@ -51,8 +51,6 @@
>  #define DXTN_LIBNAME "dxtn.dll"
>  #define RTLD_LAZY 0
>  #define RTLD_GLOBAL 0
> -#elif defined(__DJGPP__)
> -#define DXTN_LIBNAME "dxtn.dxe"
>  #else
>  #define DXTN_LIBNAME "libtxc_dxtn.so"
>  #endif
> diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h
> index fa7d92e..67867bd 100644
> --- a/src/mesa/x86/assyntax.h
> +++ b/src/mesa/x86/assyntax.h
> @@ -255,7 +255,7 @@
>  #endif /* ACK_ASSEMBLER */
>  
>  
> -#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__) || defined(__GNUC__) && !defined(__DJGPP__) && !defined(__MINGW32__)
> +#if defined(__QNX__) || defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__) || defined(__GNU__) || defined(__GNUC__) && !defined(__MINGW32__)
>  #define GLNAME(a)	a
>  #else
>  #define GLNAME(a)	CONCAT(_,a)
> @@ -1727,9 +1727,9 @@
>   * If we build with gcc's -fvisibility=hidden flag, we'll need to change
>   * the symbol visibility mode to 'default'.
>   */
> -#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
> +#if defined(GNU_ASSEMBLER) && !defined(__MINGW32__) && !defined(__APPLE__)
>  #  define HIDDEN(x) .hidden x
> -#elif defined(__GNUC__) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
> +#elif defined(__GNUC__) && !defined(__MINGW32__) && !defined(__APPLE__)
>  #  pragma GCC visibility push(default)
>  #  define HIDDEN(x) .hidden x
>  #else
> diff --git a/src/mesa/x86/read_rgba_span_x86.S b/src/mesa/x86/read_rgba_span_x86.S
> index 8177299..5def1f8 100644
> --- a/src/mesa/x86/read_rgba_span_x86.S
> +++ b/src/mesa/x86/read_rgba_span_x86.S
> @@ -31,7 +31,7 @@
>   */
>  
>  	.file	"read_rgba_span_x86.S"
> -#if !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__) /* this one cries for assyntax.h */
> +#if !defined(__MINGW32__) && !defined(__APPLE__) /* this one cries for assyntax.h */
>  /* Kevin F. Quinn 2nd July 2006
>   * Replaced data segment constants with text-segment instructions.
>   */
> @@ -671,7 +671,7 @@ _generic_read_RGBA_span_RGB565_MMX:
>  	emms
>  #endif
>  	ret
> -#endif /* !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__) */
> +#endif /* !defined(__MINGW32__) && !defined(__APPLE__) */
>  	
>  #if defined (__ELF__) && defined (__linux__)
>  	.section .note.GNU-stack,"",%progbits
>