always define TARGET_PECOFF

gcc/ChangeLog:

2015-11-14  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* config/i386/i386.h (TARGET_PECOFF): Remove define.
	* defaults.h (TARGET_PECOFF): New default definition.
	* varasm.c (handle_vtv_comdat_section): Adjust.

gcc/cp/ChangeLog:

2015-11-14  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* vtable-class-hierarchy.c (vtv_generate_init_routine): Adjust.

From-SVN: r230391

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3ac6d3f6382077de967af44affe39c0b9ab733c5..2254c0092607e438a11111eab02f5357bd6393e0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-14  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+       * config/i386/i386.h (TARGET_PECOFF): Remove define.
+       * defaults.h (TARGET_PECOFF): New default definition.
+       * varasm.c (handle_vtv_comdat_section): Adjust.
+
 2015-11-14  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
        * defaults.h: New definition of SDB_DEBUGGING_INFO.

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 3d5b2b25ced64b558f5f4e82424f079799488250..829c3f418b58dee0e4c44b262dc701a50eca27d9 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -595,9 +595,6 @@ extern tree x86_mfence;
 /* This is re-defined by cygming.h.  */
 #define TARGET_SEH 0
 
-/* This is re-defined by cygming.h.  */
-#define TARGET_PECOFF 0
-
 /* The default abi used by target.  */
 #define DEFAULT_ABI SYSV_ABI
 

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b154453dde1240ec0a07f5ef97fe01cf8794b90f..1b052dca87a70c6d15e1b7d373cd048e11b7ffa2 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2015-11-14  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+       * vtable-class-hierarchy.c (vtv_generate_init_routine): Adjust.
+
 2015-11-14  Jason Merrill  <jason@redhat.com>
 
        PR bootstrap/68346

diff --git a/gcc/cp/vtable-class-hierarchy.c b/gcc/cp/vtable-class-hierarchy.c
index 752345d7ea436ad89a808cfae29ed8c0b292a031..97481fc0c64d2f866dbea7dd9d9e534583433c50 100644 (file)
--- a/gcc/cp/vtable-class-hierarchy.c
+++ b/gcc/cp/vtable-class-hierarchy.c
@@ -1182,11 +1182,7 @@ vtv_generate_init_routine (void)
       TREE_STATIC (vtv_fndecl) = 1;
       TREE_USED (vtv_fndecl) = 1;
       DECL_PRESERVE_P (vtv_fndecl) = 1;
-#if defined (TARGET_PECOFF)
       if (flag_vtable_verify == VTV_PREINIT_PRIORITY && !TARGET_PECOFF)
-#else
-      if (flag_vtable_verify == VTV_PREINIT_PRIORITY)
-#endif
         DECL_STATIC_CONSTRUCTOR (vtv_fndecl) = 0;
 
       gimplify_function_tree (vtv_fndecl);
@@ -1194,11 +1190,7 @@ vtv_generate_init_routine (void)
 
       symtab->process_new_functions ();
 
-#if defined (TARGET_PECOFF)
       if (flag_vtable_verify == VTV_PREINIT_PRIORITY && !TARGET_PECOFF)
-#else
-      if (flag_vtable_verify == VTV_PREINIT_PRIORITY)
-#endif
         assemble_vtv_preinit_initializer (vtv_fndecl);
 
     }

diff --git a/gcc/defaults.h b/gcc/defaults.h
index ddda89a7e1481fd0a5db4e97778c68080384026e..eca624ca1be52c9cf7db4f7c61dd5476593c714c 100644 (file)
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -1301,6 +1301,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define REVERSE_CONDITION(code, mode) reverse_condition (code)
 #endif
 
+#ifndef TARGET_PECOFF
+#define TARGET_PECOFF 0
+#endif
+
 #ifdef GCC_INSN_FLAGS_H
 /* Dependent default target macro definitions
 

diff --git a/gcc/varasm.c b/gcc/varasm.c
index ec6aabf3d8e110e3db2e74f6564305143bba9d78..31411101267b7a120dcea791c99de678ea807549 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -7793,7 +7793,7 @@ handle_vtv_comdat_section (section *sect, const_tree decl ATTRIBUTE_UNUSED)
                                 | SECTION_LINKONCE,
                                 DECL_NAME (decl));
   in_section = sect;
-#elif defined (TARGET_PECOFF)
+#else
   /* Neither OBJECT_FORMAT_PE, nor OBJECT_FORMAT_COFF is set here.
      Therefore the following check is used.
      In case a the target is PE or COFF a comdat group section
@@ -7820,8 +7820,8 @@ handle_vtv_comdat_section (section *sect, const_tree decl ATTRIBUTE_UNUSED)
                                     DECL_NAME (decl));
       in_section = sect;
     }
-#else
-  switch_to_section (sect);
+  else
+    switch_to_section (sect);
 #endif
 }