From eba19e0066d69fec7212fec62bcd6952b6212889 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 17 Mar 2014 18:46:00 +0000
Subject: [PATCH] Backport AArch64 support

---
 imake-backport-aarch64-1.patch | 74 ++++++++++++++++++++++++++++++++++
 imake-backport-aarch64-2.patch | 26 ++++++++++++
 imake.spec                     | 13 +++++-
 3 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 imake-backport-aarch64-1.patch
 create mode 100644 imake-backport-aarch64-2.patch

diff --git a/imake-backport-aarch64-1.patch b/imake-backport-aarch64-1.patch
new file mode 100644
index 0000000..6c4a078
--- /dev/null
+++ b/imake-backport-aarch64-1.patch
@@ -0,0 +1,74 @@
+From 0d1be73c26f3636e024637d12c3befd8a9956cfc Mon Sep 17 00:00:00 2001
+From: Riku Voipio <riku.voipio@linaro.org>
+Date: Mon, 22 Apr 2013 11:24:13 +0000
+Subject: Add Aarch64 support
+
+This patch is based on follow patch by Dirk Müller <dirk@dmllr.de> :
+
+https://build.opensuse.org/package/view_file?expand=1&file=aarch64-support.diff&package=xorg-cf-files&project=devel%3AARM%3AAArch64%3A12.3
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/Imake.cf b/Imake.cf
+index d8a58e2..1ff3c8c 100644
+--- a/Imake.cf
++++ b/Imake.cf
+@@ -1022,6 +1022,10 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
+ #   define AMD64Architecture
+ #  endif
+ # endif
++# if defined(__aarch64__)
++#   define AArch64Architecture
++#   undef __aarch64__
++# endif
+ #endif /* linux || __GLIBC__ */
+ 
+ #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
+diff --git a/linux.cf b/linux.cf
+index af73c29..316dad3 100644
+--- a/linux.cf
++++ b/linux.cf
+@@ -578,7 +578,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
+ #define MkdirHierCmd		mkdir -p
+ 
+ #ifndef HaveLib64
+-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture)
++# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture)
+ #  define HaveLib64	YES
+ # else
+ #  define HaveLib64	NO
+@@ -976,6 +976,15 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
+ # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+ #endif /* AMD64Architecture */
+ 
++#ifdef AArch64Architecture
++# ifndef OptimizedCDebugFlags
++#  define OptimizedCDebugFlags DefaultGcc2AArch64Opt
++# endif
++# define LinuxMachineDefines   -D__aarch64__
++# define ServerOSDefines   XFree86ServerOSDefines -DDDXTIME
++# define ServerExtraDefines    -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#endif /* AArch64Architecture */
++
+ #ifndef StandardDefines
+ # ifdef __linux__
+ #  define StandardDefines	-Dlinux LinuxMachineDefines LinuxSourceDefines
+diff --git a/xfree86.cf b/xfree86.cf
+index f7c151c..0f538e0 100644
+--- a/xfree86.cf
++++ b/xfree86.cf
+@@ -2022,6 +2022,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
+ # endif
+ #endif
+ 
++#if HasGcc2 && defined(AArch64Architecture)
++# ifndef DefaultGcc2AArch64Opt
++#  define DefaultGcc2AArch64Opt -O2 GccAliasingArgs
++# endif
++#endif
++
+ #if HasGcc2 && defined(AlphaArchitecture)
+ # ifndef DefaultGcc2AxpOpt
+ #  define DefaultGcc2AxpOpt -O2 GccAliasingArgs
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/imake-backport-aarch64-2.patch b/imake-backport-aarch64-2.patch
new file mode 100644
index 0000000..efd92ee
--- /dev/null
+++ b/imake-backport-aarch64-2.patch
@@ -0,0 +1,26 @@
+From 2d586d8c0fe5190a6ab0958ee586e9a8c0a02d72 Mon Sep 17 00:00:00 2001
+From: Riku Voipio <riku.voipio@linaro.org>
+Date: Fri, 06 Dec 2013 23:37:36 +0000
+Subject: add DefaultGcc2AArch64Opt to xorg.cf
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/xorg.cf b/xorg.cf
+index 81e78df..8ea5715 100644
+--- a/xorg.cf
++++ b/xorg.cf
+@@ -1561,6 +1561,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
+ # endif
+ #endif
+ 
++#if HasGcc2 && defined(AArch64Architecture)
++# ifndef DefaultGcc2AArch64Opt
++#  define DefaultGcc2AArch64Opt -O2 GccAliasingArgs
++# endif
++#endif
++
+ #if HasGcc2 && defined(AMD64Architecture)
+ # ifndef DefaultGcc2AMD64Opt
+ #  define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce GccAliasingArgs
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/imake.spec b/imake.spec
index 9f7802f..5e129d4 100644
--- a/imake.spec
+++ b/imake.spec
@@ -1,7 +1,7 @@
 Summary: imake source code configuration and build system
 Name: imake
 Version: 1.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -15,6 +15,10 @@ Patch2: xorg-cf-files-1.0.2-redhat.patch
 Patch11: imake-1.0.2-abort.patch
 Patch12: imake-fputs.patch
 
+# upstream backports for AArch64
+Patch20: imake-backport-aarch64-1.patch
+Patch21: imake-backport-aarch64-2.patch
+
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
@@ -40,6 +44,10 @@ pushd %{name}-%{version}
 %patch11 -p1 -b .abort
 %patch12 -p1 -b .fputs
 popd
+pushd xorg-cf-files-1.0.4
+%patch20 -p1
+%patch21 -p1
+popd
 
 %build
 # Build everything
@@ -116,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xmkmf.1*
 
 %changelog
+* Mon Mar 17 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.0.6-2
+- Backport AArch64 support
+
 * Mon Jan 20 2014 Adam Jackson <ajax@redhat.com> 1.0.6-1
 - imake 1.0.6