Merge branch 'mesa_7_6_branch'

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

diff --git a/src/mesa/x86/x86_xform2.S b/src/mesa/x86/x86_xform2.S
index b9528e1653c72dfeb1d3c1662e0f208aff0fc6a3..980725ef5184dd4c0047b941121bcebfce62df05 100644 (file)
--- a/src/mesa/x86/x86_xform2.S
+++ b/src/mesa/x86/x86_xform2.S
@@ -1,4 +1,3 @@
-/* $Id: x86_xform2.S,v 1.2 2002/03/07 21:40:08 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -30,6 +29,7 @@
  * in there will break the build on some platforms.
  */
 
+#include "assyntax.h"
 #include "matypes.h"
 #include "xform_args.h"
 
@@ -66,6 +66,7 @@
 
 ALIGNTEXT16
 GLOBL GLNAME( _mesa_x86_transform_points2_general )
+HIDDEN(_mesa_x86_transform_points2_general)
 GLNAME( _mesa_x86_transform_points2_general ):
 
 #define FRAME_OFFSET 8
@@ -156,6 +157,7 @@ LLBL(x86_p2_gr_done):
 
 ALIGNTEXT16
 GLOBL GLNAME( _mesa_x86_transform_points2_perspective )
+HIDDEN(_mesa_x86_transform_points2_perspective)
 GLNAME( _mesa_x86_transform_points2_perspective ):
 
 #define FRAME_OFFSET 12
@@ -221,6 +223,7 @@ LLBL(x86_p2_pr_done):
 
 ALIGNTEXT16
 GLOBL GLNAME( _mesa_x86_transform_points2_3d )
+HIDDEN(_mesa_x86_transform_points2_3d)
 GLNAME( _mesa_x86_transform_points2_3d ):
 
 #define FRAME_OFFSET 8
@@ -302,6 +305,7 @@ LLBL(x86_p2_3dr_done):
 
 ALIGNTEXT16
 GLOBL GLNAME( _mesa_x86_transform_points2_3d_no_rot )
+HIDDEN(_mesa_x86_transform_points2_3d_no_rot)
 GLNAME( _mesa_x86_transform_points2_3d_no_rot ):
 
 #define FRAME_OFFSET 12
@@ -371,6 +375,7 @@ LLBL(x86_p2_3dnrr_done):
 
 ALIGNTEXT16
 GLOBL GLNAME( _mesa_x86_transform_points2_2d )
+HIDDEN(_mesa_x86_transform_points2_2d)
 GLNAME( _mesa_x86_transform_points2_2d ):
 
 #define FRAME_OFFSET 8
@@ -443,6 +448,7 @@ LLBL(x86_p2_2dr_done):
 
 ALIGNTEXT4
 GLOBL GLNAME( _mesa_x86_transform_points2_2d_no_rot )
+HIDDEN(_mesa_x86_transform_points2_2d_no_rot)
 GLNAME( _mesa_x86_transform_points2_2d_no_rot ):
 
 #define FRAME_OFFSET 8
@@ -507,6 +513,7 @@ LLBL(x86_p2_2dnrr_done):
 
 ALIGNTEXT16
 GLOBL GLNAME( _mesa_x86_transform_points2_identity )
+HIDDEN(_mesa_x86_transform_points2_identity)
 GLNAME( _mesa_x86_transform_points2_identity ):
 
 #define FRAME_OFFSET 12
@@ -561,3 +568,7 @@ LLBL(x86_p2_ir_done):
        POP_L( ESI )
        RET
 #undef FRAME_OFFSET
+       
+#if defined (__ELF__) && defined (__linux__)
+       .section .note.GNU-stack,"",%progbits
+#endif