From b0b793434ef492aa5afc95e0a9f787bdf860a1c1 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Sat, 4 Jun 2016 16:45:13 -0400 Subject: [PATCH] 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 * config/tc-xtensa.c: Include elf/xtensa.h. --- 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 6ccbaa24145..60a50728550 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2016-06-22 Trevor Saunders + + * config/tc-xtensa.c: Include elf/xtensa.h. + 2016-06-21 Maciej W. Rozycki * config/tc-mips.c (md_apply_fix) diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c index 40137ffd63c..d2a356734dd 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)) -- 2.30.2