diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | localedata/Makefile | 5 | ||||
| -rw-r--r-- | stdio-common/Makefile | 3 | ||||
| -rw-r--r-- | stdio-common/bug15.c | 10 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/dl-machine.h | 16 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/dl-machine.h | 16 |
6 files changed, 44 insertions, 19 deletions
@@ -1,3 +1,16 @@ +2003-01-30 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_lazy_rel): + Move to RESOLVE protected part of the header. + * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_lazy_rel): + Likewise. + +2003-01-30 Ulrich Drepper <drepper@redhat.com> + + * stdio-common/Makefile (tests): Add bug15. + (bug15-ENV): Define. + * stdio-common/bug15.c: New file. + 2002-10-07 Wolfram Gloger <wg@malloc.de> * malloc/malloc.c (sYSMALLOc): Only check for breakage due diff --git a/localedata/Makefile b/localedata/Makefile index 60c69b2cf2..a7df29d9b1 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. +# Copyright (C) 1996-2002, 2003 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 @@ -129,7 +129,8 @@ ifeq (no,$(cross-compiling)) # We have to generate locales LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \ en_US.ISO-8859-1 ja_JP.EUC-JP da_DK.ISO-8859-1 \ - hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 + hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \ + vi_VN.TCVN5712-1 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g') CHARMAPS := $(shell echo "$(LOCALES)" | \ sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g) diff --git a/stdio-common/Makefile b/stdio-common/Makefile index bfdef2b6ce..35273f1d30 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -54,7 +54,7 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \ scanf1 scanf2 scanf3 scanf4 scanf5 scanf7 scanf8 scanf9 scanf10 \ scanf11 scanf12 tst-tmpnam tst-cookie tst-obprintf tst-sscanf \ tst-swprintf tst-fseek tst-fmemopen test-vfprintf tst-gets \ - tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 + tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 bug15 test-srcs = tst-unbputc tst-printf @@ -87,6 +87,7 @@ tst-sscanf-ENV = LOCPATH=$(common-objpfx)localedata tst-swprintf-ENV = LOCPATH=$(common-objpfx)localedata test-vfprintf-ENV = LOCPATH=$(common-objpfx)localedata bug14-ENV = LOCPATH=$(common-objpfx)localedata +bug15-ENV = LOCPATH=$(common-objpfx)localedata ifneq (,$(filter %REENTRANT, $(defines))) CPPFLAGS += -D_IO_MTSAFE_IO diff --git a/stdio-common/bug15.c b/stdio-common/bug15.c new file mode 100644 index 0000000000..825ca2f980 --- /dev/null +++ b/stdio-common/bug15.c @@ -0,0 +1,10 @@ +#include <stdio.h> +#include <locale.h> + +int +main (void) +{ + char buf[10]; + setlocale (LC_ALL, "vi_VN.TCVN-5712"); + return sprintf (buf, "%.*s", 2, "vi") != 2; +} diff --git a/sysdeps/powerpc/powerpc32/dl-machine.h b/sysdeps/powerpc/powerpc32/dl-machine.h index 34858e5a4b..88408a4287 100644 --- a/sysdeps/powerpc/powerpc32/dl-machine.h +++ b/sysdeps/powerpc/powerpc32/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. PowerPC version. - Copyright (C) 1995-2000,01,02 Free Software Foundation, Inc. + Copyright (C) 1995-2002, 2003 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 @@ -295,13 +295,6 @@ extern int __elf_machine_runtime_setup (struct link_map *map, int lazy, int profile); #define elf_machine_runtime_setup __elf_machine_runtime_setup -static inline void -elf_machine_lazy_rel (struct link_map *map, - Elf32_Addr l_addr, const Elf32_Rela *reloc) -{ - /* elf_machine_runtime_setup handles this. */ -} - /* Change the PLT entry whose reloc is 'reloc' to call the actual routine. */ extern Elf32_Addr __elf_machine_fixup_plt (struct link_map *map, const Elf32_Rela *reloc, @@ -411,6 +404,13 @@ elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc, *reloc_addr = l_addr + reloc->r_addend; } +static inline void +elf_machine_lazy_rel (struct link_map *map, + Elf32_Addr l_addr, const Elf32_Rela *reloc) +{ + /* elf_machine_runtime_setup handles this. */ +} + /* The SVR4 ABI specifies that the JMPREL relocs must be inside the DT_RELA table. */ #define ELF_MACHINE_PLTREL_OVERLAP 1 diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h index 408161649b..62e7f22c6b 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.h +++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -1,6 +1,6 @@ /* Machine-dependent ELF dynamic relocation inline functions. PowerPC64 version. - Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 + Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -452,13 +452,6 @@ elf_machine_runtime_setup (struct link_map *map, int lazy, int profile) return lazy; } -static inline void -elf_machine_lazy_rel (struct link_map *map, - Elf64_Addr l_addr, const Elf64_Rela *reloc) -{ - /* elf_machine_runtime_setup handles this. */ -} - /* Change the PLT entry whose reloc is 'reloc' to call the actual routine. */ static inline Elf64_Addr @@ -747,4 +740,11 @@ elf_machine_rela (struct link_map *map, MODIFIED_CODE_NOQUEUE (reloc_addr); } +static inline void +elf_machine_lazy_rel (struct link_map *map, + Elf64_Addr l_addr, const Elf64_Rela *reloc) +{ + /* elf_machine_runtime_setup handles this. */ +} + #endif /* RESOLVE */ |