remove all .size and .type directives for functions from the asm

these are useless and have caused problems for users trying to build
with non-gnu tools like tcc's assembler.

diff --git a/src/internal/i386/syscall.s b/src/internal/i386/syscall.s
index 5b19a1b..083db1c 100644 (file)
--- a/src/internal/i386/syscall.s
+++ b/src/internal/i386/syscall.s
@@ -1,5 +1,4 @@
 .global __syscall
 .global __syscall

-.type __syscall,%function

 __syscall:
        pushl %ebx
        pushl %esi
 __syscall:
        pushl %ebx
        pushl %esi


@@ -18,4 +17,3 @@ __syscall:
        popl %esi
        popl %ebx
        ret
        popl %esi
        popl %ebx
        ret

-.size __syscall,.-__syscall

diff --git a/src/internal/x86_64/syscall.s b/src/internal/x86_64/syscall.s
index 776cde2..931f44f 100644 (file)
--- a/src/internal/x86_64/syscall.s
+++ b/src/internal/x86_64/syscall.s
@@ -1,5 +1,4 @@
 .global __syscall
 .global __syscall

-.type __syscall,%function

 __syscall:
        movq %rdi,%rax
        movq %rsi,%rdi
 __syscall:
        movq %rdi,%rax
        movq %rsi,%rdi


@@ -10,4 +9,3 @@ __syscall:
        movq 8(%rsp),%r9
        syscall
        ret
        movq 8(%rsp),%r9
        syscall
        ret

-.size __syscall,.-__syscall

diff --git a/src/setjmp/i386/longjmp.s b/src/setjmp/i386/longjmp.s
index 249d7b4..b139d9f 100644 (file)
--- a/src/setjmp/i386/longjmp.s
+++ b/src/setjmp/i386/longjmp.s
@@ -1,7 +1,5 @@
 .global _longjmp
 .global longjmp
 .global _longjmp
 .global longjmp

-.type _longjmp,%function
-.type longjmp,%function

 _longjmp:
 longjmp:
        mov  4(%esp),%edx
 _longjmp:
 longjmp:
        mov  4(%esp),%edx


@@ -18,5 +16,3 @@ longjmp:
        mov     %ecx,%esp
        mov 20(%edx),%ecx
        jmp *%ecx
        mov     %ecx,%esp
        mov 20(%edx),%ecx
        jmp *%ecx

-.size _longjmp,.-_longjmp
-.size longjmp,.-longjmp

diff --git a/src/setjmp/i386/setjmp.s b/src/setjmp/i386/setjmp.s
index 89e614f..d53c1a6 100644 (file)
--- a/src/setjmp/i386/setjmp.s
+++ b/src/setjmp/i386/setjmp.s
@@ -1,9 +1,6 @@
 .global __setjmp
 .global _setjmp
 .global setjmp
 .global __setjmp
 .global _setjmp
 .global setjmp

-.type __setjmp,%function
-.type _setjmp,%function
-.type setjmp,%function

 __setjmp:
 _setjmp:
 setjmp:
 __setjmp:
 _setjmp:
 setjmp:


@@ -18,6 +15,3 @@ setjmp:
        mov    %ecx, 20(%eax)
        xor    %eax, %eax
        ret
        mov    %ecx, 20(%eax)
        xor    %eax, %eax
        ret

-.size __setjmp,.-__setjmp
-.size _setjmp,.-_setjmp
-.size setjmp,.-setjmp

diff --git a/src/setjmp/x86_64/longjmp.s b/src/setjmp/x86_64/longjmp.s
index dd89351..70271bf 100644 (file)
--- a/src/setjmp/x86_64/longjmp.s
+++ b/src/setjmp/x86_64/longjmp.s
@@ -1,8 +1,6 @@
 /* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
 .global _longjmp
 .global longjmp
 /* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
 .global _longjmp
 .global longjmp

-.type _longjmp,%function
-.type longjmp,%function

 _longjmp:
 longjmp:
        mov %rsi,%rax           /* val will be longjmp return */
 _longjmp:
 longjmp:
        mov %rsi,%rax           /* val will be longjmp return */


