|
 |
d6fabf |
From f4d87258b453da006ca6126ccaaf4acd1be7da1c Mon Sep 17 00:00:00 2001
|
|
|
d6fabf |
From: Riku Voipio <riku voipio linaro org>
|
|
|
d6fabf |
Date: Mon, 22 Apr 2013 11:24:13 +0000
|
|
|
d6fabf |
Subject: [PATCH] Add Aarch64 support
|
|
|
d6fabf |
MIME-Version: 1.0
|
|
|
d6fabf |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6fabf |
Content-Transfer-Encoding: 8bit
|
|
|
d6fabf |
|
|
|
d6fabf |
This patch is based on follow patch by Dirk Müller <dirk dmllr de> :
|
|
|
d6fabf |
|
|
|
d6fabf |
https://build.opensuse.org/package/view_file?expand=1&file=aarch64-support.diff&package=xorg-cf-files&project=devel%3AARM%3AAArch64%3A12.3
|
|
|
d6fabf |
|
|
|
d6fabf |
Signed-off-by: Alan Coopersmith <alan coopersmith oracle com>
|
|
|
d6fabf |
|
|
|
d6fabf |
Edited-by: Marcin Juszkiewicz <mjuszkiewicz redhat com>
|
|
|
d6fabf |
|
|
|
d6fabf |
Changed OptimizedCDebugFlags define to contain real gcc flags as
|
|
|
d6fabf |
DefaultGcc2AArch64Opt was not defined during builds.
|
|
|
d6fabf |
|
|
|
d6fabf |
---
|
|
|
d6fabf |
Imake.cf | 4 ++++
|
|
|
d6fabf |
linux.cf | 11 ++++++++++-
|
|
|
d6fabf |
xfree86.cf | 6 ++++++
|
|
|
d6fabf |
3 files changed, 20 insertions(+), 1 deletion(-)
|
|
|
d6fabf |
|
|
|
d6fabf |
diff --git a/Imake.cf b/Imake.cf
|
|
|
d6fabf |
index d8a58e2..1ff3c8c 100644
|
|
|
d6fabf |
--- a/Imake.cf
|
|
|
d6fabf |
+++ b/Imake.cf
|
|
|
d6fabf |
@@ -1022,6 +1022,10 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
|
|
|
d6fabf |
# define AMD64Architecture
|
|
|
d6fabf |
# endif
|
|
|
d6fabf |
# endif
|
|
|
d6fabf |
+# if defined(__aarch64__)
|
|
|
d6fabf |
+# define AArch64Architecture
|
|
|
d6fabf |
+# undef __aarch64__
|
|
|
d6fabf |
+# endif
|
|
|
d6fabf |
#endif /* linux || __GLIBC__ */
|
|
|
d6fabf |
|
|
|
d6fabf |
#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
|
|
|
d6fabf |
diff --git a/linux.cf b/linux.cf
|
|
|
d6fabf |
index 59fbbe9..716821e 100644
|
|
|
d6fabf |
--- a/linux.cf
|
|
|
d6fabf |
+++ b/linux.cf
|
|
|
d6fabf |
@@ -584,7 +584,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
|
|
|
d6fabf |
#define MkdirHierCmd mkdir -p
|
|
|
d6fabf |
|
|
|
d6fabf |
#ifndef HaveLib64
|
|
|
d6fabf |
-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture)
|
|
|
d6fabf |
+# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture)
|
|
|
d6fabf |
# define HaveLib64 YES
|
|
|
d6fabf |
# else
|
|
|
d6fabf |
# define HaveLib64 NO
|
|
|
d6fabf |
@@ -982,6 +982,15 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
|
|
|
d6fabf |
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
|
|
|
d6fabf |
#endif /* AMD64Architecture */
|
|
|
d6fabf |
|
|
|
d6fabf |
+#ifdef AArch64Architecture
|
|
|
d6fabf |
+# ifndef OptimizedCDebugFlags
|
|
|
d6fabf |
+# define OptimizedCDebugFlags -O2 GccAliasingArgs
|
|
|
d6fabf |
+# endif
|
|
|
d6fabf |
+# define LinuxMachineDefines -D__aarch64__
|
|
|
d6fabf |
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
|
|
|
d6fabf |
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
|
|
|
d6fabf |
+#endif /* AArch64Architecture */
|
|
|
d6fabf |
+
|
|
|
d6fabf |
#ifndef StandardDefines
|
|
|
d6fabf |
# ifdef __linux__
|
|
|
d6fabf |
# define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines
|
|
|
d6fabf |
diff --git a/xfree86.cf b/xfree86.cf
|
|
|
d6fabf |
index f7c151c..0f538e0 100644
|
|
|
d6fabf |
--- a/xfree86.cf
|
|
|
d6fabf |
+++ b/xfree86.cf
|
|
|
d6fabf |
@@ -2022,6 +2022,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
|
|
|
d6fabf |
# endif
|
|
|
d6fabf |
#endif
|
|
|
d6fabf |
|
|
|
d6fabf |
+#if HasGcc2 && defined(AArch64Architecture)
|
|
|
d6fabf |
+# ifndef DefaultGcc2AArch64Opt
|
|
|
d6fabf |
+# define DefaultGcc2AArch64Opt -O2 GccAliasingArgs
|
|
|
d6fabf |
+# endif
|
|
|
d6fabf |
+#endif
|
|
|
d6fabf |
+
|
|
|
d6fabf |
#if HasGcc2 && defined(AlphaArchitecture)
|
|
|
d6fabf |
# ifndef DefaultGcc2AxpOpt
|
|
|
d6fabf |
# define DefaultGcc2AxpOpt -O2 GccAliasingArgs
|
|
|
d6fabf |
--
|
|
|
d6fabf |
1.8.3.1
|
|
|
d6fabf |
|