From 378a578affa27f0eab46bf30e78c6f4d3670927d Mon Sep 17 00:00:00 2001 From: Jozef Lawrynowicz Date: Wed, 24 Jul 2019 21:37:29 +0000 Subject: [PATCH] Fix non-GNU style in previous commits 2019-07-24 Jozef Lawrynowicz * config.gcc (msp430*-*-*): Fix non-GNU style in r273774. * config/msp430/msp430.h (ENDFILE_SPEC): Fix non-GNU style in r273773. From-SVN: r273775 --- gcc/ChangeLog | 6 ++++++ gcc/config.gcc | 4 ++-- gcc/config/msp430/msp430.h | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8afc61ded72..ae78a75ce3c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-07-24 Jozef Lawrynowicz + + * 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 * config.gcc (msp430*-*-*): Enable initfini_array by default unless diff --git a/gcc/config.gcc b/gcc/config.gcc index 76c0cb3674c..dfff1122940 100644 --- 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 ca7cf20e1d7..f952d15e7ff 100644 --- 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. */ \ -- 2.30.2