Fix non-GNU style in previous commits

2019-07-24  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* config.gcc (msp430*-*-*): Fix non-GNU style in r273774.
	* config/msp430/msp430.h (ENDFILE_SPEC): Fix non-GNU style in
	r273773.

From-SVN: r273775

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8afc61d..ae78a75 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2019-07-24  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
+       * config.gcc (msp430*-*-*): Fix non-GNU style in r273774.
+       * config/msp430/msp430.h (ENDFILE_SPEC): Fix non-GNU style in
+       r273773.
+
+2019-07-24  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
        * config.gcc (msp430*-*-*): Enable initfini_array by default unless
        explicitly disabled with --disable-initfini-array.
 

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 76c0cb3..dfff112 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2513,8 +2513,8 @@ msp430*-*-*)
        tmake_file="${tmake_file} msp430/t-msp430"
        extra_gcc_objs="driver-msp430.o"
        # Enable .init_array unless it has been explicitly disabled.
-       # The MSP430 EABI mandates the use of .init_array, and the Newlib CRT code
-       # since mid-2019 expects it.
+       # The MSP430 EABI mandates the use of .init_array, and the Newlib CRT
+       # code since mid-2019 expects it.
        if test x${disable_initfini_array} != xyes; then
                gcc_cv_initfini_array=yes
        fi

diff --git a/gcc/config/msp430/msp430.h b/gcc/config/msp430/msp430.h
index ca7cf20..f952d15 100644 (file)
--- a/gcc/config/msp430/msp430.h
+++ b/gcc/config/msp430/msp430.h
@@ -49,7 +49,8 @@ extern bool msp430x;
 
 /* -lgcc is included because crtend.o needs __mspabi_func_epilog_1.  */
 #undef  ENDFILE_SPEC
-#define ENDFILE_SPEC "%{!minrt:crtend.o%s} %{minrt:%:if-exists(crtn-minrt.o%s)}%{!minrt:%:if-exists(crtn.o%s)} -lgcc"
+#define ENDFILE_SPEC "%{!minrt:crtend.o%s} " \
+  "%{minrt:%:if-exists(crtn-minrt.o%s)}%{!minrt:%:if-exists(crtn.o%s)} -lgcc"
 
 #define ASM_SPEC "-mP " /* Enable polymorphic instructions.  */ \
   "%{mcpu=*:-mcpu=%*}%{!mcpu=*:%{mmcu=*:-mmcu=%*}} " /* Pass the CPU type on to the assembler.  */ \