From 714e9334c4d48635ed65ae7cad428b6ee2afe739 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 12 Sep 2002 23:27:30 +0000 Subject: [PATCH] Makefile.am (LIBTOOL): Use --tag CC always for this directory. 2002-09-12 Benjamin Kosnik * libmath/Makefile.am (LIBTOOL): Use --tag CC always for this directory. * libmath/Makefile.in: Regenerate. * src/Makefile.am: Tweak comment. * src/Makefile.in: Regenerate. * config/locale/gnu/c_locale.h: Remove warnings. Inject __uselocale into __gnu_cxx. * config/locale/generic/c_locale.h: Match. From-SVN: r57082 --- libstdc++-v3/ChangeLog | 12 ++++++++++++ libstdc++-v3/config/locale/generic/c_locale.h | 3 ++- libstdc++-v3/config/locale/gnu/c_locale.h | 17 +++++++++++++---- libstdc++-v3/libmath/Makefile.am | 7 +++---- libstdc++-v3/libmath/Makefile.in | 10 ++++------ libstdc++-v3/src/Makefile.am | 2 +- libstdc++-v3/src/Makefile.in | 2 +- 7 files changed, 36 insertions(+), 17 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ba8ed4b..cd6f8db 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2002-09-12 Benjamin Kosnik + + * libmath/Makefile.am (LIBTOOL): Use --tag CC always for this + directory. + * libmath/Makefile.in: Regenerate. + * src/Makefile.am: Tweak comment. + * src/Makefile.in: Regenerate. + + * config/locale/gnu/c_locale.h: Remove warnings. + Inject __uselocale into __gnu_cxx. + * config/locale/generic/c_locale.h: Match. + 2002-09-11 Benjamin Kosnik * include/bits/locale_facets.tcc (__convert_from_v): Remove. diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index cb2bae8..bfd9bf0 100644 --- a/libstdc++-v3/config/locale/generic/c_locale.h +++ b/libstdc++-v3/config/locale/generic/c_locale.h @@ -44,12 +44,13 @@ namespace std __convert_from_v(char* __out, const int __size, const char* __fmt, _Tv __v, const __c_locale&, int __prec = -1) { - int __ret; char* __old = setlocale(LC_ALL, NULL); char* __sav = static_cast(malloc(strlen(__old) + 1)); if (__sav) strcpy(__sav, __old); setlocale(LC_ALL, "C"); + + int __ret; #ifdef _GLIBCPP_USE_C99 if (__prec >= 0) __ret = snprintf(__out, __size, __fmt, __prec, __v); diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h index 91a92e9..aabbe6a 100644 --- a/libstdc++-v3/config/locale/gnu/c_locale.h +++ b/libstdc++-v3/config/locale/gnu/c_locale.h @@ -40,6 +40,13 @@ #define _GLIBCPP_C_LOCALE_GNU 1 +#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) +namespace __gnu_cxx +{ + extern "C" __typeof(uselocale) __uselocale; +} +#endif + namespace std { typedef __locale_t __c_locale; @@ -47,12 +54,13 @@ namespace std template int __convert_from_v(char* __out, const int __size, const char* __fmt, +#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) _Tv __v, const __c_locale& __cloc, int __prec = -1) { - int __ret; -#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) - __c_locale __old = __uselocale(__cloc); + __c_locale __old = __gnu_cxx::__uselocale(__cloc); #else + _Tv __v, const __c_locale&, int __prec = -1) + { char* __old = setlocale(LC_ALL, NULL); char* __sav = static_cast(malloc(strlen(__old) + 1)); if (__sav) @@ -60,6 +68,7 @@ namespace std setlocale(LC_ALL, "C"); #endif + int __ret; #ifdef _GLIBCPP_USE_C99 if (__prec >= 0) __ret = snprintf(__out, __size, __fmt, __prec, __v); @@ -73,7 +82,7 @@ namespace std #endif #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) - __uselocale(__old); + __gnu_cxx::__uselocale(__old); #else setlocale(LC_ALL, __sav); free(__sav); diff --git a/libstdc++-v3/libmath/Makefile.am b/libstdc++-v3/libmath/Makefile.am index 27d76e9..30d3dce 100644 --- a/libstdc++-v3/libmath/Makefile.am +++ b/libstdc++-v3/libmath/Makefile.am @@ -34,12 +34,11 @@ libmath_la_DEPENDENCIES = $(libmath_la_LIBADD) libmath_la_SOURCES = stubs.c -LINK = \ - $(LIBTOOL) --tag CC --mode=link "$(CCLD)" \ - $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ - # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ INCLUDES = \ $(TOPLEVEL_INCLUDES) + +# Only compiling "C" sources in this directory. +LIBTOOL = @LIBTOOL@ --tag CC diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in index 375b9ad..7640e68 100644 --- a/libstdc++-v3/libmath/Makefile.in +++ b/libstdc++-v3/libmath/Makefile.in @@ -92,7 +92,6 @@ LIBMATHOBJS = @LIBMATHOBJS@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@ -LIBTOOL = @LIBTOOL@ LIBUNWIND_FLAG = @LIBUNWIND_FLAG@ LN_S = @LN_S@ MAINT = @MAINT@ @@ -144,17 +143,15 @@ libmath_la_DEPENDENCIES = $(libmath_la_LIBADD) libmath_la_SOURCES = stubs.c -LINK = \ - $(LIBTOOL) --tag CC --mode=link "$(CCLD)" \ - $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ - - # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ INCLUDES = \ $(TOPLEVEL_INCLUDES) + +# Only compiling "C" sources in this directory. +LIBTOOL = @LIBTOOL@ --tag CC CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) @@ -170,6 +167,7 @@ CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 9678b76..4592168 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -27,7 +27,7 @@ MAINT_CHARSET = latin1 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs -# Cross compiler and multilib support. +# Cross compiler support. CXX = @glibcpp_CXX@ toolexecdir = @glibcpp_toolexecdir@ toolexeclibdir = @glibcpp_toolexeclibdir@ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 6e5b364..0e55017 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -130,7 +130,7 @@ MAINT_CHARSET = latin1 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs -# Cross compiler and multilib support. +# Cross compiler support. CXX = @glibcpp_CXX@ toolexecdir = @glibcpp_toolexecdir@ toolexeclibdir = @glibcpp_toolexeclibdir@ -- 2.7.4