summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2014-12-18 16:50:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-23 10:18:17 +0000
commit263738561564b1fa6dbb2f80eeba462680584173 (patch)
tree63af814f940c5fcc6ba7504cdb9cb0fc5f8ce9fe
parent8781b4952da9f618103a4c609efa5d694b7f195f (diff)
downloadpoky-263738561564b1fa6dbb2f80eeba462680584173.tar.gz
siteinfo: account for 32 and 64 bit arm
Pull wordsize related items from arm-common and put in arm-32. Leave them as they were. Copy arm-32 to arm-64 and comment out all variables. Re-define to correct values leaving items which do not appear to be used undefined. (From OE-Core rev: 99d43a1554b2daeb7aba3c4582ccec758e6ec4a5) Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/siteinfo.bbclass8
-rw-r--r--meta/site/arm-3247
-rw-r--r--meta/site/arm-6446
-rw-r--r--meta/site/arm-common38
4 files changed, 97 insertions, 42 deletions
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index e90632aeef..b41db46bc0 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -18,10 +18,10 @@
18def siteinfo_data(d): 18def siteinfo_data(d):
19 archinfo = { 19 archinfo = {
20 "allarch": "endian-little bit-32", # bogus, but better than special-casing the checks below for allarch 20 "allarch": "endian-little bit-32", # bogus, but better than special-casing the checks below for allarch
21 "aarch64": "endian-little bit-64 arm-common", 21 "aarch64": "endian-little bit-64 arm-common arm-64",
22 "aarch64_be": "endian-big bit-64 arm-common", 22 "aarch64_be": "endian-big bit-64 arm-common arm-64",
23 "arm": "endian-little bit-32 arm-common", 23 "arm": "endian-little bit-32 arm-common arm-32",
24 "armeb": "endian-big bit-32 arm-common", 24 "armeb": "endian-big bit-32 arm-common arm-32",
25 "avr32": "endian-big bit-32 avr32-common", 25 "avr32": "endian-big bit-32 avr32-common",
26 "bfin": "endian-little bit-32 bfin-common", 26 "bfin": "endian-little bit-32 bfin-common",
27 "i386": "endian-little bit-32 ix86-common", 27 "i386": "endian-little bit-32 ix86-common",
diff --git a/meta/site/arm-32 b/meta/site/arm-32
new file mode 100644
index 0000000000..81fd8d3103
--- /dev/null
+++ b/meta/site/arm-32
@@ -0,0 +1,47 @@
1# definitions assuming 32-bit arm architecture
2
3# apache
4ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
5ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4}
6
7# glib
8glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
9glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
10glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
11
12# glib-2.0
13glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
14glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8}
15glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4}
16glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4}
17glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
18ac_cv_alignof_guint32=4
19ac_cv_alignof_guint64=8
20ac_cv_alignof_unsigned_long=4
21
22# jikes
23ac_cv_sizeof_wchar_t=4
24
25# ORBit2
26ac_cv_alignof_CORBA_boolean=1
27ac_cv_alignof_CORBA_char=1
28ac_cv_alignof_CORBA_double=8
29ac_cv_alignof_CORBA_float=4
30ac_cv_alignof_CORBA_long=4
31ac_cv_alignof_CORBA_long_double=8
32ac_cv_alignof_CORBA_long_long=8
33ac_cv_alignof_CORBA_octet=1
34ac_cv_alignof_CORBA_pointer=4
35ac_cv_alignof_CORBA_short=2
36ac_cv_alignof_CORBA_struct=1
37ac_cv_alignof_CORBA_wchar=2
38
39# at-spi2-core
40ac_cv_alignof_char=1
41ac_cv_alignof_dbind_pointer=4
42ac_cv_alignof_dbind_struct=1
43ac_cv_alignof_dbus_bool_t=4
44ac_cv_alignof_dbus_int16_t=2
45ac_cv_alignof_dbus_int32_t=4
46ac_cv_alignof_dbus_int64_t=8
47ac_cv_alignof_double=8
diff --git a/meta/site/arm-64 b/meta/site/arm-64
new file mode 100644
index 0000000000..90c09b2d54
--- /dev/null
+++ b/meta/site/arm-64
@@ -0,0 +1,46 @@
1# definitions assuming 64-bit arm architecture
2
3# general
4ac_cv_sizeof_wchar_t=4
5ac_cv_sizeof_size_t=8
6ac_cv_sizeof_ssize_t=8
7ac_cv_alignof_char=1
8ac_cv_alignof_double=8
9
10# glib
11#glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
12#glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
13#glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
14
15# glib-2.0
16#glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
17#glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8}
18#glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4}
19#glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4}
20#glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
21ac_cv_alignof_guint32=4
22ac_cv_alignof_guint64=8
23ac_cv_alignof_unsigned_long=8
24
25# ORBit2 (should be in meta-gnome/site/arm-64)
26#ac_cv_alignof_CORBA_boolean=1
27#ac_cv_alignof_CORBA_char=1
28#ac_cv_alignof_CORBA_double=8
29#ac_cv_alignof_CORBA_float=4
30#ac_cv_alignof_CORBA_long=4
31#ac_cv_alignof_CORBA_long_double=8
32#ac_cv_alignof_CORBA_long_long=8
33#ac_cv_alignof_CORBA_octet=1
34#ac_cv_alignof_CORBA_pointer=4
35#ac_cv_alignof_CORBA_short=2
36#ac_cv_alignof_CORBA_struct=1
37#ac_cv_alignof_CORBA_wchar=2
38
39# at-spi2-core
40ac_cv_alignof_dbind_pointer=8
41ac_cv_alignof_dbind_struct=1
42ac_cv_alignof_dbus_bool_t=4
43ac_cv_alignof_dbus_int16_t=2
44ac_cv_alignof_dbus_int32_t=4
45ac_cv_alignof_dbus_int64_t=8
46
diff --git a/meta/site/arm-common b/meta/site/arm-common
index 1893dc0ab8..12e5d4592a 100644
--- a/meta/site/arm-common
+++ b/meta/site/arm-common
@@ -11,7 +11,6 @@ ac_cv_sctp=${ac_cv_sctp=no}
11# apache 11# apache
12ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} 12ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes}
13apr_cv_process_shared_works=${apr_cv_process_shared_works=no} 13apr_cv_process_shared_works=${apr_cv_process_shared_works=no}
14ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4}
15apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes} 14apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes}
16 15
17# bash 16# bash
@@ -51,8 +50,6 @@ ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
51am_cv_func_working_getline=${am_cv_func_working_getline=yes} 50am_cv_func_working_getline=${am_cv_func_working_getline=yes}
52 51
53# glib 52# glib
54glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
55glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
56glib_cv_stack_grows=${glib_cv_stack_grows=no} 53glib_cv_stack_grows=${glib_cv_stack_grows=no}
57glib_cv_uscore=${glib_cv_uscore=no} 54glib_cv_uscore=${glib_cv_uscore=no}
58glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes} 55glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
@@ -60,7 +57,6 @@ glib_cv_has__inline=${glib_cv_has__inline=yes}
60glib_cv_has__inline__=${glib_cv_has__inline__=yes} 57glib_cv_has__inline__=${glib_cv_has__inline__=yes}
61glib_cv_hasinline=${glib_cv_hasinline=yes} 58glib_cv_hasinline=${glib_cv_hasinline=yes}
62glib_cv_sane_realloc=${glib_cv_sane_realloc=yes} 59glib_cv_sane_realloc=${glib_cv_sane_realloc=yes}
63glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
64glib_cv_uscore=${glib_cv_uscore=no} 60glib_cv_uscore=${glib_cv_uscore=no}
65glib_cv_va_val_copy=${glib_cv_va_val_copy=yes} 61glib_cv_va_val_copy=${glib_cv_va_val_copy=yes}
66glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no} 62glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no}
@@ -70,15 +66,7 @@ glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_po
70 66
71# glib-2.0 67# glib-2.0
72glib_cv_long_long_format=${glib_cv_long_long_format=ll} 68glib_cv_long_long_format=${glib_cv_long_long_format=ll}
73glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
74glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8}
75glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4}
76glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4}
77glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
78glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} 69glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes}
79ac_cv_alignof_guint32=4
80ac_cv_alignof_guint64=8
81ac_cv_alignof_unsigned_long=4
82 70
83#gstreamer 71#gstreamer
84as_cv_unaligned_access=${as_cv_unaligned_access=no} 72as_cv_unaligned_access=${as_cv_unaligned_access=no}
@@ -86,9 +74,6 @@ as_cv_unaligned_access=${as_cv_unaligned_access=no}
86# httppc 74# httppc
87ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no} 75ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no}
88 76
89# jikes
90ac_cv_sizeof_wchar_t=4
91
92# lftp 77# lftp
93ac_cv_need_trio=${ac_cv_need_trio=no} 78ac_cv_need_trio=${ac_cv_need_trio=no}
94lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes} 79lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes}
@@ -119,20 +104,6 @@ mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no}
119ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} 104ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no}
120nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} 105nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
121 106
122# ORBit2
123ac_cv_alignof_CORBA_boolean=1
124ac_cv_alignof_CORBA_char=1
125ac_cv_alignof_CORBA_double=8
126ac_cv_alignof_CORBA_float=4
127ac_cv_alignof_CORBA_long=4
128ac_cv_alignof_CORBA_long_double=8
129ac_cv_alignof_CORBA_long_long=8
130ac_cv_alignof_CORBA_octet=1
131ac_cv_alignof_CORBA_pointer=4
132ac_cv_alignof_CORBA_short=2
133ac_cv_alignof_CORBA_struct=1
134ac_cv_alignof_CORBA_wchar=2
135
136# php 107# php
137ac_cv_pread=${ac_cv_pread=no} 108ac_cv_pread=${ac_cv_pread=no}
138ac_cv_pwrite=${ac_cv_pwrite=no} 109ac_cv_pwrite=${ac_cv_pwrite=no}
@@ -186,12 +157,3 @@ jm_cv_func_working_readdir=yes
186# evolution-data-server 157# evolution-data-server
187ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes} 158ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
188 159
189# at-spi2-core
190ac_cv_alignof_char=1
191ac_cv_alignof_dbind_pointer=4
192ac_cv_alignof_dbind_struct=1
193ac_cv_alignof_dbus_bool_t=4
194ac_cv_alignof_dbus_int16_t=2
195ac_cv_alignof_dbus_int32_t=4
196ac_cv_alignof_dbus_int64_t=8
197ac_cv_alignof_double=8