@@ -20,5 +18,3 @@ longjmp:
        mov %rdx,%rsp
        mov 56(%rdi),%rdx       /* this is the instruction pointer */
        jmp *%rdx               /* goto saved address without altering rsp */
        mov %rdx,%rsp
        mov 56(%rdi),%rdx       /* this is the instruction pointer */
        jmp *%rdx               /* goto saved address without altering rsp */

-.size _longjmp,.-_longjmp
-.size longjmp,.-longjmp

diff --git a/src/setjmp/x86_64/setjmp.s b/src/setjmp/x86_64/setjmp.s
index faecd35..d5ff113 100644 (file)
--- a/src/setjmp/x86_64/setjmp.s
+++ b/src/setjmp/x86_64/setjmp.s
@@ -2,9 +2,6 @@
 .global __setjmp
 .global _setjmp
 .global setjmp
 .global __setjmp
 .global _setjmp
 .global setjmp

-.type __setjmp,%function
-.type _setjmp,%function
-.type setjmp,%function

 __setjmp:
 _setjmp:
 setjmp:
 __setjmp:
 _setjmp:
 setjmp:


@@ -20,6 +17,3 @@ setjmp:
        mov %rdx,56(%rdi)
        xor %rax,%rax           /* always return 0 */
        ret
        mov %rdx,56(%rdi)
        xor %rax,%rax           /* always return 0 */
        ret

-.size __setjmp,.-__setjmp
-.size _setjmp,.-_setjmp
-.size setjmp,.-setjmp

diff --git a/src/signal/i386/restore.s b/src/signal/i386/restore.s
index e0c4ab6..298ba9a 100644 (file)
--- a/src/signal/i386/restore.s
+++ b/src/signal/i386/restore.s
@@ -1,15 +1,10 @@
 .global __restore
 .global __restore

-.type __restore,%function

 __restore:
        popl %eax
        movl $119, %eax
        int $0x80
 __restore:
        popl %eax
        movl $119, %eax
        int $0x80

-.size __restore,.-__restore

 
 .global __restore_rt
 
 .global __restore_rt

-.type __restore_rt,%function

 __restore_rt:
        movl $173, %eax
        int $0x80
 __restore_rt:
        movl $173, %eax
        int $0x80

-.size __restore_rt,.-__restore_rt
-

diff --git a/src/signal/x86_64/restore.s b/src/signal/x86_64/restore.s
index bc5e0d7..f6bb6ff 100644 (file)
--- a/src/signal/x86_64/restore.s
+++ b/src/signal/x86_64/restore.s
@@ -1,11 +1,6 @@
 .global __restore_rt
 .global __restore
 .global __restore_rt
 .global __restore

-.type __restore_rt,%function
-.type __restore,%function

 __restore_rt:
 __restore:
        movl $15, %eax
        syscall
 __restore_rt:
 __restore:
        movl $15, %eax
        syscall

-.size __restore_rt,.-__restore_rt
-.size __restore,.-__restore
-

diff --git a/src/thread/i386/__set_thread_area.s b/src/thread/i386/__set_thread_area.s
index 9bf698b..2a2e31a 100644 (file)
--- a/src/thread/i386/__set_thread_area.s
+++ b/src/thread/i386/__set_thread_area.s
@@ -1,6 +1,5 @@
 .text
 .global __set_thread_area
 .text
 .global __set_thread_area

-.type   __set_thread_area,%function

 __set_thread_area:
        pushl %ebx
        movl 8(%esp),%ecx
 __set_thread_area:
        pushl %ebx
        movl 8(%esp),%ecx


@@ -19,4 +18,3 @@ __set_thread_area:
        movw %cx,%gs
 1:
        ret
        movw %cx,%gs
 1:
        ret

