summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-01-07 12:54:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 13:38:29 +0000
commitdd98eeaf4c6f05c55886f9fa3021fae704a004fe (patch)
tree0077b4db185d5eab1c936616bcf3185864c4d152 /meta
parentc2a87e8daf118cb0fcbedd16e513987ec3e82c75 (diff)
downloadpoky-dd98eeaf4c6f05c55886f9fa3021fae704a004fe.tar.gz
cmake: add AArch64 support
(From OE-Core rev: 73dd5842a945e119c8870929e9d71067235a9247) Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc7
-rw-r--r--meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch37
-rw-r--r--meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch40
3 files changed, 82 insertions, 2 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 6dc319cb6c..b2cba5e7e6 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -9,12 +9,15 @@ LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=bb2fa3a08736b842556f6171bb9e8ae1 \ 9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=bb2fa3a08736b842556f6171bb9e8ae1 \
10 file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2" 10 file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2"
11 11
12INC_PR = "r0" 12INC_PR = "r1"
13 13
14CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" 14CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"
15 15
16SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ 16SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
17 file://support-oe-qt4-tools-names.patch" 17 file://support-oe-qt4-tools-names.patch \
18 file://aarch64-cmake.patch \
19 file://aarch64-kwsys.patch \
20 "
18 21
19inherit autotools 22inherit autotools
20 23
diff --git a/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch b/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch
new file mode 100644
index 0000000000..b3e38b3585
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/aarch64-cmake.patch
@@ -0,0 +1,37 @@
1From: Riku Voipio <riku.voipio@linaro.org>
2Date: Fri, 21 Dec 2012 11:20:02 +0000 (+0200)
3Subject: KWIML: Teach ABI.h about Aarch64
4X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=34916522
5
6KWIML: Teach ABI.h about Aarch64
7
8The __aarch64__ defines Aarch64, while __AARCH64EB__ defines bigendian
9and __AARCH64EL__ little endian. Only little endian tested, no big
10endian toolchain exists yet.
11
12Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
13
14Hand edited by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> to get it applied in OE
15
16Upstream-status: Backport
17---
18
19diff --git a/ABI.h.in b/ABI.h.in
20index f93ddba..7f4772a 100644
21--- a/Utilities/KWIML/ABI.h.in
22+++ b/Utilities/KWIML/ABI.h.in
23@@ -418,6 +418,14 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined.
24 #elif defined(__vax__)
25 # define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
26
27+/* Aarch64 */
28+#elif defined(__aarch64__)
29+# if !defined(__AARCH64EB__)
30+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_LITTLE
31+# else
32+# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
33+# endif
34+
35 /* Unknown CPU */
36 #elif !defined(@KWIML@_ABI_NO_ERROR_ENDIAN)
37 # error "Byte order of target CPU unknown."
diff --git a/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch b/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch
new file mode 100644
index 0000000000..03e8fa1162
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/aarch64-kwsys.patch
@@ -0,0 +1,40 @@
1From: KWSys Robot <kwrobot@kitware.com>
2Date: Fri, 21 Dec 2012 13:29:37 +0000 (-0500)
3Subject: KWSys 2012-12-21 (8ce09af5)
4X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=567e7d94
5
6KWSys 2012-12-21 (8ce09af5)
7
8Extract upstream KWSys using the following shell commands.
9
10$ git archive --prefix=upstream-kwsys/ 8ce09af5 | tar x
11$ git shortlog --no-merges --abbrev=8 --format='%h %s' 933eb822..8ce09af5
12Riku Voipio (1):
13 8ce09af5 CPU: Add Aarch64 support
14
15Change-Id: I4bd0a97abaa0f958e2679afe2d4ad4bcc37434a0
16
17Hand edited by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> to get it applied in OE
18
19Upstream-status: Backport
20---
21
22diff --git a/CPU.h.in b/CPU.h.in
23index ecd29d1..2e1a584 100644
24--- a/Source/kwsys/CPU.h.in
25+++ b/Source/kwsys/CPU.h.in
26@@ -98,6 +98,14 @@
27 #elif defined(__SYSC_ZARCH__)
28 # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG
29
30+/* Aarch64 */
31+#elif defined(__aarch64__)
32+# if !defined(__AARCH64EB__)
33+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE
34+# else
35+# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG
36+# endif
37+
38 /* Unknown CPU */
39 #else
40 # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID 0