mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00:00
1a0d874ed4
* locale/xlocale.c: Revert changes putting _nl_global_locale here. This file again just defines _nl_C_locobj. (_nl_C_locobj): Use a categories.def iterator in the initializer. * locale/global-locale.c: New file. Define _nl_global_locale here, using all weak references in the initializer. * locale/Makefile (aux): Add global-locale. * locale/localeinfo.h (_nl_global_locale, _NL_CURRENT_LOCALE): Make these unconditional, along with the tsd decl. [!SHARED && HAVE___THREAD && HAVE_WEAK_SYMBOLS] (NL_CURRENT_INDIRECT): Define it under these conditions. [NL_CURRENT_INDIRECT]: Test this instead of [! SHARED]. Don't declare _nl_current. Declare _nl_current_LC_FOO as `extern __thread struct locale_data *const *'. [NL_CURRENT_INDIRECT] (_NL_CURRENT_DATA, _NL_CURRENT, _NL_CURRENT_WSTR): Add indirection. [NL_CURRENT_INDIRECT] (_NL_CURRENT_DEFINE): Rewritten. Define the thread variable _nl_current_LC_FOO and also a special absolute symbol _nl_current_LC_FOO_used. * locale/uselocale.c (__uselocale) [NL_CURRENT_INDIRECT]: Set each _nl_current_LC_FOO symbol to point into the new locale, using weak references to test if _nl_current_LC_FOO_used was linked in. * locale/setlocale.c [! SHARED]: Replace this conditional ... [NL_CURRENT_INDIRECT]: ... with this one. (_nl_current, _nl_C): Variables removed. [NL_CURRENT_INDIRECT] (_nl_current_used): New variable, table of weak references to _nl_current_LC_FOO_used. [NL_CURRENT_INDIRECT] (CATEGORY_USED): Define using that table. (free_category): New function, broken out of ... (free_mem): ... here. Call that. (free_mem) [NL_CURRENT_INDIRECT]: Use a categories.def iterator instead of a loop. __USING_NAMESPACE_C99 depending on _GLIBCPP_USE_NAMESPACES.
122 lines
4.4 KiB
Makefile
122 lines
4.4 KiB
Makefile
# Copyright (C) 1991,92,1995-1999,2000,2001,2002 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
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
# 02111-1307 USA.
|
|
|
|
#
|
|
# Makefile for locales.
|
|
#
|
|
subdir := locale
|
|
|
|
headers = locale.h bits/locale.h langinfo.h xlocale.h
|
|
distribute = localeinfo.h categories.def iso-639.def iso-3166.def \
|
|
iso-4217.def weight.h weightwc.h strlen-hash.h elem-hash.h \
|
|
indigits.h indigitswc.h outdigits.h outdigitswc.h \
|
|
coll-lookup.h C-translit.h.in C-translit.h gen-translit.pl \
|
|
locarchive.h hashval.h \
|
|
$(addprefix programs/, \
|
|
locale.c localedef.c \
|
|
$(localedef-modules:=.c) $(locale-modules:=.c) \
|
|
$(lib-modules:=.c) config.h simple-hash.h \
|
|
charmap-kw.gperf charmap-kw.h locfile-token.h \
|
|
locfile-kw.gperf locfile-kw.h linereader.h \
|
|
locfile.h charmap.h repertoire.h localedef.h \
|
|
3level.h charmap-dir.h locarchive.c)
|
|
routines = setlocale findlocale loadlocale loadarchive \
|
|
localeconv nl_langinfo nl_langinfo_l mb_cur_max \
|
|
newlocale duplocale freelocale uselocale
|
|
tests = tst-C-locale
|
|
categories = ctype messages monetary numeric time paper name \
|
|
address telephone measurement identification collate
|
|
aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
|
|
xlocale localename global-locale
|
|
others = localedef locale
|
|
#others-static = localedef locale
|
|
install-bin = localedef locale
|
|
extra-objs = $(localedef-modules:=.o) $(locale-modules:=.o) \
|
|
$(lib-modules:=.o)
|
|
|
|
extra-libs = libBrokenLocale
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
libBrokenLocale-routines = broken_cur_max
|
|
|
|
subdir-dirs = programs
|
|
vpath %.c programs ../crypt
|
|
vpath %.h programs
|
|
vpath %.gperf programs
|
|
|
|
localedef-modules := $(categories:%=ld-%) charmap linereader locfile \
|
|
repertoire locarchive
|
|
localedef-aux := md5
|
|
locale-modules := locale-spec
|
|
lib-modules := charmap-dir simple-hash xmalloc xstrdup
|
|
|
|
|
|
GPERF = gperf
|
|
GPERFFLAGS = -acCgopt -k1,2,5,9,$$ -L ANSI-C
|
|
|
|
include ../Rules
|
|
|
|
programs/%-kw.h: programs/%-kw.gperf
|
|
$(GPERF) $(GPERFFLAGS) -N $(@F:-kw.h=_hash) $< > $@.new
|
|
mv -f $@.new $@
|
|
|
|
$(objpfx)localedef: $(localedef-modules:%=$(objpfx)%.o)
|
|
$(objpfx)localedef: $(localedef-aux:%=$(objpfx)%.o)
|
|
$(objpfx)locale: $(locale-modules:%=$(objpfx)%.o)
|
|
$(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o)
|
|
|
|
C-translit.h: C-translit.h.in gen-translit.pl
|
|
$(PERL) gen-translit.pl < $< > $@.tmp
|
|
mv -f $@.tmp $@
|
|
ifeq ($(with-cvs),yes)
|
|
test ! -d CVS || cvs $(CVSOPTS) commit -mRegenerated $@
|
|
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
|
|
|
|
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
|
|
|
|
CPPFLAGS-locale = -DNOT_IN_libc
|
|
CPPFLAGS-localedef = -DNOT_IN_libc
|
|
CPPFLAGS-ld-ctype = -DNOT_IN_libc
|
|
CPPFLAGS-ld-time = -DNOT_IN_libc
|
|
CPPFLAGS-ld-numeric = -DNOT_IN_libc
|
|
CPPFLAGS-ld-monetary = -DNOT_IN_libc
|
|
CPPFLAGS-ld-collate = -DNOT_IN_libc
|
|
CPPFLAGS-ld-identification = -DNOT_IN_libc
|
|
CPPFLAGS-charmap = -DNOT_IN_libc
|
|
CPPFLAGS-locarchive = -DNOT_IN_libc
|
|
CPPFLAGS-linereader = -DNOT_IN_libc
|
|
CPPFLAGS-charmap-dir = -DNOT_IN_libc
|
|
|
|
# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
|
|
# This ensures they will load libc.so for needed symbols if loaded by
|
|
# a statically-linked program that hasn't already loaded it.
|
|
$(objpfx)libBrokenLocale.so: $(common-objpfx)libc.so \
|
|
$(common-objpfx)libc_nonshared.a
|