diff --git a/newlib/configure.host b/newlib/configure.host
index f6abb5c37..baaaa7e34 100644
--- a/newlib/configure.host
+++ b/newlib/configure.host
@@ -451,6 +451,7 @@ case "${host}" in
   i[34567]86-*-rdos*)
 	sys_dir=rdos
 	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
+	newlib_cflags="${newlib_cflags} -D_I386MACH_DISABLE_HW_INTERRUPTS"
 	;;
   i[34567]86-*-sco*)
 	sys_dir=sysvi386
@@ -469,7 +470,6 @@ case "${host}" in
 	default_newlib_io_pos_args="yes"
 	#newlib_cflags="${newlib_cflags} -Werror" # DEBUGGING ONLY;BREAKS BUILD
 	newlib_cflags="${newlib_cflags} -Wall"
-	newlib_cflags="${newlib_cflags} -D_I386MACH_ALLOW_HW_INTERRUPTS"
 	newlib_cflags="${newlib_cflags} -DHAVE_FCNTL"
 	newlib_cflags="${newlib_cflags} -DHAVE_GETOPT"
 	newlib_cflags="${newlib_cflags} -D_NO_POSIX_SPAWN"
@@ -592,8 +592,6 @@ case "${host}" in
 	newlib_cflags="${newlib_cflags} -DMALLOC_PROVIDED -DEXIT_PROVIDED -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_NANOSLEEP -DHAVE_BLKSIZE -DHAVE_FCNTL -DHAVE_ASSERT_FUNC"
         # turn off unsupported items in posix directory 
 	newlib_cflags="${newlib_cflags} -D_NO_GETLOGIN -D_NO_GETPWENT -D_NO_GETUT -D_NO_GETPASS -D_NO_SIGSET -D_NO_WORDEXP -D_NO_POPEN -D_NO_POSIX_SPAWN"
-        # turn off using cli/sti in i386 setjmp/longjmp
-	newlib_cflags="${newlib_cflags} -D_I386MACH_ALLOW_HW_INTERRUPTS"
 	;;
 # VxWorks supplies its own version of malloc, and the newlib one
 # doesn't work because VxWorks does not have sbrk.
diff --git a/newlib/libc/machine/i386/i386mach.h b/newlib/libc/machine/i386/i386mach.h
index 23c32190d..403d24bfe 100644
--- a/newlib/libc/machine/i386/i386mach.h
+++ b/newlib/libc/machine/i386/i386mach.h
@@ -74,7 +74,7 @@
 #define SOTYPE_FUNCTION(sym)
 #endif
 
-#ifdef _I386MACH_ALLOW_HW_INTERRUPTS
+#ifndef _I386MACH_DISABLE_HW_INTERRUPTS
 #define        __CLI
 #define        __STI
 #else
diff --git a/newlib/libc/machine/x86_64/x86_64mach.h b/newlib/libc/machine/x86_64/x86_64mach.h
index 84cb2f85d..05e639200 100644
--- a/newlib/libc/machine/x86_64/x86_64mach.h
+++ b/newlib/libc/machine/x86_64/x86_64mach.h
@@ -104,7 +104,7 @@
 #define SOTYPE_FUNCTION(sym)
 #endif
 
-#ifdef _I386MACH_ALLOW_HW_INTERRUPTS
+#ifndef _I386MACH_DISABLE_HW_INTERRUPTS
 #define        __CLI
 #define        __STI
 #else
diff --git a/newlib/libc/sys/linux/machine/i386/i386mach.h b/newlib/libc/sys/linux/machine/i386/i386mach.h
index 23c32190d..403d24bfe 100644
--- a/newlib/libc/sys/linux/machine/i386/i386mach.h
+++ b/newlib/libc/sys/linux/machine/i386/i386mach.h
@@ -74,7 +74,7 @@
 #define SOTYPE_FUNCTION(sym)
 #endif
 
-#ifdef _I386MACH_ALLOW_HW_INTERRUPTS
+#ifndef _I386MACH_DISABLE_HW_INTERRUPTS
 #define        __CLI
 #define        __STI
 #else
diff --git a/newlib/libm/machine/i386/i386mach.h b/newlib/libm/machine/i386/i386mach.h
index 23c32190d..403d24bfe 100644
--- a/newlib/libm/machine/i386/i386mach.h
+++ b/newlib/libm/machine/i386/i386mach.h
@@ -74,7 +74,7 @@
 #define SOTYPE_FUNCTION(sym)
 #endif
 
-#ifdef _I386MACH_ALLOW_HW_INTERRUPTS
+#ifndef _I386MACH_DISABLE_HW_INTERRUPTS
 #define        __CLI
 #define        __STI
 #else