From f511163d4eef98c5f674e576377f8d61406ea3a1 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Fri, 23 Jan 2004 11:30:28 +0000 Subject: [PATCH] GCC 3.3 doesn't support #pragma weak A=B, when A is defined. This patch adds correct prototyps for those symbols and allows gcc3 to compile libc. Thanks to buggs for pointing to right GCC PR. --- lib/libc/gen/_spinlock_stub.c | 5 ++++- lib/libc/stdio/_flock_stub.c | 7 ++++++- lib/libc/sys/__error.c | 4 +++- lib/libc_r/uthread/uthread_file.c | 6 +++++- lib/libcr/gen/_spinlock_stub.c | 5 ++++- lib/libcr/stdio/_flock_stub.c | 7 ++++++- lib/libcr/sys/__error.c | 4 +++- 7 files changed, 31 insertions(+), 7 deletions(-) diff --git a/lib/libc/gen/_spinlock_stub.c b/lib/libc/gen/_spinlock_stub.c index 82b23b9184..344b98fb26 100644 --- a/lib/libc/gen/_spinlock_stub.c +++ b/lib/libc/gen/_spinlock_stub.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.4 1999/08/27 23:58:27 peter Exp $ - * $DragonFly: src/lib/libc/gen/_spinlock_stub.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libc/gen/_spinlock_stub.c,v 1.3 2004/01/23 11:30:27 joerg Exp $ * */ @@ -47,6 +47,9 @@ #pragma weak _spinlock=_spinlock_stub #pragma weak _spinlock_debug=_spinlock_debug_stub +void _spinlock(spinlock_t *); +void _spinlock_debug(spinlock_t *, char *, int); + /* * This function is a stub for the spinlock function in libpthread. */ diff --git a/lib/libc/stdio/_flock_stub.c b/lib/libc/stdio/_flock_stub.c index 429f0930d8..7793d7486e 100644 --- a/lib/libc/stdio/_flock_stub.c +++ b/lib/libc/stdio/_flock_stub.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.3 1999/08/28 00:00:55 peter Exp $ - * $DragonFly: src/lib/libc/stdio/_flock_stub.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libc/stdio/_flock_stub.c,v 1.3 2004/01/23 11:30:27 joerg Exp $ * */ @@ -47,6 +47,11 @@ #pragma weak ftrylockfile=_ftrylockfile_stub #pragma weak funlockfile=_funlockfile_stub +void flockfile(FILE *); +void _flockfile_debug(FILE *, char *, int); +int ftrylockfile(FILE *); +void funlockfile(FILE *); + /* * This function is a stub for the _flockfile function in libpthread. */ diff --git a/lib/libc/sys/__error.c b/lib/libc/sys/__error.c index 044b914f2a..7b8f5e7b7d 100644 --- a/lib/libc/sys/__error.c +++ b/lib/libc/sys/__error.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/sys/__error.c,v 1.1.8.1 2001/03/05 11:45:51 obrien Exp $ - * $DragonFly: src/lib/libc/sys/Attic/__error.c,v 1.2 2003/06/17 04:26:47 dillon Exp $ + * $DragonFly: src/lib/libc/sys/Attic/__error.c,v 1.3 2004/01/23 11:30:28 joerg Exp $ */ #include @@ -43,6 +43,8 @@ extern int errno; */ #pragma weak __error=__error_unthreaded +int * __error(void); + int * __error_unthreaded() { diff --git a/lib/libc_r/uthread/uthread_file.c b/lib/libc_r/uthread/uthread_file.c index eb27b3344b..58bb1df8eb 100644 --- a/lib/libc_r/uthread/uthread_file.c +++ b/lib/libc_r/uthread/uthread_file.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/uthread/uthread_file.c,v 1.12.2.3 2002/10/22 14:44:03 fjoe Exp $ - * $DragonFly: src/lib/libc_r/uthread/uthread_file.c,v 1.2 2003/06/17 04:26:48 dillon Exp $ + * $DragonFly: src/lib/libc_r/uthread/uthread_file.c,v 1.3 2004/01/23 11:30:28 joerg Exp $ * * POSIX stdio FILE locking functions. These assume that the locking * is only required at FILE structure level, not at file descriptor @@ -51,6 +51,10 @@ #pragma weak ftrylockfile=_ftrylockfile #pragma weak funlockfile=_funlockfile +void flockfile(FILE *); +int ftrylockfile(FILE *); +void funlockfile(FILE *); + /* * The FILE lock structure. The FILE *fp is locked if the owner is * not NULL. If not locked, the file lock structure can be diff --git a/lib/libcr/gen/_spinlock_stub.c b/lib/libcr/gen/_spinlock_stub.c index 0c04de9d77..da7bf04bfb 100644 --- a/lib/libcr/gen/_spinlock_stub.c +++ b/lib/libcr/gen/_spinlock_stub.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.4 1999/08/27 23:58:27 peter Exp $ - * $DragonFly: src/lib/libcr/gen/Attic/_spinlock_stub.c,v 1.2 2003/06/17 04:26:42 dillon Exp $ + * $DragonFly: src/lib/libcr/gen/Attic/_spinlock_stub.c,v 1.3 2004/01/23 11:30:28 joerg Exp $ * */ @@ -47,6 +47,9 @@ #pragma weak _spinlock=_spinlock_stub #pragma weak _spinlock_debug=_spinlock_debug_stub +void _spinlock(spinlock_t *); +void _spinlock_debug(spinlock_t *, char *, int); + /* * This function is a stub for the spinlock function in libpthread. */ diff --git a/lib/libcr/stdio/_flock_stub.c b/lib/libcr/stdio/_flock_stub.c index 18d6b0d08c..c4b44ad89b 100644 --- a/lib/libcr/stdio/_flock_stub.c +++ b/lib/libcr/stdio/_flock_stub.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.3 1999/08/28 00:00:55 peter Exp $ - * $DragonFly: src/lib/libcr/stdio/Attic/_flock_stub.c,v 1.2 2003/06/17 04:26:45 dillon Exp $ + * $DragonFly: src/lib/libcr/stdio/Attic/_flock_stub.c,v 1.3 2004/01/23 11:30:28 joerg Exp $ * */ @@ -47,6 +47,11 @@ #pragma weak ftrylockfile=_ftrylockfile_stub #pragma weak funlockfile=_funlockfile_stub +void flockfile(FILE *); +void _flockfile_debug(FILE *, char *, int); +int ftrylockfile(FILE *); +void funlockfile(FILE *); + /* * This function is a stub for the _flockfile function in libpthread. */ diff --git a/lib/libcr/sys/__error.c b/lib/libcr/sys/__error.c index baf45f8160..649436f204 100644 --- a/lib/libcr/sys/__error.c +++ b/lib/libcr/sys/__error.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/sys/__error.c,v 1.1.8.1 2001/03/05 11:45:51 obrien Exp $ - * $DragonFly: src/lib/libcr/sys/Attic/__error.c,v 1.2 2003/06/17 04:26:47 dillon Exp $ + * $DragonFly: src/lib/libcr/sys/Attic/__error.c,v 1.3 2004/01/23 11:30:28 joerg Exp $ */ #include @@ -43,6 +43,8 @@ extern int errno; */ #pragma weak __error=__error_unthreaded +int * __error(void); + int * __error_unthreaded() { -- 2.41.0