diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | libio/libioP.h | 24 | ||||
| -rw-r--r-- | sysdeps/generic/_G_config.h | 5 | ||||
| -rw-r--r-- | sysdeps/gnu/_G_config.h | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/_G_config.h | 4 |
5 files changed, 16 insertions, 37 deletions
diff --git a/ChangeLog b/ChangeLog index cf963d84b6..e53e36e766 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/libio/libioP.h b/libio/libioP.h index aa2b3bfa90..c8dbac50ce 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -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; diff --git a/sysdeps/generic/_G_config.h b/sysdeps/generic/_G_config.h index 6f756829e7..769b10f6df 100644 --- a/sysdeps/generic/_G_config.h +++ b/sysdeps/generic/_G_config.h @@ -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 */ diff --git a/sysdeps/gnu/_G_config.h b/sysdeps/gnu/_G_config.h index 9d6e23bb4e..478dbe1f35 100644 --- a/sysdeps/gnu/_G_config.h +++ b/sysdeps/gnu/_G_config.h @@ -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 */ diff --git a/sysdeps/mach/hurd/_G_config.h b/sysdeps/mach/hurd/_G_config.h index 9ecd4aad39..2f683d4de9 100644 --- a/sysdeps/mach/hurd/_G_config.h +++ b/sysdeps/mach/hurd/_G_config.h @@ -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 */ |