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

Fix constant string test for NeXT_RUNTIME

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13058 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2002-03-09 17:04:48 +00:00
parent 2cde7e1fad
commit 7147084838
4 changed files with 269 additions and 257 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Mar 9 12:02:45 2002 Adam Fedor <fedor@yogi.doc.com>
* configure.in: Change constant string to FooConstantString
* config/config.constant-string-class.m: Work with NeXT_RUNTIME
(patch from Markus Hitter [mah@jump-ing.de]).
2002-03-09 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSFileManager.m: Change copy so that, if the source argument

39
config/config.constant-string-class.m
View file

@ -11,15 +11,6 @@
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
*/
#ifdef NeXT_RUNTIME
/* ignore this test with the NeXT runtime - never use
-fconstant-string-class */
int main (int argc, char **argv)
{
abort ();
return 1;
}
#else /* GNU RUNTIME - the real test */
/* must be compiled compile using -fconstant-string-class=NSConstantString
as an option to gcc. If it doesn't work, it means your gcc doesn't
@ -29,15 +20,21 @@ int main (int argc, char **argv)
#include <objc/Object.h>
/* Define our custom constant string class */
@interface NSConstantString : Object
@interface FooConstantString : Object
{
char *c_string;
unsigned int len;
}
- (char *) customString;
@end
#ifdef NeXT_RUNTIME
/* This structure shouldn't be seen outside the compiler.
See Apple Radar 2870817 and the memcpy() in main(). */
struct objc_class _FooConstantStringClassReference;
#endif
@implementation NSConstantString
@implementation FooConstantString
- (char *) customString
{
return c_string;
@ -48,14 +45,30 @@ int main (int argc, char **argv)
int main (int argc, char **argv)
{
/* Create a test constant string */
NSConstantString *string = @"Antonio Valente";
FooConstantString *string = @"Antonio Valente";
#ifdef NeXT_RUNTIME
/* This memcpy is needed here due to a bug in ObjC gcc when using
next runtime. It has to be done once per program and before
the first message is sent to a constant string. Can't be moved to
the constant string's +initialize since this is already a message.
See Apple Radar 2870817 */
memcpy(&_FooConstantStringClassReference,
objc_getClass("FooConstantString"),
sizeof(_FooConstantStringClassReference));
#endif
/* Check that it really works */
if (strcmp ([string customString], "Antonio Valente"))
{
abort ();
}
/* Do another, more direct test. */
if (strcmp ([@"Jump" customString], "Jump"))
{
abort ();
}
return 0;
}
#endif /* GNU RUNTIME */

479
configure vendored
View file

File diff suppressed because it is too large Load diff

2
configure.in
View file

@ -411,7 +411,7 @@ fi
# to be used for constant strings by using the -fconstant-string-class
# option. If that is the case, we change it to NSConstantString.
#---------------------------------------------------------------------
CPPFLAGS="$CPPFLAGS -fconstant-string-class=NSConstantString"
CPPFLAGS="$CPPFLAGS -fconstant-string-class=FooConstantString"
AC_MSG_CHECKING(if the compiler supports -fconstant-string-class)
AC_CACHE_VAL(objc_compiler_supports_constant_string_class,
AC_TRY_RUN([#include "$srcdir/config/config.constant-string-class.m"],