mirror of git://sourceware.org/git/glibc.git
Update.
1999-07-17 Zack Weinberg <zack@rabi.columbia.edu> * include/libc-symbol.h: Clean up definitions of weak_alias, strong_alias, symbol_version, etc. etc. * posix/getopt.h: Use ctype.h to get features.h included, and don't include it at all if __GNU_LIBRARY__ is already defined.
This commit is contained in:
Ulrich Drepper
parent
d957279cfb
commit
428383e84f
|
|
@ -1,3 +1,10 @@
|
||||||
|
1999-07-17 Zack Weinberg <zack@rabi.columbia.edu>
|
||||||
|
|
||||||
|
* include/libc-symbol.h: Clean up definitions of weak_alias,
|
||||||
|
strong_alias, symbol_version, etc. etc.
|
||||||
|
* posix/getopt.h: Use ctype.h to get features.h included, and don't
|
||||||
|
include it at all if __GNU_LIBRARY__ is already defined.
|
||||||
|
|
||||||
1999-07-17 Ulrich Drepper <drepper@cygnus.com>
|
1999-07-17 Ulrich Drepper <drepper@cygnus.com>
|
||||||
|
|
||||||
* stdio-common/bug1.c: Include <stdlib.h> to get prototype for free.
|
* stdio-common/bug1.c: Include <stdlib.h> to get prototype for free.
|
||||||
|
|
|
||||||
|
|
@ -76,121 +76,77 @@
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __ASSEMBLER__
|
||||||
|
/* GCC understands weak symbols and aliases; use its interface where
|
||||||
|
possible, instead of embedded assembly language. */
|
||||||
|
|
||||||
/* Define ALIAS as a strong alias for ORIGINAL. */
|
/* Define ALIASNAME as a strong alias for NAME. */
|
||||||
#ifdef HAVE_ASM_SET_DIRECTIVE
|
# define strong_alias(name, aliasname) \
|
||||||
# define strong_alias_asm(original, alias) \
|
extern __typeof (name) aliasname __attribute__ ((alias (#name)));
|
||||||
ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias); \
|
|
||||||
.set C_SYMBOL_NAME (alias),C_SYMBOL_NAME (original)
|
|
||||||
# ifdef __ASSEMBLER__
|
|
||||||
# define strong_alias(original, alias) strong_alias_asm (original, alias)
|
|
||||||
# else
|
|
||||||
# define strong_alias(original, alias) \
|
|
||||||
asm (__string_1 (ASM_GLOBAL_DIRECTIVE) " " __SYMBOL_PREFIX #alias "\n" \
|
|
||||||
".set " __SYMBOL_PREFIX #alias "," __SYMBOL_PREFIX #original);
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
# define strong_alias_asm(original, alias) \
|
|
||||||
ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias); \
|
|
||||||
C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original)
|
|
||||||
# ifdef __ASSEMBLER__
|
|
||||||
# define strong_alias(original, alias) strong_alias_asm (original, alias)
|
|
||||||
# else
|
|
||||||
# define strong_alias(original, alias) \
|
|
||||||
asm (__string_1 (ASM_GLOBAL_DIRECTIVE) " " __SYMBOL_PREFIX #alias "\n" \
|
|
||||||
__SYMBOL_PREFIX #alias " = " __SYMBOL_PREFIX #original);
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Helper macros used above. */
|
/* This comes between the return type and function name in
|
||||||
#define __string_1(x) __string_0(x)
|
a function definition to make that definition weak. */
|
||||||
#define __string_0(x) #x
|
# define weak_function __attribute__ ((weak))
|
||||||
|
# define weak_const_function __attribute__ ((weak, __const__))
|
||||||
|
|
||||||
|
# ifdef HAVE_WEAK_SYMBOLS
|
||||||
|
|
||||||
#ifdef HAVE_WEAK_SYMBOLS
|
/* Define ALIASNAME as a weak alias for NAME.
|
||||||
|
|
||||||
# ifdef __ASSEMBLER__
|
|
||||||
|
|
||||||
# ifdef HAVE_ASM_WEAKEXT_DIRECTIVE
|
|
||||||
|
|
||||||
/* Define ALIAS as a weak alias for ORIGINAL.
|
|
||||||
If weak aliases are not available, this defines a strong alias. */
|
If weak aliases are not available, this defines a strong alias. */
|
||||||
# define weak_alias(original, alias) \
|
# define weak_alias(name, aliasname) \
|
||||||
.weakext C_SYMBOL_NAME (alias), C_SYMBOL_NAME (original)
|
extern __typeof (name) aliasname __attribute__ ((weak, alias (#name)));
|
||||||
|
|
||||||
/* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined). */
|
/* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined). */
|
||||||
|
# ifdef HAVE_ASM_WEAKEXT_DIRECTIVE
|
||||||
|
# define weak_extern(symbol) asm (".weakext " __SYMBOL_PREFIX #symbol);
|
||||||
|
# else
|
||||||
|
# define weak_extern(symbol) asm (".weak " __SYMBOL_PREFIX #symbol);
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# else
|
||||||
|
|
||||||
|
# define weak_alias(name, aliasname) strong_alias(name, aliasname)
|
||||||
|
# define weak_extern(symbol) /* Nothing. */
|
||||||
|
|
||||||
|
# endif
|
||||||
|
|
||||||
|
#else /* __ASSEMBLER__ */
|
||||||
|
|
||||||
|
# ifdef HAVE_ASM_SET_DIRECTIVE
|
||||||
|
# define strong_alias(original, alias) \
|
||||||
|
ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias); \
|
||||||
|
.set C_SYMBOL_NAME (alias),C_SYMBOL_NAME (original)
|
||||||
|
# else
|
||||||
|
# define strong_alias(original, alias) \
|
||||||
|
ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias); \
|
||||||
|
C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original)
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# ifdef HAVE_WEAK_SYMBOLS
|
||||||
|
# ifdef HAVE_ASM_WEAKEXT_DIRECTIVE
|
||||||
|
# define weak_alias(original, alias) \
|
||||||
|
.weakext C_SYMBOL_NAME (alias), C_SYMBOL_NAME (original)
|
||||||
# define weak_extern(symbol) \
|
# define weak_extern(symbol) \
|
||||||
.weakext C_SYMBOL_NAME (symbol)
|
.weakext C_SYMBOL_NAME (symbol)
|
||||||
|
|
||||||
# else /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
|
# else /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
|
||||||
|
|
||||||
/* Define ALIAS as a weak alias for ORIGINAL.
|
|
||||||
If weak aliases are not available, this defines a strong alias. */
|
|
||||||
# define weak_alias(original, alias) \
|
# define weak_alias(original, alias) \
|
||||||
.weak C_SYMBOL_NAME (alias); \
|
.weak C_SYMBOL_NAME (alias); \
|
||||||
C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original)
|
C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original)
|
||||||
|
|
||||||
|
|
||||||
/* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined). */
|
|
||||||
# define weak_extern(symbol) \
|
# define weak_extern(symbol) \
|
||||||
.weak C_SYMBOL_NAME (symbol)
|
.weak C_SYMBOL_NAME (symbol)
|
||||||
|
|
||||||
# endif /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
|
# endif /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
|
||||||
|
|
||||||
# else /* ! __ASSEMBLER__ */
|
# else /* ! HAVE_WEAK_SYMBOLS */
|
||||||
|
|
||||||
# ifdef HAVE_ASM_WEAKEXT_DIRECTIVE
|
# define weak_alias(original, alias) strong_alias(original, alias)
|
||||||
# define weak_extern_asm(symbol) asm (".weakext " __SYMBOL_PREFIX #symbol);
|
# define weak_extern(symbol) /* Nothing */
|
||||||
# define weak_alias_asm(original, alias) \
|
# endif /* ! HAVE_WEAK_SYMBOLS */
|
||||||
asm (".weakext " __SYMBOL_PREFIX #alias ", " __SYMBOL_PREFIX #original);
|
|
||||||
# else /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
|
|
||||||
# define weak_extern_asm(symbol) asm (".weak " __SYMBOL_PREFIX #symbol);
|
|
||||||
# define weak_alias_asm(original, alias) \
|
|
||||||
asm (".weak " __SYMBOL_PREFIX #alias "\n" \
|
|
||||||
__SYMBOL_PREFIX #alias " = " __SYMBOL_PREFIX #original);
|
|
||||||
# endif /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
|
|
||||||
|
|
||||||
# define weak_alias(o, a) weak_alias_asm (o, a)
|
#endif /* __ASSEMBLER__ */
|
||||||
# define weak_extern(symbol) weak_extern_asm (symbol)
|
|
||||||
|
|
||||||
# endif /* ! __ASSEMBLER__ */
|
|
||||||
#else
|
|
||||||
# define weak_alias(original, alias) strong_alias(original, alias)
|
|
||||||
# define weak_extern(symbol) /* Do nothing; the ref will be strong. */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#if (!defined __ASSEMBLER__ && \
|
|
||||||
(__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)))
|
|
||||||
/* GCC 2.7 and later has special syntax for weak symbols and aliases.
|
|
||||||
Using that is better when possible, because the compiler and assembler
|
|
||||||
are better clued in to what we are doing. */
|
|
||||||
# undef strong_alias
|
|
||||||
# define strong_alias(name, aliasname) \
|
|
||||||
extern __typeof (name) aliasname __attribute__ ((alias (#name)));
|
|
||||||
|
|
||||||
# ifdef HAVE_WEAK_SYMBOLS
|
|
||||||
# undef weak_alias
|
|
||||||
# define weak_alias(name, aliasname) \
|
|
||||||
extern __typeof (name) aliasname __attribute__ ((weak, alias (#name)));
|
|
||||||
|
|
||||||
/* This comes between the return type and function name in
|
|
||||||
a function definition to make that definition weak. */
|
|
||||||
# define weak_function __attribute__ ((weak))
|
|
||||||
# define weak_const_function __attribute__ ((weak, __const__))
|
|
||||||
|
|
||||||
# endif /* HAVE_WEAK_SYMBOLS. */
|
|
||||||
#endif /* Not __ASSEMBLER__, and GCC 2.7 or later. */
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef weak_function
|
|
||||||
/* If we do not have the __attribute__ ((weak)) syntax, there is no way we
|
|
||||||
can define functions as weak symbols. The compiler will emit a `.globl'
|
|
||||||
directive for the function symbol, and a `.weak' directive in addition
|
|
||||||
will produce an error from the assembler. */
|
|
||||||
# define weak_function /* empty */
|
|
||||||
# define weak_const_function /* empty */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* On some platforms we can make internal function calls (i.e., calls of
|
/* On some platforms we can make internal function calls (i.e., calls of
|
||||||
functions not exported) a bit faster by using a different calling
|
functions not exported) a bit faster by using a different calling
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,16 @@
|
||||||
# define _GETOPT_H 1
|
# define _GETOPT_H 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* We include this here since on system susing GNU libc we need some
|
/* If __GNU_LIBRARY__ is not already defined, either we are being used
|
||||||
macros defined. <stdio.h> is probably the most portable header
|
standalone, or this is the first header included in the source file.
|
||||||
file and it does what we need. */
|
If we are being used with glibc, we need to include <features.h>, but
|
||||||
#include <stdio.h>
|
that does not exist if we are standalone. So: if __GNU_LIBRARY__ is
|
||||||
|
not defined, include <ctype.h>, which will pull in <features.h> for us
|
||||||
|
if it's from glibc. (Why ctype.h? It's guaranteed to exist and it
|
||||||
|
doesn't flood the namespace with stuff the way some other headers do.) */
|
||||||
|
#if !defined __GNU_LIBRARY__
|
||||||
|
# include <ctype.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue