diff options
| -rw-r--r-- | ChangeLog | 29 | ||||
| -rw-r--r-- | config.make.in | 1 | ||||
| -rwxr-xr-x | configure | 69 | ||||
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | elf/dl-addr.c | 3 | ||||
| -rw-r--r-- | elf/dl-deps.c | 4 | ||||
| -rw-r--r-- | elf/dl-error.c | 6 | ||||
| -rw-r--r-- | elf/dl-open.c | 2 | ||||
| -rw-r--r-- | elf/testobj2.c | 1 | ||||
| -rw-r--r-- | elf/unload3mod4.c | 2 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 4 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/i386/Makefile | 2 | ||||
| -rw-r--r-- | sunrpc/des_impl.c | 6 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 5 | ||||
| -rw-r--r-- | sysdeps/gnu/errlist-compat.awk | 7 | ||||
| -rw-r--r-- | sysdeps/gnu/errlist.awk | 7 | ||||
| -rw-r--r-- | sysdeps/i386/Makefile | 2 | ||||
| -rwxr-xr-x | sysdeps/i386/configure | 3 | ||||
| -rw-r--r-- | sysdeps/i386/configure.in | 3 |
19 files changed, 149 insertions, 23 deletions
@@ -1,3 +1,32 @@ +2005-03-05 Roland McGrath <roland@redhat.com> + + * sysdeps/generic/ldsodefs.h (_dl_out_of_memory_internal): Remove decl. + (_dl_out_of_memory): Use rtld_hidden_proto. + * elf/dl-error.c (_dl_out_of_memory): Use rtld_hidden_data_def. + (_dl_signal_error): Don't use INTUSE on _dl_out_of_memory. + * elf/dl-open.c (_dl_open): Likewise. + * elf/dl-deps.c (_dl_map_object_deps): Likewise. + + * sunrpc/des_impl.c (des_set_key): Make first argument unsigned char *. + + * elf/dl-addr.c (_dl_addr): Add a cast. + + * elf/unload3mod4.c: Declare foo. + * elf/testobj2.c: Include <stdio.h>. + + * sysdeps/gnu/errlist.awk: Emit NERR macro for _sys_nerr_internal + value constant, and use it in the defn. + * sysdeps/gnu/errlist-compat.awk: Use NERR in array decl. + Use actual size for compat array decls. + + * config.make.in (cc-mtune): New substituted variable. + * configure.in (libc_cv_cc_mtune): New test for -mtune= switch, + done only if libc_mtune_example is defined. + * configure: Regenerated. + * sysdeps/i386/configure.in (libc_mtune_example): Set it. + * sysdeps/i386/configure: Regenerated. + * sysdeps/i386/Makefile (CFLAGS-initfini.s): Use $(cc-mtune). + 2005-03-05 Jakub Jelinek <jakub@redhat.com> * Makerules ($(inst_libdir)/libc.so): Use $(slibdir) instead of diff --git a/config.make.in b/config.make.in index 81cb95b..1115460 100644 --- a/config.make.in +++ b/config.make.in @@ -62,6 +62,7 @@ have-selinux = @have_selinux@ have-cc-with-libunwind = @libc_cv_cc_with_libunwind@ fno-unit-at-a-time = @fno_unit_at_a_time@ bind-now = @bindnow@ +cc-mtune = @cc_mtune@ static-libgcc = @libc_cv_gcc_static_libgcc@ @@ -313,7 +313,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_cc_with_libunwind libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie fno_unit_at_a_time libc_cv_have_initfini no_whole_archive exceptions LIBGD have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi bindnow force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os subdirs add_ons base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOCONF SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_directive libc_cv_initfinit_array libc_cv_cc_with_libunwind libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup libc_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie fno_unit_at_a_time libc_cv_have_initfini no_whole_archive exceptions LIBGD have_selinux EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff static shared pic_default cc_mtune profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -7615,6 +7615,72 @@ echo "$as_me:$LINENO: result: $pic_default" >&5 echo "${ECHO_T}$pic_default" >&6 +# This test comes after sysdeps configure fragments, so that they can +# define the variable libc_mtune_example to tell us a valid -mtune=value +# argument that we can test with. +cc_mtune=-mcpu +if test "x$libc_mtune_example" != x; then + echo "$as_me:$LINENO: checking if compiler supports -mtune option" >&5 +echo $ECHO_N "checking if compiler supports -mtune option... $ECHO_C" >&6 +if test "${libc_cv_cc_mtune+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + libc_cv_cc_mtune=no + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -mtune=$libc_mtune_example" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + libc_cv_cc_mtune=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $libc_cv_cc_mtune" >&5 +echo "${ECHO_T}$libc_cv_cc_mtune" >&6 + if test "x$libc_cv_cc_mtune" = xyes; then + cc_mtune=-mtune + fi +fi + @@ -8371,6 +8437,7 @@ s,@xcoff@,$xcoff,;t t s,@static@,$static,;t t s,@shared@,$shared,;t t s,@pic_default@,$pic_default,;t t +s,@cc_mtune@,$cc_mtune,;t t s,@profile@,$profile,;t t s,@omitfp@,$omitfp,;t t s,@bounded@,$bounded,;t t diff --git a/configure.in b/configure.in index 11f78b0..6ec23d5 100644 --- a/configure.in +++ b/configure.in @@ -2116,6 +2116,22 @@ fi rm -f conftest.*]) AC_SUBST(pic_default) +# This test comes after sysdeps configure fragments, so that they can +# define the variable libc_mtune_example to tell us a valid -mtune=value +# argument that we can test with. +AC_SUBST(cc_mtune)cc_mtune=-mcpu +if test "x$libc_mtune_example" != x; then + AC_CACHE_CHECK(if compiler supports -mtune option, libc_cv_cc_mtune, [dnl + libc_cv_cc_mtune=no + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -mtune=$libc_mtune_example" + AC_TRY_COMPILE(,,[libc_cv_cc_mtune=yes]) + ]) + if test "x$libc_cv_cc_mtune" = xyes; then + cc_mtune=-mtune + fi +fi + AC_SUBST(profile) AC_SUBST(omitfp) AC_SUBST(bounded) diff --git a/elf/dl-addr.c b/elf/dl-addr.c index c56736c..6bd7f7b 100644 --- a/elf/dl-addr.c +++ b/elf/dl-addr.c @@ -68,7 +68,8 @@ _dl_addr (const void *address, Dl_info *info, && match->l_type == lt_executable) info->dli_fname = _dl_argv[0]; - const ElfW(Sym) *symtab = D_PTR (match, l_info[DT_SYMTAB]); + const ElfW(Sym) *symtab + = (const ElfW(Sym) *) D_PTR (match, l_info[DT_SYMTAB]); const char *strtab = (const char *) D_PTR (match, l_info[DT_STRTAB]); ElfW(Word) strtabsize = match->l_info[DT_STRSZ]->d_un.d_val; diff --git a/elf/dl-deps.c b/elf/dl-deps.c index a1c16d7..a959930 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -1,5 +1,5 @@ /* Load the dependencies of a mapped object. - Copyright (C) 1996-2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1996-2003, 2004, 2005 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 @@ -307,7 +307,7 @@ _dl_map_object_deps (struct link_map *map, { /* We are not interested in the error message. */ assert (errstring != NULL); - if (errstring != INTUSE(_dl_out_of_memory)) + if (errstring != _dl_out_of_memory) free ((char *) errstring); /* Simply ignore this error and continue the work. */ diff --git a/elf/dl-error.c b/elf/dl-error.c index 0ef76c8..993b7c2 100644 --- a/elf/dl-error.c +++ b/elf/dl-error.c @@ -1,5 +1,5 @@ /* Error handling for runtime dynamic linker. - Copyright (C) 1995-2002,2004 Free Software Foundation, Inc. + Copyright (C) 1995-2002,2004,2005 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 @@ -45,7 +45,7 @@ struct catch variable since we have to avoid freeing it and so have to enable a pointer comparison. See below and in dlfcn/dlerror.c. */ const char _dl_out_of_memory[] = "out of memory"; -INTVARDEF(_dl_out_of_memory) +rtld_hidden_data_def (_dl_out_of_memory) /* This points to a function which is called when an continuable error is @@ -95,7 +95,7 @@ _dl_signal_error (int errcode, const char *objname, const char *occation, { /* This is better than nothing. */ lcatch->objname = ""; - lcatch->errstring = INTUSE(_dl_out_of_memory); + lcatch->errstring = _dl_out_of_memory; } longjmp (lcatch->env, errcode ?: -1); } diff --git a/elf/dl-open.c b/elf/dl-open.c index 4de2072..f1fcfbc 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -618,7 +618,7 @@ no more namespaces available for dlmopen()")); memcpy (local_errstring, errstring, len_errstring); } - if (errstring != INTUSE(_dl_out_of_memory)) + if (errstring != _dl_out_of_memory) free ((char *) errstring); assert (_dl_debug_initialize (0, args.nsid)->r_state == RT_CONSISTENT); diff --git a/elf/testobj2.c b/elf/testobj2.c index f00ba9f..7e4b610 100644 --- a/elf/testobj2.c +++ b/elf/testobj2.c @@ -1,5 +1,6 @@ #include <dlfcn.h> #include <stdlib.h> +#include <stdio.h> #include "testobj.h" diff --git a/elf/unload3mod4.c b/elf/unload3mod4.c index 4586ff7..52f808e 100644 --- a/elf/unload3mod4.c +++ b/elf/unload3mod4.c @@ -1,5 +1,7 @@ #include <stdio.h> +extern int foo (int x); + int bar (int x) { diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 90ccb1b..f3531e2 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,7 @@ +2005-03-05 Roland McGrath <roland@redhat.com> + + * sysdeps/i386/Makefile (CFLAGS-initfini.s): Use $(cc-mtune). + 2005-03-05 Jakub Jelinek <jakub@redhat.com> * sysdeps/powerpc/tcb-offsets.sym (thread_offsetof): Rework for GCC 4. diff --git a/linuxthreads/sysdeps/i386/Makefile b/linuxthreads/sysdeps/i386/Makefile index 418fa5c..70124b3 100644 --- a/linuxthreads/sysdeps/i386/Makefile +++ b/linuxthreads/sysdeps/i386/Makefile @@ -1,7 +1,7 @@ ifeq ($(subdir),linuxthreads) # On i686 we must avoid generating the trampoline functions generated # to get the GOT pointer. -CFLAGS-pt-initfini.s += -march=i386 -mcpu=i386 +CFLAGS-pt-initfini.s += -march=i386 $(cc-mtune)=i386 # Most files must not be compiled without frame pointer since we need # the frame base address which is stored in %ebp unless the frame pointer diff --git a/sunrpc/des_impl.c b/sunrpc/des_impl.c index 702bd02..d0004b9 100644 --- a/sunrpc/des_impl.c +++ b/sunrpc/des_impl.c @@ -391,14 +391,14 @@ static const unsigned long des_skb[8][64] = static const char shifts2[16] = {0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0}; -static void des_set_key (char *, unsigned long *) internal_function; +static void des_set_key (unsigned char *, unsigned long *) internal_function; static void des_encrypt (unsigned long *, unsigned long *, int) internal_function; int _des_crypt (char *, unsigned, struct desparams *); static void internal_function -des_set_key (char *key, unsigned long *schedule) +des_set_key (unsigned char *key, unsigned long *schedule) { register unsigned long c, d, t, s; register unsigned char *in; @@ -406,7 +406,7 @@ des_set_key (char *key, unsigned long *schedule) register int i; k = (unsigned long *) schedule; - in = (unsigned char *) key; + in = key; c2l (in, c); c2l (in, d); diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 08039e1..a3cef20 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -694,10 +694,7 @@ extern char **_dl_argv_internal attribute_hidden /* The array with message we print as a last resort. */ extern const char _dl_out_of_memory[]; -#ifdef IS_IN_rtld -/* XXX #ifdef should go away. */ -extern const char _dl_out_of_memory_internal[] attribute_hidden; -#endif +rtld_hidden_proto (_dl_out_of_memory) /* Flag set at startup and cleared when the last initializer has run. */ extern int _dl_starting_up; diff --git a/sysdeps/gnu/errlist-compat.awk b/sysdeps/gnu/errlist-compat.awk index db827f3..f357232 100644 --- a/sysdeps/gnu/errlist-compat.awk +++ b/sysdeps/gnu/errlist-compat.awk @@ -90,7 +90,7 @@ END { n = vcount[old]; printf "#if SHLIB_COMPAT (libc, %s, %s)\n", old, new; printf "# include <bits/wordsize.h>\n"; - printf "extern const char *const __sys_errlist_%s[];\n", old; + printf "extern const char *const __sys_errlist_%s[%d];\n", old, n; printf "const int __sys_nerr_%s = %d;\n", old, n; printf "strong_alias (_sys_errlist_internal, __sys_errlist_%s)\n", old; printf "declare_symbol (__sys_errlist_%s, object, __WORDSIZE/8*%d)\n", \ @@ -99,7 +99,7 @@ END { old, old; printf "compat_symbol (libc, __sys_nerr_%s, sys_nerr, %s);\n", old, old; - printf "extern const char *const ___sys_errlist_%s[];\n", old; + printf "extern const char *const ___sys_errlist_%s[%d];\n", old, n; printf "extern const int __sys_nerr_%s;\n", old; printf "strong_alias (__sys_errlist_%s, ___sys_errlist_%s)\n", old, old; printf "strong_alias (__sys_nerr_%s, ___sys_nerr_%s)\n", old, old; @@ -110,10 +110,11 @@ END { } printf "\ -extern const char *const __sys_errlist_internal[];\n\ +extern const char *const __sys_errlist_internal[NERR];\n\ extern const int __sys_nerr_internal;\n\ strong_alias (_sys_errlist_internal, __sys_errlist_internal)\n\ strong_alias (_sys_nerr_internal, __sys_nerr_internal)\n\ +extern const char *const sys_errlist[NERR];\n\ versioned_symbol (libc, _sys_errlist_internal, sys_errlist, %s);\n\ versioned_symbol (libc, __sys_errlist_internal, _sys_errlist, %s);\n\ versioned_symbol (libc, _sys_nerr_internal, sys_nerr, %s);\n\ diff --git a/sysdeps/gnu/errlist.awk b/sysdeps/gnu/errlist.awk index 3f074ed..365ac81 100644 --- a/sysdeps/gnu/errlist.awk +++ b/sysdeps/gnu/errlist.awk @@ -1,4 +1,4 @@ -# Copyright (C) 1991-1999,2002,2004 Free Software Foundation, Inc. +# Copyright (C) 1991-1999,2002,2004,2005 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 @@ -106,8 +106,9 @@ errnoh == 4 \ END { print " };"; print ""; - print "const int _sys_nerr_internal"; - print " = sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0];"; + print "#define NERR \\"; + print " (sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0])"; + print "const int _sys_nerr_internal = NERR;" print ""; print "#if !defined NOT_IN_libc && !ERRLIST_NO_COMPAT"; print "# include <errlist-compat.c>"; diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile index ece94f3..24d09c7 100644 --- a/sysdeps/i386/Makefile +++ b/sysdeps/i386/Makefile @@ -8,7 +8,7 @@ long-double-fcts = yes ifeq ($(subdir),csu) # On i686 we must avoid generating the trampoline functions generated # to get the GOT pointer. -CFLAGS-initfini.s += -march=i386 -mcpu=i386 +CFLAGS-initfini.s += -march=i386 $(cc-mtune)=i386 endif ifeq ($(subdir),gmon) diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure index d1d4dc1..ecba166 100755 --- a/sysdeps/i386/configure +++ b/sysdeps/i386/configure @@ -52,3 +52,6 @@ if test $libc_cv_cpp_asm_debuginfo = yes; then _ACEOF fi + +# Tell top-level configure to try -mtune=i386. +libc_mtune_example=i386 diff --git a/sysdeps/i386/configure.in b/sysdeps/i386/configure.in index 028e1ae..93b62b6 100644 --- a/sysdeps/i386/configure.in +++ b/sysdeps/i386/configure.in @@ -33,3 +33,6 @@ rm -f conftest*])AC_SUBST(libc_cv_cpp_asm_debuginfo) if test $libc_cv_cpp_asm_debuginfo = yes; then AC_DEFINE(HAVE_CPP_ASM_DEBUGINFO) fi + +# Tell top-level configure to try -mtune=i386. +libc_mtune_example=i386 |