mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
remove garbage collection support
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@39605 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm
parent
a964f87bde
commit
b1bfcdb774
8 changed files with 17 additions and 122 deletions
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
2016-03-25 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* 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 <rfm@gnu.org>
|
||||
|
||||
* configure.ac: Enable strict v2 mode by default
|
||||
|
|
|
|||
|
|
@ -82,10 +82,6 @@ under Unix will be denoted by gnu\-gnu\-gnu. Here is a list of some of the possi
|
|||
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 @@ to reset all shell variables, then to source
|
|||
.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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 @@ static void testStart()
|
|||
{ \
|
||||
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 @@ static void testStart()
|
|||
id _obj; \
|
||||
id _exp; \
|
||||
id _tmp = testRaised; testRaised = nil; [_tmp release]; \
|
||||
[[NSGarbageCollector defaultCollector] collectExhaustively]; \
|
||||
testLineNumber = __LINE__; \
|
||||
testStart(); \
|
||||
_obj = (id)(testExpression__);\
|
||||
|
|
@ -248,7 +244,6 @@ static void testStart()
|
|||
{ \
|
||||
_cond = [_exp isEqual: _obj]; \
|
||||
} \
|
||||
[[NSGarbageCollector defaultCollector] collectExhaustively]; \
|
||||
pass(_cond, "%s:%d ... " testFormat__, __FILE__, \
|
||||
__LINE__, ## __VA_ARGS__); \
|
||||
if (0 == _cond) \
|
||||
|
|
@ -301,7 +296,6 @@ static void testStart()
|
|||
id _exp; \
|
||||
id _pat; \
|
||||
id _tmp = testRaised; testRaised = nil; [_tmp release]; \
|
||||
[[NSGarbageCollector defaultCollector] collectExhaustively]; \
|
||||
testLineNumber = __LINE__; \
|
||||
testStart(); \
|
||||
_obj = (id)(testExpression__);\
|
||||
|
|
@ -322,7 +316,6 @@ static void testStart()
|
|||
{ \
|
||||
_cond = NO; \
|
||||
} \
|
||||
[[NSGarbageCollector defaultCollector] collectExhaustively]; \
|
||||
pass(_cond, "%s:%d ... " testFormat__, __FILE__, \
|
||||
__LINE__, ## __VA_ARGS__); \
|
||||
if (0 == _cond) \
|
||||
|
|
|
|||
|
|
@ -534,9 +534,6 @@ endif
|
|||
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,
|
||||
|
|
|
|||
|
|
@ -75,14 +75,8 @@ CCFLAGS = @CXXFLAGS@
|
|||
# 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@
|
||||
|
|
@ -217,11 +211,6 @@ USE_OBJC_EXCEPTIONS = @USE_OBJC_EXCEPTIONS@
|
|||
#
|
||||
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
|
||||
#
|
||||
|
|
|
|||
41
configure
vendored
41
configure
vendored
|
|
@ -707,7 +707,6 @@ LDFLAGS
|
|||
CFLAGS
|
||||
CC
|
||||
ac_cv_library_combo
|
||||
OBJC_WITH_GC
|
||||
target_os
|
||||
target_vendor
|
||||
target_cpu
|
||||
|
|
@ -761,7 +760,6 @@ SHELL'
|
|||
ac_subst_files=''
|
||||
ac_user_opts='
|
||||
enable_option_checking
|
||||
enable_objc_garbage_collection
|
||||
with_library_combo
|
||||
enable_install_p
|
||||
with_tar
|
||||
|
|
@ -1410,13 +1408,6 @@ Optional Features:
|
|||
--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,
|
||||
assuming that 'install -p' works, when installing files such as header files or libraries,
|
||||
|
|
@ -2416,28 +2407,6 @@ test -n "$target_alias" &&
|
|||
# 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 @@ else
|
|||
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.
|
||||
|
|
@ -5562,13 +5530,6 @@ if test "$OBJC_RUNTIME_LIB" = "gnu"; then
|
|||
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"
|
||||
if test "$OBJC_FINAL_LIB_FLAG" = ""; then
|
||||
|
|
|
|||
34
configure.ac
34
configure.ac
|
|
@ -47,30 +47,6 @@ AC_CANONICAL_TARGET([])
|
|||
# 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,[
|
||||
--with-library-combo
|
||||
|
|
@ -1213,8 +1189,7 @@ OBJC_LIB_FLAG="$withval",
|
|||
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.
|
||||
|
|
@ -1230,13 +1205,6 @@ if test "$OBJC_RUNTIME_LIB" = "gnu"; then
|
|||
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"
|
||||
if test "$OBJC_FINAL_LIB_FLAG" = ""; then
|
||||
|
|
|
|||
|
|
@ -62,12 +62,6 @@ combo_list = $(subst -, ,$(the_library_combo))
|
|||
# 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))
|
||||
endif
|
||||
|
|
@ -127,17 +121,6 @@ ifeq ($(OBJC_RUNTIME_LIB), ng)
|
|||
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
|
||||
|
|
@ -201,9 +184,6 @@ ifeq ($(FOUNDATION_LIB), fd)
|
|||
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)
|
||||
ifeq ($(leak), yes)
|
||||
|
|
|
|||
Loading…
Reference in a new issue