diff options
author | Joseph Myers <joseph@codesourcery.com> | 2017-03-16 13:31:57 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2017-03-16 13:31:57 +0000 |
commit | 2072f5c34ede81dde9e0d953d57a0690a66b0f12 (patch) | |
tree | 0833e169e1c3e9b24ef64e9010f7bb1e862f7da8 /sysdeps | |
parent | d6fc3f6516cd20f195758086fbbbe3f17a8a6d95 (diff) | |
download | glibc-2072f5c34ede81dde9e0d953d57a0690a66b0f12.zip glibc-2072f5c34ede81dde9e0d953d57a0690a66b0f12.tar.gz glibc-2072f5c34ede81dde9e0d953d57a0690a66b0f12.tar.bz2 |
Remove C++ namespace handling from glibc headers.
glibc headers include some code (not particularly consistent or
systematic) to put various declarations in C++ namespaces std and
__c99, if _GLIBCPP_USE_NAMESPACES is defined.
As noted in <https://gcc.gnu.org/ml/libstdc++/2017-03/msg00025.html>,
this macro was removed from libstdc++ in 2000. I don't expect
compilation with such old versions of libstdc++ to work with current
glibc headers anyway (whereas old *binaries* are expected to stay
working with current glibc); this patch (which should be a no-op with
any libstdc++ version postdating that removal) removes all this code
from the glibc headers.
The begin-end-check.pl test, whose comments say it is about checking
these namespace macro calls, is also removed. The code in that test
would have covered __BEGIN_DECLS / __END_DECLS as well, but if those
weren't properly matched it would show up with the
check-installed-headers-cxx tests, so I don't think there is an actual
use for keeping begin-end-check.pl with the namespace code removed.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
* misc/sys/cdefs.h (__BEGIN_NAMESPACE_STD): Remove macro.
(__END_NAMESPACE_STD): Likewise.
(__USING_NAMESPACE_STD): Likewise.
(__BEGIN_NAMESPACE_C99): Likewise.
(__END_NAMESPACE_C99): Likewise.
(__USING_NAMESPACE_C99): Likewise.
* math/math.h (_Mdouble_BEGIN_NAMESPACE): Do not define and
undefine macro.
(_Mdouble_END_NAMESPACE): Likewise.
* ctype/ctype.h: Do not handle C++ namespaces.
* libio/bits/stdio-ldbl.h: Likewise.
* libio/stdio.h: Likewise.
* locale/locale.h: Likewise.
* math/bits/mathcalls.h: Likewise.
* setjmp/setjmp.h: Likewise.
* signal/signal.h: Likewise.
* stdlib/bits/stdlib-float.h: Likewise.
* stdlib/bits/stdlib-ldbl.h: Likewise.
* stdlib/stdlib.h: Likewise.
* string/string.h: Likewise.
* sysdeps/x86/fpu/bits/mathinline.h: Likewise.
* time/bits/types/clock_t.h: Likewise.
* time/bits/types/struct_tm.h: Likewise.
* time/bits/types/time_t.h: Likewise.
* time/time.h: Likewise.
* wcsmbs/bits/wchar-ldbl.h: Likewise.
* wcsmbs/uchar.h: Likewise.
* wcsmbs/wchar.h: Likewise.
[_GLIBCPP_USE_NAMESPACES] (wint_t): Remove conditional definition.
* wctype/wctype.h: Do not handle C++ namespaces.
* scripts/begin-end-check.pl: Remove.
* Makefile (installed-headers): Likewise.
(tests-special): Do not add $(objpfx)begin-end-check.out.
($(objpfx)begin-end-check.out): Remove.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/x86/fpu/bits/mathinline.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sysdeps/x86/fpu/bits/mathinline.h b/sysdeps/x86/fpu/bits/mathinline.h index 3cab929..bcd99bd 100644 --- a/sysdeps/x86/fpu/bits/mathinline.h +++ b/sysdeps/x86/fpu/bits/mathinline.h @@ -120,7 +120,6 @@ /* The gcc, version 2.7 or below, has problems with all this inlining code. So disable it for this version of the compiler. */ # if __GNUC_PREREQ (2, 8) -__BEGIN_NAMESPACE_C99 /* Test for negative number. Used in the signbit() macro. */ __MATH_INLINE int @@ -154,7 +153,6 @@ __NTH (__signbitl (long double __x)) return (__u.__i[2] & 0x8000) != 0; } -__END_NAMESPACE_C99 # endif #endif @@ -168,7 +166,6 @@ __END_NAMESPACE_C99 there's no need to define any of these inline functions. */ # ifdef __USE_ISOC99 -__BEGIN_NAMESPACE_C99 /* Round to nearest integer. */ # ifdef __SSE_MATH__ @@ -279,12 +276,10 @@ __NTH (fmin (double __x, double __y)) } # endif -__END_NAMESPACE_C99 # endif # if defined __SSE4_1__ && defined __SSE2_MATH__ # if defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99 -__BEGIN_NAMESPACE_C99 /* Round to nearest integer. */ __MATH_INLINE double @@ -336,10 +331,8 @@ __NTH (nearbyintf (float __x)) } # endif -__END_NAMESPACE_C99 # endif -__BEGIN_NAMESPACE_STD /* Smallest integral value not less than X. */ __MATH_INLINE double __NTH (ceil (double __x)) @@ -348,9 +341,7 @@ __NTH (ceil (double __x)) __asm ("roundsd $2, %1, %0" : "=x" (__res) : "xm" (__x)); return __res; } -__END_NAMESPACE_STD -__BEGIN_NAMESPACE_C99 __MATH_INLINE float __NTH (ceilf (float __x)) { @@ -358,9 +349,7 @@ __NTH (ceilf (float __x)) __asm ("roundss $2, %1, %0" : "=x" (__res) : "xm" (__x)); return __res; } -__END_NAMESPACE_C99 -__BEGIN_NAMESPACE_STD /* Largest integer not greater than X. */ __MATH_INLINE double __NTH (floor (double __x)) @@ -369,9 +358,7 @@ __NTH (floor (double __x)) __asm ("roundsd $1, %1, %0" : "=x" (__res) : "xm" (__x)); return __res; } -__END_NAMESPACE_STD -__BEGIN_NAMESPACE_C99 __MATH_INLINE float __NTH (floorf (float __x)) { @@ -379,7 +366,6 @@ __NTH (floorf (float __x)) __asm ("roundss $1, %1, %0" : "=x" (__res) : "xm" (__x)); return __res; } -__END_NAMESPACE_C99 # endif # endif #endif |