diff options
| author | Peter Maydell | 2019-07-01 17:59:29 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-01 17:59:29 +0200 |
| commit | 5e6ebacc3b1e4e8d52a27b9f236fdc01d828641c (patch) | |
| tree | 08b11c91ac919bf8aa7d6e001dc201c5bbc4b683 /linux-user/Makefile.objs | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.1-pull-re... (diff) | |
| parent | linux-user/m68k: remove simulator syscall interface (diff) | |
| download | qemu-5e6ebacc3b1e4e8d52a27b9f236fdc01d828641c.tar.gz qemu-5e6ebacc3b1e4e8d52a27b9f236fdc01d828641c.tar.xz qemu-5e6ebacc3b1e4e8d52a27b9f236fdc01d828641c.zip | |
Merge remote-tracking branch 'remotes/vivier/tags/m68k-next-pull-request' into staging
remove m68k simulator syscall interface
Fix comments format
Fix gdbstub
# gpg: Signature made Wed 26 Jun 2019 17:20:41 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier/tags/m68k-next-pull-request:
linux-user/m68k: remove simulator syscall interface
m68k comments break patch submission due to being incorrectly formatted
The m68k gdbstub SR reg request doesnt include Condition-Codes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/Makefile.objs')
| -rw-r--r-- | linux-user/Makefile.objs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs index 285c5dfa17..d2f33beb5e 100644 --- a/linux-user/Makefile.objs +++ b/linux-user/Makefile.objs @@ -8,4 +8,3 @@ obj-$(TARGET_I386) += vm86.o obj-$(TARGET_ARM) += arm/nwfpe/ obj-$(TARGET_ARM) += arm/semihost.o obj-$(TARGET_AARCH64) += arm/semihost.o -obj-$(TARGET_M68K) += m68k-sim.o |