Merge commit '121afa9e0c02617c2a774996512e4f85f3e93da8' into upstream-merge

* commit '121afa9e0c02617c2a774996512e4f85f3e93da8': (85 commits)
  Revert "Add ability to disable build of all targets"
  cpu_physical_memory_write_rom() needs to do TB invalidates
  qemu-char: BUGFIX, don't call FD_ISSET with negative fd
  Revert 455aa1e08 and c3767ed0eb
  pc: Drop practically unused BOCHS BIOS debug ports
  add -machine mem-merge=on|off option
  Remove unused CONFIG_TCG_PASS_AREG0 and dead code
  target-mips: switch to AREG0 free mode
  target-sh4: switch to AREG0 free mode
  target-cris: Switch to AREG0 free mode
  target-cris: Avoid AREG0 for helpers
  target-microblaze: switch to AREG0 free mode
  target-arm: final conversion to AREG0 free mode
  target-arm: convert remaining helpers
  target-arm: convert void helpers
  target-unicore32: switch to AREG0 free mode
  target-m68k: avoid using cpu_single_env
  target-m68k: switch to AREG0 free mode
  target-lm32: switch to AREG0 free mode
  target-s390x: avoid cpu_single_env
  ...

Conflicts:
	configure

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 0 insertions, 70 deletions

diff --git a/dyngen-exec.h b/dyngen-exec.h
deleted file mode 100644
index 083e20bed..000000000
--- a/dyngen-exec.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  dyngen defines for micro operation code
- *
- *  Copyright (c) 2003 Fabrice Bellard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-#if !defined(__DYNGEN_EXEC_H__)
-#define __DYNGEN_EXEC_H__
-
-#if defined(CONFIG_TCG_INTERPRETER)
-/* The TCG interpreter does not need a special register AREG0,
- * but it is possible to use one by defining AREG0.
- * On i386, register edi seems to work. */
-/* Run without special register AREG0 or use a value defined elsewhere. */
-#elif defined(__i386__)
-#define AREG0 "ebp"
-#elif defined(__x86_64__)
-#define AREG0 "r14"
-#elif defined(_ARCH_PPC)
-#define AREG0 "r27"
-#elif defined(__arm__)
-#define AREG0 "r6"
-#elif defined(__hppa__)
-#define AREG0 "r17"
-#elif defined(__mips__)
-#define AREG0 "s0"
-#elif defined(__sparc__)
-#ifdef CONFIG_SOLARIS
-#define AREG0 "g2"
-#else
-#ifdef __sparc_v9__
-#define AREG0 "g5"
-#else
-#define AREG0 "g6"
-#endif
-#endif
-#elif defined(__s390__)
-#define AREG0 "r10"
-#elif defined(__alpha__)
-/* Note $15 is the frame pointer, so anything in op-i386.c that would
-   require a frame pointer, like alloca, would probably loose.  */
-#define AREG0 "$15"
-#elif defined(__mc68000)
-#define AREG0 "%a5"
-#elif defined(__ia64__)
-#define AREG0 "r7"
-#else
-#error unsupported CPU
-#endif
-
-#if defined(AREG0)
-register CPUArchState *env asm(AREG0);
-#else
-/* TODO: Try env = cpu_single_env. */
-extern CPUArchState *env;
-#endif
-
-#endif /* !defined(__DYNGEN_EXEC_H__) */