Remove C99 features not supported by avr-libc

Author: chris-durand

include/cinttypes

@@ -50,32 +50,6 @@
 # endif
 #endif
 
-#ifdef _GLIBCXX_USE_C99_INTTYPES_TR1
-
-namespace std
-{
-  // types
-  using ::imaxdiv_t;
-
-  // functions
-  using ::imaxabs;
-  using ::imaxdiv;
-
-  // GCC does not support extended integer types
-  // intmax_t abs(intmax_t)
-  // imaxdiv_t div(intmax_t, intmax_t)
-
-  using ::strtoimax;
-  using ::strtoumax;
-
-#if defined(_GLIBCXX_USE_WCHAR_T) && _GLIBCXX_USE_C99_INTTYPES_WCHAR_T_TR1
-  using ::wcstoimax;
-  using ::wcstoumax;
-#endif
-} // namespace std
-
-#endif // _GLIBCXX_USE_C99_INTTYPES_TR1
-
 #endif // C++11
 
 #endif // _GLIBCXX_CINTTYPES

include/cmath

@@ -532,31 +532,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 #if __cplusplus >= 201103L
 
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_FP
-  constexpr int
-  fpclassify(float __x)
-  { return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL,
-				FP_SUBNORMAL, FP_ZERO, __x); }
-
-  constexpr int
-  fpclassify(double __x)
-  { return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL,
-				FP_SUBNORMAL, FP_ZERO, __x); }
-
-  constexpr int
-  fpclassify(long double __x)
-  { return __builtin_fpclassify(FP_NAN, FP_INFINITE, FP_NORMAL,
-				FP_SUBNORMAL, FP_ZERO, __x); }
-#endif
-
-#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
-  template<typename _Tp>
-    constexpr typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value,
-                                              int>::__type
-    fpclassify(_Tp __x)
-    { return __x != 0 ? FP_NORMAL : FP_ZERO; }
-#endif
-
 #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_FP
   constexpr bool
   isfinite(float __x)
@@ -1062,73 +1037,31 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 #undef truncl
 
   // types
-  using ::double_t;
-  using ::float_t;
+  using double_t = double;
+  using float_t = float;
 
   // functions
-  using ::acosh;
-  using ::acoshf;
-  using ::acoshl;
-
-  using ::asinh;
-  using ::asinhf;
-  using ::asinhl;
-
-  using ::atanh;
-  using ::atanhf;
-  using ::atanhl;
 
   using ::cbrt;
-  using ::cbrtf;
-  using ::cbrtl;
+  inline float cbrtf(float __x) { return ::cbrt(__x); }
 
   using ::copysign;
-  using ::copysignf;
-  using ::copysignl;
-
-  using ::erf;
-  using ::erff;
-  using ::erfl;
-
-  using ::erfc;
-  using ::erfcf;
-  using ::erfcl;
-
-  using ::exp2;
-  using ::exp2f;
-  using ::exp2l;
-
-  using ::expm1;
-  using ::expm1f;
-  using ::expm1l;
+  inline float copysignf(float __x, float __y) { return ::copysign(__x, __y); }
 
   using ::fdim;
-  using ::fdimf;
-  using ::fdiml;
+  inline float fdimf(float __x, float __y) { return ::fdim(__x, __y); }
 
   using ::fma;
-  using ::fmaf;
-  using ::fmal;
+  inline float fmaf(float __x, float __y, float __z) { return ::fma(__x, __y, __z); }
 
   using ::fmax;
-  using ::fmaxf;
-  using ::fmaxl;
+  inline float fmaxf(float __x, float __y) { return ::fmax(__x, __y); }
 
   using ::fmin;
-  using ::fminf;
-  using ::fminl;
+  inline float fminf(float __x, float __y) { return ::fmin(__x, __y); }
 
   using ::hypot;
-  using ::hypotf;
-  using ::hypotl;
-
-  using ::ilogb;
-  using ::ilogbf;
-  using ::ilogbl;
-
-  using ::lgamma;
-  using ::lgammaf;
-  using ::lgammal;
+  inline float hypotf(float __x, float __y) { return ::hypot(__x, __y); }
 
 #ifndef _GLIBCXX_NO_C99_ROUNDING_FUNCS
   using ::llrint;
