--- np2/x11/compiler.h	2004/03/23 15:16:43	1.15
+++ np2/x11/compiler.h	2004/06/16 12:50:49	1.20
@@ -134,6 +134,27 @@ typedef	int			BOOL;
 #endif
 #endif
 
+/* archtecture */
+/* amd64 */
+#if defined(amd64) || defined(__AMD64__) || defined(__amd64__) || \
+    defined(x86_64) || defined(__x86_64__) || defined(__X86_64__)
+#define	NP2_CPU_ARCH_AMD64
+#endif /* amd64 */
+/* i386 */
+#if defined(i386) || defined(__i386__) || defined(NP2_CPU_ARCH_AMD64)
+#define	NP2_CPU_ARCH_IA32
+#endif /* i386 */
+
+#if defined(__GNUC__)
+#define	GCC_ATTR_PACKED	__attribute__((packed))
+#if defined(NP2_CPU_ARCH_IA32)
+#define	GCC_CPU_ARCH_IA32
+#endif
+#if defined(NP2_CPU_ARCH_AMD64)
+#define	GCC_CPU_ARCH_AMD64
+#endif
+#endif /* __GNUC__ */
+
 #ifndef	NELEMENTS
 #define	NELEMENTS(a)	((int)(sizeof(a) / sizeof(a[0])))
 #endif
@@ -153,12 +174,15 @@ void toolkit_msgbox(const char *title, c
 #define	SUPPORT_CRT15KHZ
 #endif
 
-#if defined(i386) || defined(__i386__)
+#if defined(NP2_CPU_ARCH_IA32)
 #undef	MEMOPTIMIZE
 #define LOADINTELDWORD(a)	(*((UINT32 *)(a)))
 #define LOADINTELWORD(a)	(*((UINT16 *)(a)))
 #define STOREINTELDWORD(a, b)	*(UINT32 *)(a) = (b)
 #define STOREINTELWORD(a, b)	*(UINT16 *)(a) = (b)
+#if defined(__GNUC__) && defined(IA32_USE_GCC_ATTR_REGPARM)
+#define	GCC_ATTR_REGPARM	__attribute__((regparm(2)))
+#endif
 #elif defined(arm) || defined (__arm__)
 #define	MEMOPTIMIZE	2
 #define	REG8		UINT
@@ -169,6 +193,7 @@ void toolkit_msgbox(const char *title, c
 #endif
 
 #define	SUPPORT_EUC
+#define	SUPPORT_SJIS
 
 #undef	SUPPORT_8BPP
 #define	SUPPORT_16BPP
@@ -176,6 +201,7 @@ void toolkit_msgbox(const char *title, c
 #define	SUPPORT_32BPP
 #define	SUPPORT_NORMALDISP
 
+#define	SUPPORT_PC9861K
 #define	SUPPORT_HOSTDRV
 
 #undef	SUPPORT_SASI
@@ -185,6 +211,7 @@ void toolkit_msgbox(const char *title, c
 #if USE_GTK > 0
 #define	SUPPORT_S98
 #define	SUPPORT_KEYDISP
+#define	SUPPORT_SOFTKBD	0
 #endif
 
 #if USE_SDL > 0