From 735095ae9566b2b14e8210e5ed44b3d5b51495f1 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 19 Mar 2012 21:00:15 +0100 Subject: Merge sysdeps/i386/elf/Versions into sysdeps/i386/Versions. Move sysdeps/i386/elf/start.S to sysdeps/i386/ Merge sysdeps/i386/elf/configure.in into sysdeps/i386/configure.in Delete merged files sysdeps/i386/elf/configure.in, sysdeps/i386/elf/Versions and sysdeps/i386/elf/configure. --- sysdeps/i386/Versions | 6 ++ sysdeps/i386/configure.in | 34 ++++++++++ sysdeps/i386/elf/Versions | 6 -- sysdeps/i386/elf/configure | 128 ------------------------------------- sysdeps/i386/elf/configure.in | 36 ----------- sysdeps/i386/elf/start.S | 142 ------------------------------------------ sysdeps/i386/start.S | 142 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 182 insertions(+), 312 deletions(-) delete mode 100644 sysdeps/i386/elf/Versions delete mode 100644 sysdeps/i386/elf/configure delete mode 100644 sysdeps/i386/elf/configure.in delete mode 100644 sysdeps/i386/elf/start.S create mode 100644 sysdeps/i386/start.S diff --git a/sysdeps/i386/Versions b/sysdeps/i386/Versions index b0230d31cf..7be44aad7a 100644 --- a/sysdeps/i386/Versions +++ b/sysdeps/i386/Versions @@ -1,3 +1,9 @@ +ld { + GLIBC_2.3 { + # The alternative i386 runtime interface to TLS. + ___tls_get_addr; + } +} libc { GLIBC_2.0 { # Functions from libgcc. diff --git a/sysdeps/i386/configure.in b/sysdeps/i386/configure.in index f769019acf..ec69080eb6 100644 --- a/sysdeps/i386/configure.in +++ b/sysdeps/i386/configure.in @@ -97,3 +97,37 @@ if AC_TRY_COMMAND([${CC-cc} -mno-vzeroupper -xc /dev/null -S -o /dev/null]); the else libc_cv_cc_novzeroupper=no fi]) + +# Check for support of thread-local storage handling in assembler and +# linker. +AC_CACHE_CHECK(for i386 TLS support, libc_cv_386_tls, [dnl +cat > conftest.s <<\EOF + .section ".tdata", "awT", @progbits + .globl foo +foo: .long 1 + .section ".tbss", "awT", @nobits + .globl bar +bar: .skip 4 + .text +baz: leal bar@TLSLDM(%ebx), %eax + leal bar@DTPOFF(%eax), %edx + subl foo@GOTTPOFF(%edx), %eax + subl $bar@TPOFF, %eax + movl foo@GOTNTPOFF(%edx), %ecx + movl %gs:(%ecx), %eax + movl %gs:bar@NTPOFF, %eax +EOF +dnl +if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then + libc_cv_386_tls=yes +else + libc_cv_386_tls=no +fi +rm -f conftest*]) +if test $libc_cv_386_tls = no; then + AC_MSG_ERROR([the assembler must support TLS]) +fi + +dnl It is always possible to access static and hidden symbols in an +dnl position independent way. +AC_DEFINE(PI_STATIC_AND_HIDDEN) diff --git a/sysdeps/i386/elf/Versions b/sysdeps/i386/elf/Versions deleted file mode 100644 index 5ca6686b83..0000000000 --- a/sysdeps/i386/elf/Versions +++ /dev/null @@ -1,6 +0,0 @@ -ld { - GLIBC_2.3 { - # The alternative i386 runtime interface to TLS. - ___tls_get_addr; - } -} diff --git a/sysdeps/i386/elf/configure b/sysdeps/i386/elf/configure deleted file mode 100644 index 83e89bd0a0..0000000000 --- a/sysdeps/i386/elf/configure +++ /dev/null @@ -1,128 +0,0 @@ - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - - - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - -# This file is generated from configure.in by Autoconf. DO NOT EDIT! - # Local configure fragment for sysdeps/i386/elf. - -# Check for support of thread-local storage handling in assembler and -# linker. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for i386 TLS support" >&5 -$as_echo_n "checking for i386 TLS support... " >&6; } -if ${libc_cv_386_tls+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat > conftest.s <<\EOF - .section ".tdata", "awT", @progbits - .globl foo -foo: .long 1 - .section ".tbss", "awT", @nobits - .globl bar -bar: .skip 4 - .text -baz: leal bar@TLSLDM(%ebx), %eax - leal bar@DTPOFF(%eax), %edx - subl foo@GOTTPOFF(%edx), %eax - subl $bar@TPOFF, %eax - movl foo@GOTNTPOFF(%edx), %ecx - movl %gs:(%ecx), %eax - movl %gs:bar@NTPOFF, %eax -EOF -if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - libc_cv_386_tls=yes -else - libc_cv_386_tls=no -fi -rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_386_tls" >&5 -$as_echo "$libc_cv_386_tls" >&6; } -if test $libc_cv_386_tls = no; then - as_fn_error $? "the assembler must support TLS" "$LINENO" 5 -fi - -$as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h - diff --git a/sysdeps/i386/elf/configure.in b/sysdeps/i386/elf/configure.in deleted file mode 100644 index 0c436f3f41..0000000000 --- a/sysdeps/i386/elf/configure.in +++ /dev/null @@ -1,36 +0,0 @@ -GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. -# Local configure fragment for sysdeps/i386/elf. - -# Check for support of thread-local storage handling in assembler and -# linker. -AC_CACHE_CHECK(for i386 TLS support, libc_cv_386_tls, [dnl -cat > conftest.s <<\EOF - .section ".tdata", "awT", @progbits - .globl foo -foo: .long 1 - .section ".tbss", "awT", @nobits - .globl bar -bar: .skip 4 - .text -baz: leal bar@TLSLDM(%ebx), %eax - leal bar@DTPOFF(%eax), %edx - subl foo@GOTTPOFF(%edx), %eax - subl $bar@TPOFF, %eax - movl foo@GOTNTPOFF(%edx), %ecx - movl %gs:(%ecx), %eax - movl %gs:bar@NTPOFF, %eax -EOF -dnl -if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then - libc_cv_386_tls=yes -else - libc_cv_386_tls=no -fi -rm -f conftest*]) -if test $libc_cv_386_tls = no; then - AC_MSG_ERROR([the assembler must support TLS]) -fi - -dnl It is always possible to access static and hidden symbols in an -dnl position independent way. -AC_DEFINE(PI_STATIC_AND_HIDDEN) diff --git a/sysdeps/i386/elf/start.S b/sysdeps/i386/elf/start.S deleted file mode 100644 index 992c358c07..0000000000 --- a/sysdeps/i386/elf/start.S +++ /dev/null @@ -1,142 +0,0 @@ -/* Startup code compliant to the ELF i386 ABI. - Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - In addition to the permissions in the GNU Lesser General Public - License, the Free Software Foundation gives you unlimited - permission to link the compiled version of this file with other - programs, and to distribute those programs without any restriction - coming from the use of this file. (The GNU Lesser General Public - License restrictions do apply in other respects; for example, they - cover modification of the file, and distribution when not linked - into another program.) - - Note that people who make modified versions of this file are not - obligated to grant this special exception for their modified - versions; it is their choice whether to do so. The GNU Lesser - General Public License gives permission to release a modified - version without this exception; this exception also makes it - possible to release a modified version which carries forward this - exception. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -/* This is the canonical entry point, usually the first thing in the text - segment. The SVR4/i386 ABI (pages 3-31, 3-32) says that when the entry - point runs, most registers' values are unspecified, except for: - - %edx Contains a function pointer to be registered with `atexit'. - This is how the dynamic linker arranges to have DT_FINI - functions called for shared libraries that have been loaded - before this code runs. - - %esp The stack contains the arguments and environment: - 0(%esp) argc - 4(%esp) argv[0] - ... - (4*argc)(%esp) NULL - (4*(argc+1))(%esp) envp[0] - ... - NULL -*/ - -#include "bp-sym.h" - - .text - .globl _start - .type _start,@function -_start: - /* Clear the frame pointer. The ABI suggests this be done, to mark - the outermost frame obviously. */ - xorl %ebp, %ebp - - /* Extract the arguments as encoded on the stack and set up - the arguments for `main': argc, argv. envp will be determined - later in __libc_start_main. */ - popl %esi /* Pop the argument count. */ - movl %esp, %ecx /* argv starts just at the current stack top.*/ - - /* Before pushing the arguments align the stack to a 16-byte - (SSE needs 16-byte alignment) boundary to avoid penalties from - misaligned accesses. Thanks to Edward Seidl - for pointing this out. */ - andl $0xfffffff0, %esp - pushl %eax /* Push garbage because we allocate - 28 more bytes. */ - - /* Provide the highest stack address to the user code (for stacks - which grow downwards). */ - pushl %esp - - pushl %edx /* Push address of the shared library - termination function. */ - -#ifdef SHARED - /* Load PIC register. */ - call 1f - addl $_GLOBAL_OFFSET_TABLE_, %ebx - - /* Push address of our own entry points to .fini and .init. */ - leal __libc_csu_fini@GOTOFF(%ebx), %eax - pushl %eax - leal __libc_csu_init@GOTOFF(%ebx), %eax - pushl %eax - - pushl %ecx /* Push second argument: argv. */ - pushl %esi /* Push first argument: argc. */ - - pushl BP_SYM (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 -#else - /* Push address of our own entry points to .fini and .init. */ - pushl $__libc_csu_fini - pushl $__libc_csu_init - - pushl %ecx /* Push second argument: argv. */ - pushl %esi /* Push first argument: argc. */ - - pushl $BP_SYM (main) - - /* Call the user's main function, and exit with its value. - But let the libc call main. */ - call BP_SYM (__libc_start_main) -#endif - - hlt /* Crash if somehow `exit' does return. */ - -#ifdef SHARED -1: movl (%esp), %ebx - ret -#endif - -/* To fulfill the System V/i386 ABI we need this symbol. Yuck, it's so - meaningless since we don't support machines < 80386. */ - .section .rodata - .globl _fp_hw -_fp_hw: .long 3 - .size _fp_hw, 4 - .type _fp_hw,@object - -/* Define a symbol for the first piece of initialized data. */ - .data - .globl __data_start -__data_start: - .long 0 - .weak data_start - data_start = __data_start diff --git a/sysdeps/i386/start.S b/sysdeps/i386/start.S new file mode 100644 index 0000000000..992c358c07 --- /dev/null +++ b/sysdeps/i386/start.S @@ -0,0 +1,142 @@ +/* Startup code compliant to the ELF i386 ABI. + Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + In addition to the permissions in the GNU Lesser General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The GNU Lesser General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + Note that people who make modified versions of this file are not + obligated to grant this special exception for their modified + versions; it is their choice whether to do so. The GNU Lesser + General Public License gives permission to release a modified + version without this exception; this exception also makes it + possible to release a modified version which carries forward this + exception. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* This is the canonical entry point, usually the first thing in the text + segment. The SVR4/i386 ABI (pages 3-31, 3-32) says that when the entry + point runs, most registers' values are unspecified, except for: + + %edx Contains a function pointer to be registered with `atexit'. + This is how the dynamic linker arranges to have DT_FINI + functions called for shared libraries that have been loaded + before this code runs. + + %esp The stack contains the arguments and environment: + 0(%esp) argc + 4(%esp) argv[0] + ... + (4*argc)(%esp) NULL + (4*(argc+1))(%esp) envp[0] + ... + NULL +*/ + +#include "bp-sym.h" + + .text + .globl _start + .type _start,@function +_start: + /* Clear the frame pointer. The ABI suggests this be done, to mark + the outermost frame obviously. */ + xorl %ebp, %ebp + + /* Extract the arguments as encoded on the stack and set up + the arguments for `main': argc, argv. envp will be determined + later in __libc_start_main. */ + popl %esi /* Pop the argument count. */ + movl %esp, %ecx /* argv starts just at the current stack top.*/ + + /* Before pushing the arguments align the stack to a 16-byte + (SSE needs 16-byte alignment) boundary to avoid penalties from + misaligned accesses. Thanks to Edward Seidl + for pointing this out. */ + andl $0xfffffff0, %esp + pushl %eax /* Push garbage because we allocate + 28 more bytes. */ + + /* Provide the highest stack address to the user code (for stacks + which grow downwards). */ + pushl %esp + + pushl %edx /* Push address of the shared library + termination function. */ + +#ifdef SHARED + /* Load PIC register. */ + call 1f + addl $_GLOBAL_OFFSET_TABLE_, %ebx + + /* Push address of our own entry points to .fini and .init. */ + leal __libc_csu_fini@GOTOFF(%ebx), %eax + pushl %eax + leal __libc_csu_init@GOTOFF(%ebx), %eax + pushl %eax + + pushl %ecx /* Push second argument: argv. */ + pushl %esi /* Push first argument: argc. */ + + pushl BP_SYM (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 +#else + /* Push address of our own entry points to .fini and .init. */ + pushl $__libc_csu_fini + pushl $__libc_csu_init + + pushl %ecx /* Push second argument: argv. */ + pushl %esi /* Push first argument: argc. */ + + pushl $BP_SYM (main) + + /* Call the user's main function, and exit with its value. + But let the libc call main. */ + call BP_SYM (__libc_start_main) +#endif + + hlt /* Crash if somehow `exit' does return. */ + +#ifdef SHARED +1: movl (%esp), %ebx + ret +#endif + +/* To fulfill the System V/i386 ABI we need this symbol. Yuck, it's so + meaningless since we don't support machines < 80386. */ + .section .rodata + .globl _fp_hw +_fp_hw: .long 3 + .size _fp_hw, 4 + .type _fp_hw,@object + +/* Define a symbol for the first piece of initialized data. */ + .data + .globl __data_start +__data_start: + .long 0 + .weak data_start + data_start = __data_start -- cgit 1.4.1