diff options
| author | Marco S Hyman <marc@cvs.openbsd.org> | 2003-01-14 20:04:45 +0000 |
|---|---|---|
| committer | Marco S Hyman <marc@cvs.openbsd.org> | 2003-01-14 20:04:45 +0000 |
| commit | a3c0a4d8aca4510d261be169ad80ffc9f559f6cf (patch) | |
| tree | 190de08d6123125d403cc2dd22b0e3ea29485142 /gnu/egcs | |
| parent | 69410924d125248c17d6e29068b99d049eb1a69a (diff) | |
Bye-bye libc_r. libc_r and libnpthread go away. libpthread
takes their place. The -pthread option to gcc uses libpthread.
ppc portion of patch from drahn@ (thanks). gcc portions of patch
OK espie@. Ports testing (no bad effects!) by naddy@
best build sequence is: build gcc, build system, build ports
remove /usr/lib/lib{c_r,npthread}.*. Note, once libc_r and
libnpthread is removed threaded ports will stop working until
they have been re-built using the libpthread and the updated gcc.
That's why the above build sequence is recommended.
Diffstat (limited to 'gnu/egcs')
| -rw-r--r-- | gnu/egcs/gcc/Makefile.bsd-wrapper | 11 | ||||
| -rw-r--r-- | gnu/egcs/gcc/config/openbsd.h | 11 | ||||
| -rw-r--r-- | gnu/egcs/gcc/config/rs6000/sysv4.h | 2 |
3 files changed, 7 insertions, 17 deletions
diff --git a/gnu/egcs/gcc/Makefile.bsd-wrapper b/gnu/egcs/gcc/Makefile.bsd-wrapper index bcc9bd80296..bd0d1b67f42 100644 --- a/gnu/egcs/gcc/Makefile.bsd-wrapper +++ b/gnu/egcs/gcc/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2002/11/24 00:58:16 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.11 2003/01/14 20:04:44 marc Exp $ MAN= cccp.1 gcc.1 gcc-local.1 MLINKS+= gcc.1 cc.1 @@ -13,10 +13,10 @@ MLINKS+= g++.1 c++.1 MLINKS+= g77.1 f77.1 .endif -VAXHOST_CFLAGS= -DIN_GCC -DOPENBSD_NATIVE -DHAVE_CONFIG_H ${PTHREAD_CFLAGS} -O0 +VAXHOST_CFLAGS= -DIN_GCC -DOPENBSD_NATIVE -DHAVE_CONFIG_H -O0 GXX_INCDIR= /usr/include/g++ -GNUCFLAGS= CFLAGS="${CFLAGS} ${COPTS} -DOPENBSD_NATIVE ${PTHREAD_CFLAGS}" +GNUCFLAGS= CFLAGS="${CFLAGS} ${COPTS} -DOPENBSD_NATIVE" CLEANFILES= .gdbinit */.gdbinit *.info* \ c-parse.c c-parse.h c-parse.y cexp.c cp/parse.c cp/parse.h \ f/*.info* objc-parse.c objc-parse.y target_path \ @@ -142,8 +142,3 @@ tags: .ifndef NOMAN .include <bsd.man.mk> .endif -.if defined(WANT_LIBPTHREAD) -PTHREAD_CFLAGS=-DOPENBSD_LIBPTHREAD -.else -PTHREAD_CFLAGS= -.endif diff --git a/gnu/egcs/gcc/config/openbsd.h b/gnu/egcs/gcc/config/openbsd.h index e1e61cc9edb..81157d41821 100644 --- a/gnu/egcs/gcc/config/openbsd.h +++ b/gnu/egcs/gcc/config/openbsd.h @@ -80,14 +80,9 @@ Boston, MA 02111-1307, USA. */ have subspecs. */ #define OBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}" -/* LIB_SPEC appropriate for OpenBSD. Select the appropriate libc, - depending on profiling and threads. Basically, - -lc(_r)?(_p)?, select _r for threads, and _p for p or pg. */ -#ifdef OPENBSD_LIBPTHREAD -#define OBSD_LIB_SPEC "%{pthread:-lnpthread%{p:_p}%{!p:%{pg:_p}}} %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}" -#else -#define OBSD_LIB_SPEC "%{!shared:-lc%{pthread:_r}%{p:_p}%{!p:%{pg:_p}}}" -#endif +/* LIB_SPEC appropriate for OpenBSD. Include -lpthread if -pthread is + specified on the command line. */ +#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread%{p:_p}%{!p:%{pg:_p}}}} %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}" #ifndef OBSD_HAS_CORRECT_SPECS diff --git a/gnu/egcs/gcc/config/rs6000/sysv4.h b/gnu/egcs/gcc/config/rs6000/sysv4.h index fd229a07a23..a4b3019d4d3 100644 --- a/gnu/egcs/gcc/config/rs6000/sysv4.h +++ b/gnu/egcs/gcc/config/rs6000/sysv4.h @@ -1372,7 +1372,7 @@ do { \ #endif #ifndef LIBC_OPENBSD_SPEC -#define LIBC_OPENBSD_SPEC "%{!shared:-lc%{pthread:_r}%{p:_p}%{!p:%{pg:_p}}}" +#define LIBC_OPENBSD_SPEC "%{!shared:%{pthread:-lpthread%{p:_p}%{!p:%{pg:_p}}}} %{!shared:-lc%{p:_p}%{!p:%{pg:_p}}}" #endif #ifndef STARTFILE_OPENBSD_SPEC |