@@ -1140,73 +1073,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   using ::llroundl;
 #endif
 
-  using ::log1p;
-  using ::log1pf;
-  using ::log1pl;
-
-  using ::log2;
-  using ::log2f;
-  using ::log2l;
-
-  using ::logb;
-  using ::logbf;
-  using ::logbl;
-
   using ::lrint;
-  using ::lrintf;
-  using ::lrintl;
+  inline float lrintf(float __x) { return ::lrint(__x); }
 
   using ::lround;
-  using ::lroundf;
-  using ::lroundl;
-
-  using ::nan;
-  using ::nanf;
-  using ::nanl;
-
-  using ::nearbyint;
-  using ::nearbyintf;
-  using ::nearbyintl;
-
-  using ::nextafter;
-  using ::nextafterf;
-  using ::nextafterl;
-
-  using ::nexttoward;
-  using ::nexttowardf;
-  using ::nexttowardl;
-
-  using ::remainder;
-  using ::remainderf;
-  using ::remainderl;
-
-  using ::remquo;
-  using ::remquof;
-  using ::remquol;
-
-  using ::rint;
-  using ::rintf;
-  using ::rintl;
+  inline float lroundf(float __x) { return ::lround(__x); }
 
   using ::round;
-  using ::roundf;
-  using ::roundl;
-
-  using ::scalbln;
-  using ::scalblnf;
-  using ::scalblnl;
-
-  using ::scalbn;
-  using ::scalbnf;
-  using ::scalbnl;
-
-  using ::tgamma;
-  using ::tgammaf;
-  using ::tgammal;
+  inline float roundf(float __x) { return ::round(__x); }
 
   using ::trunc;
-  using ::truncf;
-  using ::truncl;
+  inline float truncf(float __x) { return ::trunc(__x); }
 
   /// Additional overloads.
 #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_FP

include/cstdio

@@ -176,7 +176,6 @@ namespace __gnu_cxx
   using ::vfscanf;
   using ::vscanf;
   using ::vsnprintf;
-  using ::vsscanf;
 #endif
 } // namespace __gnu_cxx
 
@@ -186,7 +185,6 @@ namespace std
   using ::__gnu_cxx::vfscanf;
   using ::__gnu_cxx::vscanf;
   using ::__gnu_cxx::vsnprintf;
-  using ::__gnu_cxx::vsscanf;
 } // namespace std
 
 #endif // _GLIBCXX_USE_C99_STDIO

include/cstdlib

@@ -192,66 +192,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
 #undef strtof
 #undef strtold
 
-namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
-{
-_GLIBCXX_BEGIN_NAMESPACE_VERSION
-
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::lldiv_t;
-#endif
-#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
-  extern "C" void (_Exit)(int) throw () _GLIBCXX_NORETURN;
-#endif
-#if !_GLIBCXX_USE_C99_DYNAMIC
-  using ::_Exit;
-#endif
-
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::llabs;
-
-  inline lldiv_t
-  div(long long __n, long long __d)
-  { lldiv_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
-
-  using ::lldiv;
-#endif
-
-#if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  extern "C" long long int (atoll)(const char *) throw ();
-  extern "C" long long int
-    (strtoll)(const char * __restrict, char ** __restrict, int) throw ();
-  extern "C" unsigned long long int
-    (strtoull)(const char * __restrict, char ** __restrict, int) throw ();
-#endif
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::atoll;
-  using ::strtoll;
-  using ::strtoull;
-#endif
-  using ::strtof;
-  using ::strtold;
-
-_GLIBCXX_END_NAMESPACE_VERSION
-} // namespace __gnu_cxx
-
-namespace std
-{
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::__gnu_cxx::lldiv_t;
-#endif
-  using ::__gnu_cxx::_Exit;
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::__gnu_cxx::llabs;
-  using ::__gnu_cxx::div;
-  using ::__gnu_cxx::lldiv;
-#endif
-  using ::__gnu_cxx::atoll;
-  using ::__gnu_cxx::strtof;
-  using ::__gnu_cxx::strtoll;
-  using ::__gnu_cxx::strtoull;
-  using ::__gnu_cxx::strtold;
-} // namespace std
-
 #endif // _GLIBCXX_USE_C99_STDLIB
 
 } // extern "C++"