Skip 67h address size prefix unconditionally

	PR libjava/53973
	* include/x86_64-signal.h (CHECK_67H_PREFIX): Removed.
	(HANDLE_DIVIDE_OVERFLOW): Skip 67h address size prefix
	unconditionally.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189623 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1d5570d..e9b3a0f 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,6 +1,13 @@
 2012-07-18  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR libjava/53973
+       * include/x86_64-signal.h (CHECK_67H_PREFIX): Removed.
+       (HANDLE_DIVIDE_OVERFLOW): Skip 67h address size prefix
+       unconditionally.
+
+2012-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR libjava/53973
        * include/x86_64-signal.h (CHECK_67H_PREFIX): New.
        (HANDLE_DIVIDE_OVERFLOW): Check and and skip 67h address size
        prefix if CHECK_67H_PREFIX is 1.  Use ULL suffix for 64-bit

diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h
index 84907c3..12af21c 100644 (file)
--- a/libjava/include/x86_64-signal.h
+++ b/libjava/include/x86_64-signal.h
@@ -21,12 +21,6 @@ details.  */
 #define HANDLE_SEGV 1
 #define HANDLE_FPE 1
 
-#ifdef __ILP32__
-# define CHECK_67H_PREFIX 1
-#else
-# define CHECK_67H_PREFIX 0
-#endif
-
 #define SIGNAL_HANDLER(_name)                                  \
 static void _Jv_##_name (int, siginfo_t *,                     \
                         void *_p __attribute__ ((__unused__)))
@@ -53,8 +47,8 @@ do                                                                    \
                                                                        \
   bool _is_64_bit = false;                                             \
                                                                        \
-  /* Check and skip 67h address size prefix if needed.  */             \
-  if (CHECK_67H_PREFIX && _rip[0] == 0x67)                             \
+  /* Skip 67h address size prefix.  */                 \
+  if (_rip[0] == 0x67)                                                 \
     _rip++;                                                            \
                                                                        \
   if ((_rip[0] & 0xf0) == 0x40)  /* REX byte present.  */              \