[gcc(refs/vendors/ARM/heads/arm-struct-reorg-wip)] define NO_DOT_IN_LABEL only in vxworks6

[Tamar Christina]

https://gcc.gnu.org/g:aca124df6687f2b0b3d18c53ac64df25806bbef6

commit aca124df6687f2b0b3d18c53ac64df25806bbef6
Author: Alexandre Oliva <oliva@adacore.com>
Date:   Thu Feb 27 13:34:47 2020 -0300

    define NO_DOT_IN_LABEL only in vxworks6
    
    There was a mistake in forward-porting and contributing some
    vxworks7r2 changes, that caused a conditional to be dropped around a
    couple of preprocessor directives, needed only up to vxworks6, that
    change the compiler's behavior WRT introducing dollars and dots in
    symbol names.
    
    This deviates GCC's behavior from the native system compiler, in a way
    that appears to have ABI implications, so we'd like to correct that,
    even at this late stage in the development cycle.
    
    
    for  gcc/ChangeLog
    
            * config/vx-common.h (NO_DOLLAR_IN_LABEL, NO_DOT_IN_LABEL): Leave
            them alone on vx7.

Diff:
---
 gcc/ChangeLog          |  5 +++++
 gcc/config/vx-common.h | 14 ++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8c9b7906772..d42bfbe0c01 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-27  Alexandre Oliva <oliva@adacore.com>
+
+	* config/vx-common.h (NO_DOLLAR_IN_LABEL, NO_DOT_IN_LABEL): Leave
+	them alone on vx7.
+
 2020-02-27  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/93508
diff --git a/gcc/config/vx-common.h b/gcc/config/vx-common.h
index c993711c2aa..f4a1ffdfb40 100644
--- a/gcc/config/vx-common.h
+++ b/gcc/config/vx-common.h
@@ -99,12 +99,14 @@ along with GCC; see the file COPYING3.  If not see
 
 /* ------------------------ Misc configuration bits ----------------------  */
 
-/* VxWorks cannot have dots in constructor labels, because it uses a
-   mutant variation of collect2 that generates C code instead of
-   assembly.  Thus each constructor label must be a legitimate C
-   symbol.  FIXME: Have VxWorks use real collect2 instead.  */
-#undef NO_DOLLAR_IN_LABEL
-#define NO_DOT_IN_LABEL
+#ifndef TARGET_VXWORKS7
+/* VxWorks, prior to version 7, could not have dots in constructor
+   labels, because it used a mutant variation of collect2 that
+   generates C code instead of assembly.  Thus each constructor label
+   had to be a legitimate C symbol.  */
+# undef NO_DOLLAR_IN_LABEL
+# define NO_DOT_IN_LABEL
+#endif
 
 /* Kernel mode doesn't have ctors/dtors, but RTP mode does.  */
 #define TARGET_HAVE_CTORS_DTORS false