This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] xtensa: include elf/xtensa.h in tc-xtensa.c
- From: Trevor Saunders <tbsaunde at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 22 Jun 2016 09:04:09 -0000
- Subject: [binutils-gdb] xtensa: include elf/xtensa.h in tc-xtensa.c
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=b0b793434ef492aa5afc95e0a9f787bdf860a1c1
commit b0b793434ef492aa5afc95e0a9f787bdf860a1c1
Author: Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
Date: Sat Jun 4 16:45:13 2016 -0400
xtensa: include elf/xtensa.h in tc-xtensa.c
There's no reason to define these macros twice.
gas/ChangeLog:
2016-06-22 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
* config/tc-xtensa.c: Include elf/xtensa.h.
Diff:
---
gas/ChangeLog | 4 ++++
gas/config/tc-xtensa.c | 5 +----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6ccbaa2..60a5072 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-22 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
+
+ * config/tc-xtensa.c: Include elf/xtensa.h.
+
2016-06-21 Maciej W. Rozycki <macro@imgtec.com>
* config/tc-mips.c (md_apply_fix) <BFD_RELOC_MIPS_18_PCREL_S3>
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index 40137ff..d2a3567 100644
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -29,6 +29,7 @@
#include "xtensa-istack.h"
#include "struc-symbol.h"
#include "xtensa-config.h"
+#include "elf/xtensa.h"
/* Provide default values for new configuration settings. */
#ifndef XSHAL_ABI
@@ -213,8 +214,6 @@ int generating_literals = 0;
/* Required branch target alignment. */
#define XTENSA_PROP_BT_ALIGN_REQUIRE 0x3
-#define GET_XTENSA_PROP_BT_ALIGN(flag) \
- (((unsigned) ((flag) & (XTENSA_PROP_BT_ALIGN_MASK))) >> 9)
#define SET_XTENSA_PROP_BT_ALIGN(flag, align) \
(((flag) & (~XTENSA_PROP_BT_ALIGN_MASK)) | \
(((align) << 9) & XTENSA_PROP_BT_ALIGN_MASK))
@@ -235,8 +234,6 @@ int generating_literals = 0;
#define XTENSA_PROP_ALIGNMENT_MASK 0x0001f000
-#define GET_XTENSA_PROP_ALIGNMENT(flag) \
- (((unsigned) ((flag) & (XTENSA_PROP_ALIGNMENT_MASK))) >> 12)
#define SET_XTENSA_PROP_ALIGNMENT(flag, align) \
(((flag) & (~XTENSA_PROP_ALIGNMENT_MASK)) | \
(((align) << 12) & XTENSA_PROP_ALIGNMENT_MASK))