diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index ccec6d171b..72058bfb5c 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -6696,11 +6696,6 @@ Do you want to stop the program?"),
       break;
 
     case 0x9e:    /* sahf */
-      if (ir.regmap[X86_RECORD_R8_REGNUM])
-        {
-          ir.addr -= 1;
-          goto no_support;
-        }
       /* FALLTHROUGH */
     case 0xf5:    /* cmc */
     case 0xf8:    /* clc */
@@ -6711,11 +6706,6 @@ Do you want to stop the program?"),
       break;
 
     case 0x9f:    /* lahf */
-      if (ir.regmap[X86_RECORD_R8_REGNUM])
-        {
-          ir.addr -= 1;
-          goto no_support;
-        }
       I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_EFLAGS_REGNUM);
       I386_RECORD_FULL_ARCH_LIST_ADD_REG (X86_RECORD_REAX_REGNUM);
       break;