gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove last vestiges of MIXED ABI support (it didn't really work), and change code to assume that use of the apple runtime means we have the nonfragile ABI (true for modern apple systems we may be interested in using). Regenerate configure script.

Browse source
This commit is contained in:
Richard Frith-Macdonald 2020-04-14 14:56:17 +01:00
parent 7829ab86b5
commit fc0c0da188
5 changed files with 21 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2020-04-14 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/GNUstepBase/GSConfig.h.in:
* Headers/GNUstepBase/GSVersionMacros.h:
* configure.ac:
* configure:
Remove last vestiges of MIXED ABI support (it didn't really work), and
change code to assume that use of the apple runtime means we have the
nonfragile ABI (true for modern apple systems we may be interested in
using). Regenerate configure script.
2020-04-13 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Foundation/NSURLProtocol.h:

1
Headers/GNUstepBase/GSConfig.h.in
View file

@ -262,7 +262,6 @@ typedef struct {
#define OBJC2RUNTIME @OBJC2RUNTIME@
#define BASE_NATIVE_OBJC_EXCEPTIONS @BASE_NATIVE_OBJC_EXCEPTIONS@
#define GS_NONFRAGILE @GS_NONFRAGILE@
#define GS_MIXEDABI @GS_MIXEDABI@
#define GS_USE_LIBXML @HAVE_LIBXML@
#define GS_USE_GNUTLS @HAVE_GNUTLS@
#define GS_USE_AVAHI @HAVE_AVAHI@

21
Headers/GNUstepBase/GSVersionMacros.h
View file

@ -283,20 +283,15 @@
* in the class source itsself
*/
#if GS_MIXEDABI
# undef GS_NONFRAGILE
# define GS_NONFRAGILE 0 /* Mixed is treated as fragile */
#if (__has_feature(objc_nonfragile_abi))
# if !GS_NONFRAGILE
# if defined(GNUSTEP_BASE_INTERNAL)
# error "You are building gnustep-base using the objc-nonfragile-abi but your gnustep-base was not configured to use it."
# endif
# endif
#else
# if (__has_feature(objc_nonfragile_abi))
# if !GS_NONFRAGILE
# if defined(GNUSTEP_BASE_INTERNAL)
# error "You are building gnustep-base using the objc-nonfragile-abi but your gnustep-base was not configured to use it."
# endif
# endif
# else
# if GS_NONFRAGILE
# error "Your gnustep-base was configured for the objc-nonfragile-abi but you are not using it now."
# endif
# if GS_NONFRAGILE
# error "Your gnustep-base was configured for the objc-nonfragile-abi but you are not using it now."
# endif
#endif

21
configure vendored
View file

@ -670,7 +670,6 @@ HAVE_PTS_STREAM_MODULES
OBJCFLAGS
HAVE_OBJC_SYNC_ENTER
BASE_NATIVE_OBJC_EXCEPTIONS
GS_MIXEDABI
GS_NONFRAGILE
HAVE_BLOCKS
OBJC2RUNTIME
@ -794,7 +793,6 @@ with_default_config
with_installation_domain
enable_largefile
enable_nxconstantstring
enable_mixedabi
enable_bfd
enable_procfs
enable_procfs_psinfo
@ -1477,9 +1475,6 @@ Optional Features:
--disable-largefile omit support for large files
--enable-nxconstantstring
Enables the use of the NXConstantString class for old compilers.
--disable-mixedabi
Disables the combined use of fragile and nonfragile ABI so that base
can be built taking full advantage of the nonfragile ABI.
--enable-bfd
Enables the use of libbfd to provide symbolic stack traces.
Enabling this option provides support for symbolic stack traces
@ -2733,7 +2728,7 @@ if test -z "$LIBRARY_COMBO"; then
LIBRARY_COMBO=`gnustep-config --variable=LIBRARY_COMBO 2>&5`
fi
if test "$OBJC_RUNTIME_LIB" = "ng"; then
if test "$OBJC_RUNTIME_LIB" = "ng" -o "$OBJC_RUNTIME_LIB" = "apple"; then
nonfragile=yes
BASE_NONFRAGILE_ABI=1
else
@ -8101,7 +8096,6 @@ fi
# Don't revert any Objective-C flags as they are used in the next test
GS_NONFRAGILE=0
GS_MIXEDABI=0
if test "$nonfragile" = "yes"; then
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $OBJCFLAGS -x objective-c"
@ -8126,18 +8120,6 @@ fi
CPPFLAGS="$saved_CPPFLAGS"
if test $non_fragile = yes; then
GS_NONFRAGILE=1
if test "$OBJC_RUNTIME_LIB" != "ng"; then
# Check whether --enable-mixedabi was given.
if test "${enable_mixedabi+set}" = set; then :
enableval=$enable_mixedabi;
else
enable_mixedabi=yes
fi
if test $enable_mixedabi = yes; then
GS_MIXEDABI=1
fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $non_fragile" >&5
$as_echo "$non_fragile" >&6; }
@ -8145,7 +8127,6 @@ fi
# Don't revert any Objective-C flags as they are used in the next test
#--------------------------------------------------------------------

14
configure.ac
View file

@ -90,7 +90,7 @@ if test -z "$LIBRARY_COMBO"; then
LIBRARY_COMBO=`gnustep-config --variable=LIBRARY_COMBO 2>&5`
fi
if test "$OBJC_RUNTIME_LIB" = "ng"; then
if test "$OBJC_RUNTIME_LIB" = "ng" -o "$OBJC_RUNTIME_LIB" = "apple"; then
nonfragile=yes
BASE_NONFRAGILE_ABI=1
else
@ -2017,7 +2017,6 @@ AC_SUBST(HAVE_BLOCKS)
# Don't revert any Objective-C flags as they are used in the next test
GS_NONFRAGILE=0
GS_MIXEDABI=0
if test "$nonfragile" = "yes"; then
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $OBJCFLAGS -x objective-c"
@ -2029,21 +2028,10 @@ if test "$nonfragile" = "yes"; then
CPPFLAGS="$saved_CPPFLAGS"
if test $non_fragile = yes; then
GS_NONFRAGILE=1
if test "$OBJC_RUNTIME_LIB" != "ng"; then
AC_ARG_ENABLE(mixedabi,
[ --disable-mixedabi
Disables the combined use of fragile and nonfragile ABI so that base
can be built taking full advantage of the nonfragile ABI.],,
enable_mixedabi=yes)
if test $enable_mixedabi = yes; then
GS_MIXEDABI=1
fi
fi
fi
AC_MSG_RESULT($non_fragile)
fi
AC_SUBST(GS_NONFRAGILE)
AC_SUBST(GS_MIXEDABI)
# Don't revert any Objective-C flags as they are used in the next test