Commit 3979fca4 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

disas: Rename include/disas/bfd.h back to include/disas/dis-asm.h 



Commit dc99065b (v0.1.0) added dis-asm.h from binutils.

Commit 43d4145a (v0.1.5) inlined bfd.h into dis-asm.h to remove the
dependency on binutils.

Commit 76cad711 (v1.4.0) moved dis-asm.h to include/disas/bfd.h.
The new name is confusing when you try to match against (pre GPLv3+)
binutils.  Rename it back.  Keep it in the same directory, of course.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190417191805.28198-17-armbru@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 30cc9831

disas.c

+1 −1
Original line number Diff line number Diff line 
/* General "disassemble this chunk" code.  Used for debugging. */

#include "qemu/osdep.h"

#include "qemu-common.h"

#include "disas/bfd.h"

#include "disas/dis-asm.h"

#include "elf.h"

#include "qemu/qemu-print.h"

disas/alpha.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ along with this file; see the file COPYING. If not, see 
<http://www.gnu.org/licenses/>. */



#include "qemu/osdep.h"

#include "disas/bfd.h"

#include "disas/dis-asm.h"



/* MAX is redefined below, so remove any previous definition. */

#undef MAX

disas/arm-a64.cc

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


extern "C" {

#include "qemu/osdep.h"

#include "disas/bfd.h"

#include "disas/dis-asm.h"

}



#include "vixl/a64/disasm-a64.h"

disas/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
   for things we don't care about.  */



#include "qemu/osdep.h"

#include "disas/bfd.h"

#include "disas/dis-asm.h"



#define ARM_EXT_V1	 0

#define ARM_EXT_V2	 0

disas/cris.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include "qemu/osdep.h"

#include "qemu-common.h"

#include "disas/bfd.h"

#include "disas/dis-asm.h"

#include "target/cris/opcode-cris.h"



#define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0)