Use #function instead of @function

in .type directive so it works with Solaris
assembler as well as GNU assembler.

diff --git a/src/mesa/glapi/glsparcasm.py b/src/mesa/glapi/glsparcasm.py
index d55d64b552bd19833cd11e861bed406e36aad143..98cbd477ef44dcfb3c71b6897c1bc19829b25e20 100644 (file)
--- a/src/mesa/glapi/glsparcasm.py
+++ b/src/mesa/glapi/glsparcasm.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# $Id: glsparcasm.py,v 1.3 2001/06/06 22:55:28 davem69 Exp $
+# $Id: glsparcasm.py,v 1.4 2001/08/03 13:16:31 davem69 Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.5
@@ -45,7 +45,7 @@ def PrintHead():
        print '#include "glapioffsets.h"'
        print ''
        print '#define GL_PREFIX(n) gl##n'
-       print '#define GLOBL_FN(x) .globl x ; .type x,@function'
+       print '#define GLOBL_FN(x) .globl x ; .type x,#function'
        print ''
        print '/* The _glapi_Dispatch symbol addresses get relocated into the'
        print ' * sethi/or instruction sequences below at library init time.'
@@ -64,7 +64,7 @@ def PrintHead():
        print '.align 64'
        print ''
        print '.globl _mesa_sparc_glapi_begin'
-       print '.type _mesa_sparc_glapi_begin,@function'
+       print '.type _mesa_sparc_glapi_begin,#function'
        print '_mesa_sparc_glapi_begin:'
        print ''
        return
@@ -74,7 +74,7 @@ def PrintTail():
        print '\t nop'
        print ''
        print '.globl _mesa_sparc_glapi_end'
-       print '.type _mesa_sparc_glapi_end,@function'
+       print '.type _mesa_sparc_glapi_end,#function'
        print '_mesa_sparc_glapi_end:'
        print ''
 #endif

diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 781127bf27f11d3ab61d3acb53b1527b3679ba6a..303f46b302912bf2056afe8bc17b98f1941f6cb9 100644 (file)
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -2,7 +2,7 @@
 #include "glapioffsets.h"
 
 #define GL_PREFIX(n) gl##n
-#define GLOBL_FN(x) .globl x ; .type x,@function
+#define GLOBL_FN(x) .globl x ; .type x,#function
 
 /* The _glapi_Dispatch symbol addresses get relocated into the
  * sethi/or instruction sequences below at library init time.
@@ -21,7 +21,7 @@ __glapi_sparc_icache_flush: /* %o0 = insn_addr */
 .align 64
 
 .globl _mesa_sparc_glapi_begin
-.type _mesa_sparc_glapi_begin,@function
+.type _mesa_sparc_glapi_begin,#function
 _mesa_sparc_glapi_begin:
 
 GLOBL_FN(GL_PREFIX(NewList))
@@ -11768,6 +11768,6 @@ GL_PREFIX(SamplePatternSGIS):
         nop
 
 .globl _mesa_sparc_glapi_end
-.type _mesa_sparc_glapi_end,@function
+.type _mesa_sparc_glapi_end,#function
 _mesa_sparc_glapi_end: