diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-10-27 08:47:25 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-10-27 08:47:25 -0700 |
| commit | a6d3012b274f38b20e2a57162106f625746af6c6 (patch) | |
| tree | 09ff8b13eb8ff7594c27dc8812efbf696dc97484 /gcc/objc | |
| parent | cd2fd5facb5e1882d3f338ed456ae9536f7c0593 (diff) | |
| parent | 99b1021d21e5812ed01221d8fca8e8a32488a934 (diff) | |
| download | gcc-a6d3012b274f38b20e2a57162106f625746af6c6.zip gcc-a6d3012b274f38b20e2a57162106f625746af6c6.tar.gz gcc-a6d3012b274f38b20e2a57162106f625746af6c6.tar.bz2 | |
Merge from trunk revision 99b1021d21e5812ed01221d8fca8e8a32488a934.
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/ChangeLog | 16 | ||||
| -rw-r--r-- | gcc/objc/Make-lang.in | 1 | ||||
| -rw-r--r-- | gcc/objc/objc-next-runtime-abi-01.c | 3 | ||||
| -rw-r--r-- | gcc/objc/objc-next-runtime-abi-02.c | 5 |
4 files changed, 22 insertions, 3 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 668be66..51b2103 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,19 @@ +2021-10-22 Eric Gallager <egallager@gcc.gnu.org> + + PR other/102663 + * Make-lang.in: Add dummy objc.install-dvi target. + +2021-10-08 Martin Liska <mliska@suse.cz> + + * objc-next-runtime-abi-01.c: Add missing include. + * objc-next-runtime-abi-02.c: Likewise. + +2021-10-08 Martin Liska <mliska@suse.cz> + + * objc-next-runtime-abi-01.c: Use new macro + OPTION_SET_P. + * objc-next-runtime-abi-02.c (objc_next_runtime_abi_02_init): Likewise. + 2021-09-01 Iain Sandoe <iain@sandoe.co.uk> PR objc/101718 diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index 8215283..d3f99c8 100644 --- a/gcc/objc/Make-lang.in +++ b/gcc/objc/Make-lang.in @@ -91,6 +91,7 @@ objc.rest.encap: objc.info: objc.install-info: objc.dvi: +objc.install-dvi: objc.pdf: objc.install-pdf: objc.html: diff --git a/gcc/objc/objc-next-runtime-abi-01.c b/gcc/objc/objc-next-runtime-abi-01.c index 183fc01..12f8bdc 100644 --- a/gcc/objc/objc-next-runtime-abi-01.c +++ b/gcc/objc/objc-next-runtime-abi-01.c @@ -39,6 +39,7 @@ along with GCC; see the file COPYING3. If not see #include "langhooks.h" #include "c-family/c-objc.h" #include "objc-act.h" +#include "opts.h" /* When building Objective-C++, we are not linking against the C front-end and so need to replicate the C tree-construction @@ -259,7 +260,7 @@ static void next_runtime_01_initialize (void) #ifdef OBJCPLUS /* For all NeXT objc ABIs -fobjc-call-cxx-cdtors is on by default. */ - if (!global_options_set.x_flag_objc_call_cxx_cdtors) + if (!OPTION_SET_P (flag_objc_call_cxx_cdtors)) global_options.x_flag_objc_call_cxx_cdtors = 1; #endif diff --git a/gcc/objc/objc-next-runtime-abi-02.c b/gcc/objc/objc-next-runtime-abi-02.c index 9c35738..7ca0fd7 100644 --- a/gcc/objc/objc-next-runtime-abi-02.c +++ b/gcc/objc/objc-next-runtime-abi-02.c @@ -51,6 +51,7 @@ along with GCC; see the file COPYING3. If not see #include "target.h" #include "tree-iterator.h" +#include "opts.h" #include "objc-runtime-hooks.h" #include "objc-runtime-shared-support.h" @@ -255,7 +256,7 @@ objc_next_runtime_abi_02_init (objc_runtime_hooks *rthooks) } /* NeXT ABI 2 is intended to default to checking for nil receivers. */ - if (! global_options_set.x_flag_objc_nilcheck) + if (! OPTION_SET_P (flag_objc_nilcheck)) flag_objc_nilcheck = 1; rthooks->initialize = next_runtime_02_initialize; @@ -366,7 +367,7 @@ static void next_runtime_02_initialize (void) #ifdef OBJCPLUS /* For all NeXT objc ABIs -fobjc-call-cxx-cdtors is on by default. */ - if (!global_options_set.x_flag_objc_call_cxx_cdtors) + if (!OPTION_SET_P (flag_objc_call_cxx_cdtors)) global_options.x_flag_objc_call_cxx_cdtors = 1; #endif |