aboutsummaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-10-15 20:20:38 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-10-18 01:08:04 +0300
commit572ce0f4519488840d466befde6bb38ccb044e40 (patch)
tree122b04efd982683829ca5678e6ab5e5ee4cc274d /cross
parent1c186d4a300f4e0d4355d9ce1f5c16af54d27dd9 (diff)
downloadmeson-572ce0f4519488840d466befde6bb38ccb044e40.zip
meson-572ce0f4519488840d466befde6bb38ccb044e40.tar.gz
meson-572ce0f4519488840d466befde6bb38ccb044e40.tar.bz2
Added cpu family property to system information.
Diffstat (limited to 'cross')
-rw-r--r--cross/iphone.txt1
-rw-r--r--cross/ubuntu-armhf.txt3
-rw-r--r--cross/ubuntu-faketarget.txt1
-rw-r--r--cross/ubuntu-mingw.txt6
4 files changed, 8 insertions, 3 deletions
diff --git a/cross/iphone.txt b/cross/iphone.txt
index de48551..b2fe3c9 100644
--- a/cross/iphone.txt
+++ b/cross/iphone.txt
@@ -21,6 +21,7 @@ has_function_hfkerhisadf = false
[host_machine]
system = 'ios'
+cpu_family = 'arm'
cpu = 'armv7'
endian = 'little'
diff --git a/cross/ubuntu-armhf.txt b/cross/ubuntu-armhf.txt
index d15780e..09cbced 100644
--- a/cross/ubuntu-armhf.txt
+++ b/cross/ubuntu-armhf.txt
@@ -15,5 +15,6 @@ has_function_hfkerhisadf = false
[host_machine]
system = 'linux'
-cpu = 'arm'
+cpu_family = 'arm'
+cpu = 'armv7' # Not sure if correct.
endian = 'little'
diff --git a/cross/ubuntu-faketarget.txt b/cross/ubuntu-faketarget.txt
index 37e5033..cc43998 100644
--- a/cross/ubuntu-faketarget.txt
+++ b/cross/ubuntu-faketarget.txt
@@ -8,5 +8,6 @@
[target_machine]
system = 'linux'
+cpu_family = 'mips'
cpu = 'mips'
endian = 'little'
diff --git a/cross/ubuntu-mingw.txt b/cross/ubuntu-mingw.txt
index c0cfa69..2373565 100644
--- a/cross/ubuntu-mingw.txt
+++ b/cross/ubuntu-mingw.txt
@@ -13,10 +13,12 @@ root = '/usr/i686-w64-mingw32'
[host_machine]
system = 'windows'
-cpu = 'x86'
+cpu_family = 'x86'
+cpu = 'i686'
endian = 'little'
[target_machine]
system = 'darwin'
-cpu = 'arm'
+cpu_family = 'arm'
+cpu = 'armv7h' # Don't know if this is correct.
endian = 'little'