From ca001ed767bc2643d1c875fd4240942867949baa Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sat, 12 Jun 2004 05:52:22 +0000 Subject: Per comments from Bernhard Rosenkraenzer, adjust gcc 3.3.x generated asm with s/i686.get_pc_thunk.bx/get_pc_thunk_bx/g to make gcc 3.4 happy. --- libc/sysdeps/linux/i386/crti.S | 36 ++++++++++++++---------------------- libc/sysdeps/linux/i386/crtn.S | 26 ++++++++++---------------- 2 files changed, 24 insertions(+), 38 deletions(-) (limited to 'libc/sysdeps') diff --git a/libc/sysdeps/linux/i386/crti.S b/libc/sysdeps/linux/i386/crti.S index 3cc97f833..cd0194975 100644 --- a/libc/sysdeps/linux/i386/crti.S +++ b/libc/sysdeps/linux/i386/crti.S @@ -1,40 +1,32 @@ - .file "initfini.c" -#APP - .section .init -#NO_APP .globl _init .type _init, @function _init: pushl %ebp movl %esp, %ebp pushl %ebx - call __i686.get_pc_thunk.bx + call __get_pc_thunk_bx addl $_GLOBAL_OFFSET_TABLE_, %ebx -#APP - - - - + + + + .section .fini -#NO_APP .globl _fini .type _fini, @function _fini: pushl %ebp movl %esp, %ebp pushl %ebx - call __i686.get_pc_thunk.bx + call __get_pc_thunk_bx addl $_GLOBAL_OFFSET_TABLE_, %ebx -#APP - - - - .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits -.globl __i686.get_pc_thunk.bx - .hidden __i686.get_pc_thunk.bx - .type __i686.get_pc_thunk.bx, @function -__i686.get_pc_thunk.bx: + + + + .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 +__get_pc_thunk_bx: movl (%esp), %ebx ret - .ident "GCC: (GNU) 3.3.2 (Debian)" diff --git a/libc/sysdeps/linux/i386/crtn.S b/libc/sysdeps/linux/i386/crtn.S index 733f25b83..8554b9b2e 100644 --- a/libc/sysdeps/linux/i386/crtn.S +++ b/libc/sysdeps/linux/i386/crtn.S @@ -1,33 +1,27 @@ .file "initfini.c" -#APP - .section .init -#NO_APP .globl _init .type _init, @function -#NO_APP popl %ebx popl %ebp ret .size _init, .-_init -#APP - + + .section .fini -#NO_APP .globl _fini .type _fini, @function -#NO_APP popl %ebx popl %ebp ret .size _fini, .-_fini -#APP - - .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits -.globl __i686.get_pc_thunk.bx - .hidden __i686.get_pc_thunk.bx - .type __i686.get_pc_thunk.bx, @function -__i686.get_pc_thunk.bx: + + + + .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 +__get_pc_thunk_bx: movl (%esp), %ebx ret - .ident "GCC: (GNU) 3.3.2 (Debian)" -- cgit v1.2.3