diff options
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 7 | ||||
| -rwxr-xr-x | libobjc/configure | 13 | ||||
| -rw-r--r-- | libobjc/configure.ac | 9 | ||||
| -rw-r--r-- | libobjc/thr.c | 7 |
4 files changed, 13 insertions, 23 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 3999b43..704981d 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,10 @@ +2012-03-12 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * configure.ac (enable_objc_gc): Remove alpha*-dec-osf* handling. + * configure: Regenerate. + + * thr.c (_XOPEN_SOURCE): Define unconditionally. + 2011-11-21 Andreas Tobler <andreast@fgznet.ch> * configure: Regenerate. diff --git a/libobjc/configure b/libobjc/configure index 8c07356..2807d73 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -2329,13 +2329,6 @@ if test "${enable_objc_gc+set}" = set; then : OBJC_GCFLAGS='-DOBJC_WITH_GC=1' OBJC_BOEHM_GC='libobjc_gc$(libsuffix).la' OBJC_BOEHM_GC_INCLUDES='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include' - case "${host}" in - alpha*-dec-osf*) - # boehm-gc headers include <pthread.h>, which needs to be compiled - # with -pthread on Tru64 UNIX. - OBJC_GCFLAGS="${OBJC_GCFLAGS} -pthread" - ;; - esac ;; esac else @@ -10594,7 +10587,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10597 "configure" +#line 10590 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10700,7 +10693,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10703 "configure" +#line 10696 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11471,7 +11464,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 11474 "configure" +#line 11467 "configure" @interface Frob @end @implementation Frob diff --git a/libobjc/configure.ac b/libobjc/configure.ac index 52599e6..42db163 100644 --- a/libobjc/configure.ac +++ b/libobjc/configure.ac @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004 -# 2005, 2006, 2009, 2011 Free Software Foundation, Inc. +# 2005, 2006, 2009, 2011, 2012 Free Software Foundation, Inc. # Originally contributed by Dave Love (d.love@dl.ac.uk). # #This file is part of GCC. @@ -71,13 +71,6 @@ AC_ARG_ENABLE(objc-gc, OBJC_GCFLAGS='-DOBJC_WITH_GC=1' OBJC_BOEHM_GC='libobjc_gc$(libsuffix).la' OBJC_BOEHM_GC_INCLUDES='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include' - case "${host}" in - alpha*-dec-osf*) - # boehm-gc headers include <pthread.h>, which needs to be compiled - # with -pthread on Tru64 UNIX. - OBJC_GCFLAGS="${OBJC_GCFLAGS} -pthread" - ;; - esac ;; esac], [OBJC_GCFLAGS=''; OBJC_BOEHM_GC=''; OBJC_BOEHM_GC_INCLUDES='']) diff --git a/libobjc/thr.c b/libobjc/thr.c index 095b940..e8a8f5e 100644 --- a/libobjc/thr.c +++ b/libobjc/thr.c @@ -1,5 +1,5 @@ /* GNU Objective C Runtime Thread Interface - Copyright (C) 1996, 1997, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2009, 2010, 2012 Free Software Foundation, Inc. Contributed by Galen C. Hunt (gchunt@cs.rochester.edu) This file is part of GCC. @@ -27,11 +27,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define _LIBOBJC /* The line below is needed for declarations of functions such as pthread_mutexattr_settype, without which gthr-posix.h may fail to - compile within libobjc. Unfortunately, this breaks compilation on - Tru64 UNIX V4.0F, so disable it there. */ -#ifndef __osf__ + compile within libobjc. */ #define _XOPEN_SOURCE 500 -#endif #include "config.h" #include "tconfig.h" #include "coretypes.h" |