Replace MACHINE/CHIP macros with compiler macros

include/arch/i386/include/interrupt.h

@@ -3,7 +3,7 @@
 #ifndef _INTERRUPT_H
 #define _INTERRUPT_H
 
-#if (CHIP == INTEL)
+#if defined(__i386__)
 
 /* 8259A interrupt controller ports. */
 #define INT_CTL         0x20	/* I/O port for interrupt controller */

include/arch/i386/include/ports.h

@@ -3,7 +3,7 @@
 #ifndef _PORTS_H
 #define _PORTS_H
 
-#if (CHIP == INTEL)
+#if defined(__i386__)
 
 /* Miscellaneous ports. */
 #define PCR		0x65	/* Planar Control Register */
@@ -12,6 +12,6 @@
 #define TIMER2          0x42	/* I/O port for timer channel 2 */
 #define TIMER_MODE      0x43	/* I/O port for timer mode control */
 
-#endif /* (CHIP == INTEL) */
+#endif /* defined(__i386__) */
 
 #endif /* _PORTS_H */