From 075ac5a2e4afc49370b979745d00755b18a79993 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 6 Jul 2005 22:22:22 +0000 Subject: syntax touchups as suggested by Peter S. Mazinger --- libc/sysdeps/linux/i386/__longjmp.S | 12 ++++++------ libc/sysdeps/linux/i386/bsd-_setjmp.S | 18 +++++++----------- libc/sysdeps/linux/i386/bsd-setjmp.S | 32 ++++++++++++++++---------------- libc/sysdeps/linux/i386/clone.S | 14 +++++++------- libc/sysdeps/linux/i386/crt1.S | 26 +++++++++++++------------- libc/sysdeps/linux/i386/crti.S | 21 ++++++++++----------- libc/sysdeps/linux/i386/crtn.S | 28 +++++++++++++++------------- libc/sysdeps/linux/i386/mmap64.S | 11 +++++------ libc/sysdeps/linux/i386/setjmp.S | 8 ++++---- libc/sysdeps/linux/i386/syscall.S | 8 ++++---- libc/sysdeps/linux/i386/vfork.S | 12 ++++++------ 11 files changed, 93 insertions(+), 97 deletions(-) diff --git a/libc/sysdeps/linux/i386/__longjmp.S b/libc/sysdeps/linux/i386/__longjmp.S index 484a564c3..52f53bb68 100644 --- a/libc/sysdeps/linux/i386/__longjmp.S +++ b/libc/sysdeps/linux/i386/__longjmp.S @@ -21,20 +21,20 @@ #define _SETJMP_H #include -.globl __longjmp; -.type __longjmp,@function -.align 4; \ +.global __longjmp +.type __longjmp,%function +.align 4 __longjmp: movl 4(%esp), %ecx /* User's jmp_buf in %ecx. */ movl 8(%esp), %eax /* Second argument is return value. */ /* Save the return address now. */ movl (JB_PC*4)(%ecx), %edx - /* Restore registers. */ + /* Restore registers. */ movl (JB_BX*4)(%ecx), %ebx movl (JB_SI*4)(%ecx), %esi movl (JB_DI*4)(%ecx), %edi movl (JB_BP*4)(%ecx), %ebp movl (JB_SP*4)(%ecx), %esp /* Jump to saved PC. */ - jmp *%edx -.size __longjmp,.-__longjmp; + jmp *%edx +.size __longjmp,.-__longjmp diff --git a/libc/sysdeps/linux/i386/bsd-_setjmp.S b/libc/sysdeps/linux/i386/bsd-_setjmp.S index 73d90eb4e..ac2c8930d 100644 --- a/libc/sysdeps/linux/i386/bsd-_setjmp.S +++ b/libc/sysdeps/linux/i386/bsd-_setjmp.S @@ -25,27 +25,23 @@ #define _SETJMP_H #include - -.globl _setjmp; -.type _setjmp,@function -.align 4; - +.global _setjmp +.type _setjmp,%function +.align 4 _setjmp: xorl %eax, %eax movl 4 (%esp), %edx - /* Save registers. */ + /* Save registers. */ movl %ebx, (JB_BX*4)(%edx) movl %esi, (JB_SI*4)(%edx) movl %edi, (JB_DI*4)(%edx) leal 4 (%esp), %ecx /* Save SP as it will be after we return. */ - movl %ecx, (JB_SP*4)(%edx) + movl %ecx, (JB_SP*4)(%edx) movl 0 (%esp), %ecx /* Save PC we are returning to now. */ - movl %ecx, (JB_PC*4)(%edx) + movl %ecx, (JB_PC*4)(%edx) movl %ebp, (JB_BP*4)(%edx) /* Save caller's frame pointer. */ movl %eax, JB_SIZE(%edx) /* No signal mask set. */ ret -.size _setjmp,.-_setjmp; - - +.size _setjmp,.-_setjmp diff --git a/libc/sysdeps/linux/i386/bsd-setjmp.S b/libc/sysdeps/linux/i386/bsd-setjmp.S index c075bada0..532dfa1bd 100644 --- a/libc/sysdeps/linux/i386/bsd-setjmp.S +++ b/libc/sysdeps/linux/i386/bsd-setjmp.S @@ -21,32 +21,32 @@ #define _SETJMP_H #include -.globl setjmp; -.type setjmp,@function -.align 4; +.global setjmp +.type setjmp,%function +.align 4 setjmp: - movl 4 (%esp), %eax + movl 4 (%esp), %eax /* Save registers. */ - movl %ebx, (0 *4)(%eax) - movl %esi, (1 *4)(%eax) - movl %edi, (2 *4)(%eax) + movl %ebx, (0 *4)(%eax) + movl %esi, (1 *4)(%eax) + movl %edi, (2 *4)(%eax) /* Save SP as it will be after we return. */ - leal 4 (%esp), %ecx - movl %ecx, (4 *4)(%eax) + leal 4 (%esp), %ecx + movl %ecx, (4 *4)(%eax) /* Save PC we are returning to now. */ - movl 0 (%esp), %ecx - movl %ecx, (5 *4)(%eax) + movl 0 (%esp), %ecx + movl %ecx, (5 *4)(%eax) /* Save caller's frame pointer. */ - movl %ebp, (3 *4)(%eax) + movl %ebp, (3 *4)(%eax) /* Call __sigjmp_save. */ pushl $1 pushl 8(%esp) #ifdef __PIC__ /* We cannot use the PLT, because it requires that %ebx be set, but - we can't save and restore our caller's value. Instead, we do an - indirect jump through the GOT, using for the temporary register - %ecx, which is call-clobbered. */ + we can't save and restore our caller's value. Instead, we do an + indirect jump through the GOT, using for the temporary register + %ecx, which is call-clobbered. */ call here2 here2: popl %ecx addl $_GLOBAL_OFFSET_TABLE_+[.-here2], %ecx @@ -58,4 +58,4 @@ here2: popl %ecx popl %ecx popl %edx ret -.size setjmp,.-setjmp; +.size setjmp,.-setjmp diff --git a/libc/sysdeps/linux/i386/clone.S b/libc/sysdeps/linux/i386/clone.S index 1ba3bcc48..9a6533312 100644 --- a/libc/sysdeps/linux/i386/clone.S +++ b/libc/sysdeps/linux/i386/clone.S @@ -45,11 +45,12 @@ #define __NR_exit 1 .text -.type clone,@function; -.weak clone ; clone = __clone +.type clone,%function +.weak clone + clone = __clone -.type __clone,@function; -.globl __clone; +.global __clone +.type __clone,%function __clone: /* Sanity check arguments. */ @@ -135,8 +136,8 @@ __clone: #else /* __PIC__ */ .Lclone_error: - negl %eax - pushl %eax + negl %eax + pushl %eax call __errno_location popl %ecx movl %ecx, (%eax) @@ -146,4 +147,3 @@ __clone: #endif .size __clone,.-__clone - diff --git a/libc/sysdeps/linux/i386/crt1.S b/libc/sysdeps/linux/i386/crt1.S index afff8a5aa..a133cb9e0 100644 --- a/libc/sysdeps/linux/i386/crt1.S +++ b/libc/sysdeps/linux/i386/crt1.S @@ -56,18 +56,18 @@ #include - .text - .globl _start - .type _start,@function +.text +.global _start +.type _start,%function #if defined(__UCLIBC_CTOR_DTOR__) - .type _init,%function - .type _fini,%function +.type _init,%function +.type _fini,%function #else - .weak _init - .weak _fini +.weak _init +.weak _fini #endif - .type main,%function - .type __uClibc_main,%function +.type main,%function +.type __uClibc_main,%function _start: /* Clear the frame pointer. The ABI suggests this be done, to mark the outermost frame obviously. */ @@ -132,9 +132,9 @@ _start: .size _start,.-_start /* Define a symbol for the first piece of initialized data. */ - .data - .globl __data_start +.data +.global __data_start __data_start: - .long 0 - .weak data_start +.long 0 +.weak data_start data_start = __data_start diff --git a/libc/sysdeps/linux/i386/crti.S b/libc/sysdeps/linux/i386/crti.S index cd0194975..7dbaaadcb 100644 --- a/libc/sysdeps/linux/i386/crti.S +++ b/libc/sysdeps/linux/i386/crti.S @@ -1,6 +1,6 @@ - .section .init -.globl _init - .type _init, @function +.section .init +.global _init +.type _init,%function _init: pushl %ebp movl %esp, %ebp @@ -10,10 +10,9 @@ _init: - - .section .fini -.globl _fini - .type _fini, @function +.section .fini +.global _fini +.type _fini,%function _fini: pushl %ebp movl %esp, %ebp @@ -23,10 +22,10 @@ _fini: - .section .gnu.linkonce.t.__get_pc_thunk_bx,"ax",@progbits -.globl __get_pc_thunk_bx - .hidden __get_pc_thunk_bx - .type __get_pc_thunk_bx, @function +.section .gnu.linkonce.t.__get_pc_thunk_bx,"ax",@progbits +.global __get_pc_thunk_bx +.hidden __get_pc_thunk_bx +.type __get_pc_thunk_bx,%function __get_pc_thunk_bx: movl (%esp), %ebx ret diff --git a/libc/sysdeps/linux/i386/crtn.S b/libc/sysdeps/linux/i386/crtn.S index 8554b9b2e..191250487 100644 --- a/libc/sysdeps/linux/i386/crtn.S +++ b/libc/sysdeps/linux/i386/crtn.S @@ -1,27 +1,29 @@ - .file "initfini.c" - .section .init -.globl _init - .type _init, @function +.file "initfini.c" + +.section .init +.global _init +.type _init,%function popl %ebx popl %ebp ret - .size _init, .-_init +.size _init,.-_init + - .section .fini -.globl _fini - .type _fini, @function +.section .fini +.global _fini +.type _fini,%function popl %ebx popl %ebp ret - .size _fini, .-_fini +.size _fini,.-_fini - .section .gnu.linkonce.t.__get_pc_thunk_bx,"ax",@progbits -.globl __get_pc_thunk_bx - .hidden __get_pc_thunk_bx - .type __get_pc_thunk_bx, @function +.section .gnu.linkonce.t.__get_pc_thunk_bx,"ax",@progbits +.global __get_pc_thunk_bx +.hidden __get_pc_thunk_bx +.type __get_pc_thunk_bx,%function __get_pc_thunk_bx: movl (%esp), %ebx ret diff --git a/libc/sysdeps/linux/i386/mmap64.S b/libc/sysdeps/linux/i386/mmap64.S index 141b839eb..42d1bb69e 100644 --- a/libc/sysdeps/linux/i386/mmap64.S +++ b/libc/sysdeps/linux/i386/mmap64.S @@ -37,10 +37,10 @@ #define OFFLO FD+4 #define OFFHI OFFLO+4 - .text - .globl mmap64; - .type mmap64,@function; - .align 1<<4; +.text +.global mmap64 +.type mmap64,%function +.align 1<<4 mmap64: /* Save registers. */ @@ -106,7 +106,6 @@ __syscall_error: decl %eax .Lsize: - .size mmap64,.Lsize-mmap64 +.size mmap64,.Lsize-mmap64 #endif - diff --git a/libc/sysdeps/linux/i386/setjmp.S b/libc/sysdeps/linux/i386/setjmp.S index ef9deebd6..917ee283b 100644 --- a/libc/sysdeps/linux/i386/setjmp.S +++ b/libc/sysdeps/linux/i386/setjmp.S @@ -22,9 +22,9 @@ #include -.globl __sigsetjmp; -.type __sigsetjmp,@function -.align 4; +.global __sigsetjmp +.type __sigsetjmp,%function +.align 4 __sigsetjmp: movl 4 (%esp), %eax @@ -56,4 +56,4 @@ __sigsetjmp: #else jmp __sigjmp_save #endif -.size __sigsetjmp,.-__sigsetjmp; +.size __sigsetjmp,.-__sigsetjmp diff --git a/libc/sysdeps/linux/i386/syscall.S b/libc/sysdeps/linux/i386/syscall.S index feccc240f..b65950fb5 100644 --- a/libc/sysdeps/linux/i386/syscall.S +++ b/libc/sysdeps/linux/i386/syscall.S @@ -23,9 +23,9 @@ #include .text - .align 4 -.globl syscall - .type syscall,@function +.global syscall +.type syscall,%function +.align 4 syscall: pushl %edi pushl %esi @@ -75,4 +75,4 @@ Lhere: popl %edi ret .Lsize: - .size syscall,.Lsize-syscall +.size syscall,.Lsize-syscall diff --git a/libc/sysdeps/linux/i386/vfork.S b/libc/sysdeps/linux/i386/vfork.S index d340a983d..d9b8ab7ca 100644 --- a/libc/sysdeps/linux/i386/vfork.S +++ b/libc/sysdeps/linux/i386/vfork.S @@ -14,11 +14,11 @@ #else - .text - .globl __vfork; - .type __vfork,@function; - .align 1<<4; - +.text +.global __vfork +.type __vfork,%function +.align 1<<4 + __vfork: popl %ecx movl $__NR_vfork,%eax @@ -46,7 +46,7 @@ __syscall_error: decl %eax .Lsize: - .size __vfork,.Lsize-__vfork +.size __vfork,.Lsize-__vfork .weak vfork ; vfork = __vfork -- cgit v1.2.3