From 2072f5c34ede81dde9e0d953d57a0690a66b0f12 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 16 Mar 2017 13:31:57 +0000 Subject: 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 , 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. --- Makefile | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 425cb796db..1b896b979c 100644 --- a/Makefile +++ b/Makefile @@ -267,57 +267,6 @@ $(objpfx)check-local-headers.out: scripts/check-local-headers.sh "$(includedir)" "$(objpfx)" < /dev/null > $@; \ $(evaluate-test) -ifneq ($(PERL),no) -installed-headers = argp/argp.h assert/assert.h catgets/nl_types.h \ - crypt/crypt.h ctype/ctype.h debug/execinfo.h \ - dirent/dirent.h dlfcn/dlfcn.h elf/elf.h elf/link.h \ - gmon/sys/gmon.h gmon/sys/gmon_out.h gmon/sys/profil.h \ - grp/grp.h gshadow/gshadow.h iconv/iconv.h iconv/gconv.h \ - $(wildcard inet/netinet/*.h) \ - $(wildcard inet/arpa/*.h inet/protocols/*.h) \ - inet/aliases.h inet/ifaddrs.h inet/netinet/ip6.h \ - inet/netinet/icmp6.h intl/libintl.h io/sys/stat.h \ - io/sys/statfs.h io/sys/vfs.h io/sys/statvfs.h \ - io/fcntl.h io/sys/fcntl.h io/poll.h io/sys/poll.h \ - io/utime.h io/ftw.h io/fts.h io/sys/sendfile.h \ - libio/stdio.h libio/libio.h locale/locale.h \ - locale/langinfo.h locale/xlocale.h login/utmp.h \ - login/lastlog.h login/pty.h malloc/malloc.h \ - malloc/obstack.h malloc/mcheck.h math/math.h \ - math/complex.h math/fenv.h math/tgmath.h misc/sys/uio.h \ - $(wildcard nis/rpcsvc/*.h) nptl_db/thread_db.h \ - sysdeps/nptl/pthread.h sysdeps/pthread/semaphore.h \ - nss/nss.h posix/sys/utsname.h posix/sys/times.h \ - posix/sys/wait.h posix/sys/types.h posix/unistd.h \ - posix/glob.h posix/regex.h posix/wordexp.h posix/fnmatch.h\ - posix/getopt.h posix/tar.h posix/sys/unistd.h \ - posix/sched.h posix/re_comp.h posix/wait.h \ - posix/cpio.h posix/spawn.h pwd/pwd.h resolv/resolv.h \ - resolv/netdb.h $(wildcard resolv/arpa/*.h) \ - resource/sys/resource.h resource/sys/vlimit.h \ - resource/sys/vtimes.h resource/ulimit.h rt/aio.h \ - rt/mqueue.h setjmp/setjmp.h shadow/shadow.h \ - signal/signal.h signal/sys/signal.h socket/sys/socket.h \ - socket/sys/un.h stdio-common/printf.h \ - stdio-common/stdio_ext.h stdlib/stdlib.h stdlib/alloca.h \ - stdlib/monetary.h stdlib/fmtmsg.h stdlib/ucontext.h \ - sysdeps/generic/inttypes.h sysdeps/generic/stdint.h \ - stdlib/errno.h stdlib/sys/errno.h string/string.h \ - string/strings.h string/memory.h string/endian.h \ - string/argz.h string/envz.h string/byteswap.h \ - $(wildcard sunrpc/rpc/*.h sunrpc/rpcsvc/*.h) \ - sysvipc/sys/ipc.h sysvipc/sys/msg.h sysvipc/sys/sem.h \ - sysvipc/sys/shm.h termios/termios.h \ - termios/sys/termios.h termios/sys/ttychars.h time/time.h \ - time/sys/time.h time/sys/timeb.h wcsmbs/wchar.h \ - wctype/wctype.h - -tests-special += $(objpfx)begin-end-check.out -$(objpfx)begin-end-check.out: scripts/begin-end-check.pl - $(PERL) scripts/begin-end-check.pl $(installed-headers) > $@; \ - $(evaluate-test) -endif - ifneq "$(headers)" "" # Special test of all the installed headers in this directory. tests-special += $(objpfx)check-installed-headers-c.out -- cgit v1.2.3