diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-12-21 21:11:47 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-12-21 21:11:48 +0000 |
| commit | d1e8e8ecc3d2a1a72504912d671f1cbbac1b06e5 (patch) | |
| tree | 2b450d96b01455df8ed908bf8f26ddc388a03380 /disas | |
| parent | 82ecffa8c050bf5bbc13329e9b65eac1caa5b55c (diff) | |
| parent | fcf5ef2ab52c621a4617ebbef36bf43b4003f4c0 (diff) | |
| download | qemu-d1e8e8ecc3d2a1a72504912d671f1cbbac1b06e5.tar.gz | |
Merge remote-tracking branch 'remotes/huth/tags/target-dirs-20161220' into staging
Move target-xxx folders to target/ directory
# gpg: Signature made Tue 20 Dec 2016 21:00:39 GMT
# gpg: using RSA key 0x2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>"
# gpg: aka "Thomas Huth <thuth@redhat.com>"
# gpg: aka "Thomas Huth <huth@tuxfamily.org>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth/tags/target-dirs-20161220:
Move target-* CPU file into a target/ folder
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'disas')
| -rw-r--r-- | disas/cris.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/disas/cris.c b/disas/cris.c index 7f35bc0c6b..08161d1f21 100644 --- a/disas/cris.c +++ b/disas/cris.c @@ -21,9 +21,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "disas/bfd.h" -//#include "sysdep.h" -#include "target-cris/opcode-cris.h" -//#include "libiberty.h" +#include "target/cris/opcode-cris.h" #define CONST_STRNEQ(STR1,STR2) (strncmp ((STR1), (STR2), sizeof (STR2) - 1) == 0) |