Support m32r architecture.

--- imake/imakemdep.h.org	2006-07-04 13:04:02.581701912 +0900
+++ imake/imakemdep.h	2006-07-04 13:04:54.220851568 +0900
@@ -429,6 +429,9 @@ char *cpp_argv[ARGUMENTS] = {
 # ifdef __hppa__
 	"-D__hppa__",
 # endif
+# ifdef __m32r__
+	"-D__m32r__",
+# endif
 # ifdef __sh__
 	"-D__sh__",
 # endif
@@ -1402,6 +1405,9 @@ struct symtab	predefs[] = {
 # ifdef __hppa__
 	{"__hppa__", "1"},
 # endif
+# ifdef __m32r__
+	{"__m32r__", "1"},
+# endif
 # ifdef __sh__
 	{"__sh__", "1"},
 # endif
--- makedepend/imakemdep.h.org	2006-07-04 13:06:20.926670280 +0900
+++ makedepend/imakemdep.h	2006-07-04 13:07:10.883075752 +0900
@@ -429,6 +429,9 @@ char *cpp_argv[ARGUMENTS] = {
 # ifdef __hppa__
 	"-D__hppa__",
 # endif
+# ifdef __m32r__
+	"-D__m32r__",
+# endif
 # ifdef __sh__
 	"-D__sh__",
 # endif
@@ -1402,6 +1405,9 @@ struct symtab	predefs[] = {
 # ifdef __hppa__
 	{"__hppa__", "1"},
 # endif
+# ifdef __m32r__
+	{"__m32r__", "1"},
+# endif
 # ifdef __sh__
 	{"__sh__", "1"},
 # endif
--- xorg-cf-files/Imake.cf.org	2006-07-04 13:08:03.839025224 +0900
+++ xorg-cf-files/Imake.cf	2006-07-04 13:33:23.340025960 +0900
@@ -964,6 +964,12 @@ XCOMM Keep cpp from replacing path eleme
 #  endif
 #  undef __hppa__
 # endif /* __hppa__ */
+# ifdef __m32r__
+#  ifndef m32rArchitecture
+#   define m32rArchitecture
+#  endif
+#  undef __m32r__
+# endif /* __m32r__ */
 # ifdef __sh__
 #  ifndef SuperHArchitecture
 #   define SuperHArchitecture
--- xorg-cf-files/linux.cf.org	2006-07-04 14:13:14.007589248 +0900
+++ xorg-cf-files/linux.cf	2006-07-04 14:19:49.999389344 +0900
@@ -1060,6 +1060,15 @@ InstallNamedTargetNoClobber(install,file
 # endif
 #endif
 
+#ifdef m32rArchitecture
+# ifndef OptimizedCDebugFlags
+#  define OptimizedCDebugFlags	DefaultGcc2DebugOpt DefaultGcc2OptimizeOpt GccAliasingArgs
+# endif
+# define LinuxMachineDefines	-D__m32r__
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -mmodel=large
+# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -mmodel=large
+#endif
+
 #ifdef SuperHArchitecture
 # ifndef SuperHArchOptFlags
 #  ifdef SuperH4Architecture
--- xorg-cf-files/xfree86.cf.org	2006-07-04 13:39:56.668230984 +0900
+++ xorg-cf-files/xfree86.cf	2006-07-04 13:44:18.624407592 +0900
@@ -1107,6 +1107,87 @@ VENDORMANVERSION = XVendorManVersionStri
 # endif
 #endif
 
+/*
+ * M32R drivers
+ */
+#if defined(m32rArchitecture)
+# ifndef XF86Server
+#  define XF86Server            YES
+# endif
+/* Amiga framebuffer module */
+# ifndef XF86AFB
+#  define XF86AFB               YES
+# endif
+/* 1bpp module */
+# ifndef XF1Bpp
+#  define XF1Bpp                YES
+# endif
+/* 4bpp module */
+# ifndef XF4Bpp
+#  define XF4Bpp                YES
+# endif
+/* 8/32bpp overlay module */
+# ifndef XF8_32Bpp
+#  define XF8_32Bpp             YES
+# endif
+/* 8/16bpp dual fb module */
+# ifndef XF8_16Bpp
+#  define XF8_16Bpp             YES
+# endif
+/* 24/32bpp conversion module */
+# ifndef XF24_32Bpp
+#  define XF24_32Bpp            YES
+# endif
+/* shadow fb module */
+# ifndef XFShadowFB
+#  define XFShadowFB            YES
+# endif
+/* vgahw module */
+# ifndef XF86VgaHw
+#  define XF86VgaHw             YES
+# endif
+/* fbdevhw module */
+# ifndef XF86FBDevHw
+#  define XF86FBDevHw           YES
+# endif
+/* XAA module */
+# ifndef XF86XAA
+#  define XF86XAA               YES
+# endif
+/* ramdac module */
+# ifndef XF86Ramdac
+#  define XF86Ramdac            YES
+# endif
+/* I2C module */
+# ifndef XF86I2C
+#  define XF86I2C               YES
+# endif
+/* DDC module */
+# ifndef XF86DDC
+#  define XF86DDC               YES
+# endif
+/* RAC (Resource Access Control) module */
+# ifndef XF86RAC
+#  define XF86RAC               YES
+# endif
+/* int10 module */
+# ifndef XF86Int10
+#  define XF86Int10             YES
+# endif
+
+# ifndef DevelDrivers
+#  if XFree86Devel
+#   define DevelDrivers         imstt
+#  else
+#   define DevelDrivers         /* */
+#  endif
+# endif
+
+# ifndef XF86CardDrivers
+#  define XF86CardDrivers       fbdev XF86OSCardDrivers XF86ExtraCardDrivers
+# endif
+#endif
+
 /* SuperH drivers */
 
 #if defined(SuperHArchitecture)