More fallout from supporting only ELF

This commit is contained in:
Ulrich Drepper 2012-01-08 00:45:01 -05:00
parent a784e50247
commit a0da5fe1e4
25 changed files with 725 additions and 1041 deletions

View File

@ -1,3 +1,31 @@
2012-01-08 Ulrich Drepper <drepper@gmail.com>
* configure.in: Remove --with-elf and --enable-bounded options.
Dont set base_machine for ia64. More non-ELF conditions removed.
Remove testing and setting of leading underscore information.
* config.make.in (build-bounded): Set to no.
* config.h.in: Remove NO_UNDERSCORES entry.
* include/libc-symbols.h: Don't define HAVE_WEAK_SYMBOLS. ELF has
them.
* csu/start.c: Remove !NO_UNDERSCORE code.
* locale/localeinfo.h: Likewise.
* sysdeps/generic/machine-gmon.h: Likewise.
* sysdeps/generic/sysdep.h: Likewise.
* sysdeps/i386/sysdep.h: Likewise.
* sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h: Likewise.
* sysdeps/mach/sysdep.h: Likewise.
* sysdeps/s390/s390-32/sysdep.h: Likewise.
* sysdeps/s390/s390-64/sysdep.h: Likewise.
* sysdeps/sh/sysdep.h: Likewise.
* sysdeps/sparc/sparc32/alloca.S: Likewise.
* sysdeps/unix/i386/sysdep.S: Likewise.
* sysdeps/unix/sparc/start.c: Likewise.
* sysdeps/unix/sparc/sysdep.S: Likewise.
* sysdeps/unix/sparc/sysdep.h: Likewise.
* sysdeps/unix/start.c: Likewise.
* sysdeps/unix/x86_64/sysdep.S: Likewise.
* sysdeps/x86_64/sysdep.h: Likewise.
2012-01-07 Ulrich Drepper <drepper@gmail.com> 2012-01-07 Ulrich Drepper <drepper@gmail.com>
[BZ #13553] [BZ #13553]

View File

@ -17,10 +17,6 @@
/* Defined if building with SELinux support & libcap libs are detected. */ /* Defined if building with SELinux support & libcap libs are detected. */
#undef HAVE_LIBCAP #undef HAVE_LIBCAP
/* Define if C symbols are asm symbols. Don't define if C symbols
have a `_' prepended to make the asm symbol. */
#undef NO_UNDERSCORES
/* Define if weak symbols are available via the `.weak' directive. */ /* Define if weak symbols are available via the `.weak' directive. */
#undef HAVE_ASM_WEAK_DIRECTIVE #undef HAVE_ASM_WEAK_DIRECTIVE

View File

@ -92,7 +92,7 @@ build-static = @static@
build-shared = @shared@ build-shared = @shared@
build-pic-default= @libc_cv_pic_default@ build-pic-default= @libc_cv_pic_default@
build-profile = @profile@ build-profile = @profile@
build-bounded = @bounded@ build-bounded = no
build-static-nss = @static_nss@ build-static-nss = @static_nss@
add-ons = @add_ons@ add-ons = @add_ons@
add-on-subdirs = @add_on_subdirs@ add-on-subdirs = @add_on_subdirs@

780
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -77,11 +77,6 @@ AC_ARG_WITH([binutils],
[specify location of binutils (as and ld)]), [specify location of binutils (as and ld)]),
[path_binutils=$withval], [path_binutils=$withval],
[path_binutils='']) [path_binutils=''])
AC_ARG_WITH([elf],
AC_HELP_STRING([--with-elf],
[if using the ELF object format]),
[elf=$withval],
[elf=no])
AC_ARG_WITH([selinux], AC_ARG_WITH([selinux],
AC_HELP_STRING([--with-selinux], AC_HELP_STRING([--with-selinux],
[if building with SELinux support]), [if building with SELinux support]),
@ -129,19 +124,14 @@ dnl [static=yes])
static=yes static=yes
AC_ARG_ENABLE([shared], AC_ARG_ENABLE([shared],
AC_HELP_STRING([--enable-shared], AC_HELP_STRING([--enable-shared],
[build shared library @<:@default=yes if GNU ld & ELF@:>@]), [build shared library @<:@default=yes if GNU ld@:>@]),
[shared=$enableval], [shared=$enableval],
[shared=default]) [shared=yes])
AC_ARG_ENABLE([profile], AC_ARG_ENABLE([profile],
AC_HELP_STRING([--enable-profile], AC_HELP_STRING([--enable-profile],
[build profiled library @<:@default=no@:>@]), [build profiled library @<:@default=no@:>@]),
[profile=$enableval], [profile=$enableval],
[profile=no]) [profile=no])
AC_ARG_ENABLE([bounded],
AC_HELP_STRING([--enable-bounded],
[build with runtime bounds checking @<:@default=no@:>@]),
[bounded=$enableval],
[bounded=no])
AC_ARG_ENABLE([versioning], AC_ARG_ENABLE([versioning],
AC_HELP_STRING([--disable-versioning], AC_HELP_STRING([--disable-versioning],
[do not include versioning information in the library objects @<:@default=yes if supported@:>@]), [do not include versioning information in the library objects @<:@default=yes if supported@:>@]),
@ -510,7 +500,6 @@ changequote(,)dnl
# base_machine, we don't change it. # base_machine, we don't change it.
test -n "$base_machine" || case "$machine" in test -n "$base_machine" || case "$machine" in
i[34567]86) base_machine=i386 machine=i386/$machine ;; i[34567]86) base_machine=i386 machine=i386/$machine ;;
ia64) base_machine=ia64 machine=ia64 ;;
powerpc) base_machine=powerpc machine=powerpc/powerpc32 ;; powerpc) base_machine=powerpc machine=powerpc/powerpc32 ;;
powerpc64) base_machine=powerpc machine=powerpc/powerpc64 ;; powerpc64) base_machine=powerpc machine=powerpc/powerpc64 ;;
s390) base_machine=s390 machine=s390/s390-32 ;; s390) base_machine=s390 machine=s390/s390-32 ;;
@ -771,22 +760,20 @@ AC_SUBST(submachine)
# We have now validated the configuration. # We have now validated the configuration.
# If using ELF, look for an `elf' subdirectory of each machine directory. # Look for an `elf' subdirectory of each machine directory.
# We prepend these rather than inserting them whereever the machine appears # We prepend these rather than inserting them whereever the machine appears
# because things specified by the machine's ELF ABI should override # because things specified by the machine's ELF ABI should override
# OS-specific things, and should always be the same for any OS on the # OS-specific things, and should always be the same for any OS on the
# machine (otherwise what's the point of an ABI?). # machine (otherwise what's the point of an ABI?).
if test "$elf" = yes; then elf_dirs=
elf_dirs= for d in $add_ons_pfx ''; do
for d in $add_ons_pfx ''; do for m in $mach; do
for m in $mach; do if test -d $srcdir/${d}sysdeps$m/elf; then
if test -d $srcdir/${d}sysdeps$m/elf; then elf_dirs="$elf_dirs ${d}sysdeps$m/elf"
elf_dirs="$elf_dirs ${d}sysdeps$m/elf" fi
fi
done
done done
sysnames="`echo $elf_dirs | sed -e 's,//,/,g'` $sysnames" done
fi sysnames="`echo $elf_dirs | sed -e 's,//,/,g'` $sysnames"
# Expand the list of system names into a full list of directories # Expand the list of system names into a full list of directories
@ -870,10 +857,7 @@ changequote([,])dnl
done done
# Add the default directories. # Add the default directories.
default_sysnames=sysdeps/generic default_sysnames="sysdeps/generic/elf sysdeps/generic"
if test "$elf" = yes; then
default_sysnames="sysdeps/generic/elf $default_sysnames"
fi
sysnames="$names $default_sysnames" sysnames="$names $default_sysnames"
AC_SUBST(sysnames) AC_SUBST(sysnames)
# The other names were emitted during the scan. # The other names were emitted during the scan.
@ -1267,62 +1251,61 @@ else
fi fi
AC_SUBST(VERSIONING) AC_SUBST(VERSIONING)
if test $elf = yes && test $shared != no && test $VERSIONING = no; then if test $shared != no && test $VERSIONING = no; then
echo "\ echo "\
*** WARNING: You should not compile GNU libc without versioning. Not using *** WARNING: You should not compile GNU libc without versioning. Not using
*** versioning will introduce incompatibilities so that old binaries *** versioning will introduce incompatibilities so that old binaries
*** will not run anymore. *** will not run anymore.
*** For versioning you need recent binutils (binutils-2.8.1.0.23 or newer)." *** For versioning you need recent binutils (binutils-2.8.1.0.23 or newer)."
fi fi
if test $elf = yes; then AC_CACHE_CHECK(for .previous assembler directive,
AC_CACHE_CHECK(for .previous assembler directive, libc_cv_asm_previous_directive, [dnl
libc_cv_asm_previous_directive, [dnl cat > conftest.s <<EOF
cat > conftest.s <<EOF
.section foo_section .section foo_section
.previous .previous
EOF EOF
if AC_TRY_COMMAND(${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then if AC_TRY_COMMAND(${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then
libc_cv_asm_previous_directive=yes libc_cv_asm_previous_directive=yes
else else
libc_cv_asm_previous_directive=no libc_cv_asm_previous_directive=no
fi fi
rm -f conftest*]) rm -f conftest*])
if test $libc_cv_asm_previous_directive = yes; then if test $libc_cv_asm_previous_directive = yes; then
AC_DEFINE(HAVE_ASM_PREVIOUS_DIRECTIVE) AC_DEFINE(HAVE_ASM_PREVIOUS_DIRECTIVE)
else else
AC_CACHE_CHECK(for .popsection assembler directive, AC_CACHE_CHECK(for .popsection assembler directive,
libc_cv_asm_popsection_directive, [dnl libc_cv_asm_popsection_directive, [dnl
cat > conftest.s <<EOF cat > conftest.s <<EOF
.pushsection foo_section .pushsection foo_section
.popsection .popsection
EOF EOF
if AC_TRY_COMMAND(${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then if AC_TRY_COMMAND(${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then
libc_cv_asm_popsection_directive=yes libc_cv_asm_popsection_directive=yes
else else
libc_cv_asm_popsection_directive=no libc_cv_asm_popsection_directive=no
fi
rm -f conftest*])
if test $libc_cv_asm_popsection_directive = yes; then
AC_DEFINE(HAVE_ASM_POPSECTION_DIRECTIVE)
fi
fi fi
AC_CACHE_CHECK(for .protected and .hidden assembler directive, rm -f conftest*])
libc_cv_asm_protected_directive, [dnl if test $libc_cv_asm_popsection_directive = yes; then
cat > conftest.s <<EOF AC_DEFINE(HAVE_ASM_POPSECTION_DIRECTIVE)
fi
fi
AC_CACHE_CHECK(for .protected and .hidden assembler directive,
libc_cv_asm_protected_directive, [dnl
cat > conftest.s <<EOF
.protected foo .protected foo
foo: foo:
.hidden bar .hidden bar
bar: bar:
EOF EOF
if AC_TRY_COMMAND(${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then if AC_TRY_COMMAND(${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then
libc_cv_asm_protected_directive=yes libc_cv_asm_protected_directive=yes
else else
AC_MSG_ERROR(assembler support for symbol visibility is required) AC_MSG_ERROR(assembler support for symbol visibility is required)
fi fi
rm -f conftest*]) rm -f conftest*])
if test $libc_cv_asm_protected_directive = yes; then if test $libc_cv_asm_protected_directive = yes; then
AC_CACHE_CHECK(whether __attribute__((visibility())) is supported, AC_CACHE_CHECK(whether __attribute__((visibility())) is supported,
libc_cv_visibility_attribute, libc_cv_visibility_attribute,
[cat > conftest.c <<EOF [cat > conftest.c <<EOF
int foo __attribute__ ((visibility ("hidden"))) = 1; int foo __attribute__ ((visibility ("hidden"))) = 1;
@ -1338,13 +1321,13 @@ EOF
fi fi
rm -f conftest.{c,s} rm -f conftest.{c,s}
]) ])
if test $libc_cv_visibility_attribute != yes; then if test $libc_cv_visibility_attribute != yes; then
AC_MSG_ERROR(compiler support for visibility attribute is required) AC_MSG_ERROR(compiler support for visibility attribute is required)
fi
fi fi
fi
if test $libc_cv_visibility_attribute = yes; then if test $libc_cv_visibility_attribute = yes; then
AC_CACHE_CHECK(for broken __attribute__((visibility())), AC_CACHE_CHECK(for broken __attribute__((visibility())),
libc_cv_broken_visibility_attribute, libc_cv_broken_visibility_attribute,
[cat > conftest.c <<EOF [cat > conftest.c <<EOF
int foo (int x); int foo (int x);
@ -1361,36 +1344,36 @@ changequote([,])dnl
fi fi
rm -f conftest.c conftest.s rm -f conftest.c conftest.s
]) ])
if test $libc_cv_broken_visibility_attribute = yes; then if test $libc_cv_broken_visibility_attribute = yes; then
AC_MSG_ERROR(working compiler support for visibility attribute is required) AC_MSG_ERROR(working compiler support for visibility attribute is required)
fi
fi fi
fi
AC_CACHE_CHECK(for broken __attribute__((alias())), AC_CACHE_CHECK(for broken __attribute__((alias())),
libc_cv_broken_alias_attribute, libc_cv_broken_alias_attribute,
[cat > conftest.c <<EOF [cat > conftest.c <<EOF
extern int foo (int x) __asm ("xyzzy"); extern int foo (int x) __asm ("xyzzy");
int bar (int x) { return x; } int bar (int x) { return x; }
extern __typeof (bar) foo __attribute ((weak, alias ("bar"))); extern __typeof (bar) foo __attribute ((weak, alias ("bar")));
extern int dfoo; extern int dfoo;
extern __typeof (dfoo) dfoo __asm ("abccb"); extern __typeof (dfoo) dfoo __asm ("abccb");
int dfoo = 1; int dfoo = 1;
EOF EOF
libc_cv_broken_alias_attribute=yes libc_cv_broken_alias_attribute=yes
if AC_TRY_COMMAND(${CC-cc} -Werror -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD); then if AC_TRY_COMMAND(${CC-cc} -Werror -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD); then
if grep 'xyzzy' conftest.s >/dev/null && if grep 'xyzzy' conftest.s >/dev/null &&
grep 'abccb' conftest.s >/dev/null; then grep 'abccb' conftest.s >/dev/null; then
libc_cv_broken_alias_attribute=no libc_cv_broken_alias_attribute=no
fi fi
fi fi
rm -f conftest.c conftest.s rm -f conftest.c conftest.s
]) ])
if test $libc_cv_broken_alias_attribute = yes; then if test $libc_cv_broken_alias_attribute = yes; then
AC_MSG_ERROR(working alias attribute support required) AC_MSG_ERROR(working alias attribute support required)
fi fi
if test $libc_cv_visibility_attribute = yes; then if test $libc_cv_visibility_attribute = yes; then
AC_CACHE_CHECK(whether to put _rtld_local into .sdata section, AC_CACHE_CHECK(whether to put _rtld_local into .sdata section,
libc_cv_have_sdata_section, libc_cv_have_sdata_section,
[echo "int i;" > conftest.c [echo "int i;" > conftest.c
libc_cv_have_sdata_section=no libc_cv_have_sdata_section=no
@ -1400,43 +1383,43 @@ EOF
fi fi
rm -f conftest.c conftest.so rm -f conftest.c conftest.so
]) ])
if test $libc_cv_have_sdata_section = yes; then if test $libc_cv_have_sdata_section = yes; then
AC_DEFINE(HAVE_SDATA_SECTION) AC_DEFINE(HAVE_SDATA_SECTION)
fi
fi fi
fi
AC_CACHE_CHECK(for .preinit_array/.init_array/.fini_array support, AC_CACHE_CHECK(for .preinit_array/.init_array/.fini_array support,
libc_cv_initfini_array, [dnl libc_cv_initfini_array, [dnl
cat > conftest.c <<EOF cat > conftest.c <<EOF
int _start (void) { return 0; } int _start (void) { return 0; }
int __start (void) { return 0; } int __start (void) { return 0; }
int foo (void) { return 1; } int foo (void) { return 1; }
int (*fp) (void) __attribute__ ((section (".init_array"))) = foo; int (*fp) (void) __attribute__ ((section (".init_array"))) = foo;
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest conftest.c if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest conftest.c
-static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD]) -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD])
then then
if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then if $READELF -S conftest | fgrep INIT_ARRAY > /dev/null; then
libc_cv_initfini_array=yes libc_cv_initfini_array=yes
else
libc_cv_initfini_array=no
fi
else else
libc_cv_initfini_array=no libc_cv_initfini_array=no
fi fi
rm -f conftest*]) else
if test $libc_cv_initfini_array != yes; then libc_cv_initfini_array=no
AC_MSG_ERROR([Need linker with .init_array/.fini_array support.]) fi
fi rm -f conftest*])
if test $libc_cv_initfini_array != yes; then
AC_MSG_ERROR([Need linker with .init_array/.fini_array support.])
fi
AC_CACHE_CHECK(whether to use .ctors/.dtors header and trailer, AC_CACHE_CHECK(whether to use .ctors/.dtors header and trailer,
libc_cv_ctors_header, [dnl libc_cv_ctors_header, [dnl
libc_cv_ctors_header=yes libc_cv_ctors_header=yes
AC_TRY_LINK([], [ AC_TRY_LINK([], [
__attribute__ ((constructor)) void ctor (void) { puts("ctor"); } __attribute__ ((constructor)) void ctor (void) { puts("ctor"); }
__attribute__ ((destructor)) void dtor (void) { puts("dtor"); } __attribute__ ((destructor)) void dtor (void) { puts("dtor"); }
], ],
[dnl [dnl
AS_IF([$READELF -WS conftest$ac_exeext | $AWK ' AS_IF([$READELF -WS conftest$ac_exeext | $AWK '
{ gsub(/\@<:@ */, "@<:@") } { gsub(/\@<:@ */, "@<:@") }
$2 == ".ctors" || $2 == ".dtors" { $2 == ".ctors" || $2 == ".dtors" {
@ -1454,102 +1437,102 @@ __attribute__ ((destructor)) void dtor (void) { puts("dtor"); }
], [dnl ], [dnl
AC_MSG_ERROR([missing __attribute__ ((constructor)) support??]) AC_MSG_ERROR([missing __attribute__ ((constructor)) support??])
]) ])
]) ])
if test $libc_cv_ctors_header = no; then if test $libc_cv_ctors_header = no; then
AC_DEFINE(NO_CTORS_DTORS_SECTIONS) AC_DEFINE(NO_CTORS_DTORS_SECTIONS)
fi fi
AC_CACHE_CHECK(for libunwind-support in compiler, AC_CACHE_CHECK(for libunwind-support in compiler,
libc_cv_cc_with_libunwind, [ libc_cv_cc_with_libunwind, [
cat > conftest.c <<EOF cat > conftest.c <<EOF
int main (void) { return 0; } int main (void) { return 0; }
EOF EOF
if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \ if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
conftest.c -v 2>&1 >/dev/null | grep -q " -lunwind "; then conftest.c -v 2>&1 >/dev/null | grep -q " -lunwind "; then
libc_cv_cc_with_libunwind=yes libc_cv_cc_with_libunwind=yes
else
libc_cv_cc_with_libunwind=no
fi
rm -f conftest*])
AC_SUBST(libc_cv_cc_with_libunwind)
if test $libc_cv_cc_with_libunwind = yes; then
AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
fi
AC_CACHE_CHECK(for -z nodelete option,
libc_cv_z_nodelete, [dnl
cat > conftest.c <<EOF
int _start (void) { return 42; }
EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-fPIC -shared -o conftest.so conftest.c
-nostartfiles -nostdlib
-Wl,--enable-new-dtags,-z,nodelete 1>&AS_MESSAGE_LOG_FD])
then
libc_cv_z_nodelete=yes
else else
AC_MSG_ERROR(linker with -z nodelete support required) libc_cv_cc_with_libunwind=no
fi fi
rm -f conftest*]) rm -f conftest*])
AC_SUBST(libc_cv_cc_with_libunwind)
if test $libc_cv_cc_with_libunwind = yes; then
AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
fi
AC_CACHE_CHECK(for -z nodlopen option, AC_CACHE_CHECK(for -z nodelete option,
libc_cv_z_nodlopen, [dnl libc_cv_z_nodelete, [dnl
cat > conftest.c <<EOF cat > conftest.c <<EOF
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-fPIC -shared -o conftest.so conftest.c
-nostartfiles -nostdlib
-Wl,--enable-new-dtags,-z,nodelete 1>&AS_MESSAGE_LOG_FD])
then
libc_cv_z_nodelete=yes
else
AC_MSG_ERROR(linker with -z nodelete support required)
fi
rm -f conftest*])
AC_CACHE_CHECK(for -z nodlopen option,
libc_cv_z_nodlopen, [dnl
cat > conftest.c <<EOF
int _start (void) { return 42; }
EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-fPIC -shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-nostartfiles -nostdlib -nostartfiles -nostdlib
-Wl,--enable-new-dtags,-z,nodlopen 1>&AS_MESSAGE_LOG_FD]) -Wl,--enable-new-dtags,-z,nodlopen 1>&AS_MESSAGE_LOG_FD])
then then
libc_cv_z_nodlopen=yes libc_cv_z_nodlopen=yes
else else
AC_MSG_ERROR(linker with -z nodlopen support required) AC_MSG_ERROR(linker with -z nodlopen support required)
fi fi
rm -f conftest*]) rm -f conftest*])
AC_CACHE_CHECK(for -z initfirst option, AC_CACHE_CHECK(for -z initfirst option,
libc_cv_z_initfirst, [dnl libc_cv_z_initfirst, [dnl
cat > conftest.c <<EOF cat > conftest.c <<EOF
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-fPIC -shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-nostartfiles -nostdlib -nostartfiles -nostdlib
-Wl,--enable-new-dtags,-z,initfirst 1>&AS_MESSAGE_LOG_FD]) -Wl,--enable-new-dtags,-z,initfirst 1>&AS_MESSAGE_LOG_FD])
then then
libc_cv_z_initfirst=yes libc_cv_z_initfirst=yes
else else
AC_MSG_ERROR(linker with -z initfirst support required) AC_MSG_ERROR(linker with -z initfirst support required)
fi fi
rm -f conftest*]) rm -f conftest*])
# Add-on fragments can set these for other machines. # Add-on fragments can set these for other machines.
libc_commonpagesize=${libc_commonpagesize:-no} libc_commonpagesize=${libc_commonpagesize:-no}
libc_relro_required=${libc_relro_required:-no} libc_relro_required=${libc_relro_required:-no}
case "$base_machine" in case "$base_machine" in
i[[34567]]86 | x86_64 | powerpc* | s390*) i[[34567]]86 | x86_64 | powerpc* | s390*)
libc_commonpagesize=0x1000 libc_commonpagesize=0x1000
libc_relro_required=yes libc_relro_required=yes
;; ;;
sparc*) sparc*)
libc_commonpagesize=0x2000 libc_commonpagesize=0x2000
libc_relro_required=yes libc_relro_required=yes
;; ;;
ia64*) ia64*)
libc_commonpagesize=0x4000 libc_commonpagesize=0x4000
;; ;;
alpha*) alpha*)
libc_commonpagesize=0x10000 libc_commonpagesize=0x10000
libc_relro_required=yes libc_relro_required=yes
;; ;;
esac esac
if test $libc_commonpagesize != no; then if test $libc_commonpagesize != no; then
AC_CACHE_CHECK(for -z relro option, AC_CACHE_CHECK(for -z relro option,
libc_cv_z_relro, [dnl libc_cv_z_relro, [dnl
libc_cv_z_relro=no libc_cv_z_relro=no
AC_LANG_CONFTEST([AC_LANG_SOURCE([[ AC_LANG_CONFTEST([AC_LANG_SOURCE([[
int _start (void) { return 42; } int _start (void) { return 42; }
extern void _exit (int); extern void _exit (int);
/* Since these pointers are const, they should go in rodata. /* Since these pointers are const, they should go in rodata.
@ -1561,7 +1544,7 @@ const void *const relro[] = { &_start, &_exit, 0 };
follows it, or only very small writable data. */ follows it, or only very small writable data. */
int data[0x10000] = { 1, }; int data[0x10000] = { 1, };
]])]) ]])])
cat > conftest.awk <<\EOF cat > conftest.awk <<\EOF
BEGIN { BEGIN {
result = "no" result = "no"
commonpagesize = strtonum(commonpagesize) commonpagesize = strtonum(commonpagesize)
@ -1577,184 +1560,184 @@ $1 == "GNU_RELRO" {
} }
END { print result } END { print result }
EOF EOF
AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-fPIC -shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-nostartfiles -nostdlib -nostartfiles -nostdlib
-Wl,-z,relro 1>&AS_MESSAGE_LOG_FD]) && -Wl,-z,relro 1>&AS_MESSAGE_LOG_FD]) &&
AC_TRY_COMMAND([$READELF -Wl conftest.so > conftest.ph]) && AC_TRY_COMMAND([$READELF -Wl conftest.so > conftest.ph]) &&
AC_TRY_COMMAND([ AC_TRY_COMMAND([
$AWK -v commonpagesize=$libc_commonpagesize -f conftest.awk $AWK -v commonpagesize=$libc_commonpagesize -f conftest.awk
conftest.ph > conftest.cps conftest.ph > conftest.cps
]) && ]) &&
libc_cv_z_relro=`cat conftest.cps 2>&AS_MESSAGE_LOG_FD` libc_cv_z_relro=`cat conftest.cps 2>&AS_MESSAGE_LOG_FD`
rm -f conftest*]) rm -f conftest*])
if { test "x$libc_relro_required" = xyes && if { test "x$libc_relro_required" = xyes &&
test "x$libc_cv_z_relro" != xyes test "x$libc_cv_z_relro" != xyes
} }
then then
AC_MSG_ERROR(linker with -z relro support required) AC_MSG_ERROR(linker with -z relro support required)
fi
else
AC_MSG_WARN([missing architecture parameter to check for working -z relro])
fi fi
else
AC_MSG_WARN([missing architecture parameter to check for working -z relro])
fi
AC_CACHE_CHECK(for -Bgroup option, AC_CACHE_CHECK(for -Bgroup option,
libc_cv_Bgroup, [dnl libc_cv_Bgroup, [dnl
cat > conftest.c <<EOF cat > conftest.c <<EOF
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-fPIC -shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-Wl,-Bgroup -nostdlib 1>&AS_MESSAGE_LOG_FD]) -Wl,-Bgroup -nostdlib 1>&AS_MESSAGE_LOG_FD])
then then
libc_cv_Bgroup=yes libc_cv_Bgroup=yes
else else
libc_cv_Bgroup=no libc_cv_Bgroup=no
fi fi
rm -f conftest*]) rm -f conftest*])
AC_SUBST(libc_cv_Bgroup) AC_SUBST(libc_cv_Bgroup)
AC_CACHE_CHECK(for libgcc_s suffix, AC_CACHE_CHECK(for libgcc_s suffix,
libc_cv_libgcc_s_suffix, [dnl libc_cv_libgcc_s_suffix, [dnl
cat > conftest.c <<EOF cat > conftest.c <<EOF
int main (void) { return 0; } int main (void) { return 0; }
EOF EOF
changequote(,)dnl changequote(,)dnl
libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \ libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
-fPIC -shared -shared-libgcc -o conftest.so \ -fPIC -shared -shared-libgcc -o conftest.so \
conftest.c -v 2>&1 >/dev/null \ conftest.c -v 2>&1 >/dev/null \
| sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'` | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
changequote([,])dnl changequote([,])dnl
rm -f conftest*]) rm -f conftest*])
AC_SUBST(libc_cv_libgcc_s_suffix) AC_SUBST(libc_cv_libgcc_s_suffix)
AC_CACHE_CHECK(for --as-needed option, AC_CACHE_CHECK(for --as-needed option,
libc_cv_as_needed, [dnl libc_cv_as_needed, [dnl
cat > conftest.c <<EOF cat > conftest.c <<EOF
int main (void) { return 0; } int main (void) { return 0; }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-fPIC -shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed
-nostdlib 1>&AS_MESSAGE_LOG_FD]) -nostdlib 1>&AS_MESSAGE_LOG_FD])
then then
libc_cv_as_needed=yes libc_cv_as_needed=yes
else else
libc_cv_as_needed=no libc_cv_as_needed=no
fi fi
rm -f conftest*]) rm -f conftest*])
AC_SUBST(libc_cv_as_needed) AC_SUBST(libc_cv_as_needed)
ASFLAGS_config= ASFLAGS_config=
AC_CACHE_CHECK(whether --noexecstack is desirable for .S files, AC_CACHE_CHECK(whether --noexecstack is desirable for .S files,
libc_cv_as_noexecstack, [dnl libc_cv_as_noexecstack, [dnl
cat > conftest.c <<EOF cat > conftest.c <<EOF
void foo (void) { } void foo (void) { }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS
-S -o conftest.s conftest.c 1>&AS_MESSAGE_LOG_FD]) \ -S -o conftest.s conftest.c 1>&AS_MESSAGE_LOG_FD]) \
&& grep -q .note.GNU-stack conftest.s \ && grep -q .note.GNU-stack conftest.s \
&& AC_TRY_COMMAND([${CC-cc} $ASFLAGS -Wa,--noexecstack && AC_TRY_COMMAND([${CC-cc} $ASFLAGS -Wa,--noexecstack
-c -o conftest.o conftest.s 1>&AS_MESSAGE_LOG_FD]) -c -o conftest.o conftest.s 1>&AS_MESSAGE_LOG_FD])
then then
libc_cv_as_noexecstack=yes libc_cv_as_noexecstack=yes
else else
libc_cv_as_noexecstack=no libc_cv_as_noexecstack=no
fi fi
rm -f conftest*]) rm -f conftest*])
if test $libc_cv_as_noexecstack = yes; then if test $libc_cv_as_noexecstack = yes; then
ASFLAGS_config="$ASFLAGS_config -Wa,--noexecstack" ASFLAGS_config="$ASFLAGS_config -Wa,--noexecstack"
fi fi
AC_SUBST(ASFLAGS_config) AC_SUBST(ASFLAGS_config)
AC_CACHE_CHECK(for -z combreloc, AC_CACHE_CHECK(for -z combreloc,
libc_cv_z_combreloc, [dnl libc_cv_z_combreloc, [dnl
cat > conftest.c <<EOF cat > conftest.c <<EOF
extern int bar (int); extern int bar (int);
extern int mumble; extern int mumble;
int foo (void) { return bar (mumble); } int foo (void) { return bar (mumble); }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-fPIC -shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-nostdlib -nostartfiles -nostdlib -nostartfiles
-Wl,-z,combreloc 1>&AS_MESSAGE_LOG_FD]) -Wl,-z,combreloc 1>&AS_MESSAGE_LOG_FD])
then then
dnl The following test is a bit weak. We must use a tool which can test dnl The following test is a bit weak. We must use a tool which can test
dnl cross-platform since the gcc used can be a cross compiler. Without dnl cross-platform since the gcc used can be a cross compiler. Without
dnl introducing new options this is not easily doable. Instead use a tool dnl introducing new options this is not easily doable. Instead use a tool
dnl which always is cross-platform: readelf. To detect whether -z combreloc dnl which always is cross-platform: readelf. To detect whether -z combreloc
dnl look for a section named .rel.dyn. dnl look for a section named .rel.dyn.
if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then if $READELF -S conftest.so | grep '\.rel\(a\|\)\.dyn' > /dev/null; then
libc_cv_z_combreloc=yes libc_cv_z_combreloc=yes
else
libc_cv_z_combreloc=no
fi
else else
libc_cv_z_combreloc=no libc_cv_z_combreloc=no
fi fi
rm -f conftest*]) else
if test "$libc_cv_z_combreloc" = yes; then libc_cv_z_combreloc=no
AC_DEFINE(HAVE_Z_COMBRELOC) fi
fi rm -f conftest*])
AC_SUBST(libc_cv_z_combreloc) if test "$libc_cv_z_combreloc" = yes; then
AC_DEFINE(HAVE_Z_COMBRELOC)
fi
AC_SUBST(libc_cv_z_combreloc)
AC_CACHE_CHECK(for -z execstack, AC_CACHE_CHECK(for -z execstack,
libc_cv_z_execstack, [dnl libc_cv_z_execstack, [dnl
cat > conftest.c <<EOF cat > conftest.c <<EOF
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-fPIC -shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-Wl,-z,execstack -nostdlib -Wl,-z,execstack -nostdlib
1>&AS_MESSAGE_LOG_FD]) 1>&AS_MESSAGE_LOG_FD])
then then
libc_cv_z_execstack=yes libc_cv_z_execstack=yes
else else
libc_cv_z_execstack=no libc_cv_z_execstack=no
fi fi
rm -f conftest*]) rm -f conftest*])
AC_SUBST(libc_cv_z_execstack) AC_SUBST(libc_cv_z_execstack)
AC_CACHE_CHECK(for -fpie, libc_cv_fpie, [dnl AC_CACHE_CHECK(for -fpie, libc_cv_fpie, [dnl
cat > conftest.c <<EOF cat > conftest.c <<EOF
int foo; int foo;
main () { return 0;} main () { return 0;}
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fpie if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fpie
-o conftest conftest.c 1>&AS_MESSAGE_LOG_FD]) -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD])
then then
libc_cv_fpie=yes libc_cv_fpie=yes
else else
libc_cv_fpie=no libc_cv_fpie=no
fi fi
rm -f conftest*]) rm -f conftest*])
AC_SUBST(libc_cv_fpie) AC_SUBST(libc_cv_fpie)
AC_CACHE_CHECK(for --hash-style option, AC_CACHE_CHECK(for --hash-style option,
libc_cv_hashstyle, [dnl libc_cv_hashstyle, [dnl
cat > conftest.c <<EOF cat > conftest.c <<EOF
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-fPIC -shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-Wl,--hash-style=both -nostdlib 1>&AS_MESSAGE_LOG_FD]) -Wl,--hash-style=both -nostdlib 1>&AS_MESSAGE_LOG_FD])
then then
libc_cv_hashstyle=yes libc_cv_hashstyle=yes
else else
libc_cv_hashstyle=no libc_cv_hashstyle=no
fi fi
rm -f conftest*]) rm -f conftest*])
AC_SUBST(libc_cv_hashstyle) AC_SUBST(libc_cv_hashstyle)
# The linker's default -shared behavior is good enough if it # The linker's default -shared behavior is good enough if it
# does these things that our custom linker scripts ensure that # does these things that our custom linker scripts ensure that
# all allocated NOTE sections come first. # all allocated NOTE sections come first.
if test "$use_default_link" = default; then if test "$use_default_link" = default; then
AC_CACHE_CHECK([for sufficient default -shared layout], AC_CACHE_CHECK([for sufficient default -shared layout],
libc_cv_use_default_link, [dnl libc_cv_use_default_link, [dnl
libc_cv_use_default_link=no libc_cv_use_default_link=no
cat > conftest.s <<\EOF cat > conftest.s <<\EOF
.section .note.a,"a",%note .section .note.a,"a",%note
.balign 4 .balign 4
.long 4,4,9 .long 4,4,9
@ -1766,7 +1749,7 @@ EOF
.string "GNU" .string "GNU"
.string "bar" .string "bar"
EOF EOF
if AC_TRY_COMMAND([dnl if AC_TRY_COMMAND([dnl
${CC-cc} $ASFLAGS -shared -o conftest.so conftest.s 1>&AS_MESSAGE_LOG_FD]) && ${CC-cc} $ASFLAGS -shared -o conftest.so conftest.s 1>&AS_MESSAGE_LOG_FD]) &&
ac_try=`$READELF -S conftest.so | sed -n \ ac_try=`$READELF -S conftest.so | sed -n \
['${x;p;} ['${x;p;}
@ -1775,30 +1758,29 @@ EOF
b b
: a : a
H']` H']`
then then
libc_seen_a=no libc_seen_b=no libc_seen_a=no libc_seen_b=no
set -- $ac_try set -- $ac_try
while test $# -ge 2 -a "$1" = NOTE; do while test $# -ge 2 -a "$1" = NOTE; do
case "$2" in case "$2" in
.note.a) libc_seen_a=yes ;; .note.a) libc_seen_a=yes ;;
.note.b) libc_seen_b=yes ;; .note.b) libc_seen_b=yes ;;
esac esac
shift 2 shift 2
done done
case "$libc_seen_a$libc_seen_b" in case "$libc_seen_a$libc_seen_b" in
yesyes) yesyes)
libc_cv_use_default_link=yes libc_cv_use_default_link=yes
;; ;;
*) *)
echo >&AS_MESSAGE_LOG_FD "\ echo >&AS_MESSAGE_LOG_FD "\
$libc_seen_a$libc_seen_b from: $libc_seen_a$libc_seen_b from:
$ac_try" $ac_try"
;; ;;
esac esac
fi
rm -f conftest*])
use_default_link=$libc_cv_use_default_link
fi fi
rm -f conftest*])
use_default_link=$libc_cv_use_default_link
fi fi
AC_CACHE_CHECK(linker output format, libc_cv_output_format, [dnl AC_CACHE_CHECK(linker output format, libc_cv_output_format, [dnl
@ -1870,88 +1852,25 @@ else
fi fi
AC_SUBST(gnu89_inline) AC_SUBST(gnu89_inline)
if test $elf != yes; then AC_CACHE_CHECK(whether cc puts quotes around section names,
AC_CACHE_CHECK(for .init and .fini sections, libc_cv_have_initfini, libc_cv_have_section_quotes,
[AC_TRY_COMPILE(, [asm (".section .init"); [cat > conftest.c <<EOF
asm (".section .fini"); static const int foo
asm ("${libc_cv_dot_text}");], __attribute__ ((section ("bar"))) = 1;
libc_cv_have_initfini=yes,
libc_cv_have_initfini=no)])
AC_SUBST(libc_cv_have_initfini)dnl
if test $libc_cv_have_initfini = yes; then
AC_DEFINE(HAVE_INITFINI)
fi
fi
if test $elf = yes; then
AC_CACHE_CHECK(whether cc puts quotes around section names,
libc_cv_have_section_quotes,
[cat > conftest.c <<EOF
static const int foo
__attribute__ ((section ("bar"))) = 1;
EOF EOF
if ${CC-cc} -S conftest.c -o conftest.s; then if ${CC-cc} -S conftest.c -o conftest.s; then
if grep '\.section.*"bar"' conftest.s >/dev/null; then if grep '\.section.*"bar"' conftest.s >/dev/null; then
libc_cv_have_section_quotes=yes libc_cv_have_section_quotes=yes
else
libc_cv_have_section_quotes=no
fi
else else
libc_cv_have_section_quotes=unknown libc_cv_have_section_quotes=no
fi fi
rm -f conftest.{c,s} else
]) libc_cv_have_section_quotes=unknown
if test $libc_cv_have_section_quotes = yes; then fi
AC_DEFINE(HAVE_SECTION_QUOTES) rm -f conftest.{c,s}
fi ])
fi if test $libc_cv_have_section_quotes = yes; then
AC_DEFINE(HAVE_SECTION_QUOTES)
dnl AC_CHECK_ASM_UNDERSCORE([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
AC_DEFUN(AC_CHECK_ASM_UNDERSCORE,
[cat > conftest.$ac_ext <<EOF
dnl This sometimes fails to find confdefs.h, for some reason.
dnl [#]line $LINENO "[$]0"
[#]line $LINENO "configure"
#include "confdefs.h"
void underscore_test(void) {
return; }
EOF
if AC_TRY_EVAL(ac_compile); then
if grep _underscore_test conftest* >/dev/null; then
ifelse([$1], , :, [rm -f conftest*
$1])
else
ifelse([$2], , , [rm -f conftest*
$2])
fi
else
echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
ifelse([$2], , , [rm -f conftest*
$2])
fi
rm -f conftest*])
if test $elf = yes; then
libc_cv_asm_underscores=no
else
if test $ac_cv_prog_cc_works = yes; then
AC_CACHE_CHECK(for _ prefix on C symbol names, libc_cv_asm_underscores,
[AC_TRY_LINK([asm ("_glibc_foobar:");], [glibc_foobar ();],
libc_cv_asm_underscores=yes,
libc_cv_asm_underscores=no)])
else
AC_CACHE_CHECK(for _ prefix on C symbol names, libc_cv_asm_underscores,
[AC_CHECK_ASM_UNDERSCORE(libc_cv_asm_underscores=yes,
libc_cv_asm_underscores=no)])
fi
fi
if test $libc_cv_asm_underscores = no; then
AC_DEFINE(NO_UNDERSCORES)
fi
if test $elf = yes; then
libc_cv_weak_symbols=yes
fi fi
AC_CACHE_CHECK(for assembler .weak directive, libc_cv_asm_weak_directive, AC_CACHE_CHECK(for assembler .weak directive, libc_cv_asm_weak_directive,
@ -2314,9 +2233,6 @@ AC_SUBST(ldd_rewrite_script)
AC_SUBST(static) AC_SUBST(static)
AC_SUBST(shared) AC_SUBST(shared)
if test $shared = default; then
shared=$elf
fi
AC_CACHE_CHECK([whether -fPIC is default], libc_cv_pic_default, AC_CACHE_CHECK([whether -fPIC is default], libc_cv_pic_default,
[libc_cv_pic_default=yes [libc_cv_pic_default=yes

View File

@ -8,6 +8,4 @@
/* The first piece of initialized data. */ /* The first piece of initialized data. */
int __data_start = 0; int __data_start = 0;
#ifdef HAVE_WEAK_SYMBOLS
weak_alias (__data_start, data_start) weak_alias (__data_start, data_start)
#endif

View File

@ -55,24 +55,16 @@
/* The symbols in all the user (non-_) macros are C symbols. */ /* The symbols in all the user (non-_) macros are C symbols. */
#if defined HAVE_ASM_WEAK_DIRECTIVE || defined HAVE_ASM_WEAKEXT_DIRECTIVE #if !defined HAVE_ASM_WEAK_DIRECTIVE && !defined HAVE_ASM_WEAKEXT_DIRECTIVE
# define HAVE_WEAK_SYMBOLS # error "weak symbol support needed"
#endif #endif
#ifndef __SYMBOL_PREFIX #ifndef __SYMBOL_PREFIX
# ifdef NO_UNDERSCORES # define __SYMBOL_PREFIX
# define __SYMBOL_PREFIX
# else
# define __SYMBOL_PREFIX "_"
# endif
#endif #endif
#ifndef C_SYMBOL_NAME #ifndef C_SYMBOL_NAME
# ifdef NO_UNDERSCORES # define C_SYMBOL_NAME(name) name
# define C_SYMBOL_NAME(name) name
# else
# define C_SYMBOL_NAME(name) _##name
# endif
#endif #endif
#ifndef ASM_LINE_SEP #ifndef ASM_LINE_SEP
@ -104,32 +96,23 @@
# define weak_function __attribute__ ((weak)) # define weak_function __attribute__ ((weak))
# define weak_const_function __attribute__ ((weak, __const__)) # define weak_const_function __attribute__ ((weak, __const__))
# ifdef HAVE_WEAK_SYMBOLS
/* Define ALIASNAME as a weak alias for NAME. /* Define ALIASNAME as a weak alias for NAME.
If weak aliases are not available, this defines a strong alias. */ If weak aliases are not available, this defines a strong alias. */
# define weak_alias(name, aliasname) _weak_alias (name, aliasname) # define weak_alias(name, aliasname) _weak_alias (name, aliasname)
# define _weak_alias(name, aliasname) \ # define _weak_alias(name, aliasname) \
extern __typeof (name) aliasname __attribute__ ((weak, alias (#name))); extern __typeof (name) aliasname __attribute__ ((weak, alias (#name)));
/* Same as WEAK_ALIAS, but mark symbol as hidden. */ /* Same as WEAK_ALIAS, but mark symbol as hidden. */
# define weak_hidden_alias(name, aliasname) \ # define weak_hidden_alias(name, aliasname) \
_weak_hidden_alias (name, aliasname) _weak_hidden_alias (name, aliasname)
# define _weak_hidden_alias(name, aliasname) \ # define _weak_hidden_alias(name, aliasname) \
extern __typeof (name) aliasname \ extern __typeof (name) aliasname \
__attribute__ ((weak, alias (#name), __visibility__ ("hidden"))); __attribute__ ((weak, alias (#name), __visibility__ ("hidden")));
/* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined). */ /* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined). */
# define weak_extern(symbol) _weak_extern (weak symbol) # define weak_extern(symbol) _weak_extern (weak symbol)
# define _weak_extern(expr) _Pragma (#expr) # define _weak_extern(expr) _Pragma (#expr)
# else
# define weak_alias(name, aliasname) strong_alias(name, aliasname)
# define weak_hidden_alias(name, aliasname) strong_alias(name, aliasname)
# define weak_extern(symbol) /* Nothing. */
# endif
#else /* __ASSEMBLER__ */ #else /* __ASSEMBLER__ */
@ -167,43 +150,36 @@
# endif # endif
# endif # endif
# ifdef HAVE_WEAK_SYMBOLS # ifdef HAVE_ASM_WEAKEXT_DIRECTIVE
# ifdef HAVE_ASM_WEAKEXT_DIRECTIVE # ifdef HAVE_ASM_GLOBAL_DOT_NAME
# ifdef HAVE_ASM_GLOBAL_DOT_NAME # define weak_alias(original, alias) \
# define weak_alias(original, alias) \
.weakext C_SYMBOL_NAME (alias), C_SYMBOL_NAME (original) ASM_LINE_SEP \ .weakext C_SYMBOL_NAME (alias), C_SYMBOL_NAME (original) ASM_LINE_SEP \
.weakext C_SYMBOL_DOT_NAME (alias), C_SYMBOL_DOT_NAME (original) .weakext C_SYMBOL_DOT_NAME (alias), C_SYMBOL_DOT_NAME (original)
# else # else
# define weak_alias(original, alias) \ # define weak_alias(original, alias) \
.weakext C_SYMBOL_NAME (alias), C_SYMBOL_NAME (original) .weakext C_SYMBOL_NAME (alias), C_SYMBOL_NAME (original)
# endif # endif
# define weak_extern(symbol) \ # define weak_extern(symbol) \
.weakext C_SYMBOL_NAME (symbol) .weakext C_SYMBOL_NAME (symbol)
# else /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */ # else /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
# ifdef HAVE_ASM_GLOBAL_DOT_NAME # ifdef HAVE_ASM_GLOBAL_DOT_NAME
# define weak_alias(original, alias) \ # define weak_alias(original, alias) \
.weak C_SYMBOL_NAME (alias) ASM_LINE_SEP \ .weak C_SYMBOL_NAME (alias) ASM_LINE_SEP \
C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original) ASM_LINE_SEP \ C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original) ASM_LINE_SEP \
.weak C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP \ .weak C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP \
C_SYMBOL_DOT_NAME (alias) = C_SYMBOL_DOT_NAME (original) C_SYMBOL_DOT_NAME (alias) = C_SYMBOL_DOT_NAME (original)
# else # else
# define weak_alias(original, alias) \ # define weak_alias(original, alias) \
.weak C_SYMBOL_NAME (alias) ASM_LINE_SEP \ .weak C_SYMBOL_NAME (alias) ASM_LINE_SEP \
C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original) C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original)
# endif # endif
# define weak_extern(symbol) \ # define weak_extern(symbol) \
.weak C_SYMBOL_NAME (symbol) .weak C_SYMBOL_NAME (symbol)
# endif /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */ # endif /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
# else /* ! HAVE_WEAK_SYMBOLS */
# define weak_alias(original, alias) strong_alias(original, alias)
# define weak_extern(symbol) /* Nothing */
# endif /* ! HAVE_WEAK_SYMBOLS */
#endif /* __ASSEMBLER__ */ #endif /* __ASSEMBLER__ */

View File

@ -1,5 +1,5 @@
/* Declarations for internal libc locale interfaces /* Declarations for internal libc locale interfaces
Copyright (C) 1995-2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Copyright (C) 1995-2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -216,7 +216,7 @@ __libc_tsd_define (extern, __locale_t, LOCALE)
unused. We can manage this playing some tricks with weak references. unused. We can manage this playing some tricks with weak references.
But with thread-local locale settings, it becomes quite ungainly unless But with thread-local locale settings, it becomes quite ungainly unless
we can use __thread variables. So only in that case do we attempt this. */ we can use __thread variables. So only in that case do we attempt this. */
#if !defined SHARED && defined HAVE_WEAK_SYMBOLS #ifndef SHARED
# include <tls.h> # include <tls.h>
# define NL_CURRENT_INDIRECT 1 # define NL_CURRENT_INDIRECT 1
#endif #endif

View File

@ -1,5 +1,5 @@
/* Machine-dependent definitions for profiling support. Generic GCC 2 version. /* Machine-dependent definitions for profiling support. Generic GCC 2 version.
Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. Copyright (C) 1996, 1997, 2000, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -31,16 +31,10 @@
#endif #endif
#include <sysdep.h> #include <sysdep.h>
#ifndef NO_UNDERSCORES
/* The asm symbols for C functions are `_function'.
The canonical name for the counter function is `mcount', no _. */
void _mcount (void) asm ("mcount");
#else
/* The canonical name for the function is `_mcount' in both C and asm, /* The canonical name for the function is `_mcount' in both C and asm,
but some old asm code might assume it's `mcount'. */ but some old asm code might assume it's `mcount'. */
void _mcount (void); void _mcount (void);
weak_alias (_mcount, mcount) weak_alias (_mcount, mcount)
#endif
static void mcount_internal (u_long frompc, u_long selfpc); static void mcount_internal (u_long frompc, u_long selfpc);

View File

@ -1,5 +1,5 @@
/* Generic asm macros used on many machines. /* Generic asm macros used on many machines.
Copyright (C) 1991-1993,96,98,2002,2003,2009,2011 Copyright (C) 1991-1993,96,98,2002,2003,2009,2011,2012
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -21,18 +21,10 @@
#ifndef C_LABEL #ifndef C_LABEL
/* Define a macro we can use to construct the asm name for a C symbol. */ /* Define a macro we can use to construct the asm name for a C symbol. */
# ifdef NO_UNDERSCORES # ifdef __STDC__
# ifdef __STDC__ # define C_LABEL(name) name##:
# define C_LABEL(name) name##:
# else
# define C_LABEL(name) name/**/:
# endif
# else # else
# ifdef __STDC__ # define C_LABEL(name) name/**/:
# define C_LABEL(name) _##name##:
# else
# define C_LABEL(name) _/**/name/**/:
# endif
# endif # endif
#endif #endif

View File

@ -30,10 +30,6 @@
#define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg; #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
#define ASM_SIZE_DIRECTIVE(name) .size name,.-name; #define ASM_SIZE_DIRECTIVE(name) .size name,.-name;
/* In ELF C symbols are asm symbols. */
#undef NO_UNDERSCORES
#define NO_UNDERSCORES
/* Define an entry point visible from C. /* Define an entry point visible from C.
@ -95,13 +91,11 @@
#define CALL_MCOUNT /* Do nothing. */ #define CALL_MCOUNT /* Do nothing. */
#endif #endif
#ifdef NO_UNDERSCORES
/* Since C identifiers are not normally prefixed with an underscore /* Since C identifiers are not normally prefixed with an underscore
on this system, the asm identifier `syscall_error' intrudes on the on this system, the asm identifier `syscall_error' intrudes on the
C name space. Make sure we use an innocuous name. */ C name space. Make sure we use an innocuous name. */
#define syscall_error __syscall_error #define syscall_error __syscall_error
#define mcount _mcount #define mcount _mcount
#endif
#define PSEUDO(name, syscall_name, args) \ #define PSEUDO(name, syscall_name, args) \
.globl syscall_error; \ .globl syscall_error; \

View File

@ -20,7 +20,7 @@
long_double_symbol (libc, __GL_##name##_##aliasname, aliasname); long_double_symbol (libc, __GL_##name##_##aliasname, aliasname);
# define long_double_symbol_1(lib, local, symbol, version) \ # define long_double_symbol_1(lib, local, symbol, version) \
versioned_symbol (lib, local, symbol, version) versioned_symbol (lib, local, symbol, version)
#elif defined HAVE_WEAK_SYMBOLS #else
# define ldbl_hidden_def(local, name) libc_hidden_def (name) # define ldbl_hidden_def(local, name) libc_hidden_def (name)
# define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname) # define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname)
# define ldbl_weak_alias(name, aliasname) weak_alias (name, aliasname) # define ldbl_weak_alias(name, aliasname) weak_alias (name, aliasname)
@ -33,12 +33,6 @@
# define long_double_symbol_1(lib, local, symbol, version) \ # define long_double_symbol_1(lib, local, symbol, version) \
weak_alias (local, symbol) weak_alias (local, symbol)
# endif # endif
#else
# define ldbl_hidden_def(local, name) libc_hidden_def (name)
# define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname)
# define ldbl_weak_alias(name, aliasname) strong_alias (name, aliasname)
# define long_double_symbol_1(lib, local, symbol, version) \
strong_alias (local, symbol)
#endif #endif
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__

View File

@ -84,8 +84,4 @@
#endif #endif
/* Used by some assembly code. */ /* Used by some assembly code. */
#ifdef NO_UNDERSCORES
#define C_SYMBOL_NAME(name) name #define C_SYMBOL_NAME(name) name
#else
#define C_SYMBOL_NAME(name) _##name
#endif

View File

@ -30,10 +30,6 @@
#define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg; #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
#define ASM_SIZE_DIRECTIVE(name) .size name,.-name; #define ASM_SIZE_DIRECTIVE(name) .size name,.-name;
/* In ELF C symbols are asm symbols. */
#undef NO_UNDERSCORES
#define NO_UNDERSCORES
/* Define an entry point visible from C. */ /* Define an entry point visible from C. */
#define ENTRY(name) \ #define ENTRY(name) \
@ -66,13 +62,11 @@
#define CALL_MCOUNT /* Do nothing. */ #define CALL_MCOUNT /* Do nothing. */
#endif #endif
#ifdef NO_UNDERSCORES
/* Since C identifiers are not normally prefixed with an underscore /* Since C identifiers are not normally prefixed with an underscore
on this system, the asm identifier `syscall_error' intrudes on the on this system, the asm identifier `syscall_error' intrudes on the
C name space. Make sure we use an innocuous name. */ C name space. Make sure we use an innocuous name. */
#define syscall_error __syscall_error #define syscall_error __syscall_error
#define mcount _mcount #define mcount _mcount
#endif
#define PSEUDO(name, syscall_name, args) \ #define PSEUDO(name, syscall_name, args) \
lose: SYSCALL_PIC_SETUP \ lose: SYSCALL_PIC_SETUP \

View File

@ -30,10 +30,6 @@
#define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg; #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
#define ASM_SIZE_DIRECTIVE(name) .size name,.-name; #define ASM_SIZE_DIRECTIVE(name) .size name,.-name;
/* In ELF C symbols are asm symbols. */
#undef NO_UNDERSCORES
#define NO_UNDERSCORES
/* Define an entry point visible from C. */ /* Define an entry point visible from C. */
#define ENTRY(name) \ #define ENTRY(name) \
@ -64,13 +60,11 @@
#define CALL_MCOUNT /* Do nothing. */ #define CALL_MCOUNT /* Do nothing. */
#endif #endif
#ifdef NO_UNDERSCORES
/* Since C identifiers are not normally prefixed with an underscore /* Since C identifiers are not normally prefixed with an underscore
on this system, the asm identifier `syscall_error' intrudes on the on this system, the asm identifier `syscall_error' intrudes on the
C name space. Make sure we use an innocuous name. */ C name space. Make sure we use an innocuous name. */
#define syscall_error __syscall_error #define syscall_error __syscall_error
#define mcount _mcount #define mcount _mcount
#endif
#define PSEUDO(name, syscall_name, args) \ #define PSEUDO(name, syscall_name, args) \
lose: SYSCALL_PIC_SETUP \ lose: SYSCALL_PIC_SETUP \

View File

@ -69,12 +69,10 @@
#define CALL_MCOUNT /* Do nothing. */ #define CALL_MCOUNT /* Do nothing. */
#endif #endif
#ifdef NO_UNDERSCORES
/* Since C identifiers are not normally prefixed with an underscore /* Since C identifiers are not normally prefixed with an underscore
on this system, the asm identifier `syscall_error' intrudes on the on this system, the asm identifier `syscall_error' intrudes on the
C name space. Make sure we use an innocuous name. */ C name space. Make sure we use an innocuous name. */
#define syscall_error __syscall_error #define syscall_error __syscall_error
#define mcount _mcount #define mcount _mcount
#endif
#endif /* __ASSEMBLER__ */ #endif /* __ASSEMBLER__ */

View File

@ -1,4 +1,4 @@
/* Copyright (C) 1994, 1997 Free Software Foundation, Inc. /* Copyright (C) 1994, 1997, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -22,10 +22,6 @@
arguments which it makes relocatable symbols but seem always to be arguments which it makes relocatable symbols but seem always to be
the constant 96; I have no idea what they are for. */ the constant 96; I have no idea what they are for. */
#ifndef NO_UNDERSCORES
#define __builtin_alloca ___builtin_alloca
#endif
ENTRY (__builtin_alloca) ENTRY (__builtin_alloca)
sub %sp, %o0, %sp /* Push some stack space. */ sub %sp, %o0, %sp /* Push some stack space. */
retl /* Return; the returned buffer leaves 96 */ retl /* Return; the returned buffer leaves 96 */

View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991-1997,2000,2002,2004,2005,2011 /* Copyright (C) 1991-1997,2000,2002,2004,2005,2011,2012
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -30,12 +30,7 @@
.globl C_SYMBOL_NAME(errno) .globl C_SYMBOL_NAME(errno)
.globl syscall_error .globl syscall_error
#undef syscall_error
#ifdef NO_UNDERSCORES
__syscall_error: __syscall_error:
#else
syscall_error:
#endif
#if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN #if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN
/* We translate the system's EWOULDBLOCK error into EAGAIN. /* We translate the system's EWOULDBLOCK error into EAGAIN.
The GNU C library always defines EWOULDBLOCK==EAGAIN. The GNU C library always defines EWOULDBLOCK==EAGAIN.

View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,93,94,95,96,97,2004 Free Software Foundation, Inc. /* Copyright (C) 1991-1997,2004,2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -52,9 +52,7 @@
/* The first piece of initialized data. */ /* The first piece of initialized data. */
int __data_start = 0; int __data_start = 0;
#ifdef HAVE_WEAK_SYMBOLS
weak_alias (__data_start, data_start) weak_alias (__data_start, data_start)
#endif
extern void __libc_init (int argc, char **argv, char **envp) __THROW; extern void __libc_init (int argc, char **argv, char **envp) __THROW;
extern int main (int argc, char **argv, char **envp) __THROW; extern int main (int argc, char **argv, char **envp) __THROW;

View File

@ -1,4 +1,4 @@
/* Copyright (C) 1994, 1997 Free Software Foundation, Inc. /* Copyright (C) 1994, 1997, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -25,12 +25,7 @@
.text .text
.align 2 .align 2
#undef syscall_error
#ifdef NO_UNDERSCORES
__syscall_error: __syscall_error:
#else
syscall_error:
#endif
#if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN #if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN
/* We translate the system's EWOULDBLOCK error into EAGAIN. /* We translate the system's EWOULDBLOCK error into EAGAIN.
The GNU C library always defines EWOULDBLOCK==EAGAIN. The GNU C library always defines EWOULDBLOCK==EAGAIN.

View File

@ -22,12 +22,10 @@
#ifdef __ASSEMBLER__ #ifdef __ASSEMBLER__
#ifdef NO_UNDERSCORES
/* Since C identifiers are not normally prefixed with an underscore /* Since C identifiers are not normally prefixed with an underscore
on this system, the asm identifier `syscall_error' intrudes on the on this system, the asm identifier `syscall_error' intrudes on the
C name space. Make sure we use an innocuous name. */ C name space. Make sure we use an innocuous name. */
#define syscall_error C_SYMBOL_NAME(__syscall_error) #define syscall_error C_SYMBOL_NAME(__syscall_error)
#endif
#ifdef PIC #ifdef PIC
#define SETUP_PIC_REG(reg, tmp) \ #define SETUP_PIC_REG(reg, tmp) \

View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 93, 1995-1998, 2000 Free Software Foundation, Inc. /* Copyright (C) 1991, 93, 1995-1998, 2000, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -40,9 +40,7 @@
/* The first piece of initialized data. */ /* The first piece of initialized data. */
int __data_start = 0; int __data_start = 0;
#ifdef HAVE_WEAK_SYMBOLS
weak_alias (__data_start, data_start) weak_alias (__data_start, data_start)
#endif
#ifdef DUMMIES #ifdef DUMMIES
#define ARG_DUMMIES DUMMIES, #define ARG_DUMMIES DUMMIES,
@ -69,13 +67,6 @@ _start ()
start1 (); start1 ();
} }
#ifndef NO_UNDERSCORES
/* Make an alias called `start' (no leading underscore, so it can't
conflict with C symbols) for `_start'. This is the name vendor crt0.o's
tend to use, and thus the name most linkers expect. */
asm (".set start, __start");
#endif
#endif #endif
/* ARGSUSED */ /* ARGSUSED */

View File

@ -1,4 +0,0 @@
/* System V does not precede the asm names of C symbols with a `_'. */
#define NO_UNDERSCORES
#include <sysdeps/unix/i386/sysdep.h>

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2001, 2002, 2004, 2005, 2011 Free Software Foundation, Inc. /* Copyright (C) 2001,2002,2004,2005,2011,2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -30,12 +30,7 @@
.globl C_SYMBOL_NAME(errno) .globl C_SYMBOL_NAME(errno)
.globl syscall_error .globl syscall_error
#undef syscall_error
#ifdef NO_UNDERSCORES
__syscall_error: __syscall_error:
#else
syscall_error:
#endif
#if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN #if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN
/* We translate the system's EWOULDBLOCK error into EAGAIN. /* We translate the system's EWOULDBLOCK error into EAGAIN.
The GNU C library always defines EWOULDBLOCK==EAGAIN. The GNU C library always defines EWOULDBLOCK==EAGAIN.

View File

@ -29,10 +29,6 @@
#define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg; #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
#define ASM_SIZE_DIRECTIVE(name) .size name,.-name; #define ASM_SIZE_DIRECTIVE(name) .size name,.-name;
/* In ELF C symbols are asm symbols. */
#undef NO_UNDERSCORES
#define NO_UNDERSCORES
/* Define an entry point visible from C. */ /* Define an entry point visible from C. */
#define ENTRY(name) \ #define ENTRY(name) \
@ -67,13 +63,11 @@
#define CALL_MCOUNT /* Do nothing. */ #define CALL_MCOUNT /* Do nothing. */
#endif #endif
#ifdef NO_UNDERSCORES
/* Since C identifiers are not normally prefixed with an underscore /* Since C identifiers are not normally prefixed with an underscore
on this system, the asm identifier `syscall_error' intrudes on the on this system, the asm identifier `syscall_error' intrudes on the
C name space. Make sure we use an innocuous name. */ C name space. Make sure we use an innocuous name. */
#define syscall_error __syscall_error #define syscall_error __syscall_error
#define mcount _mcount #define mcount _mcount
#endif
#define PSEUDO(name, syscall_name, args) \ #define PSEUDO(name, syscall_name, args) \
lose: \ lose: \