From be742f1ebefc631d30c3711ada16f5fe5d3b9bac Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 16 May 2017 07:31:15 +0000 Subject: [PATCH] objc-runtime-shared-support.c (build_module_descriptor): Remove unnecessary conditional when building instance of objc_module. 2017-05-16 Sylvestre Ledru * objc-runtime-shared-support.c (build_module_descriptor): Remove unnecessary conditional when building instance of objc_module. CID 1406758 From-SVN: r248087 --- gcc/objc/ChangeLog | 6 ++++++ gcc/objc/objc-runtime-shared-support.c | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 88ec3b3cd69..0c6f3fcd8ae 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,9 @@ +2017-05-16 Sylvestre Ledru + + * objc-runtime-shared-support.c (build_module_descriptor): + Remove unnecessary conditional when building instance of + objc_module. CID 1406758 + 2017-05-09 Nathan Sidwell * objc-gnu-runtime-abi-01.c (objc_add_static_instance): Use diff --git a/gcc/objc/objc-runtime-shared-support.c b/gcc/objc/objc-runtime-shared-support.c index 8d35d27c031..5ead87078c6 100644 --- a/gcc/objc/objc-runtime-shared-support.c +++ b/gcc/objc/objc-runtime-shared-support.c @@ -500,11 +500,7 @@ build_module_descriptor (long vers, tree attr) objc_finish_struct (objc_module_template, decls); /* Create an instance of "_objc_module". */ - UOBJC_MODULES_decl = start_var_decl (objc_module_template, - /* FIXME - why the conditional - if the symbol is the - same. */ - flag_next_runtime ? "_OBJC_Module" : "_OBJC_Module"); + UOBJC_MODULES_decl = start_var_decl (objc_module_template, "_OBJC_Module"); /* This is the root of the metadata for defined classes and categories, it is referenced by the runtime and, therefore, needed. */ -- 2.30.2