objc-runtime-shared-support.c (build_module_descriptor): Remove unnecessary condition...

2017-05-16  Sylvestre Ledru  <sylvestre@debian.org>

        * objc-runtime-shared-support.c (build_module_descriptor):
        Remove unnecessary conditional when building instance of
        objc_module. CID 1406758

From-SVN: r248087

diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 88ec3b3cd695907c7d4f453c64573caff5a6ac89..0c6f3fcd8ae67956849a916c77e054e1daf55128 100644 (file)
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-16  Sylvestre Ledru  <sylvestre@debian.org>
+
+       * objc-runtime-shared-support.c (build_module_descriptor):
+       Remove unnecessary conditional when building instance of
+       objc_module. CID 1406758
+
 2017-05-09  Nathan Sidwell  <nathan@acm.org>
 
        * 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 8d35d27c031c18e148d374c5e0bfe09523b529c7..5ead87078c6206f6a660901532ad9d6412389f59 100644 (file)
--- 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.  */