Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change __weak_extern to __weak_reference so that gcc4 works.

Browse Source
This commit is contained in:
christos 2006-05-18 17:54:19 +00:00
parent 79156a7347
commit 96473fa808
7 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/csu/common_elf/common.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: common.h,v 1.11 2006/05/17 17:08:07 christos Exp $ */
/* $NetBSD: common.h,v 1.12 2006/05/18 17:54:19 christos Exp $ */
/*
* Copyright (c) 1995 Christopher G. Demetriou
@ -81,12 +81,7 @@ void _rtld_setup(void (*)(void), const Obj_Entry *obj);
* if we happen to be compiling without -static but with without any
* shared libs present, things will still work.
*/
extern int _DYNAMIC
#if __GNUC__ > 3
__attribute__((__weakref__))
#endif
;
__weak_extern(_DYNAMIC);
extern int _DYNAMIC __weak_reference(_DYNAMIC);
#endif /* DYNAMIC */
#ifdef MCRT0

10
lib/csu/powerpc/crt0.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: crt0.c,v 1.25 2004/08/26 21:15:05 thorpej Exp $ */
/* $NetBSD: crt0.c,v 1.26 2006/05/18 17:54:19 christos Exp $ */
/*
* Copyright (c) 1997 Jason R. Thorpe.
@ -41,10 +41,8 @@
* Small Data Area designators. If not defined, will show up as being
* at address zero.
*/
extern int _SDA_BASE_[];
__weak_extern(_SDA_BASE_);
extern int _SDA2_BASE_[];
__weak_extern(_SDA2_BASE_);
extern int _SDA_BASE_[] __weak_reference(_SDA_BASE_);
extern int _SDA2_BASE_[] __weak_reference(_SDA2_BASE_);
/*
* First 5 arguments are specified by the PowerPC SVR4 ABI. The
@ -103,7 +101,7 @@ _start(int argc, char **argv, char **envp,
* NOTE: Leave the RCS ID _after_ __start(), in case it gets placed in .text.
*/
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: crt0.c,v 1.25 2004/08/26 21:15:05 thorpej Exp $");
__RCSID("$NetBSD: crt0.c,v 1.26 2006/05/18 17:54:19 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "common.c"

10
lib/libc/arch/m68k/sys/__sigaction14_sigtramp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: __sigaction14_sigtramp.c,v 1.7 2006/02/19 05:06:02 christos Exp $ */
/* $NetBSD: __sigaction14_sigtramp.c,v 1.8 2006/05/18 17:54:19 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.7 2006/02/19 05:06:02 christos Exp $");
__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.8 2006/05/18 17:54:19 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@ -49,7 +49,10 @@ __RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.7 2006/02/19 05:06:02 christos Ex
#include "extern.h"
__weak_alias(__sigaction14, __libc_sigaction14)
__weak_extern(__sigtramp_sigcontext_1)
#ifdef __LIBC12_SOURCE__
extern const int __sigtramp_sigcontext_1[]
__weak_reference(__sigtramp_sigcontext_1);
#endif
int
__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
@ -69,7 +72,6 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
* set in the sigaction.
*/
if ((act->sa_flags & SA_SIGINFO) == 0) {
extern const int __sigtramp_sigcontext_1[];
int sav = errno;
int rv = __sigaction_sigtramp(sig, act, oact,
__sigtramp_sigcontext_1, 1);

10
lib/libc/arch/ns32k/sys/__sigaction14_sigtramp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: __sigaction14_sigtramp.c,v 1.6 2006/02/19 05:06:03 christos Exp $ */
/* $NetBSD: __sigaction14_sigtramp.c,v 1.7 2006/05/18 17:54:19 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.6 2006/02/19 05:06:03 christos Exp $");
__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.7 2006/05/18 17:54:19 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@ -51,7 +51,10 @@ __RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.6 2006/02/19 05:06:03 christos Ex
#ifdef __weak_alias
__weak_alias(__sigaction14, __libc_sigaction14)
#endif
__weak_extern(__sigtramp_sigcontext_1)
#ifdef __LIBC12_SOURCE__
extern const int __sigtramp_sigcontext_1[]
__weak_reference(__sigtramp_sigcontext_1);
#endif
int
__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
@ -71,7 +74,6 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
* set in the sigaction.
*/
if ((act->sa_flags & SA_SIGINFO) == 0) {
extern const int __sigtramp_sigcontext_1[];
int sav = errno;
int rv = __sigaction_sigtramp(sig, act, oact,
__sigtramp_sigcontext_1, 1);

10
lib/libc/arch/powerpc/sys/__sigaction14_sigtramp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: __sigaction14_sigtramp.c,v 1.7 2006/02/19 05:06:03 christos Exp $ */
/* $NetBSD: __sigaction14_sigtramp.c,v 1.8 2006/05/18 17:54:19 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.7 2006/02/19 05:06:03 christos Exp $");
__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.8 2006/05/18 17:54:19 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@ -49,7 +49,10 @@ __RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.7 2006/02/19 05:06:03 christos Ex
#include "extern.h"
__weak_alias(__sigaction14, __libc_sigaction14)
__weak_extern(__sigtramp_sigcontext_1)
#ifdef __LIBC12_SOURCE__
extern const int __sigtramp_sigcontext_1[]
__weak_reference(__sigtramp_sigcontext_1);
#endif
int
__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
@ -69,7 +72,6 @@ __libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
* set in the sigaction.
*/
if ((act->sa_flags & SA_SIGINFO) == 0) {
extern const int __sigtramp_sigcontext_1[];
int sav = errno;
int rv = __sigaction_sigtramp(sig, act, oact,
__sigtramp_sigcontext_1, 1);

9
lib/libc/arch/sh3/sys/__sigaction14_sigtramp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: __sigaction14_sigtramp.c,v 1.6 2006/02/19 05:06:03 christos Exp $ */
/* $NetBSD: __sigaction14_sigtramp.c,v 1.7 2006/05/18 17:54:19 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.6 2006/02/19 05:06:03 christos Exp $");
__RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.7 2006/05/18 17:54:19 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@ -48,7 +48,10 @@ __RCSID("$NetBSD: __sigaction14_sigtramp.c,v 1.6 2006/02/19 05:06:03 christos Ex
#include "extern.h"
__weak_alias(__sigaction14, __libc_sigaction14)
__weak_extern(__sigtramp_sigcontext_1)
#ifdef __LIBC12_SOURCE__
extern const int __sigtramp_sigcontext_1[]
__weak_reference(__sigtramp_sigcontext_1);
#endif
int
__libc_sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)

10
lib/libedit/vi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vi.c,v 1.25 2006/03/06 21:11:56 christos Exp $ */
/* $NetBSD: vi.c,v 1.26 2006/05/18 17:54:19 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: vi.c,v 1.25 2006/03/06 21:11:56 christos Exp $");
__RCSID("$NetBSD: vi.c,v 1.26 2006/05/18 17:54:19 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@ -919,11 +919,11 @@ protected el_action_t
/*ARGSUSED*/
vi_alias(EditLine *el, int c)
{
#ifdef __weak_extern
#ifdef __weak_reference
char alias_name[3];
char *alias_text;
extern char *get_alias_text(const char *);
__weak_extern(get_alias_text);
extern char *get_alias_text(const char *)
__weak_reference(get_alias_text);
if (get_alias_text == 0) {
return CC_ERROR;