diff options
| author | Jozef Lawrynowicz <jozef.l@mittosystems.com> | 2020-09-08 11:31:02 +0100 |
|---|---|---|
| committer | Jozef Lawrynowicz <jozef.l@mittosystems.com> | 2020-09-08 11:31:56 +0100 |
| commit | b75863a88ececd4fcce9e3b35df8d91b82cf4fc5 (patch) | |
| tree | 09a54f6faef5d0215796402f66b81572a99ca0b1 | |
| parent | 285d81be9725acc36dc8eca48d4df506cd5e6f6f (diff) | |
| download | gcc-b75863a88ececd4fcce9e3b35df8d91b82cf4fc5.zip gcc-b75863a88ececd4fcce9e3b35df8d91b82cf4fc5.tar.gz gcc-b75863a88ececd4fcce9e3b35df8d91b82cf4fc5.tar.bz2 | |
MSP430: Fix detection of assembler support for .mspabi_attribute
The assembly code ".mspabi_attribute 4,1" uses the object attribute
mechanism to indicate that the 430 ISA is in use. However, the default
ISA is 430X, so GAS fails to assemble this since the ISA wasn't also set
to 430 on the command line.
gcc/ChangeLog:
* config/msp430/msp430.c (msp430_file_end): Fix jumbled
HAVE_AS_MSPABI_ATTRIBUTE and HAVE_AS_GNU_ATTRIBUTE checks.
* configure: Regenerate.
* configure.ac: Use ".mspabi_attribute 4,2" to check for assembler
support for this object attribute directive.
| -rw-r--r-- | gcc/config/msp430/msp430.c | 4 | ||||
| -rwxr-xr-x | gcc/configure | 2 | ||||
| -rw-r--r-- | gcc/configure.ac | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c index d0557fe..a299ed7 100644 --- a/gcc/config/msp430/msp430.c +++ b/gcc/config/msp430/msp430.c @@ -2091,7 +2091,7 @@ msp430_output_aligned_decl_common (FILE * stream, static void msp430_file_end (void) { -#ifdef HAVE_AS_GNU_ATTRIBUTE +#ifdef HAVE_AS_MSPABI_ATTRIBUTE /* Enum for tag names. */ enum { @@ -2130,7 +2130,7 @@ msp430_file_end (void) OFBA_MSPABI_Tag_Data_Model, TARGET_LARGE ? OFBA_MSPABI_Val_Model_Large : OFBA_MSPABI_Val_Model_Small); -#ifdef HAVE_AS_MSPABI_ATTRIBUTE +#ifdef HAVE_AS_GNU_ATTRIBUTE /* Emit .gnu_attribute directive for Tag_GNU_MSP430_Data_Region. */ fprintf (asm_out_file, "\t%s %d, %d\n", gnu_attr, Tag_GNU_MSP430_Data_Region, msp430_data_region == MSP430_REGION_LOWER diff --git a/gcc/configure b/gcc/configure index 0f7a8db..0a09777 100755 --- a/gcc/configure +++ b/gcc/configure @@ -27981,7 +27981,7 @@ else then gcc_cv_as_msp430_mspabi_attribute=yes fi elif test x$gcc_cv_as != x; then - $as_echo '.mspabi_attribute 4,1' > conftest.s + $as_echo '.mspabi_attribute 4,2' > conftest.s if { ac_try='$gcc_cv_as $gcc_cv_as_flags -o conftest.o conftest.s >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 diff --git a/gcc/configure.ac b/gcc/configure.ac index 0f11238..6a233a3c 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -5041,7 +5041,7 @@ pointers into PC-relative form.]) [Define if your assembler supports .gnu_attribute.])]) gcc_GAS_CHECK_FEATURE([.mspabi_attribute support], gcc_cv_as_msp430_mspabi_attribute, [2,33,50],, - [.mspabi_attribute 4,1],, + [.mspabi_attribute 4,2],, [AC_DEFINE(HAVE_AS_MSPABI_ATTRIBUTE, 1, [Define if your assembler supports .mspabi_attribute.])]) if test x$enable_newlib_nano_formatted_io = xyes; then |