Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
This commit is contained in:
Ulrich Drepper
commit
f3ed22607e
20
ChangeLog
20
ChangeLog
|
|
@ -3,6 +3,26 @@
|
|||
* nscd/servicescache.c (cache_addserv): Make sure written is always
|
||||
initialized.
|
||||
|
||||
2011-08-14 Roland McGrath <roland@hack.frob.com>
|
||||
|
||||
* string/strncat.c (STRNCAT): Use prototype definition.
|
||||
|
||||
* locale/Makefile (locale-CPPFLAGS): Renamed CPPFLAGS-locale-programs.
|
||||
(locale-CPPFLAGS): New variable; put LOCALEDIR, LOCALE_ALIAS_PATH and
|
||||
-Iprograms here.
|
||||
(cppflags-iterator.mk sequence): Use locale-programs in place of nonlib.
|
||||
(localedef-modules): Add localedef.
|
||||
(locale-modules): Add locale.
|
||||
|
||||
* sysdeps/generic/ldsodefs.h (struct unique_sym): Add a const.
|
||||
* elf/rtld.c (dl_main): Invert order of assignment in last change,
|
||||
to avoid a warning.
|
||||
|
||||
2011-08-14 David S. Miller <davem@davemloft.net>
|
||||
|
||||
* sysdeps/unix/sysv/linux/sparc/bits/resource.h (RLIM_INFINITY,
|
||||
RLIM64_INFINITY): Fix 64-bit values for 32-bit sparc.
|
||||
|
||||
2011-08-13 Ulrich Drepper <drepper@gmail.com>
|
||||
|
||||
* elf/dl-open.c: Rename show_scope to _dl_schow_scope and export.
|
||||
|
|
|
|||
|
|
@ -1391,7 +1391,7 @@ of this helper program; chances are you did not intend to run this program.\n\
|
|||
char *copy = malloc (len);
|
||||
if (copy == NULL)
|
||||
_dl_fatal_printf ("out of memory\n");
|
||||
l->l_name = l->l_libname->name = memcpy (copy, dsoname, len);
|
||||
l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
|
||||
}
|
||||
|
||||
/* Add the vDSO to the object list. */
|
||||
|
|
|
|||
|
|
@ -60,10 +60,11 @@ vpath %.c programs ../crypt
|
|||
vpath %.h programs
|
||||
vpath %.gperf programs
|
||||
|
||||
localedef-modules := $(categories:%=ld-%) charmap linereader locfile \
|
||||
localedef-modules := localedef $(categories:%=ld-%) \
|
||||
charmap linereader locfile \
|
||||
repertoire locarchive
|
||||
localedef-aux := md5
|
||||
locale-modules := locale-spec
|
||||
locale-modules := locale locale-spec
|
||||
lib-modules := charmap-dir simple-hash xmalloc xstrdup
|
||||
|
||||
|
||||
|
|
@ -91,22 +92,27 @@ endif
|
|||
|
||||
localepath = "$(localedir):$(i18ndir)"
|
||||
|
||||
locale-CPPFLAGS := -DLOCALE_PATH='$(localepath)' \
|
||||
-DLOCALEDIR='"$(localedir)"' \
|
||||
-DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
|
||||
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
|
||||
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
|
||||
-DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \
|
||||
-Iprograms -DNOT_IN_libc
|
||||
# -Iprograms doesn't really belong here, but this gets it at the head
|
||||
# of the list instead of the tail, where CPPFLAGS-$(lib) gets added.
|
||||
# We need it before the standard -I's to see programs/config.h first.
|
||||
locale-CPPFLAGS = -DLOCALEDIR='"$(localedir)"' \
|
||||
-DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
|
||||
-Iprograms
|
||||
|
||||
CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
|
||||
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
|
||||
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
|
||||
-DLOCSRCDIR='"$(i18ndir)/locales"' \
|
||||
-DHAVE_CONFIG_H -DNOT_IN_libc
|
||||
|
||||
CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
|
||||
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
|
||||
CFLAGS-charmap-dir.c = -Wno-write-strings
|
||||
|
||||
# This makes sure -DNOT_IN_libc is passed for all these modules.
|
||||
# This makes sure -DNOT_IN_libc et al are passed for all these modules.
|
||||
cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \
|
||||
$(locale-modules) $(lib-modules))
|
||||
lib := nonlib
|
||||
lib := locale-programs
|
||||
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
|
||||
|
||||
# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 1991, 1997 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1991,1997,2011 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
|
||||
|
|
@ -29,10 +29,7 @@ typedef char reg_char;
|
|||
#endif
|
||||
|
||||
char *
|
||||
STRNCAT (s1, s2, n)
|
||||
char *s1;
|
||||
const char *s2;
|
||||
size_t n;
|
||||
STRNCAT (char *s1, const char *s2, size_t n)
|
||||
{
|
||||
reg_char c;
|
||||
char *s = s1;
|
||||
|
|
|
|||
|
|
@ -396,7 +396,7 @@ struct rtld_global
|
|||
uint32_t hashval;
|
||||
const char *name;
|
||||
const ElfW(Sym) *sym;
|
||||
struct link_map *map;
|
||||
const struct link_map *map;
|
||||
} *entries;
|
||||
size_t size;
|
||||
size_t n_elements;
|
||||
|
|
|
|||
|
|
@ -130,11 +130,11 @@ enum __rlimit_resource
|
|||
#ifndef __USE_FILE_OFFSET64
|
||||
# define RLIM_INFINITY ((long int)(~0UL >> 1))
|
||||
#else
|
||||
# define RLIM_INFINITY 0x7fffffffffffffffLL
|
||||
# define RLIM_INFINITY 0xffffffffffffffffLL
|
||||
#endif
|
||||
|
||||
#ifdef __USE_LARGEFILE64
|
||||
# define RLIM64_INFINITY 0x7fffffffffffffffLL
|
||||
# define RLIM64_INFINITY 0xffffffffffffffffLL
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue