Compare commits

...

1 Commits

Author SHA1 Message Date
Pedro Alves
58aa785057 Fix objc tests 2017-06-06 12:25:33 +01:00
4 changed files with 14 additions and 10 deletions

View File

@@ -1,6 +1,7 @@
#include <objc/Object.h> #import <Foundation/Foundation.h>
#include <stdio.h>
@interface BasicClass: Object @interface BasicClass: NSObject
{ {
id object; id object;
} }
@@ -74,7 +75,7 @@ const char *_NSPrintForDebugger(id object)
{ {
/* This is not really what _NSPrintForDebugger should do, but it /* This is not really what _NSPrintForDebugger should do, but it
is a simple test if gdb can call this function */ is a simple test if gdb can call this function */
if (object && [object respondsTo: @selector(myDescription)]) if (object && [object respondsToSelector: @selector(myDescription)])
return [object myDescription]; return [object myDescription];
return NULL; return NULL;

View File

@@ -1,10 +1,11 @@
#include <objc/Object.h> #import <Foundation/Foundation.h>
#include <stdio.h>
@interface NonDebug: Object @interface NonDebug: NSObject
{ {
} }
@end @end
@interface NonDebug2: Object @interface NonDebug2: NSObject
{ {
} }
@end @end

View File

@@ -1,6 +1,7 @@
#include <objc/Object.h> #import <Foundation/Foundation.h>
#include <stdio.h>
@interface Decode: Object @interface Decode: NSObject
{ {
} }
- multipleDef; - multipleDef;
@@ -42,7 +43,7 @@ const char *_NSPrintForDebugger(id object)
{ {
/* This is not really what _NSPrintForDebugger should do, but it /* This is not really what _NSPrintForDebugger should do, but it
is a simple test if gdb can call this function */ is a simple test if gdb can call this function */
if (object && [object respondsTo: @selector(myDescription)]) if (object && [object respondsToSelector: @selector(myDescription)])
return [object myDescription]; return [object myDescription];
return NULL; return NULL;

View File

@@ -3742,7 +3742,7 @@ proc gdb_compile_shlib_pthreads {sources dest options} {
proc gdb_compile_objc {source dest type options} { proc gdb_compile_objc {source dest type options} {
set built_binfile 0 set built_binfile 0
set why_msg "unrecognized error" set why_msg "unrecognized error"
foreach lib {-lobjc -lpthreads -lpthread -lthread solaris} { foreach lib {-lgnustep-base -lobjc -lpthreads -lpthread -lthread solaris} {
# This kind of wipes out whatever libs the caller may have # This kind of wipes out whatever libs the caller may have
# set. Or maybe theirs will override ours. How infelicitous. # set. Or maybe theirs will override ours. How infelicitous.
if { $lib == "solaris" } { if { $lib == "solaris" } {
@@ -3751,6 +3751,7 @@ proc gdb_compile_objc {source dest type options} {
if { $lib != "-lobjc" } { if { $lib != "-lobjc" } {
set lib "-lobjc $lib" set lib "-lobjc $lib"
} }
set options_with_lib [concat $options [list libs=$lib quiet]] set options_with_lib [concat $options [list libs=$lib quiet]]
set ccout [gdb_compile $source $dest $type $options_with_lib] set ccout [gdb_compile $source $dest $type $options_with_lib]
switch -regexp -- $ccout { switch -regexp -- $ccout {