-.size __set_thread_area,.-__set_thread_area

diff --git a/src/thread/i386/__unmapself.s b/src/thread/i386/__unmapself.s
index bcf6e7f..b5e9c71 100644 (file)
--- a/src/thread/i386/__unmapself.s
+++ b/src/thread/i386/__unmapself.s
@@ -1,6 +1,5 @@
 .text
 .global __unmapself
 .text
 .global __unmapself

-.type   __unmapself,%function

 __unmapself:
        movl $91,%eax
        movl 4(%esp),%ebx
 __unmapself:
        movl $91,%eax
        movl 4(%esp),%ebx


@@ -9,5 +8,3 @@ __unmapself:
        xorl %ebx,%ebx
        movl $1,%eax
        int $128
        xorl %ebx,%ebx
        movl $1,%eax
        int $128

-
-.size __unmapself,.-__unmapself

diff --git a/src/thread/i386/cancellation2.s b/src/thread/i386/cancellation2.s
index 859aa23..6f3f694 100644 (file)
--- a/src/thread/i386/cancellation2.s
+++ b/src/thread/i386/cancellation2.s
@@ -1,6 +1,5 @@
 .text
 .global __pthread_register_cancel
 .text
 .global __pthread_register_cancel

-.type   __pthread_register_cancel,%function

 __pthread_register_cancel:
        pushl %eax
        call __pthread_register_cancel_3
 __pthread_register_cancel:
        pushl %eax
        call __pthread_register_cancel_3


@@ -8,7 +7,6 @@ __pthread_register_cancel:
        ret
 
 .global __pthread_unregister_cancel
        ret
 
 .global __pthread_unregister_cancel

-.type   __pthread_unregister_cancel,%function

 __pthread_unregister_cancel:
        pushl %eax
        call __pthread_unregister_cancel_3
 __pthread_unregister_cancel:
        pushl %eax
        call __pthread_unregister_cancel_3

diff --git a/src/thread/i386/cancellation3.s b/src/thread/i386/cancellation3.s
index 210293e..6096b8c 100644 (file)
--- a/src/thread/i386/cancellation3.s
+++ b/src/thread/i386/cancellation3.s
@@ -1,6 +1,5 @@
 .text
 .global __pthread_unwind_next
 .text
 .global __pthread_unwind_next

-.type   __pthread_unwind_next,%function

 __pthread_unwind_next:
        pushl %eax
        call __pthread_unwind_next_3
 __pthread_unwind_next:
        pushl %eax
        call __pthread_unwind_next_3

diff --git a/src/thread/i386/clone.s b/src/thread/i386/clone.s
index 53405cf..4133915 100644 (file)
--- a/src/thread/i386/clone.s
+++ b/src/thread/i386/clone.s
@@ -1,6 +1,5 @@
 .text
 .global __uniclone
 .text
 .global __uniclone

-.type   __uniclone,%function

 __uniclone:
        movl    4(%esp),%ecx
        subl    $24,%ecx
 __uniclone:
        movl    4(%esp),%ecx
        subl    $24,%ecx


@@ -24,4 +23,3 @@ __uniclone:
        popl    %esi
        popl    %ebx
        ret
        popl    %esi
        popl    %ebx
        ret

-.size __uniclone,.-__uniclone

diff --git a/src/thread/i386/syscall_cp.s b/src/thread/i386/syscall_cp.s
index 5190513..fa435f3 100644 (file)
--- a/src/thread/i386/syscall_cp.s
+++ b/src/thread/i386/syscall_cp.s
@@ -1,6 +1,5 @@
 .text
 .global __syscall_cp_asm
 .text
 .global __syscall_cp_asm

-.type   __syscall_cp_asm,%function

 __syscall_cp_asm:
        pushl %ebx
        pushl %esi
 __syscall_cp_asm:
        pushl %ebx
        pushl %esi

