Merge remote branch 'origin/opengl-es-v2'

[mesa.git] / src / mesa / x86 / common_x86_asm.S

diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S
index 9deceeaa32731114cdd904ce601f24be4ec83e47..ea4047a0e140c31f9ab937479623057459731bb7 100644 (file)
--- a/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@ -1,10 +1,8 @@
-/* $Id: common_x86_asm.S,v 1.17 2003/01/21 16:13:58 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.3
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -42,12 +40,14 @@
  */
 
 #include "matypes.h"
+#include "assyntax.h"
 #include "common_x86_features.h"
 
        SEG_TEXT
 
 ALIGNTEXT4
 GLOBL GLNAME(_mesa_x86_has_cpuid)
+HIDDEN(_mesa_x86_has_cpuid)
 GLNAME(_mesa_x86_has_cpuid):
 
        /* Test for the CPUID command.  If the ID Flag bit in EFLAGS
@@ -71,6 +71,7 @@ GLNAME(_mesa_x86_has_cpuid):
 
 ALIGNTEXT4
 GLOBL GLNAME(_mesa_x86_cpuid)
+HIDDEN(_mesa_x86_cpuid)
 GLNAME(_mesa_x86_cpuid):
 
        MOV_L   (REGOFF(4, ESP), EAX)           /* cpuid op */
@@ -94,6 +95,7 @@ GLNAME(_mesa_x86_cpuid):
 
 ALIGNTEXT4
 GLOBL GLNAME(_mesa_x86_cpuid_eax)
+HIDDEN(_mesa_x86_cpuid_eax)
 GLNAME(_mesa_x86_cpuid_eax):
 
        MOV_L   (REGOFF(4, ESP), EAX)           /* cpuid op */
@@ -106,6 +108,7 @@ GLNAME(_mesa_x86_cpuid_eax):
 
 ALIGNTEXT4
 GLOBL GLNAME(_mesa_x86_cpuid_ebx)
+HIDDEN(_mesa_x86_cpuid_ebx)
 GLNAME(_mesa_x86_cpuid_ebx):
 
        MOV_L   (REGOFF(4, ESP), EAX)           /* cpuid op */
@@ -119,6 +122,7 @@ GLNAME(_mesa_x86_cpuid_ebx):
 
 ALIGNTEXT4
 GLOBL GLNAME(_mesa_x86_cpuid_ecx)
+HIDDEN(_mesa_x86_cpuid_ecx)
 GLNAME(_mesa_x86_cpuid_ecx):
 
        MOV_L   (REGOFF(4, ESP), EAX)           /* cpuid op */
@@ -132,6 +136,7 @@ GLNAME(_mesa_x86_cpuid_ecx):
 
 ALIGNTEXT4
 GLOBL GLNAME(_mesa_x86_cpuid_edx)
+HIDDEN(_mesa_x86_cpuid_edx)
 GLNAME(_mesa_x86_cpuid_edx):
 
        MOV_L   (REGOFF(4, ESP), EAX)           /* cpuid op */
@@ -148,9 +153,16 @@ GLNAME(_mesa_x86_cpuid_edx):
  * supports SSE.  A signal handler for SIGILL should have been set
  * before calling this function, otherwise this could kill the client
  * application.
+ *
+ *        -----> !!!! ATTENTION DEVELOPERS !!!! <-----
+ *
+ * If you're debugging with gdb and you get stopped in this function,
+ * just type 'continue'!  Execution will proceed normally.
+ * See freedesktop.org bug #1709 for more info.
  */
 ALIGNTEXT4
 GLOBL GLNAME( _mesa_test_os_sse_support )
+HIDDEN(_mesa_test_os_sse_support)
 GLNAME( _mesa_test_os_sse_support ):
 
        XORPS   ( XMM0, XMM0 )
@@ -165,6 +177,7 @@ GLNAME( _mesa_test_os_sse_support ):
  */
 ALIGNTEXT4
 GLOBL GLNAME( _mesa_test_os_sse_exception_support )
+HIDDEN(_mesa_test_os_sse_exception_support)
 GLNAME( _mesa_test_os_sse_exception_support ):
 
        PUSH_L  ( EBP )
@@ -201,3 +214,7 @@ GLNAME( _mesa_test_os_sse_exception_support ):
 
 #endif
 
+       
+#if defined (__ELF__) && defined (__linux__)
+       .section .note.GNU-stack,"",%progbits
+#endif