[PATCH cf] Add support for OpenRISC 1000 (or1k) CPU

[Manuel A. Fernandez Montecelo]

Signed-off-by: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
---
 Imake.cf   | 4 ++++
 linux.cf   | 9 +++++++++
 xfree86.cf | 6 ++++++
 xorg.cf    | 6 ++++++
 4 files changed, 25 insertions(+)

diff --git a/Imake.cf b/Imake.cf
index 9e438e7..e7ebe4d 100644
--- a/Imake.cf
+++ b/Imake.cf
@@ -928,6 +928,10 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
 #  define PpcArchitecture
 #  undef powerpc
 # endif
+# if defined(__or1k__)
+#   define OpenRISC1000Architecture
+#   undef __or1k__
+# endif
 # if defined (__powerpc__) && !defined(__powerpc64__) && !defined (powerpc64)
 #  ifndef PpcArchitecture
 #   define PpcArchitecture
diff --git a/linux.cf b/linux.cf
index 75c9447..7845325 100644
--- a/linux.cf
+++ b/linux.cf
@@ -887,6 +887,15 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
 # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
 #endif
 
+#ifdef OpenRISC1000Architecture
+# ifndef OptimizedCDebugFlags
+#  define OptimizedCDebugFlags	DefaultGcc2OpenRISC1000Opt
+# endif
+# define LinuxMachineDefines	-D__or1k__
+# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
+# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
+#endif
+
 #ifdef Ppc64Architecture
 # define DefaultCCOptions	-mminimal-toc
 # ifndef OptimizedCDebugFlags
diff --git a/xfree86.cf b/xfree86.cf
index 3172cc2..1dbbd87 100644
--- a/xfree86.cf
+++ b/xfree86.cf
@@ -2034,6 +2034,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
 # endif
 #endif
 
+#if HasGcc2 && defined(OpenRISC1000Architecture)
+# ifndef DefaultGcc2OpenRISC1000Opt
+#  define DefaultGcc2OpenRISC1000Opt -O2 GccAliasingArgs
+# endif
+#endif
+
 #if HasGcc2 && defined(Ppc64Architecture)
 # ifndef DefaultGcc2Ppc64Opt
 #  define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs
diff --git a/xorg.cf b/xorg.cf
index 8ea5715..3b0f10b 100644
--- a/xorg.cf
+++ b/xorg.cf
@@ -1591,6 +1591,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
 # endif
 #endif
 
+#if HasGcc2 && defined(OpenRISC1000Architecture)
+# ifndef DefaultGcc2OpenRISC1000Opt
+#  define DefaultGcc2OpenRISC1000Opt -O2 GccAliasingArgs
+# endif
+#endif
+
 #if HasGcc2 && defined(PpcArchitecture)
 # ifndef DefaultGcc2PpcOpt
 #  define DefaultGcc2PpcOpt -O2 GccAliasingArgs
-- 
2.1.0.rc1