diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-23 23:37:00 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-23 23:37:00 +0200 |
| commit | f9e888643115b4b2f28853ebd1733f4410fb8839 (patch) | |
| tree | 58c69f6cef623679080e8933b6c79880bfbd7cb8 /sysdeps/i386/start.S | |
| parent | d78eef6ebc008f784f501ce208bef12c6eafda27 (diff) | |
| parent | b934acf0e93c5a220551ed6e686bb9d45a24a8cc (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'sysdeps/i386/start.S')
| -rw-r--r-- | sysdeps/i386/start.S | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sysdeps/i386/start.S b/sysdeps/i386/start.S index afaf2cd020..51187652dc 100644 --- a/sysdeps/i386/start.S +++ b/sysdeps/i386/start.S @@ -52,8 +52,6 @@ NULL */ -#include "bp-sym.h" - .text .globl _start .type _start,@function @@ -97,11 +95,11 @@ _start: pushl %ecx /* Push second argument: argv. */ pushl %esi /* Push first argument: argc. */ - pushl BP_SYM (main)@GOT(%ebx) + pushl main@GOT(%ebx) /* Call the user's main function, and exit with its value. But let the libc call main. */ - call BP_SYM (__libc_start_main)@PLT + call __libc_start_main@PLT #else /* Push address of our own entry points to .fini and .init. */ pushl $__libc_csu_fini @@ -110,11 +108,11 @@ _start: pushl %ecx /* Push second argument: argv. */ pushl %esi /* Push first argument: argc. */ - pushl $BP_SYM (main) + pushl $main /* Call the user's main function, and exit with its value. But let the libc call main. */ - call BP_SYM (__libc_start_main) + call __libc_start_main #endif hlt /* Crash if somehow `exit' does return. */ |