Skip to content

R
riscv-gcc-1
Commit f3b004d8 by Benjamin Kosnik
Options

[multiple changes] 


2000-04-26  Nathan C. Myers  <ncm@cantrip.org>

	* bits/basic_string.h: include <bits/atomicity.h> instead
        of <atomicity.h>, and use the uglified names.
        * config/cpu/*/atomicity.h: replace with bits/atomicity.h;
        uglify names, eliminate dependence on <inttypes.h>.
        * src/Makefile.in, src/Makefile.am: refer to correct place
        for atomicity.h header.

2000-04-25 Steven King <sxking@uswest.net>

        * bits/basic_string.h: Fix syntax error.

2000-04-25  Benjamin Kosnik  <bkoz@redhat.com>

	* acinclude.m4 (GLIBCPP_CHECK_MATH_SUPPORT): Improve checks for
	USE_LONG_DOUBLE.
	(GLIBCPP_ENABLE_DEBUG): If alpha, use -gdwarf-2.
	* math/Makefile.am (EXTRA_LONG_DOUBLE_yes): Add all the long
	versions to this as copysignl is needed anyway for these targets.
	* math/Makefile.in: Regenerate.

	* bits/streambuf.tcc (streambuf::xsgetn): Tweak.
	* bits/fstream.tcc (underflow): Cast to libio types.
	* bits/basic_file.h (seekoff): Fixes for alpha: use __c_streamoff.
	* config/c_io_libio.cc (seekoff): And here.

From-SVN: r33501
parent a6496605
Showing with 389 additions and 221 deletions
libstdc++-v3/ChangeLog
2000-04-26 Nathan C. Myers <ncm@cantrip.org>
* bits/basic_string.h: include <bits/atomicity.h> instead
of <atomicity.h>, and use the uglified names.
* config/cpu/*/atomicity.h: replace with bits/atomicity.h;
uglify names, eliminate dependence on <inttypes.h>.
* src/Makefile.in, src/Makefile.am: refer to correct place
for atomicity.h header.
2000-04-25 Steven King <sxking@uswest.net>
* bits/basic_string.h: Fix syntax error.
2000-04-25 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4 (GLIBCPP_CHECK_MATH_SUPPORT): Improve checks for
USE_LONG_DOUBLE.
(GLIBCPP_ENABLE_DEBUG): If alpha, use -gdwarf-2.
* math/Makefile.am (EXTRA_LONG_DOUBLE_yes): Add all the long
versions to this as copysignl is needed anyway for these targets.
* math/Makefile.in: Regenerate.
* bits/streambuf.tcc (streambuf::xsgetn): Tweak.
* bits/fstream.tcc (underflow): Cast to libio types.
* bits/basic_file.h (seekoff): Fixes for alpha: use __c_streamoff.
* config/c_io_libio.cc (seekoff): And here.
2000-04-24 Loren J. Rittle <ljrittle@acm.org> 2000-04-24 Loren J. Rittle <ljrittle@acm.org>
* mkcheck.in: Report compiler version used for test. Find * mkcheck.in: Report compiler version used for test. Find
......
libstdc++-v3/Makefile.am
...@@ -137,11 +137,4 @@ AM_MAKEFLAGS = \ ...@@ -137,11 +137,4 @@ AM_MAKEFLAGS = \
"NM=$(NM)" \ "NM=$(NM)" \
"NM_FOR_BUILD=$(NM_FOR_BUILD)" \ "NM_FOR_BUILD=$(NM_FOR_BUILD)" \
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \ "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
"DESTDIR=$(DESTDIR)" "DESTDIR=$(DESTDIR)"
libstdc++-v3/Makefile.in
...@@ -188,7 +188,7 @@ AM_MAKEFLAGS = \ ...@@ -188,7 +188,7 @@ AM_MAKEFLAGS = \
"NM=$(NM)" \ "NM=$(NM)" \
"NM_FOR_BUILD=$(NM_FOR_BUILD)" \ "NM_FOR_BUILD=$(NM_FOR_BUILD)" \
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \ "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
"DESTDIR=$(DESTDIR)" "DESTDIR=$(DESTDIR)"
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
......
libstdc++-v3/acinclude.m4
...@@ -242,8 +242,8 @@ dnl Check to see what architecture we are compiling for. If it's ...@@ -242,8 +242,8 @@ dnl Check to see what architecture we are compiling for. If it's
dnl supported, use special hand-crafted routines to provide thread dnl supported, use special hand-crafted routines to provide thread
dnl primitives. dnl primitives.
dnl dnl
dnl Depending on what is found, select various configure/cpu/*/atomicity.h dnl Depending on what is found, select configure/cpu/*/bits/atomicity.h
dnl If not found, select configure/cpu/generic/atomicity.h dnl If not found, select configure/cpu/generic/bits/atomicity.h
dnl dnl
dnl GLIBCPP_CHECK_CPU dnl GLIBCPP_CHECK_CPU
AC_DEFUN(GLIBCPP_CHECK_CPU, [ AC_DEFUN(GLIBCPP_CHECK_CPU, [
...@@ -414,9 +414,9 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [ ...@@ -414,9 +414,9 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
carg cargf nan hypot hypotf atan2f expf copysignf) carg cargf nan hypot hypotf atan2f expf copysignf)
dnl We compile the long double complex functions only if the function dnl We compile the long double complex functions only if the function
dnl provides the non-complex functions. dnl provides the non-complex long double functions.
USE_LONG_DOUBLE=no USE_LONG_DOUBLE=no
AC_CHECK_FUNC(sinl, AC_CHECK_FUNC(copysignl,
USE_LONG_DOUBLE=yes USE_LONG_DOUBLE=yes
AC_REPLACE_MATHFUNCS(ccoshl ccosl cexpl cpowl csinhl csinl \ AC_REPLACE_MATHFUNCS(ccoshl ccosl cexpl cpowl csinhl csinl \
csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l)) csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l))
...@@ -604,10 +604,19 @@ changequote([, ])dnl ...@@ -604,10 +604,19 @@ changequote([, ])dnl
enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_debug" in case "$enable_debug" in
yes) DEBUGFLAGS='-ggdb -O0' yes)
;; case "$target_cpu" in
no) DEBUGFLAGS='-g' alpha*)
;; DEBUGFLAGS='-O0 -gdwarf-2'
;;
*)
DEBUGFLAGS='-O0 -g'
;;
esac
;;
no)
DEBUGFLAGS='-g'
;;
esac esac
AC_SUBST(DEBUGFLAGS) AC_SUBST(DEBUGFLAGS)
]) ])
...@@ -728,6 +737,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ ...@@ -728,6 +737,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
need_libio=yes need_libio=yes
fi fi
AC_SUBST(BUILD_LIBIO_INCLUDE) AC_SUBST(BUILD_LIBIO_INCLUDE)
# see if the _G_config.h header needs to be built.
# NB: This replaces the _G_CONFIG_H machinery in libio-v2
AC_CHECK_HEADER(_G_config.h, has_gconf_h=yes, has_gconf_h=no)
AM_CONDITIONAL(GLIBCPP_NEED_LIBIO_CONFIG_H, test "$has_gconf_h" = no)
;; ;;
xwince) xwince)
CSTDIO_H=c_io_wince.h CSTDIO_H=c_io_wince.h
......
libstdc++-v3/aclocal.m4
...@@ -254,8 +254,8 @@ dnl Check to see what architecture we are compiling for. If it's ...@@ -254,8 +254,8 @@ dnl Check to see what architecture we are compiling for. If it's
dnl supported, use special hand-crafted routines to provide thread dnl supported, use special hand-crafted routines to provide thread
dnl primitives. dnl primitives.
dnl dnl
dnl Depending on what is found, select various configure/cpu/*/atomicity.h dnl Depending on what is found, select configure/cpu/*/bits/atomicity.h
dnl If not found, select configure/cpu/generic/atomicity.h dnl If not found, select configure/cpu/generic/bits/atomicity.h
dnl dnl
dnl GLIBCPP_CHECK_CPU dnl GLIBCPP_CHECK_CPU
AC_DEFUN(GLIBCPP_CHECK_CPU, [ AC_DEFUN(GLIBCPP_CHECK_CPU, [
...@@ -426,9 +426,9 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [ ...@@ -426,9 +426,9 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
carg cargf nan hypot hypotf atan2f expf copysignf) carg cargf nan hypot hypotf atan2f expf copysignf)
dnl We compile the long double complex functions only if the function dnl We compile the long double complex functions only if the function
dnl provides the non-complex functions. dnl provides the non-complex long double functions.
USE_LONG_DOUBLE=no USE_LONG_DOUBLE=no
AC_CHECK_FUNC(sinl, AC_CHECK_FUNC(copysignl,
USE_LONG_DOUBLE=yes USE_LONG_DOUBLE=yes
AC_REPLACE_MATHFUNCS(ccoshl ccosl cexpl cpowl csinhl csinl \ AC_REPLACE_MATHFUNCS(ccoshl ccosl cexpl cpowl csinhl csinl \
csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l)) csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l))
...@@ -616,10 +616,19 @@ changequote([, ])dnl ...@@ -616,10 +616,19 @@ changequote([, ])dnl
enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_debug" in case "$enable_debug" in
yes) DEBUGFLAGS='-ggdb -O0' yes)
;; case "$target_cpu" in
no) DEBUGFLAGS='-g' alpha*)
;; DEBUGFLAGS='-O0 -gdwarf-2'
;;
*)
DEBUGFLAGS='-O0 -g'
;;
esac
;;
no)
DEBUGFLAGS='-g'
;;
esac esac
AC_SUBST(DEBUGFLAGS) AC_SUBST(DEBUGFLAGS)
]) ])
...@@ -740,6 +749,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ ...@@ -740,6 +749,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
need_libio=yes need_libio=yes
fi fi
AC_SUBST(BUILD_LIBIO_INCLUDE) AC_SUBST(BUILD_LIBIO_INCLUDE)
# see if the _G_config.h header needs to be built.
# NB: This replaces the _G_CONFIG_H machinery in libio-v2
AC_CHECK_HEADER(_G_config.h, has_gconf_h=yes, has_gconf_h=no)
AM_CONDITIONAL(GLIBCPP_NEED_LIBIO_CONFIG_H, test "$has_gconf_h" = no)
;; ;;
xwince) xwince)
CSTDIO_H=c_io_wince.h CSTDIO_H=c_io_wince.h
......
libstdc++-v3/bits/basic_file.h
// Wrapper of C-language FILE struct -*- C++ -*- // Wrapper of C-language FILE struct -*- C++ -*-
// Copyright (C) 1999 Free Software Foundation, Inc. // Copyright (C) 1999, 2000 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the // software; you can redistribute it and/or modify it under the
...@@ -49,8 +49,8 @@ namespace std { ...@@ -49,8 +49,8 @@ namespace std {
#endif #endif
{ {
#if _GLIBCPP_BASIC_FILE_ENCAPSULATION #if _GLIBCPP_BASIC_FILE_ENCAPSULATION
int _M_fileno; int _M_fileno;
__c_file_type* _M_cfile; __c_file_type* _M_cfile;
#endif #endif
public: public:
...@@ -110,15 +110,15 @@ namespace std { ...@@ -110,15 +110,15 @@ namespace std {
// A complex "seekoff" function that sets all of __c_file_type's // A complex "seekoff" function that sets all of __c_file_type's
// ponters and associated data members correctly and manages it's // ponters and associated data members correctly and manages it's
// relation to the external byte sequence. // relation to the external byte sequence.
virtual __c_streampos virtual streamoff
seekoff(streamoff __off, ios_base::seekdir __way, seekoff(streamoff __off, ios_base::seekdir __way,
ios_base::openmode __mode = ios_base::in | ios_base::out); ios_base::openmode __mode = ios_base::in | ios_base::out);
// A complex "seekpos" function that sets all of __c_file_type's // A complex "seekpos" function that sets all of __c_file_type's
// pointers and associated data members correctly and manages it's // pointers and associated data members correctly and manages it's
// relation to the external byte sequence. // relation to the external byte sequence.
virtual __c_streampos virtual streamoff
seekpos(__c_streampos __pos, seekpos(streamoff __pos,
ios_base::openmode __mode = ios_base::in | ios_base::out); ios_base::openmode __mode = ios_base::in | ios_base::out);
virtual streambuf* virtual streambuf*
...@@ -145,8 +145,8 @@ namespace std { ...@@ -145,8 +145,8 @@ namespace std {
// A simple seek function for the external byte sequence, that // A simple seek function for the external byte sequence, that
// does no mucking around with or setting of the pointers or flags // does no mucking around with or setting of the pointers or flags
// in __c_file_type. // in __c_file_type.
virtual __c_streampos virtual streamoff
sys_seek(__c_streampos __off, ios_base::seekdir __way); sys_seek(streamoff __off, ios_base::seekdir __way);
virtual int virtual int
sys_close(); sys_close();
......
libstdc++-v3/bits/basic_string.h
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#define _CPP_BITS_STRING_H 1 #define _CPP_BITS_STRING_H 1
#include <bits/exception_support.h> #include <bits/exception_support.h>
#include <atomicity.h> #include <bits/atomicity.h>
namespace std { namespace std {
...@@ -123,10 +123,6 @@ namespace std { ...@@ -123,10 +123,6 @@ namespace std {
// Types: // Types:
typedef typename _Alloc::rebind<char>::other _Raw_bytes_alloc; typedef typename _Alloc::rebind<char>::other _Raw_bytes_alloc;
// NB: Would be better if atomicity.h defined type(s) itself.
typedef uint32_t _State_type;
typedef int32_t _Signed_state_type;
// (Public) Data members: // (Public) Data members:
// The maximum number of individual char_type elements of an // The maximum number of individual char_type elements of an
...@@ -145,19 +141,19 @@ namespace std { ...@@ -145,19 +141,19 @@ namespace std {
size_type _M_length; size_type _M_length;
size_type _M_capacity; size_type _M_capacity;
_State_type _M_state; _Atomic_word _M_state;
bool bool
_M_is_leaked() const _M_is_leaked() const
{ return static_cast<_Signed_state_type>(_M_state) < 0; } { return _M_state < 0; }
bool bool
_M_is_shared() const _M_is_shared() const
{ return static_cast<_Signed_state_type>(_M_state) > 0; } { return _M_state > 0; }
void void
_M_set_leaked() _M_set_leaked()
{ _M_state = _State_type(-1); } { _M_state = -1; }
void void
_M_set_sharable() _M_set_sharable()
...@@ -183,7 +179,7 @@ namespace std { ...@@ -183,7 +179,7 @@ namespace std {
void void
_M_dispose(const _Alloc& __a) _M_dispose(const _Alloc& __a)
{ {
if (_Signed_state_type(exchange_and_add(&_M_state, -1)) <= 0) if (__exchange_and_add(&_M_state, -1) <= 0)
_M_destroy(__a); _M_destroy(__a);
} // XXX MT } // XXX MT
...@@ -193,7 +189,7 @@ namespace std { ...@@ -193,7 +189,7 @@ namespace std {
_CharT* _CharT*
_M_refcopy() throw() _M_refcopy() throw()
{ {
atomic_add(&_M_state, 1); __atomic_add(&_M_state, 1);
return _M_refdata(); return _M_refdata();
} // XXX MT } // XXX MT
...@@ -887,9 +883,10 @@ namespace std { ...@@ -887,9 +883,10 @@ namespace std {
inline basic_string<_CharT, _Traits, _Alloc> inline basic_string<_CharT, _Traits, _Alloc>
operator+(const basic_string<_CharT, _Traits, _Alloc>& __lhs, _CharT __rhs) operator+(const basic_string<_CharT, _Traits, _Alloc>& __lhs, _CharT __rhs)
{ {
typedef basic_string<_CharT, _Traits, _Alloc> __string_type; typedef basic_string<_CharT, _Traits, _Alloc> __string_type;
typedef typename __string_type::size_type __size_type;
__string_type __str(__lhs); __string_type __str(__lhs);
__str.append(__string_type::size_type(1), __rhs); __str.append(__size_type(1), __rhs);
return __str; return __str;
} }
......
libstdc++-v3/bits/fstream.tcc
...@@ -198,8 +198,8 @@ namespace std ...@@ -198,8 +198,8 @@ namespace std
if (__testout) if (__testout)
_M_really_overflow(); _M_really_overflow();
else else
_M_file->seekoff(_M_in_cur - _M_in_beg, ios_base::cur, _M_file->seekoff(_M_in_cur - _M_in_beg,
ios_base::in); ios_base::cur, ios_base::in);
} }
if (__testinit || __testget) if (__testinit || __testget)
...@@ -208,7 +208,7 @@ namespace std ...@@ -208,7 +208,7 @@ namespace std
// external byte sequence (whatever physical byte sink or // external byte sequence (whatever physical byte sink or
// FILE actually is.) // FILE actually is.)
char __conv_buf[_M_buf_size]; char __conv_buf[_M_buf_size];
int_type __size = _M_file->xsgetn(__conv_buf, _M_buf_size); streamsize __size = _M_file->xsgetn(__conv_buf, _M_buf_size);
// Part two: (Re)fill internal buf contents from external buf. // Part two: (Re)fill internal buf contents from external buf.
if (0 < __size) if (0 < __size)
...@@ -240,9 +240,9 @@ namespace std ...@@ -240,9 +240,9 @@ namespace std
// Part three: Sync the current internal buffer // Part three: Sync the current internal buffer
// position with the (now overshot) external buffer // position with the (now overshot) external buffer
// position. // position.
pos_type __p = _M_file->seekoff(0 - __size, ios_base::cur, streamoff __p = _M_file->seekoff(0 - __size, ios_base::cur,
ios_base::in); ios_base::in);
if (__p._M_position() == -1) if (__p == -1)
{ {
// XXX Something is wrong, do error checking. // XXX Something is wrong, do error checking.
} }
...@@ -379,11 +379,11 @@ namespace std ...@@ -379,11 +379,11 @@ namespace std
// _M_file->sys_write(), and do error (minimal) checking. // _M_file->sys_write(), and do error (minimal) checking.
if (__r != codecvt_base::error) if (__r != codecvt_base::error)
{ {
streamsize __r = _M_file->xsputn(__conv_buf, __plen); streamsize __len = _M_file->xsputn(__conv_buf, __plen);
// NB: Need this so that external byte sequence reflects // NB: Need this so that external byte sequence reflects
// internal buffer. // internal buffer.
_M_file->sync(); _M_file->sync();
if (__r == __plen) if (__len == __plen)
{ {
_M_set_indeterminate(); _M_set_indeterminate();
__retval = traits_type::not_eof(__c); __retval = traits_type::not_eof(__c);
...@@ -431,8 +431,6 @@ namespace std ...@@ -431,8 +431,6 @@ namespace std
__computed_off += _M_in_cur - _M_in_beg; __computed_off += _M_in_cur - _M_in_beg;
__retval = _M_file->seekoff(__computed_off, __way, __mode); __retval = _M_file->seekoff(__computed_off, __way, __mode);
if (__retval._M_position() == -1)
__retval == pos_type(off_type(-1));
_M_set_indeterminate(); _M_set_indeterminate();
} }
// NB: Need to do this in case _M_file in indeterminate // NB: Need to do this in case _M_file in indeterminate
...@@ -511,8 +509,7 @@ namespace std ...@@ -511,8 +509,7 @@ namespace std
if (__r != codecvt_base::error) if (__r != codecvt_base::error)
{ {
streamsize __r = _M_file->xsputn(__conv_buf, streamsize __r = _M_file->xsputn(__conv_buf, __rlen);
__rlen);
if (__r == __rlen) if (__r == __rlen)
{ {
_M_out_cur = _M_out_beg; _M_out_cur = _M_out_beg;
......
libstdc++-v3/bits/std_fstream.h
...@@ -171,7 +171,7 @@ namespace std { ...@@ -171,7 +171,7 @@ namespace std {
// the position of the external byte sequence (_M_file) // the position of the external byte sequence (_M_file)
// plus the offset in the current internal buffer // plus the offset in the current internal buffer
// (_M_out_beg - _M_out_cur) // (_M_out_beg - _M_out_cur)
__c_streampos __cur = _M_file->seekoff(0, ios_base::cur); streamoff __cur = _M_file->seekoff(0, ios_base::cur);
off_type __off = _M_out_cur - _M_out_beg; off_type __off = _M_out_cur - _M_out_beg;
this->_M_really_overflow(); this->_M_really_overflow();
_M_file->seekpos(__cur + __off); _M_file->seekpos(__cur + __off);
......
libstdc++-v3/bits/streambuf.tcc
...@@ -128,8 +128,7 @@ namespace std { ...@@ -128,8 +128,7 @@ namespace std {
{ {
while (__retval < __n) while (__retval < __n)
{ {
bool __testget = _M_in_cur < _M_in_end; if (_M_in_cur < _M_in_end)
if (__testget)
{ {
size_t __len; size_t __len;
if (_M_in_cur + __n - __retval <= _M_in_end) if (_M_in_cur + __n - __retval <= _M_in_end)
......
libstdc++-v3/config/c_io_libio.cc
...@@ -204,14 +204,14 @@ namespace std { ...@@ -204,14 +204,14 @@ namespace std {
__basic_file::xsgetn(char* __s, streamsize __n) __basic_file::xsgetn(char* __s, streamsize __n)
{ return _IO_default_xsgetn(this, __s, __n); } { return _IO_default_xsgetn(this, __s, __n); }
__c_streampos streamoff
__basic_file::seekoff(streamoff __off, ios_base::seekdir __way, __basic_file::seekoff(streamoff __off, ios_base::seekdir __way,
ios_base::openmode __mode) ios_base::openmode __mode)
{ return _IO_file_seekoff(this, __off, __way, __mode); } { return _IO_file_seekoff(this, __off, __way, __mode); }
__c_streampos streamoff
__basic_file::seekpos(__c_streampos __pos, ios_base::openmode __mode) __basic_file::seekpos(streamoff __pos, ios_base::openmode __mode)
{ return _IO_file_seekoff(this, __pos, ios_base::beg, __mode); } { return _IO_file_seekoff(this, __pos, ios_base::beg, __mode); }
// NB: Unused. // NB: Unused.
streambuf* streambuf*
...@@ -238,8 +238,8 @@ namespace std { ...@@ -238,8 +238,8 @@ namespace std {
{ return _IO_file_write(this, __s, __n); } { return _IO_file_write(this, __s, __n); }
// NB: Unused. // NB: Unused.
__c_streampos streamoff
__basic_file::sys_seek(__c_streampos __pos, ios_base::seekdir __way) __basic_file::sys_seek(streamoff __pos, ios_base::seekdir __way)
{ return _IO_file_seek(this, __pos, __way); } { return _IO_file_seek(this, __pos, __way); }
// NB: Unused. // NB: Unused.
......
libstdc++-v3/config/c_io_libio.h
...@@ -37,22 +37,23 @@ ...@@ -37,22 +37,23 @@
namespace std { namespace std {
// from fpos.h // from fpos.h
typedef _IO_off_t streamoff;
typedef _IO_ssize_t streamsize; // Signed integral type typedef _IO_ssize_t streamsize; // Signed integral type
#if _GLIBCPP_USE_WCHAR_T
typedef _IO_off_t wstreamoff;
typedef _IO_ssize_t wstreamsize; typedef _IO_ssize_t wstreamsize;
#endif
#if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001 #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
typedef _IO_fpos64_t __c_streampos; typedef _IO_off64_t streamoff;
typedef _IO_fpos64_t __c_streampos;
typedef _IO_off64_t wstreamoff;
#else #else
typedef _IO_fpos_t __c_streampos; typedef _IO_off_t streamoff;
typedef _IO_fpos_t __c_streampos;
typedef _IO_off_t wstreamoff;
#endif #endif
typedef _IO_lock_t __c_lock; typedef _IO_lock_t __c_lock;
// from basic_file.h // from basic_file.h
typedef _IO_FILE __c_file_type; typedef _IO_FILE __c_file_type;
#define _GLIBCPP_BASIC_FILE_INHERITANCE 1 #define _GLIBCPP_BASIC_FILE_INHERITANCE 1
// from ios_base.h // from ios_base.h
......
libstdc++-v3/configure
...@@ -2168,16 +2168,25 @@ else ...@@ -2168,16 +2168,25 @@ else
enable_debug=no enable_debug=no
fi fi
case "$enable_debug" in case "$enable_debug" in
yes) DEBUGFLAGS='-ggdb -O0' yes)
;; case "$target_cpu" in
no) DEBUGFLAGS='-g' alpha*)
;; DEBUGFLAGS='-O0 -gdwarf-2'
;;
*)
DEBUGFLAGS='-O0 -g'
;;
esac
;;
no)
DEBUGFLAGS='-g'
;;
esac esac
echo $ac_n "checking for cstdio to use""... $ac_c" 1>&6 echo $ac_n "checking for cstdio to use""... $ac_c" 1>&6
echo "configure:2181: checking for cstdio to use" >&5 echo "configure:2190: checking for cstdio to use" >&5
# Check whether --enable-cstdio or --disable-cstdio was given. # Check whether --enable-cstdio or --disable-cstdio was given.
if test "${enable_cstdio+set}" = set; then if test "${enable_cstdio+set}" = set; then
enableval="$enable_cstdio" enableval="$enable_cstdio"
...@@ -2201,17 +2210,17 @@ fi ...@@ -2201,17 +2210,17 @@ fi
# see if we are on a system with libio native (ie, linux) # see if we are on a system with libio native (ie, linux)
ac_safe=`echo "libio.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "libio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for libio.h""... $ac_c" 1>&6 echo $ac_n "checking for libio.h""... $ac_c" 1>&6
echo "configure:2205: checking for libio.h" >&5 echo "configure:2214: checking for libio.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2210 "configure" #line 2219 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <libio.h> #include <libio.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2241,6 +2250,52 @@ fi ...@@ -2241,6 +2250,52 @@ fi
need_libio=yes need_libio=yes
fi fi
# see if the _G_config.h header needs to be built.
# NB: This replaces the _G_CONFIG_H machinery in libio-v2
ac_safe=`echo "_G_config.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for _G_config.h""... $ac_c" 1>&6
echo "configure:2259: checking for _G_config.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 2264 "configure"
#include "confdefs.h"
#include <_G_config.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
has_gconf_h=yes
else
echo "$ac_t""no" 1>&6
has_gconf_h=no
fi
if test "$has_gconf_h" = no; then
GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE=
GLIBCPP_NEED_LIBIO_CONFIG_H_FALSE='#'
else
GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE='#'
GLIBCPP_NEED_LIBIO_CONFIG_H_FALSE=
fi
;; ;;
xwince) xwince)
CSTDIO_H=c_io_wince.h CSTDIO_H=c_io_wince.h
...@@ -2289,7 +2344,7 @@ EOF ...@@ -2289,7 +2344,7 @@ EOF
echo $ac_n "checking for threads package to use""... $ac_c" 1>&6 echo $ac_n "checking for threads package to use""... $ac_c" 1>&6
echo "configure:2293: checking for threads package to use" >&5 echo "configure:2348: checking for threads package to use" >&5
# Check whether --enable-threads or --disable-threads was given. # Check whether --enable-threads or --disable-threads was given.
if test "${enable_threads+set}" = set; then if test "${enable_threads+set}" = set; then
enableval="$enable_threads" enableval="$enable_threads"
...@@ -2352,17 +2407,17 @@ fi ...@@ -2352,17 +2407,17 @@ fi
posix) posix)
ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for pthread.h""... $ac_c" 1>&6 echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
echo "configure:2356: checking for pthread.h" >&5 echo "configure:2411: checking for pthread.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2361 "configure" #line 2416 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <pthread.h> #include <pthread.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2526,17 +2581,17 @@ else ...@@ -2526,17 +2581,17 @@ else
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2530: checking for $ac_hdr" >&5 echo "configure:2585: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2535 "configure" #line 2590 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2566,7 +2621,7 @@ done ...@@ -2566,7 +2621,7 @@ done
echo $ac_n "checking for GNU C++ __complex__ support""... $ac_c" 1>&6 echo $ac_n "checking for GNU C++ __complex__ support""... $ac_c" 1>&6
echo "configure:2570: checking for GNU C++ __complex__ support" >&5 echo "configure:2625: checking for GNU C++ __complex__ support" >&5
if eval "test \"`echo '$''{'glibcpp_cv_complex'+set}'`\" = set"; then if eval "test \"`echo '$''{'glibcpp_cv_complex'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2580,7 +2635,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes ...@@ -2580,7 +2635,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2584 "configure" #line 2639 "configure"
#include "confdefs.h" #include "confdefs.h"
struct dcomplex { __complex__ double x; }; \ struct dcomplex { __complex__ double x; }; \
dcomplex f(const dcomplex& x) { return dcomplex(x); } dcomplex f(const dcomplex& x) { return dcomplex(x); }
...@@ -2589,7 +2644,7 @@ int main() { ...@@ -2589,7 +2644,7 @@ int main() {
dcomplex x; f(x); dcomplex x; f(x);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
glibcpp_cv_complex=ok glibcpp_cv_complex=ok
else else
...@@ -2621,7 +2676,7 @@ EOF ...@@ -2621,7 +2676,7 @@ EOF
echo $ac_n "checking for GNU C++ __complex__ float support""... $ac_c" 1>&6 echo $ac_n "checking for GNU C++ __complex__ float support""... $ac_c" 1>&6
echo "configure:2625: checking for GNU C++ __complex__ float support" >&5 echo "configure:2680: checking for GNU C++ __complex__ float support" >&5
if eval "test \"`echo '$''{'glibcpp_cv_float_complex'+set}'`\" = set"; then if eval "test \"`echo '$''{'glibcpp_cv_float_complex'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2654,14 +2709,14 @@ cross_compiling=$ac_cv_prog_cxx_cross ...@@ -2654,14 +2709,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
}; };
EOB EOB
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2658 "configure" #line 2713 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "conftest.h" #include "conftest.h"
int main() { int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
glibcpp_cv_float_complex=ok glibcpp_cv_float_complex=ok
else else
...@@ -2692,16 +2747,16 @@ EOF ...@@ -2692,16 +2747,16 @@ EOF
echo $ac_n "checking for __builtin_sinf""... $ac_c" 1>&6 echo $ac_n "checking for __builtin_sinf""... $ac_c" 1>&6
echo "configure:2696: checking for __builtin_sinf" >&5 echo "configure:2751: checking for __builtin_sinf" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2698 "configure" #line 2753 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <math.h> #include <math.h>
int main() { int main() {
float foo(void) { __builtin_sinf(0.0); } float foo(void) { __builtin_sinf(0.0); }
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
use_builtin_sinf=yes use_builtin_sinf=yes
else else
...@@ -2720,16 +2775,16 @@ EOF ...@@ -2720,16 +2775,16 @@ EOF
fi fi
echo $ac_n "checking for __builtin_cosf""... $ac_c" 1>&6 echo $ac_n "checking for __builtin_cosf""... $ac_c" 1>&6
echo "configure:2724: checking for __builtin_cosf" >&5 echo "configure:2779: checking for __builtin_cosf" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2726 "configure" #line 2781 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <math.h> #include <math.h>
int main() { int main() {
float foo(void) { __builtin_cosf(0.0); } float foo(void) { __builtin_cosf(0.0); }
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
use_builtin_cosf=yes use_builtin_cosf=yes
else else
...@@ -2748,16 +2803,16 @@ EOF ...@@ -2748,16 +2803,16 @@ EOF
fi fi
echo $ac_n "checking for __builtin_fabsf""... $ac_c" 1>&6 echo $ac_n "checking for __builtin_fabsf""... $ac_c" 1>&6
echo "configure:2752: checking for __builtin_fabsf" >&5 echo "configure:2807: checking for __builtin_fabsf" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2754 "configure" #line 2809 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <math.h> #include <math.h>
int main() { int main() {
float foo(void) { __builtin_fabsf(0.0); } float foo(void) { __builtin_fabsf(0.0); }
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
use_builtin_fabsf=yes use_builtin_fabsf=yes
else else
...@@ -2776,16 +2831,16 @@ EOF ...@@ -2776,16 +2831,16 @@ EOF
fi fi
echo $ac_n "checking for __builtin_sqrtf""... $ac_c" 1>&6 echo $ac_n "checking for __builtin_sqrtf""... $ac_c" 1>&6
echo "configure:2780: checking for __builtin_sqrtf" >&5 echo "configure:2835: checking for __builtin_sqrtf" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2782 "configure" #line 2837 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <math.h> #include <math.h>
int main() { int main() {
float foo(void) { __builtin_sqrtf(0.0); } float foo(void) { __builtin_sqrtf(0.0); }
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
use_builtin_sqrtf=yes use_builtin_sqrtf=yes
else else
...@@ -2805,7 +2860,7 @@ EOF ...@@ -2805,7 +2860,7 @@ EOF
echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
echo "configure:2809: checking for sin in -lm" >&5 echo "configure:2864: checking for sin in -lm" >&5
ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -2813,7 +2868,7 @@ else ...@@ -2813,7 +2868,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS" LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2817 "configure" #line 2872 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -2824,7 +2879,7 @@ int main() { ...@@ -2824,7 +2879,7 @@ int main() {
sin() sin()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -2851,17 +2906,17 @@ fi ...@@ -2851,17 +2906,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:2855: checking for $ac_hdr" >&5 echo "configure:2910: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2860 "configure" #line 2915 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2893,12 +2948,12 @@ done ...@@ -2893,12 +2948,12 @@ done
carg cargf nan hypot hypotf atan2f expf copysignf carg cargf nan hypot hypotf atan2f expf copysignf
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:2897: checking for $ac_func" >&5 echo "configure:2952: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2902 "configure" #line 2957 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -2921,7 +2976,7 @@ $ac_func(); ...@@ -2921,7 +2976,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -2949,60 +3004,60 @@ done ...@@ -2949,60 +3004,60 @@ done
USE_LONG_DOUBLE=no USE_LONG_DOUBLE=no
echo $ac_n "checking for sinl""... $ac_c" 1>&6 echo $ac_n "checking for copysignl""... $ac_c" 1>&6
echo "configure:2954: checking for sinl" >&5 echo "configure:3009: checking for copysignl" >&5
if eval "test \"`echo '$''{'ac_cv_func_sinl'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_copysignl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2959 "configure" #line 3014 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sinl(); below. */ which can conflict with char copysignl(); below. */
#include <assert.h> #include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */ builtin and then its argument prototype would still apply. */
char sinl(); char copysignl();
int main() { int main() {
/* The GNU C library defines this for functions which it implements /* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */ something starting with __ and the normal name is an alias. */
#if defined (__stub_sinl) || defined (__stub___sinl) #if defined (__stub_copysignl) || defined (__stub___copysignl)
choke me choke me
#else #else
sinl(); copysignl();
#endif #endif
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_sinl=yes" eval "ac_cv_func_copysignl=yes"
else else
echo "configure: failed program was:" >&5 echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_sinl=no" eval "ac_cv_func_copysignl=no"
fi fi
rm -f conftest* rm -f conftest*
fi fi
if eval "test \"`echo '$ac_cv_func_'sinl`\" = yes"; then if eval "test \"`echo '$ac_cv_func_'copysignl`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
USE_LONG_DOUBLE=yes USE_LONG_DOUBLE=yes
for ac_func in ccoshl ccosl cexpl cpowl csinhl csinl \ for ac_func in ccoshl ccosl cexpl cpowl csinhl csinl \
csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3001: checking for $ac_func" >&5 echo "configure:3056: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3006 "configure" #line 3061 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -3025,7 +3080,7 @@ $ac_func(); ...@@ -3025,7 +3080,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -3063,12 +3118,12 @@ fi ...@@ -3063,12 +3118,12 @@ fi
fpclass qfpclass fpclass qfpclass
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3067: checking for $ac_func" >&5 echo "configure:3122: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3072 "configure" #line 3127 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -3091,7 +3146,7 @@ $ac_func(); ...@@ -3091,7 +3146,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -3126,12 +3181,12 @@ _strtof _strtold _fabsf _sincos _sincosf _sincosl _finite _finitef _qfinite \ ...@@ -3126,12 +3181,12 @@ _strtof _strtold _fabsf _sincos _sincosf _sincosl _finite _finitef _qfinite \
_fpclass _qfpclass _fpclass _qfpclass
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3130: checking for $ac_func" >&5 echo "configure:3185: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3135 "configure" #line 3190 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -3154,7 +3209,7 @@ $ac_func(); ...@@ -3154,7 +3209,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -3184,17 +3239,17 @@ LIBS="$save_LIBS" ...@@ -3184,17 +3239,17 @@ LIBS="$save_LIBS"
ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
echo "configure:3188: checking for wchar.h" >&5 echo "configure:3243: checking for wchar.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3193 "configure" #line 3248 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <wchar.h> #include <wchar.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3212,16 +3267,16 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ...@@ -3212,16 +3267,16 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
echo $ac_n "checking for native mbstate_t""... $ac_c" 1>&6 echo $ac_n "checking for native mbstate_t""... $ac_c" 1>&6
echo "configure:3216: checking for native mbstate_t" >&5 echo "configure:3271: checking for native mbstate_t" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3218 "configure" #line 3273 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <wchar.h> #include <wchar.h>
int main() { int main() {
mbstate_t teststate; mbstate_t teststate;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
use_native_mbstatet=yes use_native_mbstatet=yes
else else
...@@ -3240,16 +3295,16 @@ EOF ...@@ -3240,16 +3295,16 @@ EOF
fi fi
echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6
echo "configure:3244: checking for WCHAR_MIN and WCHAR_MAX" >&5 echo "configure:3299: checking for WCHAR_MIN and WCHAR_MAX" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3246 "configure" #line 3301 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <wchar.h> #include <wchar.h>
int main() { int main() {
int i = WCHAR_MIN; int j = WCHAR_MAX; int i = WCHAR_MIN; int j = WCHAR_MAX;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
has_wchar_minmax=yes has_wchar_minmax=yes
else else
...@@ -3270,9 +3325,9 @@ EOF ...@@ -3270,9 +3325,9 @@ EOF
# Test wchar.h for WEOF, which is what we use to determine whether # Test wchar.h for WEOF, which is what we use to determine whether
# to specialize for wchar_t or not. # to specialize for wchar_t or not.
echo $ac_n "checking for WEOF""... $ac_c" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6
echo "configure:3274: checking for WEOF" >&5 echo "configure:3329: checking for WEOF" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3276 "configure" #line 3331 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <wchar.h> #include <wchar.h>
...@@ -3281,7 +3336,7 @@ int main() { ...@@ -3281,7 +3336,7 @@ int main() {
wint_t i = WEOF; wint_t i = WEOF;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
has_weof=yes has_weof=yes
else else
...@@ -3296,12 +3351,12 @@ rm -f conftest* ...@@ -3296,12 +3351,12 @@ rm -f conftest*
for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3300: checking for $ac_func" >&5 echo "configure:3355: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3305 "configure" #line 3360 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -3324,7 +3379,7 @@ $ac_func(); ...@@ -3324,7 +3379,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -3353,7 +3408,7 @@ done ...@@ -3353,7 +3408,7 @@ done
echo $ac_n "checking for wide character support""... $ac_c" 1>&6 echo $ac_n "checking for wide character support""... $ac_c" 1>&6
echo "configure:3357: checking for wide character support" >&5 echo "configure:3412: checking for wide character support" >&5
if test $has_weof = "yes" && test $has_wchar_minmax = "yes"; then if test $has_weof = "yes" && test $has_wchar_minmax = "yes"; then
libinst_wstring_la="libinst-wstring.la" libinst_wstring_la="libinst-wstring.la"
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
...@@ -3381,17 +3436,17 @@ fi ...@@ -3381,17 +3436,17 @@ fi
ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ctype.h""... $ac_c" 1>&6 echo $ac_n "checking for ctype.h""... $ac_c" 1>&6
echo "configure:3385: checking for ctype.h" >&5 echo "configure:3440: checking for ctype.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3390 "configure" #line 3445 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3412,9 +3467,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ...@@ -3412,9 +3467,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
ctype_default=yes ctype_default=yes
echo $ac_n "checking for gnu-linux <ctype>""... $ac_c" 1>&6 echo $ac_n "checking for gnu-linux <ctype>""... $ac_c" 1>&6
echo "configure:3416: checking for gnu-linux <ctype>" >&5 echo "configure:3471: checking for gnu-linux <ctype>" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3418 "configure" #line 3473 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
...@@ -3425,7 +3480,7 @@ int ...@@ -3425,7 +3480,7 @@ int
+ __ctype_tolower[a] + __ctype_toupper[a] + __ctype_b[a];} + __ctype_tolower[a] + __ctype_toupper[a] + __ctype_b[a];}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_linux=yes ctype_linux=yes
...@@ -3444,9 +3499,9 @@ rm -f conftest* ...@@ -3444,9 +3499,9 @@ rm -f conftest*
if test $ctype_default = "yes"; then if test $ctype_default = "yes"; then
echo $ac_n "checking for solaris 2.6 or 2.7 <ctype>""... $ac_c" 1>&6 echo $ac_n "checking for solaris 2.6 or 2.7 <ctype>""... $ac_c" 1>&6
echo "configure:3448: checking for solaris 2.6 or 2.7 <ctype>" >&5 echo "configure:3503: checking for solaris 2.6 or 2.7 <ctype>" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3450 "configure" #line 3505 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
...@@ -3457,7 +3512,7 @@ int ...@@ -3457,7 +3512,7 @@ int
+ __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];} + __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_solaris=yes ctype_solaris=yes
...@@ -3472,7 +3527,7 @@ rm -f conftest* ...@@ -3472,7 +3527,7 @@ rm -f conftest*
if test $ctype_solaris = "yes"; then if test $ctype_solaris = "yes"; then
echo $ac_n "checking for version""... $ac_c" 1>&6 echo $ac_n "checking for version""... $ac_c" 1>&6
echo "configure:3476: checking for version" >&5 echo "configure:3531: checking for version" >&5
ac_ext=C ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CXXCPP $CPPFLAGS' ac_cpp='$CXXCPP $CPPFLAGS'
...@@ -3481,14 +3536,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes ...@@ -3481,14 +3536,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3485 "configure" #line 3540 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
typedef long* __to_type; __to_type const& _M_toupper = __trans_upper; typedef long* __to_type; __to_type const& _M_toupper = __trans_upper;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_solaris26=yes ctype_solaris26=yes
...@@ -3520,9 +3575,9 @@ cross_compiling=$ac_cv_prog_cc_cross ...@@ -3520,9 +3575,9 @@ cross_compiling=$ac_cv_prog_cc_cross
if test $ctype_default = "yes"; then if test $ctype_default = "yes"; then
echo $ac_n "checking for solaris 2.5.1 <ctype>""... $ac_c" 1>&6 echo $ac_n "checking for solaris 2.5.1 <ctype>""... $ac_c" 1>&6
echo "configure:3524: checking for solaris 2.5.1 <ctype>" >&5 echo "configure:3579: checking for solaris 2.5.1 <ctype>" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3526 "configure" #line 3581 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
...@@ -3532,7 +3587,7 @@ int ...@@ -3532,7 +3587,7 @@ int
+ __ctype[a];} + __ctype[a];}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_solaris25=yes ctype_solaris25=yes
...@@ -3552,9 +3607,9 @@ rm -f conftest* ...@@ -3552,9 +3607,9 @@ rm -f conftest*
if test $ctype_default = "yes"; then if test $ctype_default = "yes"; then
echo $ac_n "checking for aix <ctype>""... $ac_c" 1>&6 echo $ac_n "checking for aix <ctype>""... $ac_c" 1>&6
echo "configure:3556: checking for aix <ctype>" >&5 echo "configure:3611: checking for aix <ctype>" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3558 "configure" #line 3613 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
...@@ -3565,7 +3620,7 @@ int ...@@ -3565,7 +3620,7 @@ int
+ _VALC('a') + _IS('c', 0);} + _VALC('a') + _IS('c', 0);}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_aix=yes ctype_aix=yes
...@@ -3585,9 +3640,9 @@ rm -f conftest* ...@@ -3585,9 +3640,9 @@ rm -f conftest*
if test $ctype_default = "yes"; then if test $ctype_default = "yes"; then
echo $ac_n "checking for newlib <ctype>""... $ac_c" 1>&6 echo $ac_n "checking for newlib <ctype>""... $ac_c" 1>&6
echo "configure:3589: checking for newlib <ctype>" >&5 echo "configure:3644: checking for newlib <ctype>" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3591 "configure" #line 3646 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
...@@ -3597,7 +3652,7 @@ int ...@@ -3597,7 +3652,7 @@ int
+ _ctype_[a];} + _ctype_[a];}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_newlib=yes ctype_newlib=yes
...@@ -3631,17 +3686,17 @@ fi ...@@ -3631,17 +3686,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3635: checking for $ac_hdr" >&5 echo "configure:3690: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3640 "configure" #line 3695 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3670,12 +3725,12 @@ done ...@@ -3670,12 +3725,12 @@ done
for ac_func in getpagesize for ac_func in getpagesize
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3674: checking for $ac_func" >&5 echo "configure:3729: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3679 "configure" #line 3734 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -3698,7 +3753,7 @@ $ac_func(); ...@@ -3698,7 +3753,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -3723,7 +3778,7 @@ fi ...@@ -3723,7 +3778,7 @@ fi
done done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
echo "configure:3727: checking for working mmap" >&5 echo "configure:3782: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3731,7 +3786,7 @@ else ...@@ -3731,7 +3786,7 @@ else
ac_cv_func_mmap_fixed_mapped=no ac_cv_func_mmap_fixed_mapped=no
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3735 "configure" #line 3790 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test. /* Thanks to Mike Haertel and Jim Avera for this test.
...@@ -3871,7 +3926,7 @@ main() ...@@ -3871,7 +3926,7 @@ main()
} }
EOF EOF
if { (eval echo configure:3875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_mmap_fixed_mapped=yes
else else
...@@ -3934,19 +3989,19 @@ fi ...@@ -3934,19 +3989,19 @@ fi
if test $ac_cv_header_locale_h = yes; then if test $ac_cv_header_locale_h = yes; then
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
echo "configure:3938: checking for LC_MESSAGES" >&5 echo "configure:3993: checking for LC_MESSAGES" >&5
if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3943 "configure" #line 3998 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <locale.h> #include <locale.h>
int main() { int main() {
return LC_MESSAGES return LC_MESSAGES
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_val_LC_MESSAGES=yes ac_cv_val_LC_MESSAGES=yes
else else
...@@ -4177,6 +4232,8 @@ s%@WERRORSUPPRESS@%$WERRORSUPPRESS%g ...@@ -4177,6 +4232,8 @@ s%@WERRORSUPPRESS@%$WERRORSUPPRESS%g
s%@cpu_include_dir@%$cpu_include_dir%g s%@cpu_include_dir@%$cpu_include_dir%g
s%@DEBUGFLAGS@%$DEBUGFLAGS%g s%@DEBUGFLAGS@%$DEBUGFLAGS%g
s%@BUILD_LIBIO_INCLUDE@%$BUILD_LIBIO_INCLUDE%g s%@BUILD_LIBIO_INCLUDE@%$BUILD_LIBIO_INCLUDE%g
s%@GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE@%$GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE%g
s%@GLIBCPP_NEED_LIBIO_CONFIG_H_FALSE@%$GLIBCPP_NEED_LIBIO_CONFIG_H_FALSE%g
s%@CSTDIO_H@%$CSTDIO_H%g s%@CSTDIO_H@%$CSTDIO_H%g
s%@CSTDIO_CC@%$CSTDIO_CC%g s%@CSTDIO_CC@%$CSTDIO_CC%g
s%@GLIBCPP_NEED_LIBIO_TRUE@%$GLIBCPP_NEED_LIBIO_TRUE%g s%@GLIBCPP_NEED_LIBIO_TRUE@%$GLIBCPP_NEED_LIBIO_TRUE%g
......
libstdc++-v3/libio/ChangeLog
2000-04-25 Benjamin Kosnik <bkoz@haight.constant.com>
* libio.h: Change decls for seekoff/seekpos.
* Makefile.am: Add bits to not generate _G_config.h on linux.
* gen-params: Remove sigset_t declaration.
2000-02-29 Benjamin Kosnik <bkoz@haight.constant.com> 2000-02-29 Benjamin Kosnik <bkoz@haight.constant.com>
* Makefile.am (libio_headers): Strip out deadweight. * Makefile.am (libio_headers): Strip out deadweight.
......
libstdc++-v3/libio/Makefile.am
...@@ -25,6 +25,12 @@ AUTOMAKE_OPTIONS = 1.3 cygnus ...@@ -25,6 +25,12 @@ AUTOMAKE_OPTIONS = 1.3 cygnus
noinst_LTLIBRARIES = libio.la noinst_LTLIBRARIES = libio.la
if GLIBCPP_NEED_LIBIO_CONFIG_H
LIBIO_CONFIG_H = _G_config.h
else
LIBIO_CONFIG_H =
endif
includes = includes =
libio_headers = \ libio_headers = \
...@@ -37,16 +43,17 @@ else ...@@ -37,16 +43,17 @@ else
LIBIO_SRCS = LIBIO_SRCS =
endif endif
EXTRA_DIST = iostreamP.h EXTRA_DIST = iostreamP.h
libio_la_LIBADD = $(LIBIO_SRCS) libio_la_LIBADD = $(LIBIO_SRCS)
libio_la_DEPENDENCIES = $(libio_la_LIBADD) libio_la_DEPENDENCIES = $(libio_la_LIBADD)
libio_la_SOURCES = $(LIBIO_SRCS) libio_la_SOURCES = $(LIBIO_SRCS)
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
# Specifying that *.o depend on this one header # Specifying that *.o depend on this one header
$(libio_la_OBJECTS): _G_config.h $(libio_la_OBJECTS): $(LIBIO_CONFIG_H)
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
# Generate this file. # Generate this file.
_G_config.h: $(srcdir)/gen-params _G_config.h: $(srcdir)/gen-params
......
libstdc++-v3/libio/Makefile.in
...@@ -105,6 +105,9 @@ libinst_wstring_la = @libinst_wstring_la@ ...@@ -105,6 +105,9 @@ libinst_wstring_la = @libinst_wstring_la@
AUTOMAKE_OPTIONS = 1.3 cygnus AUTOMAKE_OPTIONS = 1.3 cygnus
noinst_LTLIBRARIES = libio.la noinst_LTLIBRARIES = libio.la
@GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE@LIBIO_CONFIG_H = \
@GLIBCPP_NEED_LIBIO_CONFIG_H_TRUE@_G_config.h
@GLIBCPP_NEED_LIBIO_CONFIG_H_FALSE@LIBIO_CONFIG_H = \
includes = includes =
...@@ -334,7 +337,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean ...@@ -334,7 +337,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Specifying that *.o depend on this one header # Specifying that *.o depend on this one header
$(libio_la_OBJECTS): _G_config.h $(libio_la_OBJECTS): $(LIBIO_CONFIG_H)
# Generate this file. # Generate this file.
_G_config.h: $(srcdir)/gen-params _G_config.h: $(srcdir)/gen-params
......
libstdc++-v3/libio/fileops.c
...@@ -155,11 +155,20 @@ _IO_file_finish (fp, dummy) ...@@ -155,11 +155,20 @@ _IO_file_finish (fp, dummy)
_IO_default_finish (fp, 0); _IO_default_finish (fp, 0);
} }
#if _G_IO_IO_FILE_VERSION == 0x20001
_IO_FILE *
_IO_file_fopen (fp, filename, mode, some_int)
_IO_FILE *fp;
const char *filename;
const char *mode;
int some_int;
#else
_IO_FILE * _IO_FILE *
_IO_file_fopen (fp, filename, mode) _IO_file_fopen (fp, filename, mode)
_IO_FILE *fp; _IO_FILE *fp;
const char *filename; const char *filename;
const char *mode; const char *mode;
#endif
{ {
int oflags = 0, omode; int oflags = 0, omode;
int read_write, fdesc; int read_write, fdesc;
...@@ -419,12 +428,21 @@ _IO_file_sync (fp) ...@@ -419,12 +428,21 @@ _IO_file_sync (fp)
return retval; return retval;
} }
_IO_pos_t #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
_IO_off64_t
_IO_file_seekoff (fp, offset, dir, mode)
_IO_FILE *fp;
_IO_off64_t offset;
int dir;
int mode;
#else
_IO_off_t
_IO_file_seekoff (fp, offset, dir, mode) _IO_file_seekoff (fp, offset, dir, mode)
_IO_FILE *fp; _IO_FILE *fp;
_IO_off_t offset; _IO_off_t offset;
int dir; int dir;
int mode; int mode;
#endif
{ {
_IO_pos_t result; _IO_pos_t result;
_IO_off_t delta, new_offset; _IO_off_t delta, new_offset;
...@@ -587,11 +605,19 @@ _IO_file_read (fp, buf, size) ...@@ -587,11 +605,19 @@ _IO_file_read (fp, buf, size)
return read (fp->_fileno, buf, size); return read (fp->_fileno, buf, size);
} }
_IO_pos_t #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
_IO_off64_t
_IO_file_seek (fp, offset, dir)
_IO_FILE *fp;
_IO_off64_t offset;
int dir;
#else
_IO_off_t
_IO_file_seek (fp, offset, dir) _IO_file_seek (fp, offset, dir)
_IO_FILE *fp; _IO_FILE *fp;
_IO_off_t offset; _IO_off_t offset;
int dir; int dir;
#endif
{ {
return lseek (fp->_fileno, offset, dir); return lseek (fp->_fileno, offset, dir);
} }
......
libstdc++-v3/libio/genops.c
...@@ -467,15 +467,24 @@ _IO_default_setbuf (fp, p, len) ...@@ -467,15 +467,24 @@ _IO_default_setbuf (fp, p, len)
return fp; return fp;
} }
_IO_pos_t #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
_IO_off64_t
_IO_default_seekpos (fp, pos, mode) _IO_default_seekpos (fp, pos, mode)
_IO_FILE *fp; _IO_FILE *fp;
_IO_pos_t pos; _IO_off64_t pos;
int mode; int mode;
#else
_IO_off_t
_IO_default_seekpos (fp, pos, mode)
_IO_FILE *fp;
_IO_off_t pos;
int mode;
#endif
{ {
return _IO_SEEKOFF (fp, _IO_pos_as_off (pos), 0, mode); return _IO_SEEKOFF (fp, pos, 0, mode);
} }
int int
_IO_default_doallocate (fp) _IO_default_doallocate (fp)
_IO_FILE *fp; _IO_FILE *fp;
...@@ -551,12 +560,21 @@ _IO_default_finish (fp, dummy) ...@@ -551,12 +560,21 @@ _IO_default_finish (fp, dummy)
_IO_un_link (fp); _IO_un_link (fp);
} }
_IO_pos_t #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
_IO_off64_t
_IO_default_seekoff (fp, offset, dir, mode)
_IO_FILE *fp;
_IO_off64_t offset;
int dir;
int mode;
#else
_IO_off_t
_IO_default_seekoff (fp, offset, dir, mode) _IO_default_seekoff (fp, offset, dir, mode)
_IO_FILE *fp; _IO_FILE *fp;
_IO_off_t offset; _IO_off_t offset;
int dir; int dir;
int mode; int mode;
#endif
{ {
return _IO_pos_BAD; return _IO_pos_BAD;
} }
...@@ -882,11 +900,19 @@ _IO_default_pbackfail (fp, c) ...@@ -882,11 +900,19 @@ _IO_default_pbackfail (fp, c)
return (unsigned char) *fp->_IO_read_ptr; return (unsigned char) *fp->_IO_read_ptr;
} }
_IO_pos_t #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
_IO_off64_t
_IO_default_seek (fp, offset, dir)
_IO_FILE *fp;
_IO_off64_t offset;
int dir;
#else
_IO_off_t
_IO_default_seek (fp, offset, dir) _IO_default_seek (fp, offset, dir)
_IO_FILE *fp; _IO_FILE *fp;
_IO_off_t offset; _IO_off_t offset;
int dir; int dir;
#endif
{ {
return _IO_pos_BAD; return _IO_pos_BAD;
} }
......
libstdc++-v3/libio/libioP.h
...@@ -344,19 +344,16 @@ extern _IO_off64_t _IO_default_seekoff __P ((_IO_FILE *, ...@@ -344,19 +344,16 @@ extern _IO_off64_t _IO_default_seekoff __P ((_IO_FILE *,
_IO_off64_t, int, int)); _IO_off64_t, int, int));
extern _IO_off64_t _IO_default_seekpos __P ((_IO_FILE *, extern _IO_off64_t _IO_default_seekpos __P ((_IO_FILE *,
_IO_off64_t, int)); _IO_off64_t, int));
extern _IO_off64_t _IO_default_seek __P ((_IO_FILE *, _IO_off64_t, int));
#else #else
extern _IO_off_t _IO_default_seekoff __P ((_IO_FILE *, _IO_off_t, int, int)); extern _IO_off_t _IO_default_seekoff __P ((_IO_FILE *, _IO_off_t, int, int));
extern _IO_off_t _IO_default_seekpos __P ((_IO_FILE *, _IO_off_t, int)); extern _IO_off_t _IO_default_seekpos __P ((_IO_FILE *, _IO_off_t, int));
extern _IO_off_t _IO_default_seek __P ((_IO_FILE *, _IO_off_t, int));
#endif #endif
extern _IO_ssize_t _IO_default_write __P ((_IO_FILE *, const void *, extern _IO_ssize_t _IO_default_write __P ((_IO_FILE *, const void *,
_IO_ssize_t)); _IO_ssize_t));
extern _IO_ssize_t _IO_default_read __P ((_IO_FILE *, void *, _IO_ssize_t)); extern _IO_ssize_t _IO_default_read __P ((_IO_FILE *, void *, _IO_ssize_t));
extern int _IO_default_stat __P ((_IO_FILE *, void *)); extern int _IO_default_stat __P ((_IO_FILE *, void *));
#if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
extern _IO_off64_t _IO_default_seek __P ((_IO_FILE *, _IO_off64_t, int));
#else
extern _IO_off_t _IO_default_seek __P ((_IO_FILE *, _IO_off_t, int));
#endif
extern int _IO_default_sync __P ((_IO_FILE *)); extern int _IO_default_sync __P ((_IO_FILE *));
#define _IO_default_close ((_IO_close_t) _IO_default_sync) #define _IO_default_close ((_IO_close_t) _IO_default_sync)
......
libstdc++-v3/math/Makefile.am
...@@ -26,16 +26,17 @@ AUTOMAKE_OPTIONS = 1.3 cygnus ...@@ -26,16 +26,17 @@ AUTOMAKE_OPTIONS = 1.3 cygnus
noinst_LTLIBRARIES = libmath.la noinst_LTLIBRARIES = libmath.la
EXTRA_LONG_DOUBLE_yes = \ EXTRA_LONG_DOUBLE_yes = \
ccosl.c cexpl.c c_logl.c clog10l.c cpowl.c csinhl.c \
csqrtl.c ctanhl.c ctanl.c cargl.c hypotl.c \
signbitl.c cabsl.c signbitl.c cabsl.c
EXTRA_DIST = \ EXTRA_DIST = \
ccos.c ccosf.c ccosh.c ccoshf.c ccoshl.c ccosl.c \ ccos.c ccosf.c ccosh.c ccoshf.c ccoshl.c \
cexp.c cexpf.c cexpl.c \ cexp.c cexpf.c c_log.c c_logf.c clog10.c clog10f.c \
c_log.c c_logf.c c_logl.c clog10.c clog10f.c clog10l.c \ cpow.c cpowf.c csin.c csinf.c csinh.c csinhf.c \
cpow.c cpowf.c cpowl.c csin.c csinf.c csinh.c csinhf.c csinhl.c \ csinl.c csqrt.c csqrtf.c ctan.c ctanf.c ctanh.c \
csinl.c csqrt.c csqrtf.c csqrtl.c ctan.c ctanf.c ctanh.c \ ctanhf.c carg.c cargf.c hypot.c hypotf.c\
ctanhf.c ctanhl.c ctanl.c carg.c cargf.c cargl.c hypot.c hypotf.c\ atan2f.c expf.c \
hypotl.c atan2f.c expf.c \
$(EXTRA_LONG_DOUBLE_yes) $(EXTRA_LONG_DOUBLE_yes)
libmath_la_LIBADD = \ libmath_la_LIBADD = \
...@@ -54,3 +55,5 @@ INCLUDES = -I.. $(TOPLEVEL_INCLUDES) ...@@ -54,3 +55,5 @@ INCLUDES = -I.. $(TOPLEVEL_INCLUDES)
libstdc++-v3/math/Makefile.in
...@@ -107,17 +107,18 @@ AUTOMAKE_OPTIONS = 1.3 cygnus ...@@ -107,17 +107,18 @@ AUTOMAKE_OPTIONS = 1.3 cygnus
noinst_LTLIBRARIES = libmath.la noinst_LTLIBRARIES = libmath.la
EXTRA_LONG_DOUBLE_yes = \ EXTRA_LONG_DOUBLE_yes = \
ccosl.c cexpl.c c_logl.c clog10l.c cpowl.c csinhl.c \
csqrtl.c ctanhl.c ctanl.c cargl.c hypotl.c \
signbitl.c cabsl.c signbitl.c cabsl.c
EXTRA_DIST = \ EXTRA_DIST = \
ccos.c ccosf.c ccosh.c ccoshf.c ccoshl.c ccosl.c \ ccos.c ccosf.c ccosh.c ccoshf.c ccoshl.c \
cexp.c cexpf.c cexpl.c \ cexp.c cexpf.c c_log.c c_logf.c clog10.c clog10f.c \
c_log.c c_logf.c c_logl.c clog10.c clog10f.c clog10l.c \ cpow.c cpowf.c csin.c csinf.c csinh.c csinhf.c \
cpow.c cpowf.c cpowl.c csin.c csinf.c csinh.c csinhf.c csinhl.c \ csinl.c csqrt.c csqrtf.c ctan.c ctanf.c ctanh.c \
csinl.c csqrt.c csqrtf.c csqrtl.c ctan.c ctanf.c ctanh.c \ ctanhf.c carg.c cargf.c hypot.c hypotf.c\
ctanhf.c ctanhl.c ctanl.c carg.c cargf.c cargl.c hypot.c hypotf.c\ atan2f.c expf.c \
hypotl.c atan2f.c expf.c \
$(EXTRA_LONG_DOUBLE_yes) $(EXTRA_LONG_DOUBLE_yes)
......
libstdc++-v3/src/Makefile.am
...@@ -166,7 +166,7 @@ generated_headers = \ ...@@ -166,7 +166,7 @@ generated_headers = \
bits/std_limits.h bits/c++config.h bits/c++threads.h bits/c++io.h bits/std_limits.h bits/c++config.h bits/c++threads.h bits/c++io.h
cpu_headers = \ cpu_headers = \
$(top_srcdir)/@cpu_include_dir@/atomicity.h $(top_srcdir)/@cpu_include_dir@/bits/atomicity.h
string_sources = \ string_sources = \
stringMAIN.cc stringCTORNC.cc stringCTORAL.cc \ stringMAIN.cc stringCTORNC.cc stringCTORAL.cc \
...@@ -262,8 +262,8 @@ myinstallheaders: $(headers:%=$(myincludep)%) ...@@ -262,8 +262,8 @@ myinstallheaders: $(headers:%=$(myincludep)%)
echo "$(INSTALL_DATA) $$i $(myincludep)"; \ echo "$(INSTALL_DATA) $$i $(myincludep)"; \
$(INSTALL_DATA) $$i $(myincludep); \ $(INSTALL_DATA) $$i $(myincludep); \
done; \ done; \
echo "$(INSTALL_DATA) $(cpu_headers) $(myincludep)"; \ echo "$(INSTALL_DATA) $(cpu_headers) $(myincludep)bits/"; \
$(INSTALL_DATA) $(cpu_headers) $(myincludep); \ $(INSTALL_DATA) $(cpu_headers) $(myincludep)bits/; \
fi; fi;
$(headers:%=$(myincludep)%): $(myincludep)%: % $(headers:%=$(myincludep)%): $(myincludep)%: %
......
libstdc++-v3/src/Makefile.in
...@@ -247,7 +247,7 @@ generated_headers = \ ...@@ -247,7 +247,7 @@ generated_headers = \
cpu_headers = \ cpu_headers = \
$(top_srcdir)/@cpu_include_dir@/atomicity.h $(top_srcdir)/@cpu_include_dir@/bits/atomicity.h
string_sources = \ string_sources = \
...@@ -614,8 +614,8 @@ myinstallheaders: $(headers:%=$(myincludep)%) ...@@ -614,8 +614,8 @@ myinstallheaders: $(headers:%=$(myincludep)%)
echo "$(INSTALL_DATA) $$i $(myincludep)"; \ echo "$(INSTALL_DATA) $$i $(myincludep)"; \
$(INSTALL_DATA) $$i $(myincludep); \ $(INSTALL_DATA) $$i $(myincludep); \
done; \ done; \
echo "$(INSTALL_DATA) $(cpu_headers) $(myincludep)"; \ echo "$(INSTALL_DATA) $(cpu_headers) $(myincludep)bits/"; \
$(INSTALL_DATA) $(cpu_headers) $(myincludep); \ $(INSTALL_DATA) $(cpu_headers) $(myincludep)bits/; \
fi; fi;
$(headers:%=$(myincludep)%): $(myincludep)%: % $(headers:%=$(myincludep)%): $(myincludep)%: %
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment