diff options
| author |   kurt <kurt@openbsd.org> | 2009-07-26 22:51:28 +0000 |
|---|---|---|
| committer | kurt <kurt@openbsd.org> | 2009-07-26 22:51:28 +0000 |
| commit | a9d36ad66992ed6d70b62e2dfeb94904638c85e4 (patch) | |
| tree | 75a9dd7e4c2b83b3936b244d4da05cc9a637c09f | |
| parent | sync to 1.8.1: rewrite quoted literal handling correctly, (diff) | |
| download | wireguard-openbsd-a9d36ad66992ed6d70b62e2dfeb94904638c85e4.tar.xz wireguard-openbsd-a9d36ad66992ed6d70b62e2dfeb94904638c85e4.zip | |
- revert thread model posix since it broke the build for hppa. will revist
when all archs are fully tested and working.
- major bump libstdc++
| -rw-r--r-- | gnu/lib/libstdc++/shlib_version | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/Makefile.bsd-wrapper | 3 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/gcc/config/m68k/openbsd.h | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/gcc/config/openbsd.h | 8 |
4 files changed, 9 insertions, 6 deletions
diff --git a/gnu/lib/libstdc++/shlib_version b/gnu/lib/libstdc++/shlib_version index bebcead20d0..f9b5b0729ea 100644 --- a/gnu/lib/libstdc++/shlib_version +++ b/gnu/lib/libstdc++/shlib_version @@ -1,2 +1,2 @@ -major=48 +major=49 minor=0 diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper index 31ef6b84708..4905a2064dc 100644 --- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper +++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.58 2009/07/25 02:04:02 kurt Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.59 2009/07/26 22:51:28 kurt Exp $ MAN= gcc.1 cpp.1 gcov.1 protoize.1 MLINKS+= protoize.1 unprotoize.1 @@ -107,7 +107,6 @@ config.status: gcc/Makefile.in gcc/configure gcc/c-parse.in ${LANGUAGES} --enable-cpp --disable-nls \ --with-gxx-include-dir=${GXX_INCDIR} \ --enable-__cxa_atexit \ - --enable-threads=posix \ ${CONFIGTARGET} ${GCCARCH} && touch config.status .ifdef NOMAN diff --git a/gnu/usr.bin/gcc/gcc/config/m68k/openbsd.h b/gnu/usr.bin/gcc/gcc/config/m68k/openbsd.h index ef71e056816..4107ddf3376 100644 --- a/gnu/usr.bin/gcc/gcc/config/m68k/openbsd.h +++ b/gnu/usr.bin/gcc/gcc/config/m68k/openbsd.h @@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA. */ /* Define __HAVE_68881__ in preprocessor, unless -msoft-float is specified. This will control the use of inline 68881 insns in certain macros. */ #undef CPP_SPEC -#define CPP_SPEC "%{!msoft-float:-D__HAVE_68881__ -D__HAVE_FPU__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS -D_REENTRANT}" +#define CPP_SPEC "%{!msoft-float:-D__HAVE_68881__ -D__HAVE_FPU__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}" /* Run-time target specifications. */ #define CPP_PREDEFINES "-D__unix__ -D__m68k__ -D__mc68000__ -D__mc68020__ -D__OpenBSD__ -Asystem=unix -Asystem=OpenBSD -Acpu=m68k -Amachine=m68k" diff --git a/gnu/usr.bin/gcc/gcc/config/openbsd.h b/gnu/usr.bin/gcc/gcc/config/openbsd.h index f52b0e6bea4..f3ef4f92f5e 100644 --- a/gnu/usr.bin/gcc/gcc/config/openbsd.h +++ b/gnu/usr.bin/gcc/gcc/config/openbsd.h @@ -124,9 +124,9 @@ Boston, MA 02111-1307, USA. */ This two-stage defines makes it easy to pick that for targets that have subspecs. */ #ifdef CPP_CPU_SPEC -#define OBSD_CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS -D_REENTRANT}" +#define OBSD_CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}" #else -#define OBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS -D_REENTRANT}" +#define OBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}" #endif #ifndef OBSD_HAS_CORRECT_SPECS @@ -323,6 +323,10 @@ do { \ /* Storage layout. */ +/* Otherwise, since we support weak, gthr.h erroneously tries to use + #pragma weak. */ +#define GTHREAD_USE_WEAK 0 + /* bug work around: we don't want to support #pragma weak, but the current code layout needs HANDLE_PRAGMA_WEAK asserted for __attribute((weak)) to work. On the other hand, we don't define HANDLE_PRAGMA_WEAK directly, |