From af5b3bc33bbaf9151c34a351bdb257b90d407d5b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 8 Jul 1996 06:18:25 +0000 Subject: Mon Jul 8 02:14:25 1996 Roland McGrath * libc-symbols.h [GCC >= 2.7] (strong_alias, weak_alias): Use extern storage class. GCC gives an error for non-extern data defns with the alias attribute. Mon Jul 8 00:11:15 1996 Roland McGrath * libc-symbols.h (weak_function): New macro. For GCC 2.7+ define as __attribute__ ((weak)). * elf/dl-minimal.c: Use weak_function as keyword in function defns instead of weak_symbol (NAME) after the defn. * stdlib/strtol.c: Likewise. * sysdeps/mach/hurd/dl-sysdep.c: Likewise. * sysdeps/alpha/dl-machine.h (elf_machine_rela) [RTLD_BOOTSTRAP]: If this is defined, don't declare _dl_rtld_map as weak, and don't check for MAP pointing to it. RESOLVE is always null in this case, so test with #ifdef instead of if. * libc-symbols.h (symbol_set_declare): Use weak_extern instead of weak_symbol. * csu/initfini.c (_init): Likewise. * locale/setlocale.c (DEFINE_CATEGORY): Likewise. * misc/efgcvt_r.c: Likewise. * sysdeps/alpha/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise. * libc-symbols.h [ASSEMBLER] (weak_symbol): Macro removed. It was not used in any assembler code. (weak_symbol_asm): Renamed to weak_extern_asm. (weak_extern): New macro replaces weak_symbol for weak extern refs; define to weak_extern_asm for [!ASSEMBLER]. * libc-symbols.h [! ASSEMBLER] [HAVE_WEAK_SYMBOLS] (weak_symbol_asm, weak_alias_asm): New macros, renamed from weak_symbol/weak_alias; define those now as aliases. Change conditional to use __attribute__ syntax for GCC 2.7+, not 2.8+ [GCC >= 2.7] [HAVE_WEAK_SYMBOLS] (weak_symbol): Do weak_symbol_asm after GCC weak attribute decl. --- sysdeps/mach/hurd/dl-sysdep.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'sysdeps/mach') diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index ec53e2f..cffc51e 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -271,7 +271,7 @@ _dl_sysdep_message (const char *msg, ...) dynamic linker re-relocates itself to be user-visible (for -ldl), it will get the user's definition (i.e. usually libc's). */ -int +int weak_function __open (const char *file_name, int mode, ...) { enum retry_type doretry; @@ -496,7 +496,7 @@ __open (const char *file_name, int mode, ...) } } -int +int weak_function __close (int fd) { if (fd != (int) MACH_PORT_NULL) @@ -504,7 +504,7 @@ __close (int fd) return 0; } -caddr_t +caddr_t weak_function __mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset) { error_t err; @@ -546,7 +546,7 @@ __mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset) return err ? (caddr_t) __hurd_fail (err) : (caddr_t) mapaddr; } -void +void weak_function _exit (int status) { __proc_mark_exit (_dl_hurd_data->portarray[INIT_PORT_PROC], @@ -554,11 +554,6 @@ _exit (int status) while (__task_terminate (__mach_task_self ())) __mach_task_self_ = (__mach_task_self) (); } - -weak_symbol (_exit) -weak_symbol (__open) -weak_symbol (__close) -weak_symbol (__mmap) /* This function is called by interruptible RPC stubs. For initial @@ -566,7 +561,7 @@ weak_symbol (__mmap) weak, the real defn in libc.so will override it if we are linked into the user program (-ldl). */ -error_t +error_t weak_function _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg, mach_msg_option_t option, mach_msg_size_t send_size, @@ -578,4 +573,3 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg, return __mach_msg (msg, option, send_size, rcv_size, rcv_name, timeout, notify); } -weak_symbol (_hurd_intr_rpc_mach_msg) -- cgit v1.1