Author: rfm
Date: Fri Mar 25 11:02:54 2016
New Revision: 39605
URL: http://svn.gna.org/viewcvs/gnustep?rev=39605&view=rev
Log:
remove garbage collection support
Modified:
tools/make/trunk/ChangeLog
tools/make/trunk/Documentation/library-combo.7
tools/make/trunk/TestFramework/Testing.h
tools/make/trunk/common.make
tools/make/trunk/config.make.in
tools/make/trunk/configure
tools/make/trunk/configure.ac
tools/make/trunk/library-combo.make
Modified: tools/make/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/ChangeLog?rev=39605&r1=39604&r2=39605&view=diff
==============================================================================
--- tools/make/trunk/ChangeLog (original)
+++ tools/make/trunk/ChangeLog Fri Mar 25 11:02:54 2016
@@ -1,3 +1,14 @@
+2016-03-25 Richard Frith-Macdonald <[email protected]>
+
+ * common.make:
+ * config.make.in:
+ * configure.ac:
+ * library-combo.make:
+ * Documentation/library-combo.7:
+ * TestFramework/Testing.h:
+ * configure:
+ Remove garbage collection support
+
2016-03-04 Richard Frith-Macdonald <[email protected]>
* configure.ac: Enable strict v2 mode by default
Modified: tools/make/trunk/Documentation/library-combo.7
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/Documentation/library-combo.7?rev=39605&r1=39604&r2=39605&view=diff
==============================================================================
--- tools/make/trunk/Documentation/library-combo.7 (original)
+++ tools/make/trunk/Documentation/library-combo.7 Fri Mar 25 11:02:54 2016
@@ -82,10 +82,6 @@
ng gnu gnu
.RS 0
gnu fd gnu
-.RS 0
- gnugc gnu gnu
-.RS 0
- gnugc fd gnu
.RS 0
apple apple apple
.RS 0
@@ -194,12 +190,12 @@
.B GNUstep.sh
again. Let's assume we use gnu-gnu-gnu as our current
.B LIBRARY_COMBO
-and we want to switch to gnugc\-gnu\-gnu, then we would use:
+and we want to switch to ng\-gnu\-gnu, then we would use:
.PP
.RS 0
. /usr/GNUstep/System/Library/Makefiles/GNUstep-reset.sh
.RS 0
- export LIBRARY_COMBO=gnugc\-gnu\-gnu
+ export LIBRARY_COMBO=ng\-gnu\-gnu
.RS 0
. /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
Modified: tools/make/trunk/TestFramework/Testing.h
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/TestFramework/Testing.h?rev=39605&r1=39604&r2=39605&view=diff
==============================================================================
--- tools/make/trunk/TestFramework/Testing.h (original)
+++ tools/make/trunk/TestFramework/Testing.h Fri Mar 25 11:02:54 2016
@@ -28,7 +28,6 @@
#import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSDate.h>
#import <Foundation/NSException.h>
-#import <Foundation/NSGarbageCollector.h>
#import <Foundation/NSObjCRuntime.h>
#import <Foundation/NSObject.h>
#import <Foundation/NSRegularExpression.h>
@@ -181,11 +180,9 @@
{ \
int _cond; \
id _tmp = testRaised; testRaised = nil; [_tmp release]; \
- [[NSGarbageCollector defaultCollector] collectExhaustively]; \
testLineNumber = __LINE__; \
testStart(); \
_cond = (int)(testExpression__); \
- [[NSGarbageCollector defaultCollector] collectExhaustively]; \
pass(_cond, "%s:%d ... " testFormat__, __FILE__, \
__LINE__, ## __VA_ARGS__); \
} \
@@ -231,7 +228,6 @@
id _obj; \
id _exp; \
id _tmp = testRaised; testRaised = nil; [_tmp release]; \
- [[NSGarbageCollector defaultCollector] collectExhaustively]; \
testLineNumber = __LINE__; \
testStart(); \
_obj = (id)(testExpression__);\
@@ -248,7 +244,6 @@
{ \
_cond = [_exp isEqual: _obj]; \
} \
- [[NSGarbageCollector defaultCollector] collectExhaustively]; \
pass(_cond, "%s:%d ... " testFormat__, __FILE__, \
__LINE__, ## __VA_ARGS__); \
if (0 == _cond) \
@@ -301,7 +296,6 @@
id _exp; \
id _pat; \
id _tmp = testRaised; testRaised = nil; [_tmp release]; \
- [[NSGarbageCollector defaultCollector] collectExhaustively]; \
testLineNumber = __LINE__; \
testStart(); \
_obj = (id)(testExpression__);\
@@ -322,7 +316,6 @@
{ \
_cond = NO; \
} \
- [[NSGarbageCollector defaultCollector] collectExhaustively]; \
pass(_cond, "%s:%d ... " testFormat__, __FILE__, \
__LINE__, ## __VA_ARGS__); \
if (0 == _cond) \
Modified: tools/make/trunk/common.make
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/common.make?rev=39605&r1=39604&r2=39605&view=diff
==============================================================================
--- tools/make/trunk/common.make (original)
+++ tools/make/trunk/common.make Fri Mar 25 11:02:54 2016
@@ -534,9 +534,6 @@
ifeq ($(OBJC_RUNTIME_LIB), gnu)
OBJC_RUNTIME = GNU
endif
-ifeq ($(OBJC_RUNTIME_LIB), gnugc)
- OBJC_RUNTIME = GNU
-endif
# If all of the following really needed ? If the system is not
# flattened, multiple Foundation libraries are not permitted anyway,
Modified: tools/make/trunk/config.make.in
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/config.make.in?rev=39605&r1=39604&r2=39605&view=diff
==============================================================================
--- tools/make/trunk/config.make.in (original)
+++ tools/make/trunk/config.make.in Fri Mar 25 11:02:54 2016
@@ -75,14 +75,8 @@
# configured.
GNUSTEP_DEFAULT_DEBUG = @GNUSTEP_DEFAULT_DEBUG@
-ifeq ($(OBJC_RUNTIME_LIB), gnugc)
- ifeq ($(OBJC_LIB_FLAG),)
- OBJC_LIB_FLAG = -lobjc_gc
- endif
-else
- ifeq ($(OBJC_LIB_FLAG),)
- OBJC_LIB_FLAG = -lobjc
- endif
+ifeq ($(OBJC_LIB_FLAG),)
+ OBJC_LIB_FLAG = -lobjc
endif
EXEEXT = @EXEEXT@
@@ -218,11 +212,6 @@
USE_NONFRAGILE_ABI = @USE_NONFRAGILE_ABI@
#
-# Whether we are using the ObjC garbage cllection library.
-#
-OBJC_WITH_GC = @OBJC_WITH_GC@
-
-#
# Whether the compiler is GCC with precompiled header support
#
GCC_WITH_PRECOMPILED_HEADERS = @GCC_WITH_PRECOMPILED_HEADERS@
Modified: tools/make/trunk/configure
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/configure?rev=39605&r1=39604&r2=39605&view=diff
==============================================================================
--- tools/make/trunk/configure (original)
+++ tools/make/trunk/configure Fri Mar 25 11:02:54 2016
@@ -707,7 +707,6 @@
CFLAGS
CC
ac_cv_library_combo
-OBJC_WITH_GC
target_os
target_vendor
target_cpu
@@ -761,7 +760,6 @@
ac_subst_files=''
ac_user_opts='
enable_option_checking
-enable_objc_garbage_collection
with_library_combo
enable_install_p
with_tar
@@ -1409,13 +1407,6 @@
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-
---enable-objc-garbage-collection
- Enable objc garbage collection. Use this option if you want
- to use garbage collection for objective-c software. This is equivalent
- to using --with-library-combo=gnugc-gnu-gnu to set the runtime library
- to be the gnu runtime with garbage collection.
-
--disable-install-p
Disable using 'install -p' when installing files. By default,
@@ -2416,28 +2407,6 @@
# Setup the library combination
#--------------------------------------------------------------------
-#--------------------------------------------------------------------
-# Check if objc should use garbage collection.
-#--------------------------------------------------------------------
-# Check whether --enable-objc-garbage-collection was given.
-if test "${enable_objc_garbage_collection+set}" = set; then :
- enableval=$enable_objc_garbage_collection; OBJC_WITH_GC=$enableval
-else
- OBJC_WITH_GC=""
-fi
-
-
-if test "$OBJC_WITH_GC" = "yes"; then
- ac_cv_library_combo="gnugc-gnu-gnu"
-elif test "$OBJC_WITH_GC" = "no"; then
- if test "$ac_cv_library_combo"="gnugc-gnu-gnu"; then
- ac_cv_library_combo="gnu-gnu-gnu"
- fi
-else
- OBJC_WITH_GC=no
-fi
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library combo" >&5
$as_echo_n "checking for library combo... " >&6; }
@@ -5545,8 +5514,7 @@
fi
# We pass the flag, unchanged, to gnustep-make - if it's empty,
-# gnustep-make will be free to use -lobjc or -lobjc_gc depending on
-# the case.
+# gnustep-make will be free to use -lobjc
# But we need to compute, and print out, what flag we're using now.
@@ -5561,13 +5529,6 @@
OBJC_FINAL_LIB_FLAG=-lobjc
fi
OBJCRT="$OBJC_FINAL_LIB_FLAG"
-fi
-if test "$OBJC_RUNTIME_LIB" = "gnugc"; then
- CFLAGS="$CFLAGS -fgnu-runtime -DGNU_RUNTIME"
- if test "$OBJC_FINAL_LIB_FLAG" = ""; then
- OBJC_FINAL_LIB_FLAG=-lobjc_gc
- fi
- OBJCRT="$OBJC_FINAL_LIB_FLAG -ldl -lgc"
fi
if test "$OBJC_RUNTIME_LIB" = "nx"; then
CFLAGS="$CFLAGS -DNeXT_RUNTIME"
Modified: tools/make/trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/configure.ac?rev=39605&r1=39604&r2=39605&view=diff
==============================================================================
--- tools/make/trunk/configure.ac (original)
+++ tools/make/trunk/configure.ac Fri Mar 25 11:02:54 2016
@@ -46,30 +46,6 @@
#--------------------------------------------------------------------
# Setup the library combination
#--------------------------------------------------------------------
-
-#--------------------------------------------------------------------
-# Check if objc should use garbage collection.
-#--------------------------------------------------------------------
-AC_ARG_ENABLE(objc-garbage-collection, [
---enable-objc-garbage-collection
- Enable objc garbage collection. Use this option if you want
- to use garbage collection for objective-c software. This is equivalent
- to using --with-library-combo=gnugc-gnu-gnu to set the runtime library
- to be the gnu runtime with garbage collection.
-],
-OBJC_WITH_GC=$enableval,
-OBJC_WITH_GC="")
-
-if test "$OBJC_WITH_GC" = "yes"; then
- ac_cv_library_combo="gnugc-gnu-gnu"
-elif test "$OBJC_WITH_GC" = "no"; then
- if test "$ac_cv_library_combo"="gnugc-gnu-gnu"; then
- ac_cv_library_combo="gnu-gnu-gnu"
- fi
-else
- OBJC_WITH_GC=no
-fi
-AC_SUBST(OBJC_WITH_GC)
AC_MSG_CHECKING(for library combo)
AC_ARG_WITH(library-combo,[
@@ -1213,8 +1189,7 @@
OBJC_LIB_FLAG=""
)
# We pass the flag, unchanged, to gnustep-make - if it's empty,
-# gnustep-make will be free to use -lobjc or -lobjc_gc depending on
-# the case.
+# gnustep-make will be free to use -lobjc
AC_SUBST(OBJC_LIB_FLAG)
# But we need to compute, and print out, what flag we're using now.
@@ -1229,13 +1204,6 @@
OBJC_FINAL_LIB_FLAG=-lobjc
fi
OBJCRT="$OBJC_FINAL_LIB_FLAG"
-fi
-if test "$OBJC_RUNTIME_LIB" = "gnugc"; then
- CFLAGS="$CFLAGS -fgnu-runtime -DGNU_RUNTIME"
- if test "$OBJC_FINAL_LIB_FLAG" = ""; then
- OBJC_FINAL_LIB_FLAG=-lobjc_gc
- fi
- OBJCRT="$OBJC_FINAL_LIB_FLAG -ldl -lgc"
fi
if test "$OBJC_RUNTIME_LIB" = "nx"; then
CFLAGS="$CFLAGS -DNeXT_RUNTIME"
Modified: tools/make/trunk/library-combo.make
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/library-combo.make?rev=39605&r1=39604&r2=39605&view=diff
==============================================================================
--- tools/make/trunk/library-combo.make (original)
+++ tools/make/trunk/library-combo.make Fri Mar 25 11:02:54 2016
@@ -61,12 +61,6 @@
# NB: The user can always specify any of the OBJC_RUNTIME_LIB, the
# FOUNDATION_LIB and the GUI_LIB variable manually overriding our
# determination.
-
-# gc=yes is just another way of saying you want OBJC_RUNTIME_LIB = gnugc
-# to be used!
-ifeq ($(gc), yes)
- OBJC_RUNTIME_LIB = gnugc
-endif
ifeq ($(OBJC_RUNTIME_LIB),)
OBJC_RUNTIME_LIB = $(word 1,$(combo_list))
@@ -127,17 +121,6 @@
endif
endif
-ifeq ($(OBJC_RUNTIME_LIB), gnugc)
- OBJC_LDFLAGS =
- OBJC_LIB_DIR =
- OBJC_LIBS = $(OBJC_LIB_FLAG) -ldl -lgc
- RUNTIME_FLAG = -fgnu-runtime
- RUNTIME_DEFINE = -DGNU_RUNTIME=1 -DGS_WITH_GC=1
- ifeq ($(debug), yes)
- RUNTIME_DEFINE += -DGC_DEBUG
- endif
-endif
-
ifeq ($(OBJC_RUNTIME_LIB), nx)
RUNTIME_FLAG = -fnext-runtime
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
@@ -200,9 +183,6 @@
FND_DEFINE = -DLIB_FOUNDATION_LIBRARY=1
FND_LIBS = -lFoundation
-
- # If gc=yes was passed and libFoundation was compiled with Boehm's
- # GC support, use the appropriate libraries
ifeq ($(gc), yes)
ifeq ($(LIBFOUNDATION_WITH_GC), yes)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