diff --git a/src/thread/x86_64/__set_thread_area.s b/src/thread/x86_64/__set_thread_area.s
index faf73ec..75f19a8 100644 (file)
--- a/src/thread/x86_64/__set_thread_area.s
+++ b/src/thread/x86_64/__set_thread_area.s
@@ -1,11 +1,9 @@
 /* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
 .text
 .global __set_thread_area
 /* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
 .text
 .global __set_thread_area

-.type   __set_thread_area,%function

 __set_thread_area:
         mov %rdi,%rsi           /* shift for syscall */
         movl $0x1002,%edi       /* SET_FS register */
         movl $158,%eax          /* set fs segment to */
         syscall                 /* arch_prctl(SET_FS, arg)*/
        ret
 __set_thread_area:
         mov %rdi,%rsi           /* shift for syscall */
         movl $0x1002,%edi       /* SET_FS register */
         movl $158,%eax          /* set fs segment to */
         syscall                 /* arch_prctl(SET_FS, arg)*/
        ret

-.size __set_thread_area,.-__set_thread_area

diff --git a/src/thread/x86_64/__unmapself.s b/src/thread/x86_64/__unmapself.s
index 0b04d99..438f5eb 100644 (file)
--- a/src/thread/x86_64/__unmapself.s
+++ b/src/thread/x86_64/__unmapself.s
@@ -1,11 +1,9 @@
 /* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
 .text
 .global __unmapself
 /* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
 .text
 .global __unmapself

-.type   __unmapself,%function

 __unmapself:
        movl $11,%eax   /* SYS_munmap */
        syscall         /* munmap(arg2,arg3) */
        xor %rdi,%rdi   /* exit() args: always return success */
        movl $60,%eax   /* SYS_exit */
        syscall         /* exit(0) */
 __unmapself:
        movl $11,%eax   /* SYS_munmap */
        syscall         /* munmap(arg2,arg3) */
        xor %rdi,%rdi   /* exit() args: always return success */
        movl $60,%eax   /* SYS_exit */
        syscall         /* exit(0) */

-.size __unmapself,.-__unmapself

diff --git a/src/thread/x86_64/clone.s b/src/thread/x86_64/clone.s
index e006bcc..ce67cc6 100644 (file)
--- a/src/thread/x86_64/clone.s
+++ b/src/thread/x86_64/clone.s
@@ -1,7 +1,6 @@
 /* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
 .text
 .global __uniclone
 /* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
 .text
 .global __uniclone

-.type   __uniclone,%function

 /* rdi = child_stack, rsi = start, rdx = pthread_struct */
 __uniclone:
         subq    $8,%rsp         /* pad parent stack to prevent branch later */
 /* rdi = child_stack, rsi = start, rdx = pthread_struct */
 __uniclone:
         subq    $8,%rsp         /* pad parent stack to prevent branch later */


@@ -19,4 +18,3 @@ __uniclone:
         pop     %rdi            /* child stack: restore pthread_struct
                                  * parent stack: undo rsp displacement */
         ret
         pop     %rdi            /* child stack: restore pthread_struct
                                  * parent stack: undo rsp displacement */
         ret

-.size __uniclone,.-__uniclone

diff --git a/src/thread/x86_64/syscall_cp.s b/src/thread/x86_64/syscall_cp.s
index 9727ad3..2081928 100644 (file)
--- a/src/thread/x86_64/syscall_cp.s
+++ b/src/thread/x86_64/syscall_cp.s
@@ -1,6 +1,5 @@
 .text
 .global __syscall_cp_asm
 .text
 .global __syscall_cp_asm

-.type   __syscall_cp_asm,%function

 __syscall_cp_asm:
        lea 1f(%rip),%rax
        mov %rax,8(%rdi)
 __syscall_cp_asm:
        lea 1f(%rip),%rax
        mov %rax,8(%rdi)