diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-27 09:08:20 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-05-27 09:08:20 +0000 |
| commit | 131f3644ef87d5406722ee42b0989cb5783156fa (patch) | |
| tree | 6f9c3016cb1696987ba7b0cc8c1b8c5400c6157d /libobjc | |
| parent | 851ccf1afd9b0e045e7dda2539a3dfa30c16bb64 (diff) | |
| download | gcc-131f3644ef87d5406722ee42b0989cb5783156fa.tar.gz | |
2015-05-27 Basile Starynkevitch <basile@starynkevitch.net>
{{merged with almost GCC 5. i.e. trunk r222129 from 2015-04-15,
using svn merge -r219880:222129
svn+ssh://bstarynk@gcc.gnu.org/svn/gcc/trunk }}
[gcc/]
2015-05-27 Basile Starynkevitch <basile@starynkevitch.net>
{{merged with GCC 5, so}}
* melt-runtime.h (melt_fatal_error, melt_fatal_error_at_line):
Pass UNKNOWN_LOCATION for GCC 5. Re-indented with command:
astyle --style=gnu -s2
* melt-runtime.cc: Re-indented with command:
astyle --style=gnu -s2
(melt_branch_process_arguments, melt_ggcstart_callback)
(melt_reserved_allocation_failure): Use melt_fatal_error instead
of fatal_error.
* melt/generated/meltrunsup-inc.cc: Manually edited for fatal_error.
* melt/generated/warmelt-first.cc: Ditto.
* melt/warmelt-first.melt (melt_assert_failure_fun): Ditto.
* melt/warmelt-modes.melt (generate_runtypesupport_scanning):
Ditto, in the emitted code.
* Makefile.in: mention s-gtype instead of gt-melt-runtime.h in
dependencies.
(TEXI_GCCINT_FILES): Add meltgendoc.texi.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@223739 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 9 | ||||
| -rw-r--r-- | libobjc/sendmsg.c | 8 | ||||
| -rw-r--r-- | libobjc/thr.c | 5 |
3 files changed, 17 insertions, 5 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index b41d229da21..34c3e8e8b0c 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,12 @@ +2015-02-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR libobjc/63765 + * thr.c (_XOPEN_SOURCE): Remove. + +2015-01-27 Matthias Klose <doko@ubuntu.com> + + * sendmsg.c: Add prototypes for __objc_get_forward_imp and get_imp. + 2015-01-09 Dimitris Papavasiliou <dpapavas@gmail.com> PR libobjc/51891 diff --git a/libobjc/sendmsg.c b/libobjc/sendmsg.c index 1703743cab4..8e347dfede3 100644 --- a/libobjc/sendmsg.c +++ b/libobjc/sendmsg.c @@ -104,6 +104,10 @@ static struct objc_method * search_for_method_in_hierarchy (Class class, SEL sel struct objc_method * search_for_method_in_list (struct objc_method_list * list, SEL op); id nil_method (id, SEL); +/* Make sure this inline function is exported regardless of GNU89 or C99 + inlining semantics as it is part of the libobjc ABI. */ +extern IMP __objc_get_forward_imp (id, SEL); + /* Given a selector, return the proper forwarding implementation. */ inline IMP @@ -320,6 +324,10 @@ get_implementation (id receiver, Class class, SEL sel) return res; } +/* Make sure this inline function is exported regardless of GNU89 or C99 + inlining semantics as it is part of the libobjc ABI. */ +extern IMP get_imp (Class, SEL); + inline IMP get_imp (Class class, SEL sel) diff --git a/libobjc/thr.c b/libobjc/thr.c index f45a752afb3..4b16d4b059c 100644 --- a/libobjc/thr.c +++ b/libobjc/thr.c @@ -25,11 +25,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #include "objc-private/common.h" #include "objc-private/error.h" #define _LIBOBJC -/* The line below is needed for declarations of functions such as - pthread_mutexattr_settype, without which gthr-posix.h may fail to - compile within libobjc. While we only need XPG5 for this, Solaris - requires XPG6 for C99 and later. */ -#define _XOPEN_SOURCE 600 #include "config.h" #include "tconfig.h" #include "coretypes.h" |