mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-17 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove libio C++ vtable definitions.

Browse Source
This commit is contained in:
Joseph Myers 2012-09-10 21:22:42 +00:00
parent 33a9f7b6cc
commit 0e886ef96e
5 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2012-09-10 Joseph Myers <joseph@codesourcery.com>
* libio/libioP.h [__GNUC__] (VTABLE_LABEL): Remove.
[!builtinbuf_vtable && __cplusplus] (builtinbuf_vtable): Likewise.
* sysdeps/generic/_G_config.h (_G_NAMES_HAVE_UNDERSCORE): Remove.
(_G_VTABLE_LABEL_PREFIX): Likewise.
(_G_VTABLE_LABEL_HAS_LENGTH): Likewise.
* sysdeps/gnu/_G_config.h (_G_NAMES_HAVE_UNDERSCORE): Remove.
(_G_VTABLE_LABEL_HAS_LENGTH): Likewise.
(_G_VTABLE_LABEL_PREFIX): Likewise.
(_G_VTABLE_LABEL_PREFIX_ID): Likewise.
* sysdeps/mach/hurd/_G_config.h (_G_NAMES_HAVE_UNDERSCORE): Remove.
(_G_VTABLE_LABEL_HAS_LENGTH): Likewise.
(_G_VTABLE_LABEL_PREFIX): Likewise.
(_G_VTABLE_LABEL_PREFIX_ID): Likewise.
2012-09-10 H.J. Lu <hongjiu.lu@intel.com>
* libio/Makefile: Include ../Makeconfig before tests.

24
libio/libioP.h
View File

@ -862,30 +862,6 @@ extern int _IO_vscanf (const char *, _IO_va_list) __THROW;
# endif
#endif
/* VTABLE_LABEL defines NAME as of the CLASS class.
CNLENGTH is strlen(#CLASS). */
#ifdef __GNUC__
# if _G_VTABLE_LABEL_HAS_LENGTH
# define VTABLE_LABEL(NAME, CLASS, CNLENGTH) \
extern char NAME[] asm (_G_VTABLE_LABEL_PREFIX #CNLENGTH #CLASS);
# else
# define VTABLE_LABEL(NAME, CLASS, CNLENGTH) \
extern char NAME[] asm (_G_VTABLE_LABEL_PREFIX #CLASS);
# endif
#endif /* __GNUC__ */
#if !defined(builtinbuf_vtable) && defined(__cplusplus)
# ifdef __GNUC__
VTABLE_LABEL(builtinbuf_vtable, builtinbuf, 10)
# else
# if _G_VTABLE_LABEL_HAS_LENGTH
# define builtinbuf_vtable _G_VTABLE_LABEL_PREFIX_ID##10builtinbuf
# else
# define builtinbuf_vtable _G_VTABLE_LABEL_PREFIX_ID##builtinbuf
# endif
# endif
#endif /* !defined(builtinbuf_vtable) && defined(__cplusplus) */
#define _IO_va_start(args, last) va_start(args, last)
extern struct _IO_fake_stdiobuf _IO_stdin_buf, _IO_stdout_buf, _IO_stderr_buf;

5
sysdeps/generic/_G_config.h
View File

@ -77,9 +77,4 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
#define _G_BUFSIZ 8192
/* These are the vtbl details for ELF. */
#define _G_NAMES_HAVE_UNDERSCORE 0
#define _G_VTABLE_LABEL_PREFIX "_vt."
#define _G_VTABLE_LABEL_HAS_LENGTH 1
#endif /* _G_config.h */

4
sysdeps/gnu/_G_config.h
View File

@ -84,10 +84,6 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
#define _G_BUFSIZ 8192
/* These are the vtbl details for ELF. */
#define _G_NAMES_HAVE_UNDERSCORE 0
#define _G_VTABLE_LABEL_HAS_LENGTH 1
#define _G_USING_THUNKS 1
#define _G_VTABLE_LABEL_PREFIX "__vt_"
#define _G_VTABLE_LABEL_PREFIX_ID __vt_
#endif /* _G_config.h */

4
sysdeps/mach/hurd/_G_config.h
View File

@ -83,10 +83,6 @@ typedef unsigned int _G_uint32_t __attribute__ ((__mode__ (__SI__)));
#define _G_BUFSIZ 8192
/* These are the vtbl details for ELF. */
#define _G_NAMES_HAVE_UNDERSCORE 0
#define _G_VTABLE_LABEL_HAS_LENGTH 1
#define _G_USING_THUNKS 1
#define _G_VTABLE_LABEL_PREFIX "__vt_"
#define _G_VTABLE_LABEL_PREFIX_ID __vt_
#endif /* _G_config.h */