r600g: Implement GL_ARB_texture_gather

[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 13c2b9b9f813600de6df8f3b99458c827e6a48c1..1887bcaaff4d1d6815c2c8e6f97596a0d5638366 100644 (file)
--- a/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -17,9 +16,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 /*
@@ -40,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
@@ -69,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 */
@@ -92,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 */
@@ -104,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 */
@@ -117,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 */
@@ -130,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 */
@@ -155,6 +162,7 @@ GLNAME(_mesa_x86_cpuid_edx):
  */
 ALIGNTEXT4
 GLOBL GLNAME( _mesa_test_os_sse_support )
+HIDDEN(_mesa_test_os_sse_support)
 GLNAME( _mesa_test_os_sse_support ):
 
        XORPS   ( XMM0, XMM0 )
@@ -169,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 )
@@ -205,3 +214,7 @@ GLNAME( _mesa_test_os_sse_exception_support ):
 
 #endif
 
+       
+#if defined (__ELF__) && defined (__linux__)
+       .section .note.GNU-stack,"",%progbits
+#endif