diff --git a/ChangeLog b/ChangeLog index 5889b2165e..6d2665add7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,51 @@ +2004-05-15 Petter Reinholdtsen + + * locale/iso-3166.def: Remove YUGOSLAVIA and insert "SERBIA AND + MONTENEGRO" which have taken over the code 819. Patch from + Danilo Segan. [BZ #40] + +2004-05-15 Jakub Jelinek + + * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h + (SYSCALL_ERROR_HANDLER): Rename __sparc.get_pic.l7 to + __sparc_get_pic_l7. + +2004-05-15 Joseph S. Myers + + * catgets/gencat.c: Update bug reporting instructions. + * csu/version.c: Likewise. + * debug/catchsegv.sh: Likewise. + * debug/pcprofiledump.c: Likewise. + * debug/xtrace.sh: Likewise. + * elf/ldd.bash.in: Likewise. + * iconv/iconv_prog.c: Likewise. + * iconv/iconvconfig.c: Likewise. + * locale/programs/locale.c: Likewise. + * locale/programs/localedef.c: Likewise. + * login/programs/pt_chown.c: Likewise. + * malloc/memusage.sh: Likewise. + * malloc/memusagestat.c: Likewise. + * malloc/mtrace.pl: Likewise. + * manual/crypt.texi: Likewise. + * manual/install.texi: Likewise. + * nss/makedb.c: Likewise. + +2004-05-14 Jakub Jelinek + + * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Only + CHECK_STATIC_TLS if sym != NULL. + * sysdeps/sh/dl-machine.h (elf_machine_rela): Likewise. + * sysdeps/i386/dl-machine.h (elf_machine_rela): Likewise. + +2004-05-12 Andreas Schwab + + * posix/regex_internal.c (build_wcs_buffer): Also set pstr->mbs + when translating. + +2004-05-13 H.J. Lu + + * Rules (xtests): Depend on tests. + 2004-05-13 Jakub Jelinek * libio/genops.c (_IO_default_xsputn): Avoid one overflow per char if diff --git a/catgets/gencat.c b/catgets/gencat.c index 308b0a27f0..2f6c81dc1d 100644 --- a/catgets/gencat.c +++ b/catgets/gencat.c @@ -231,7 +231,8 @@ more_help (int key, const char *text, void *input) case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ return strdup (gettext ("\ -Report bugs using the `glibcbug' script to .\n")); +For bug reporting instructions, please see:\n\ +.\n")); default: break; } diff --git a/csu/version.c b/csu/version.c index 8c3178ba7c..1104fa9137 100644 --- a/csu/version.c +++ b/csu/version.c @@ -37,7 +37,8 @@ Compiled by GNU CC version "__VERSION__".\n" #ifdef USE_TLS "Thread-local storage support included.\n" #endif -"Report bugs using the `glibcbug' script to .\n"; +"For bug reporting instructions, please see:\n\ +.\n"; #include diff --git a/debug/catchsegv.sh b/debug/catchsegv.sh index 8379c6b8d6..853b108609 100755 --- a/debug/catchsegv.sh +++ b/debug/catchsegv.sh @@ -33,7 +33,8 @@ if test $# -eq 0; then echo 'Usage: catchsegv PROGRAM ARGS...' echo ' --help print this help, then exit' echo ' --version print version number, then exit' - echo "Report bugs using the \`glibcbug' script to ." + echo "For bug reporting instructions, please see:" + echo "." exit 0 ;; --v | --ve | --ver | --vers | --versi | --versio | --version) diff --git a/debug/pcprofiledump.c b/debug/pcprofiledump.c index 6d3a2c7354..210e5089e9 100644 --- a/debug/pcprofiledump.c +++ b/debug/pcprofiledump.c @@ -197,7 +197,8 @@ more_help (int key, const char *text, void *input) case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ return strdup (gettext ("\ -Report bugs using the `glibcbug' script to .\n")); +For bug reporting instructions, please see:\n\ +.\n")); default: break; } diff --git a/debug/xtrace.sh b/debug/xtrace.sh index 97c76507ee..43a74a053d 100755 --- a/debug/xtrace.sh +++ b/debug/xtrace.sh @@ -54,7 +54,8 @@ do_help() { Mandatory arguments to long options are also mandatory for any corresponding short options. -Report bugs using the \`glibcbug' script to .\n" +For bug reporting instructions, please see: +.\n" exit 0 } diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in index e6015f55e6..aeceae8592 100644 --- a/elf/ldd.bash.in +++ b/elf/ldd.bash.in @@ -51,7 +51,8 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -d, --data-relocs process data relocations -r, --function-relocs process data and function relocations -v, --verbose print all information -Report bugs using the \`glibcbug' script to ." +For bug reporting instructions, please see: +." exit 0 ;; -d | --d | --da | --dat | --data | --data- | --data-r | --data-re | \ diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index 5455974f5c..af823255b2 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -406,7 +406,8 @@ more_help (int key, const char *text, void *input) case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ return strdup (gettext ("\ -Report bugs using the `glibcbug' script to .\n")); +For bug reporting instructions, please see:\n\ +.\n")); default: break; } diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c index 10c0d7e6f1..da0d54f43b 100644 --- a/iconv/iconvconfig.c +++ b/iconv/iconvconfig.c @@ -355,7 +355,8 @@ more_help (int key, const char *text, void *input) case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ return strdup (gettext ("\ -Report bugs using the `glibcbug' script to .\n")); +For bug reporting instructions, please see:\n\ +.\n")); default: break; } diff --git a/locale/iso-3166.def b/locale/iso-3166.def index c7f8258f08..f87f15bf59 100644 --- a/locale/iso-3166.def +++ b/locale/iso-3166.def @@ -193,6 +193,7 @@ DEFINE_COUNTRY_CODE ("SAN MARINO", SM, SMR, 674) DEFINE_COUNTRY_CODE ("SAO TOME AND PRINCIPE", ST, STP, 678) DEFINE_COUNTRY_CODE ("SAUDI ARABIA", SA, SAU, 682) DEFINE_COUNTRY_CODE ("SENEGAL", SN, SEN, 686) +DEFINE_COUNTRY_CODE ("SERBIA AND MONTENEGRO", CS, SCG, 891) DEFINE_COUNTRY_CODE ("SEYCHELLES", SC, SYC, 690) DEFINE_COUNTRY_CODE ("SIERRA LEONE", SL, SLE, 694) DEFINE_COUNTRY_CODE ("SINGAPORE", SG, SGP, 702) @@ -240,6 +241,5 @@ DEFINE_COUNTRY_CODE ("VIRGIN ISLANDS, U.S.", VI, VIR, 850) DEFINE_COUNTRY_CODE ("WALLIS AND FUTUNA", WF, WLF, 876) DEFINE_COUNTRY_CODE ("WESTERN SAHARA", EH, ESH, 732) DEFINE_COUNTRY_CODE ("YEMEN", YE, YEM, 887) -DEFINE_COUNTRY_CODE ("YUGOSLAVIA", YU, YUG, 891) DEFINE_COUNTRY_CODE ("ZAMBIA", ZM, ZMB, 894) DEFINE_COUNTRY_CODE ("ZIMBABWE", ZW, ZWE, 716) diff --git a/locale/programs/locale.c b/locale/programs/locale.c index 92be8e231a..dede36d256 100644 --- a/locale/programs/locale.c +++ b/locale/programs/locale.c @@ -277,7 +277,8 @@ more_help (int key, const char *text, void *input) case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ return xstrdup (gettext ("\ -Report bugs using the `glibcbug' script to .\n")); +For bug reporting instructions, please see:\n\ +.\n")); default: break; } diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index b38ce6c53e..1c01272e2a 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -370,7 +370,8 @@ System's directory for character maps : %s\n\ locale path : %s\n\ %s"), CHARMAP_PATH, REPERTOIREMAP_PATH, LOCALE_PATH, gettext ("\ -Report bugs using the `glibcbug' script to .\n")); +For bug reporting instructions, please see:\n\ +.\n")); return cp; default: break; diff --git a/localedata/ChangeLog b/localedata/ChangeLog index d0cc3372d9..392a14521b 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,7 @@ +2004-05-17 Ulrich Drepper + + * SUPPORTED (SUPPORTED-LOCALES): Remove sr_YU locales. + 2004-05-15 Petter Reinholdtsen * locales/it_IT: Change currency formatting from none to two diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index 2f0c87d93f..a1a4d70e63 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -274,10 +274,6 @@ so_KE/ISO-8859-1 \ so_SO/ISO-8859-1 \ sq_AL.UTF-8/UTF-8 \ sq_AL/ISO-8859-1 \ -sr_YU.UTF-8/UTF-8 \ -sr_YU.UTF-8@cyrillic/UTF-8 \ -sr_YU/ISO-8859-2 \ -sr_YU@cyrillic/ISO-8859-5 \ st_ZA.UTF-8/UTF-8 \ st_ZA/ISO-8859-1 \ sv_FI.UTF-8/UTF-8 \ diff --git a/localedata/locales/sr_YU b/localedata/locales/sr_YU deleted file mode 100644 index d249f79656..0000000000 --- a/localedata/locales/sr_YU +++ /dev/null @@ -1,323 +0,0 @@ -comment_char % -escape_char / -% -% Serbian Language Locale for Yugoslavia -% Source: USM/MZT -% Address: -% -% Contact: -% Email: -% Tel: -% Fax: none -% Language: sr -% Territory: YU -% Revision: 4.4 -% Date: 1997-04-17 -% Application: general -% Users: general -% Charset: ISO-8859-2 -% Distribution and use is free, also -% for commercial purposes. - -LC_IDENTIFICATION -title "Serbian locale for Yugoslavia" -source "USM/MZT" -address "" -contact "" -email "bug-glibc@gnu.org" -tel "" -fax "" -language "Serbian" -territory "Yugoslavia" -revision "1.0" -date "2000-06-29" -% -category "sr_YU:2000";LC_IDENTIFICATION -category "sr_YU:2000";LC_CTYPE -category "sr_YU:2000";LC_COLLATE -category "sr_YU:2000";LC_TIME -category "sr_YU:2000";LC_NUMERIC -category "sr_YU:2000";LC_MONETARY -category "sr_YU:2000";LC_MESSAGES -category "sr_YU:2000";LC_PAPER -category "sr_YU:2000";LC_NAME -category "sr_YU:2000";LC_ADDRESS -category "sr_YU:2000";LC_TELEPHONE - -END LC_IDENTIFICATION - -LC_COLLATE -copy "iso14651_t1" - -% a b c c' c< d dz< d// e f g h i j k l lj m n nj o p -% q r s s< t u v w x y z z< - -collating-symbol -collating-element from "" -collating-element from "" -collating-element from "" -collating-element from "" -collating-symbol -collating-element from "" -collating-element from "" -collating-element from "" -collating-element from "" -collating-symbol -collating-element from "" -collating-element from "" -collating-element from "" -collating-element from "" -collating-symbol -collating-symbol -collating-symbol -collating-symbol -collating-symbol - -collating-symbol -collating-symbol - -reorder-after - -reorder-after - - -reorder-after - - - - - -reorder-after - -reorder-after - -reorder-after - -reorder-after - - -reorder-after - ;;;IGNORE - ;;;IGNORE -reorder-after - ;;;IGNORE - ;;;IGNORE - -reorder-after - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE -reorder-after - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - -reorder-after - ;;;IGNORE - ;;;IGNORE -reorder-after - ;;;IGNORE - ;;;IGNORE - -reorder-after - ;;;IGNORE - ;;;IGNORE -reorder-after - ;;;IGNORE - ;;;IGNORE - -reorder-after - ;;;IGNORE -reorder-after - ;;;IGNORE - -reorder-after - ;;;IGNORE -reorder-after - ;;;IGNORE - -reorder-end -END LC_COLLATE - -LC_CTYPE -copy "i18n" -translit_start -include "translit_combining";"" - -% cyrillic -> latin - "";"" % d- - "" % gj - "" % dz - "" % j - "" % lj - "" % nj - "";"" % c' - "" % kj - "";"" % dz< - - "";"" % D- - "" % Gj - "" % Dz - "" % J - "" % Lj - "" % Nj - "";"" % C' - "" % Kj - "";"" % Dz< - - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "";"" % z< - "";"" % s< - "";"" % c< - - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "";"" % z< - "";"" % s< - "";"" % c< - -translit_end -END LC_CTYPE - -LC_MESSAGES -yesexpr "" -noexpr "" -END LC_MESSAGES - -LC_MONETARY -int_curr_symbol "" -currency_symbol "" -mon_decimal_point "" -mon_thousands_sep "" -mon_grouping 3;3 -positive_sign "" -negative_sign "" -int_frac_digits 0 -frac_digits 0 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -END LC_MONETARY - -LC_NUMERIC -decimal_point "" -thousands_sep "" -grouping 0;0 -END LC_NUMERIC - -LC_TIME - -abday "";"";/ - "";"";/ - "";"";/ - "" -day "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -abmon "";"";/ - "";"";/ - "";"";/ - "";"";/ - "";"";/ - "";"" -mon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -d_t_fmt "" -d_fmt "" -t_fmt "" -am_pm "";"" -t_fmt_ampm "" -date_fmt "/ -/ -" -END LC_TIME - -LC_PAPER -% FIXME -height 297 -% FIXME -width 210 -END LC_PAPER - -LC_TELEPHONE -tel_int_fmt "/ -" -int_prefix "" -END LC_TELEPHONE - -LC_MEASUREMENT -% FIXME -measurement 1 -END LC_MEASUREMENT - -LC_NAME -name_fmt "/ -" -END LC_NAME - -LC_ADDRESS -postal_fmt "/ -/ -/ -/ -" -country_ab2 "" -country_ab3 "" -country_num 891 -END LC_ADDRESS diff --git a/localedata/locales/sr_YU@cyrillic b/localedata/locales/sr_YU@cyrillic deleted file mode 100644 index cf9ed873eb..0000000000 --- a/localedata/locales/sr_YU@cyrillic +++ /dev/null @@ -1,141 +0,0 @@ -comment_char % -escape_char / -% -% Serbian Language Locale for Yugoslavia -% Source: USM/MZT -% Address: -% -% Contact: -% Email: -% Tel: -% Fax: none -% Language: sr -% Territory: YU -% Revision: 4.4 -% Date: 1997-04-17 -% Application: general -% Users: general -% Repertoiremap: mnemonic.ds -% Charset: ISO-8859-5 -% Distribution and use is free, also -% for commercial purposes. - -LC_IDENTIFICATION -title "Serbian locale for Yugoslavia" -source "USM/MZT" -address "" -contact "" -email "bug-glibc@gnu.org" -tel "" -fax "" -language "Serbian" -territory "Yugoslavia" -revision "1.0" -date "2000-10-27" -% -category "sr_YU@cyrillic:2000";LC_IDENTIFICATION -category "sr_YU@cyrillic:2000";LC_CTYPE -category "sr_YU@cyrillic:2000";LC_COLLATE -category "sr_YU@cyrillic:2000";LC_TIME -category "sr_YU@cyrillic:2000";LC_NUMERIC -category "sr_YU@cyrillic:2000";LC_MONETARY -category "sr_YU@cyrillic:2000";LC_MESSAGES -category "sr_YU@cyrillic:2000";LC_PAPER -category "sr_YU@cyrillic:2000";LC_NAME -category "sr_YU@cyrillic:2000";LC_ADDRESS -category "sr_YU@cyrillic:2000";LC_TELEPHONE - -END LC_IDENTIFICATION - -LC_COLLATE -copy "sr_YU" -END LC_COLLATE - -LC_CTYPE -copy "i18n" -END LC_CTYPE - -LC_MESSAGES -yesexpr "" -noexpr "" -END LC_MESSAGES - -LC_MONETARY -int_curr_symbol "" -currency_symbol "" -mon_decimal_point "" -mon_thousands_sep "" -mon_grouping 3;3 -positive_sign "" -negative_sign "" -int_frac_digits 0 -frac_digits 0 -p_cs_precedes 1 -p_sep_by_space 1 -n_cs_precedes 1 -n_sep_by_space 1 -p_sign_posn 1 -n_sign_posn 1 -END LC_MONETARY - -LC_NUMERIC -copy "sr_YU" -END LC_NUMERIC - -LC_TIME - -abday "";"";/ - "";"";/ - "";"";/ - "" -day "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -abmon "";"";/ - "";"";/ - "";"";/ - "";"";/ - "";"";/ - "";"" -mon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -d_t_fmt "" -d_fmt "" -t_fmt "" -am_pm "";"" -t_fmt_ampm "" -END LC_TIME - -LC_PAPER -copy "sr_YU" -END LC_PAPER - -LC_TELEPHONE -copy "sr_YU" -END LC_TELEPHONE - -LC_MEASUREMENT -copy "sr_YU" -END LC_MEASUREMENT - -LC_NAME -copy "sr_YU" -END LC_NAME - -LC_ADDRESS -copy "sr_YU" -END LC_ADDRESS diff --git a/login/programs/pt_chown.c b/login/programs/pt_chown.c index ced7032dd1..485eddabc9 100644 --- a/login/programs/pt_chown.c +++ b/login/programs/pt_chown.c @@ -86,7 +86,8 @@ The owner is set to the current user, the group is set to `%s',\ and the access permission is set to `%o'.\n\n\ %s"), TTY_GROUP, S_IRUSR|S_IWUSR|S_IWGRP, gettext ("\ -Report bugs using the `glibcbug' script to .\n")); +For bug reporting instructions, please see:\n\ +.\n")); return cp; default: break; diff --git a/malloc/memusage.sh b/malloc/memusage.sh index b1e405b953..be8f755a20 100755 --- a/malloc/memusage.sh +++ b/malloc/memusage.sh @@ -61,7 +61,8 @@ Profile memory usage of PROGRAM. Mandatory arguments to long options are also mandatory for any corresponding short options. -Report bugs using the \`glibcbug' script to ." +For bug reporting instructions, please see: +." exit 0 } diff --git a/malloc/memusagestat.c b/malloc/memusagestat.c index 2b16b01ded..fa2d219c36 100644 --- a/malloc/memusagestat.c +++ b/malloc/memusagestat.c @@ -600,7 +600,8 @@ more_help (int key, const char *text, void *input) case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ orig = gettext ("\ -Report bugs using the `glibcbug' script to .\n"); +For bug reporting instructions, please see:\n\ +.\n"); cp = strdup (orig); if (cp == NULL) cp = orig; diff --git a/malloc/mtrace.pl b/malloc/mtrace.pl index b3d3311204..60c0a11877 100644 --- a/malloc/mtrace.pl +++ b/malloc/mtrace.pl @@ -30,7 +30,8 @@ sub usage { print " --help print this help, then exit\n"; print " --version print version number, then exit\n"; print "\n"; - print "Report bugs using the `glibcbug' script to .\n"; + print "For bug reporting instructions, please see:\n" + print ".\n"; exit 0; } diff --git a/manual/crypt.texi b/manual/crypt.texi index 1198d6a721..0ea5ff85d4 100644 --- a/manual/crypt.texi +++ b/manual/crypt.texi @@ -79,8 +79,8 @@ royalty for commercial production or sale of any product developed with the source code'' to most countries. The rules in this area are continuously changing. If you know of any -information in this manual that is out-of-date, please report it using -the @code{glibcbug} script. @xref{Reporting Bugs}. +information in this manual that is out-of-date, please report it to +the bug database. @xref{Reporting Bugs}. @node getpass @section Reading Passwords diff --git a/manual/install.texi b/manual/install.texi index efe2a0ffdc..b8f5d6fc41 100644 --- a/manual/install.texi +++ b/manual/install.texi @@ -559,7 +559,7 @@ It is a good idea to verify that the problem has not already been reported. Bugs are documented in two places: The file @file{BUGS} describes a number of well known bugs and the bug tracking system has a WWW interface at -@url{http://www-gnats.gnu.org:8080/cgi-bin/wwwgnats.pl}. The WWW +@url{http://sources.redhat.com/bugzilla/}. The WWW interface gives you access to open and closed reports. A closed report normally includes a patch or a hint on solving the problem. @@ -582,20 +582,13 @@ library, you really only need to narrow it down to one library function call, if possible. This should not be too difficult. The final step when you have a simple test case is to report the bug. -Do this using the @code{glibcbug} script. It is installed with libc, or -if you haven't installed it, will be in your build directory. Send your -test case, the results you got, the results you expected, and what you -think the problem might be (if you've thought of anything). -@code{glibcbug} will insert the configuration information we need to -see, and ship the report off to @email{bugs@@gnu.org}. Don't send -a message there directly; it is fed to a program that expects mail to be -formatted in a particular way. Use the script. +Do this using the WWW interface to the bug database. If you are not sure how a function should behave, and this manual doesn't tell you, that's a bug in the manual. Report that too! If the function's behavior disagrees with the manual, then either the library or the manual has a bug, so report the disagreement. If you find any -errors or omissions in this manual, please report them to the Internet -address @email{bug-glibc-manual@@gnu.org}. If you refer to specific +errors or omissions in this manual, please report them to the +bug database. If you refer to specific sections of the manual, please include the section names for easier identification. diff --git a/nss/makedb.c b/nss/makedb.c index 6114f65079..5390dc1373 100644 --- a/nss/makedb.c +++ b/nss/makedb.c @@ -229,7 +229,8 @@ more_help (int key, const char *text, void *input) case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ return strdup (gettext ("\ -Report bugs using the `glibcbug' script to .\n")); +For bug reporting instructions, please see:\n\ +.\n")); default: break; } diff --git a/posix/regex_internal.c b/posix/regex_internal.c index a3dcfbbb65..96f113745f 100644 --- a/posix/regex_internal.c +++ b/posix/regex_internal.c @@ -242,7 +242,7 @@ build_wcs_buffer (pstr) for (i = 0; i < pstr->mb_cur_max && i < remain_len; ++i) { ch = pstr->raw_mbs [pstr->raw_mbs_idx + byte_idx + i]; - buf[i] = pstr->trans[ch]; + buf[i] = pstr->mbs[byte_idx + i] = pstr->trans[ch]; } p = (const char *) buf; } diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 26abbfb64a..65ae53a408 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -587,20 +587,24 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, It is a positive value which will be subtracted from the thread pointer. To get the variable position in the TLS block we subtract the offset from that of the TLS block. */ - CHECK_STATIC_TLS (map, sym_map); - *reloc_addr - = (sym == NULL ? 0 : sym_map->l_tls_offset - sym->st_value) - + reloc->r_addend; + if (sym != NULL) + { + CHECK_STATIC_TLS (map, sym_map); + *reloc_addr = sym_map->l_tls_offset - sym->st_value + + reloc->r_addend; + } break; case R_386_TLS_TPOFF: /* The offset is negative, forward from the thread pointer. */ /* We know the offset of object the symbol is contained in. It is a negative value which will be added to the thread pointer. */ - CHECK_STATIC_TLS (map, sym_map); - *reloc_addr - = (sym == NULL ? 0 : sym->st_value - sym_map->l_tls_offset) - + reloc->r_addend; + if (sym != NULL) + { + CHECK_STATIC_TLS (map, sym_map); + *reloc_addr = sym->st_value - sym_map->l_tls_offset + + reloc->r_addend; + } break; # endif /* use TLS */ case R_386_COPY: diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h index a0852a4e71..834b81a4c9 100644 --- a/sysdeps/sh/dl-machine.h +++ b/sysdeps/sh/dl-machine.h @@ -580,10 +580,12 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, It is a positive value which will be added to the thread pointer. To get the variable position in the TLS block we add the offset from that of the TLS block. */ - CHECK_STATIC_TLS (map, sym_map); - *reloc_addr - = ((sym == NULL ? 0 : sym_map->l_tls_offset + sym->st_value) - + reloc->r_addend); + if (sym != NULL) + { + CHECK_STATIC_TLS (map, sym_map); + *reloc_addr = sym_map->l_tls_offset + sym->st_value + + reloc->r_addend; + } # endif break; #endif /* use TLS */ diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index 5f39949c00..52fc6329dd 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -521,22 +521,27 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, /* We know the offset of object the symbol is contained in. It is a negative value which will be added to the thread pointer. */ - CHECK_STATIC_TLS (map, sym_map); - *reloc_addr - = (sym == NULL ? 0 : sym->st_value - sym_map->l_tls_offset) - + reloc->r_addend; + if (sym != NULL) + { + CHECK_STATIC_TLS (map, sym_map); + *reloc_addr = sym->st_value - sym_map->l_tls_offset + + reloc->r_addend; + } break; # ifndef RTLD_BOOTSTRAP case R_SPARC_TLS_LE_HIX22: case R_SPARC_TLS_LE_LOX10: - CHECK_STATIC_TLS (map, sym_map); - value = (sym == NULL ? 0 : sym->st_value - sym_map->l_tls_offset) - + reloc->r_addend; - if (r_type == R_SPARC_TLS_LE_HIX22) - *reloc_addr = (*reloc_addr & 0xffc00000) | ((~value) >> 10); - else - *reloc_addr = (*reloc_addr & 0xffffe000) | (value & 0x3ff) - | 0x1c00; + if (sym != NULL) + { + CHECK_STATIC_TLS (map, sym_map); + value = sym->st_value - sym_map->l_tls_offset + + reloc->r_addend; + if (r_type == R_SPARC_TLS_LE_HIX22) + *reloc_addr = (*reloc_addr & 0xffc00000) | ((~value) >> 10); + else + *reloc_addr = (*reloc_addr & 0xffffe000) | (value & 0x3ff) + | 0x1c00; + } break; # endif #endif diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h index 5ba9f3f88b..67cb32645b 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Miguel de Icaza , January 1997. @@ -70,18 +70,18 @@ #if RTLD_PRIVATE_ERRNO # define SYSCALL_ERROR_HANDLER \ - .section .gnu.linkonce.t.__sparc.get_pic.l7,"ax",@progbits; \ - .globl __sparc.get_pic.l7; \ - .hidden __sparc.get_pic.l7; \ - .type __sparc.get_pic.l7,@function; \ -__sparc.get_pic.l7: \ + .section .gnu.linkonce.t.__sparc_get_pic_l7,"ax",@progbits; \ + .globl __sparc_get_pic_l7; \ + .hidden __sparc_get_pic_l7; \ + .type __sparc_get_pic_l7,@function; \ +__sparc_get_pic_l7: \ retl; \ add %o7, %l7, %l7; \ .previous; \ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \ save %sp,-96,%sp; \ sethi %hi(_GLOBAL_OFFSET_TABLE_-4), %l7; \ - call __sparc.get_pic.l7; \ + call __sparc_get_pic_l7; \ add %l7, %lo(_GLOBAL_OFFSET_TABLE_+4), %l7; \ ld [%l7 + errno], %l0; \ st %i0, [%l0]; \ @@ -96,11 +96,11 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \ # endif # ifdef SHARED # define SYSCALL_ERROR_HANDLER \ - .section .gnu.linkonce.t.__sparc.get_pic.l7,"ax",@progbits; \ - .globl __sparc.get_pic.l7; \ - .hidden __sparc.get_pic.l7; \ - .type __sparc.get_pic.l7,@function; \ -__sparc.get_pic.l7: \ + .section .gnu.linkonce.t.__sparc_get_pic_l7,"ax",@progbits; \ + .globl __sparc_get_pic_l7; \ + .hidden __sparc_get_pic_l7; \ + .type __sparc_get_pic_l7,@function; \ +__sparc_get_pic_l7: \ retl; \ add %o7, %l7, %l7; \ .previous; \ @@ -108,7 +108,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \ save %sp,-96,%sp; \ sethi %tie_hi22(SYSCALL_ERROR_ERRNO), %l1; \ sethi %hi(_GLOBAL_OFFSET_TABLE_-4), %l7; \ - call __sparc.get_pic.l7; \ + call __sparc_get_pic_l7; \ add %l7, %lo(_GLOBAL_OFFSET_TABLE_+4), %l7; \ add %l1, %tie_lo10(SYSCALL_ERROR_ERRNO), %l1; \ ld [%l7 + %l1], %l1, %tie_ld(SYSCALL_ERROR_ERRNO); \