diff options
Diffstat (limited to 'meta-linaro-integration')
95 files changed, 16061 insertions, 0 deletions
diff --git a/meta-linaro-integration/README b/meta-linaro-integration/README new file mode 100644 index 0000000..fdca8c7 --- /dev/null +++ b/meta-linaro-integration/README | |||
@@ -0,0 +1,15 @@ | |||
1 | Integration layer for Linaro Builds & Baselines | ||
2 | =============================================== | ||
3 | |||
4 | |||
5 | This layer is meant to fix or workaround integration issues which would normally go into a DISTRO layer. The B&B builds use OE-core distroless, but some tweaks are needed: | ||
6 | |||
7 | 1) Enable busybox httpd, the CI loop depends on it | ||
8 | 2) Overlay/bbappend recipes till fixes go upstream | ||
9 | |||
10 | OE-core is extremely non-transparent when fixes will go in or get rejected, meta-openembedded is better but depends on a CI loop (test-dependencies) that currently takes 15 days to complete. Due to our use of monthly cycles and the effort to maintain forks recipes will get overlayed/bbappended with our changes here. | ||
11 | |||
12 | Topic specific bbappends like aarch64 or bigendian should remain in their respective layers since those are BSP type changes, not DISTRO type changes. | ||
13 | |||
14 | |||
15 | |||
diff --git a/meta-linaro-integration/conf/layer.conf b/meta-linaro-integration/conf/layer.conf new file mode 100644 index 0000000..edb8f29 --- /dev/null +++ b/meta-linaro-integration/conf/layer.conf | |||
@@ -0,0 +1,16 @@ | |||
1 | BBPATH .= ":${LAYERDIR}" | ||
2 | BBFILES += "\ | ||
3 | ${LAYERDIR}/recipes-*/*/*.bb \ | ||
4 | ${LAYERDIR}/recipes-*/*/*.bbappend \ | ||
5 | " | ||
6 | |||
7 | BBFILE_COLLECTIONS += "linaro-integration" | ||
8 | BBFILE_PATTERN_linaro-integration := "^${LAYERDIR}/" | ||
9 | BBFILE_PRIORITY_linaro-integration = "30" | ||
10 | |||
11 | # do not error out on bbappends for missing recipes | ||
12 | BB_DANGLINGAPPENDS_WARNONLY = "true" | ||
13 | |||
14 | SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | ||
15 | gcc-cross-${TARGET_ARCH}->glibc \ | ||
16 | " | ||
diff --git a/meta-linaro-integration/recipes-core/busybox/busybox_%.bbappend b/meta-linaro-integration/recipes-core/busybox/busybox_%.bbappend new file mode 100644 index 0000000..0fd4571 --- /dev/null +++ b/meta-linaro-integration/recipes-core/busybox/busybox_%.bbappend | |||
@@ -0,0 +1,3 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
2 | |||
3 | SRC_URI += "file://linaro.cfg" | ||
diff --git a/meta-linaro-integration/recipes-core/busybox/files/linaro.cfg b/meta-linaro-integration/recipes-core/busybox/files/linaro.cfg new file mode 100644 index 0000000..d652fa2 --- /dev/null +++ b/meta-linaro-integration/recipes-core/busybox/files/linaro.cfg | |||
@@ -0,0 +1,6 @@ | |||
1 | CONFIG_DPKG_DEB=y | ||
2 | CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y | ||
3 | CONFIG_SETSID=y | ||
4 | CONFIG_HTTPD=y | ||
5 | CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y | ||
6 | CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/acpica/acpica_20140828.bb b/meta-linaro-integration/recipes-overlayed/acpica/acpica_20140828.bb new file mode 100644 index 0000000..fb19c88 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/acpica/acpica_20140828.bb | |||
@@ -0,0 +1,34 @@ | |||
1 | SUMMARY = "ACPICA tools for the development and debug of ACPI tables" | ||
2 | DESCRIPTION = "The ACPI Component Architecture (ACPICA) project provides an \ | ||
3 | OS-independent reference implementation of the Advanced Configuration and \ | ||
4 | Power Interface Specification (ACPI). ACPICA code contains those portions of \ | ||
5 | ACPI meant to be directly integrated into the host OS as a kernel-resident \ | ||
6 | subsystem, and a small set of tools to assist in developing and debugging \ | ||
7 | ACPI tables." | ||
8 | HOMEPAGE = "http://www.acpica.org/" | ||
9 | SECTION = "console/tools" | ||
10 | LICENSE = "BSD | GPLv2" | ||
11 | LIC_FILES_CHKSUM = "file://generate/unix/readme.txt;md5=204407e197c1a01154a48f6c6280c3aa" | ||
12 | DEPENDS = "bison flex" | ||
13 | |||
14 | SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \ | ||
15 | file://no-werror.patch \ | ||
16 | " | ||
17 | SRC_URI[md5sum] = "6f05f0d10166a1b1ff6107f3d1cdf1e5" | ||
18 | SRC_URI[sha256sum] = "01d8867656c5ba41dec307c4383ce676196ad4281ac2c9dec9f5be5fac6d888e" | ||
19 | |||
20 | S = "${WORKDIR}/acpica-unix2-${PV}" | ||
21 | |||
22 | EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'" | ||
23 | |||
24 | do_install() { | ||
25 | install -D -p -m0755 generate/unix/bin*/iasl ${D}${bindir}/iasl | ||
26 | install -D -p -m0755 generate/unix/bin*/acpibin ${D}${bindir}/acpibin | ||
27 | install -D -p -m0755 generate/unix/bin*/acpiexec ${D}${bindir}/acpiexec | ||
28 | install -D -p -m0755 generate/unix/bin*/acpihelp ${D}${bindir}/acpihelp | ||
29 | install -D -p -m0755 generate/unix/bin*/acpinames ${D}${bindir}/acpinames | ||
30 | install -D -p -m0755 generate/unix/bin*/acpisrc ${D}${bindir}/acpisrc | ||
31 | install -D -p -m0755 generate/unix/bin*/acpixtract ${D}${bindir}/acpixtract | ||
32 | } | ||
33 | |||
34 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/acpica/acpitests/0001-aaptisrun-alter-to-allow-destination-directory-as-ar.patch b/meta-linaro-integration/recipes-overlayed/acpica/acpitests/0001-aaptisrun-alter-to-allow-destination-directory-as-ar.patch new file mode 100644 index 0000000..47c2dd2 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/acpica/acpitests/0001-aaptisrun-alter-to-allow-destination-directory-as-ar.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From b74f3c497d3fb689d12aed26dd5b8614ca6ac96e Mon Sep 17 00:00:00 2001 | ||
2 | From: Graeme Gregory <graeme.gregory@linaro.org> | ||
3 | Date: Tue, 25 Nov 2014 12:49:42 +0000 | ||
4 | Subject: [PATCH] aaptisrun : alter to allow destination directory as argument | ||
5 | |||
6 | Also search for appits in $PATH | ||
7 | |||
8 | Upstream-status: Inapropriate [LAVA use only, upstream unmaintained] | ||
9 | Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org> | ||
10 | --- | ||
11 | tests/aapits/bin/aapitsrun | 6 ++++-- | ||
12 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/tests/aapits/bin/aapitsrun b/tests/aapits/bin/aapitsrun | ||
15 | index cfa999e..3a97a0f 100755 | ||
16 | --- a/tests/aapits/bin/aapitsrun | ||
17 | +++ b/tests/aapits/bin/aapitsrun | ||
18 | @@ -20,7 +20,7 @@ | ||
19 | |||
20 | # Init variables of utility | ||
21 | |||
22 | -AAPITSDIR=../tmp | ||
23 | +AAPITSDIR="$1" | ||
24 | |||
25 | AAPITSOUT=${AAPITSDIR}/raw.out | ||
26 | AAPITSSUM=${AAPITSDIR}/sum.out | ||
27 | @@ -56,6 +56,8 @@ TESTS_NUMBERS="$AT_INIT_TEST_NUM $AT_MEMM_TEST_NUM $AT_TBLM_TEST_NUM $AT_NSPM_TE | ||
28 | |||
29 | # Check the working directory | ||
30 | |||
31 | +mkdir -p "$AAPITSDIR/aml" || true | ||
32 | + | ||
33 | if [ ! -d "$AAPITSDIR" ]; then | ||
34 | echo "There is no directory $AAPITSDIR, run make in ../asl" | ||
35 | exit 1 | ||
36 | @@ -68,7 +70,7 @@ if [ ! -d "$AAPITSAML" ]; then | ||
37 | exit 1 | ||
38 | fi | ||
39 | |||
40 | -AAPITS=./aapits | ||
41 | +AAPITS=`which aapits` | ||
42 | |||
43 | # Check access to AapiTS utility | ||
44 | |||
45 | @@ -144,8 +144,8 @@ echo "tests_fail=$tests_fail" | ||
46 | echo "tests_none=$tests_none" | ||
47 | echo "tests_fault=$tests_fault" | ||
48 | |||
49 | -echo "End AAPI TS: " $TS_FMT_INIDATE:$TS_FMT_INITIME > $AAPITSOUT | ||
50 | -echo "End AAPI TS: " $TS_FMT_INIDATE:$TS_FMT_INITIME > $AAPITSSUM | ||
51 | +echo "End AAPI TS: " $TS_FMT_INIDATE:$TS_FMT_INITIME >> $AAPITSOUT | ||
52 | +echo "End AAPI TS: " $TS_FMT_INIDATE:$TS_FMT_INITIME >> $AAPITSSUM | ||
53 | echo "End AAPI TS: " $TS_FMT_INIDATE:$TS_FMT_INITIME | ||
54 | |||
55 | exit 0 | ||
56 | |||
57 | -- | ||
58 | 2.1.1 | ||
59 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/acpica/acpitests/aapits-linux.patch b/meta-linaro-integration/recipes-overlayed/acpica/acpitests/aapits-linux.patch new file mode 100644 index 0000000..7c5d6b0 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/acpica/acpitests/aapits-linux.patch | |||
@@ -0,0 +1,336 @@ | |||
1 | From: Al Stone <ahs3@ahs3.net> | ||
2 | Date: Mon, 7 Apr 2014 19:09:37 +0000 | ||
3 | Subject: [PATCH 1/2] Fixup aapits build | ||
4 | |||
5 | From http://git.linaro.org/people/al.stone/acpica-tools.git | ||
6 | Upstream-status: Unknown | ||
7 | |||
8 | diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapits/tests/aapits/atexec.c | ||
9 | --- acpica-unix2-20130626/tests/aapits/atexec.c 2013-01-17 12:48:28.000000000 -0700 | ||
10 | +++ acpica-unix2-20130626-aapits/tests/aapits/atexec.c 2013-07-25 13:44:23.023894441 -0600 | ||
11 | @@ -639,6 +639,7 @@ | ||
12 | } | ||
13 | |||
14 | |||
15 | +#if ACPI_MACHINE_WIDTH == 32 | ||
16 | /******************************************************************************* | ||
17 | * | ||
18 | * FUNCTION: AtBuildLocalRSDT | ||
19 | @@ -757,8 +758,9 @@ | ||
20 | LocalRSDT->Header.Checksum = (UINT8)~LocalRSDT->Header.Checksum; | ||
21 | } | ||
22 | } | ||
23 | +#endif | ||
24 | |||
25 | |||
26 | /******************************************************************************* | ||
27 | * | ||
28 | * FUNCTION: AtBuildLocalXSDT | ||
29 | @@ -1424,7 +1426,7 @@ | ||
30 | ACPI_WARNING ((AE_INFO, | ||
31 | "Request on [%4.4s] is beyond region limit Req-%X+%X, Base=%X, Len-%X\n", | ||
32 | (RegionObject->Region.Node)->Name.Ascii, (UINT32) Address, | ||
33 | - ByteWidth, (UINT32) BufferAddress, Length)); | ||
34 | + ByteWidth, (UINT32) BufferAddress, (UINT32) Length)); | ||
35 | |||
36 | return (AE_AML_REGION_LIMIT); | ||
37 | } | ||
38 | @@ -1792,7 +1796,9 @@ | ||
39 | Path, Obj.Integer.Value, Value); | ||
40 | #else | ||
41 | printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", | ||
42 | - Path, Obj.Integer.Value, Value); | ||
43 | + Path, | ||
44 | + (long long unsigned int) Obj.Integer.Value, | ||
45 | + (long long unsigned int) Value); | ||
46 | #endif | ||
47 | Status = AE_ERROR; | ||
48 | } | ||
49 | @@ -1871,7 +1877,7 @@ | ||
50 | { | ||
51 | TestErrors++; | ||
52 | printf ("Test Error: cannot allocate buffer of %d bytes\n", | ||
53 | - Results.Length); | ||
54 | + (int) Results.Length); | ||
55 | return (AE_NO_MEMORY); | ||
56 | } | ||
57 | Results.Pointer = Object; | ||
58 | @@ -1952,7 +1956,8 @@ | ||
59 | { | ||
60 | printf ("AtCheckBuffer: unexpected length %d of Buffer vs" | ||
61 | " calculated %d bytes\n", | ||
62 | - Results.Length, ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof (ACPI_OBJECT) + Length)); | ||
63 | + (int)Results.Length, | ||
64 | + (int)(ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof (ACPI_OBJECT) + Length))); | ||
65 | } | ||
66 | |||
67 | /* Initialize the return buffer structure */ | ||
68 | @@ -1961,7 +1968,7 @@ | ||
69 | { | ||
70 | TestErrors++; | ||
71 | printf ("Test Error: cannot allocate buffer of %d bytes\n", | ||
72 | - Results.Length); | ||
73 | + (int) Results.Length); | ||
74 | return (AE_NO_MEMORY); | ||
75 | } | ||
76 | Results.Pointer = Object; | ||
77 | diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapits/tests/aapits/atinit.c | ||
78 | --- acpica-unix2-20130626/tests/aapits/atinit.c 2013-01-17 12:48:28.000000000 -0700 | ||
79 | +++ acpica-unix2-20130626-aapits/tests/aapits/atinit.c 2013-07-25 13:20:19.706705960 -0600 | ||
80 | @@ -3024,7 +3024,7 @@ | ||
81 | AapiErrors++; | ||
82 | printf ("API Error: AcpiGetSystemInfo() returned" | ||
83 | " Length %d, expected %d\n", | ||
84 | - OutBuffer.Length, sizeof (Info)); | ||
85 | + (int) OutBuffer.Length, (int) sizeof (Info)); | ||
86 | return (AE_ERROR); | ||
87 | } | ||
88 | |||
89 | @@ -3046,7 +3046,7 @@ | ||
90 | AapiErrors++; | ||
91 | printf ("API Error: AcpiGetSystemInfo() returned" | ||
92 | " Length %d, expected %d\n", | ||
93 | - OutBuffer.Length, sizeof (Info)); | ||
94 | + (int) OutBuffer.Length, (int) sizeof (Info)); | ||
95 | return (AE_ERROR); | ||
96 | } | ||
97 | |||
98 | @@ -3066,7 +3066,7 @@ | ||
99 | AapiErrors++; | ||
100 | printf ("API Error: AcpiGetSystemInfo() returned" | ||
101 | " Length %d, expected %d\n", | ||
102 | - OutBuffer.Length, sizeof (Info)); | ||
103 | + (int) OutBuffer.Length, (int) sizeof (Info)); | ||
104 | return (AE_ERROR); | ||
105 | } | ||
106 | else if (OutBuffer.Pointer != &Info) | ||
107 | @@ -3149,7 +3149,7 @@ | ||
108 | AapiErrors++; | ||
109 | printf ("API Error: AcpiGetSystemInfo() returned" | ||
110 | " Length %d, expected %d\n", | ||
111 | - OutBuffer.Length, sizeof (Info)); | ||
112 | + (int) OutBuffer.Length, (int) sizeof (Info)); | ||
113 | return (AE_ERROR); | ||
114 | } | ||
115 | else if (OutBuffer.Pointer != &Info) | ||
116 | @@ -3214,7 +3214,7 @@ | ||
117 | AapiErrors++; | ||
118 | printf ("API Error: AcpiGetSystemInfo() returned" | ||
119 | " Length %d, expected %d\n", | ||
120 | - OutBuffer.Length, sizeof (ACPI_SYSTEM_INFO)); | ||
121 | + (int) OutBuffer.Length, (int) sizeof (ACPI_SYSTEM_INFO)); | ||
122 | return (AE_ERROR); | ||
123 | } | ||
124 | else | ||
125 | diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapits/tests/aapits/atmain.c | ||
126 | --- acpica-unix2-20130626/tests/aapits/atmain.c 2013-01-17 12:48:28.000000000 -0700 | ||
127 | +++ acpica-unix2-20130626-aapits/tests/aapits/atmain.c 2013-07-25 13:18:22.083323948 -0600 | ||
128 | @@ -315,7 +315,7 @@ | ||
129 | { | ||
130 | printf ("ACPICA API TS err: test num %ld of test case %ld" | ||
131 | " is not implemented\n", | ||
132 | - test_num, test_case); | ||
133 | + (long int) test_num, (long int) test_case); | ||
134 | return (AtRetNotImpl); | ||
135 | } | ||
136 | |||
137 | @@ -430,7 +432,7 @@ | ||
138 | if (test_case < 1 || test_case > AT_TEST_CASE_NUM) | ||
139 | { | ||
140 | printf ("ACPICA API TS err: test case %ld is out of range 1 - %d\n", | ||
141 | - test_case, AT_TEST_CASE_NUM); | ||
142 | + (long int) test_case, (int) AT_TEST_CASE_NUM); | ||
143 | return (AtRetBadParam); | ||
144 | } | ||
145 | |||
146 | @@ -438,7 +440,7 @@ | ||
147 | if (test_num < 0 || test_num > AtTestCase[test_case].TestsNum) | ||
148 | { | ||
149 | printf ("ACPICA API TS err: test num %ld is out of range 0 - %d\n", | ||
150 | - test_num, AtTestCase[test_case].TestsNum); | ||
151 | + (long int) test_num, AtTestCase[test_case].TestsNum); | ||
152 | return (AtRetBadParam); | ||
153 | } | ||
154 | |||
155 | diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626-aapits/tests/aapits/atnamespace.c | ||
156 | --- acpica-unix2-20130626/tests/aapits/atnamespace.c 2013-01-17 12:48:28.000000000 -0700 | ||
157 | +++ acpica-unix2-20130626-aapits/tests/aapits/atnamespace.c 2013-07-25 13:24:15.366466707 -0600 | ||
158 | @@ -2535,7 +2535,8 @@ | ||
159 | #else | ||
160 | printf ("API Error: Address of %s (0x%llX) != (0x%llX)\n", | ||
161 | PathNames[2 * i + 1], | ||
162 | - Info->Address, ExpectedInfo[i].Address); | ||
163 | + (long long unsigned int) Info->Address, | ||
164 | + (long long unsigned int) ExpectedInfo[i].Address); | ||
165 | #endif | ||
166 | #else | ||
167 | printf ("API Error: Address of %s (0x%X) != (0x%X)\n", | ||
168 | @@ -2908,7 +2909,8 @@ | ||
169 | TestErrors++; | ||
170 | printf ("AtGetNextObjectTypeCommon: different numbers of entities" | ||
171 | "in TypesNames (%d) and LevelTypes0000 (%d)\n", | ||
172 | - TypesCount, sizeof (LevelTypes0000) / sizeof (ACPI_OBJECT_TYPE)); | ||
173 | + TypesCount, | ||
174 | + (int) (sizeof (LevelTypes0000) / sizeof (ACPI_OBJECT_TYPE))); | ||
175 | return (AE_ERROR); | ||
176 | } | ||
177 | |||
178 | @@ -4192,7 +4194,9 @@ | ||
179 | Pathname, Obj.Integer.Value, Value); | ||
180 | #else | ||
181 | printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", | ||
182 | - Pathname, Obj.Integer.Value, Value); | ||
183 | + Pathname, | ||
184 | + (long long unsigned int) Obj.Integer.Value, | ||
185 | + (long long unsigned int) Value); | ||
186 | #endif | ||
187 | Status = AE_ERROR; | ||
188 | } | ||
189 | @@ -5199,7 +5203,7 @@ | ||
190 | { | ||
191 | AapiErrors++; | ||
192 | printf ("API Error: AcpiOsAllocate(%d) returned NULL\n", | ||
193 | - OutName.Length); | ||
194 | + (int) OutName.Length); | ||
195 | return (AE_ERROR); | ||
196 | } | ||
197 | } | ||
198 | diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626-aapits/tests/aapits/atosxfctrl.c | ||
199 | --- acpica-unix2-20130626/tests/aapits/atosxfctrl.c 2013-01-17 12:48:28.000000000 -0700 | ||
200 | +++ acpica-unix2-20130626-aapits/tests/aapits/atosxfctrl.c 2013-07-25 13:30:00.375492751 -0600 | ||
201 | @@ -737,13 +737,15 @@ | ||
202 | #if ACPI_MACHINE_WIDTH == 64 | ||
203 | #ifdef _MSC_VER | ||
204 | printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%I64x\n", | ||
205 | + Width, Address); | ||
206 | #else | ||
207 | printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%llx\n", | ||
208 | + Width, (long long unsigned int) Address); | ||
209 | #endif | ||
210 | #else | ||
211 | printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%x\n", | ||
212 | -#endif | ||
213 | Width, Address); | ||
214 | +#endif | ||
215 | return (NULL); | ||
216 | } | ||
217 | |||
218 | @@ -764,15 +766,19 @@ | ||
219 | #ifdef _MSC_VER | ||
220 | printf("OsxfCtrlFingReg: intersection Regs (0x%I64x: 0x%x)" | ||
221 | " and (0x%I64x: 0x%x)\n", | ||
222 | + Reg->Address, Reg->Width, Address, Width); | ||
223 | #else | ||
224 | printf("OsxfCtrlFingReg: intersection Regs (0x%llx: 0x%x)" | ||
225 | " and (0x%llx: 0x%x)\n", | ||
226 | + (long long unsigned int) Reg->Address, | ||
227 | + Reg->Width, | ||
228 | + (long long unsigned int) Address, Width); | ||
229 | #endif | ||
230 | #else | ||
231 | printf("OsxfCtrlFingReg: intersection Regs (0x%x: 0x%x)" | ||
232 | " and (0x%x: 0x%x)\n", | ||
233 | -#endif | ||
234 | Reg->Address, Reg->Width, Address, Width); | ||
235 | +#endif | ||
236 | return (NULL); | ||
237 | } | ||
238 | } | ||
239 | @@ -786,13 +792,15 @@ | ||
240 | #if ACPI_MACHINE_WIDTH == 64 | ||
241 | #ifdef _MSC_VER | ||
242 | printf("OsxfCtrlFingReg: no memory for Reg (0x%I64x: 0x%x)\n", | ||
243 | + Reg->Address, Reg->Width); | ||
244 | #else | ||
245 | printf("OsxfCtrlFingReg: no memory for Reg (0x%llx: 0x%x)\n", | ||
246 | + (long long unsigned int) Reg->Address, Reg->Width); | ||
247 | #endif | ||
248 | #else | ||
249 | printf("OsxfCtrlFingReg: no memory for Reg (0x%x: 0x%x)\n", | ||
250 | -#endif | ||
251 | Reg->Address, Reg->Width); | ||
252 | +#endif | ||
253 | return (NULL); | ||
254 | } | ||
255 | Reg->Type = Type; | ||
256 | @@ -932,14 +940,19 @@ | ||
257 | #if ACPI_MACHINE_WIDTH == 64 | ||
258 | #ifdef _MSC_VER | ||
259 | printf("%.2u (%s Address 0x%I64x: Width %.2u) r/w counts: %u/%u\n", | ||
260 | + i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO", | ||
261 | + Reg->Address, Reg->Width, Reg->ReadCount, Reg->WriteCount); | ||
262 | #else | ||
263 | printf("%.2u (%s Address 0x%llx: Width %.2u) r/w counts: %u/%u\n", | ||
264 | + i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO", | ||
265 | + (long long unsigned int) Reg->Address, | ||
266 | + Reg->Width, Reg->ReadCount, Reg->WriteCount); | ||
267 | #endif | ||
268 | #else | ||
269 | printf("%.2u (%s Address 0x%.4x: Width %.2u) r/w counts: %u/%u\n", | ||
270 | -#endif | ||
271 | i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO", | ||
272 | Reg->Address, Reg->Width, Reg->ReadCount, Reg->WriteCount); | ||
273 | +#endif | ||
274 | Reg = Reg->Next; | ||
275 | i++; | ||
276 | } | ||
277 | diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626-aapits/tests/aapits/atresource.c | ||
278 | --- acpica-unix2-20130626/tests/aapits/atresource.c 2013-01-17 12:48:29.000000000 -0700 | ||
279 | +++ acpica-unix2-20130626-aapits/tests/aapits/atresource.c 2013-07-25 13:25:49.423565947 -0600 | ||
280 | @@ -174,7 +174,7 @@ | ||
281 | AapiErrors++; | ||
282 | printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d," | ||
283 | " expected %d\n", | ||
284 | - Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN); | ||
285 | + Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN); | ||
286 | return (AE_ERROR); | ||
287 | } | ||
288 | |||
289 | @@ -490,7 +490,7 @@ | ||
290 | AapiErrors++; | ||
291 | printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d," | ||
292 | " expected %d\n", | ||
293 | - Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN); | ||
294 | + Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN); | ||
295 | return (AE_ERROR); | ||
296 | } | ||
297 | |||
298 | @@ -689,7 +689,7 @@ | ||
299 | AapiErrors++; | ||
300 | printf ("Api Error: Resource->Length (%d) != %d\n", | ||
301 | CurrentResource->Length, | ||
302 | - ACPI_ROUND_UP_TO_NATIVE_WORD (ACPI_RS_SIZE (ACPI_RESOURCE_IRQ))); | ||
303 | + (int) (ACPI_ROUND_UP_TO_NATIVE_WORD (ACPI_RS_SIZE (ACPI_RESOURCE_IRQ)))); | ||
304 | } | ||
305 | |||
306 | if (CurrentResource->Data.Irq.Triggering != 0) /* Level-Triggered */ | ||
307 | @@ -981,7 +981,7 @@ | ||
308 | AapiErrors++; | ||
309 | printf ("API Error: AcpiGetPossibleResources(%s) returned Length %d," | ||
310 | " expected %d\n", | ||
311 | - Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN); | ||
312 | + Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN); | ||
313 | return (AE_ERROR); | ||
314 | } | ||
315 | |||
316 | @@ -1923,7 +1923,7 @@ | ||
317 | AapiErrors++; | ||
318 | printf ("API Error: AcpiGetIrqRoutingTable(%s) returned Length %d," | ||
319 | " expected %d\n", | ||
320 | - Pathname, OutBuffer.Length, 0xA48); | ||
321 | + Pathname, (int) OutBuffer.Length, 0xA48); | ||
322 | return (AE_ERROR); | ||
323 | } | ||
324 | |||
325 | diff -urN acpica-unix2-20130626/tests/aapits/Makefile acpica-unix2-20130626-aapits/tests/aapits/Makefile | ||
326 | --- acpica-unix2-20130626/tests/aapits/Makefile 2013-01-17 12:48:29.000000000 -0700 | ||
327 | +++ acpica-unix2-20130626-aapits/tests/aapits/Makefile 2013-07-25 15:17:09.309236422 -0600 | ||
328 | @@ -194,7 +194,7 @@ | ||
329 | CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_APITS -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../source/include | ||
330 | |||
331 | |||
332 | -acpiexec : $(patsubst %.c,%.o, $(SRCS)) | ||
333 | +$(PROG) : $(patsubst %.c,%.o, $(SRCS)) | ||
334 | $(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG) | ||
335 | |||
336 | CLEANFILES= $(PROG) | ||
diff --git a/meta-linaro-integration/recipes-overlayed/acpica/acpitests/aapits-makefile.patch b/meta-linaro-integration/recipes-overlayed/acpica/acpitests/aapits-makefile.patch new file mode 100644 index 0000000..4d9e997 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/acpica/acpitests/aapits-makefile.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From: Al Stone <ahs3@ahs3.net> | ||
2 | Date: Mon, 7 Apr 2014 19:09:37 +0000 | ||
3 | Subject: [PATCH 1/2] Fixup aapits build | ||
4 | |||
5 | From http://git.linaro.org/people/al.stone/acpica-tools.git | ||
6 | Upstream-status: Unknown | ||
7 | |||
8 | diff -urN acpica-unix2-20140325/tests/aapits/Makefile acpica-unix2-20140325/tests/aapits/Makefile | ||
9 | --- acpica-unix2-20140325/tests/aapits/Makefile 2014-04-05 14:23:14.683636794 -0600 | ||
10 | +++ acpica-unix2-20140325-aapits/tests/aapits/Makefile 2014-04-05 15:10:57.879184598 -0600 | ||
11 | @@ -16,6 +16,7 @@ | ||
12 | atosxfwrap.c \ | ||
13 | osunixxf.c \ | ||
14 | ../../source/common/ahids.c \ | ||
15 | + ../../source/common/ahuuids.c \ | ||
16 | ../../source/common/cmfsize.c \ | ||
17 | ../../source/common/getopt.c \ | ||
18 | ../../source/components/hardware/hwtimer.c \ | ||
19 | @@ -174,6 +175,7 @@ | ||
20 | ../../source/components/utilities/utexcep.c \ | ||
21 | ../../source/components/utilities/utfileio.c \ | ||
22 | ../../source/components/utilities/utglobal.c \ | ||
23 | + ../../source/components/utilities/uthex.c \ | ||
24 | ../../source/components/utilities/utids.c \ | ||
25 | ../../source/components/utilities/utinit.c \ | ||
26 | ../../source/components/utilities/utlock.c \ | ||
27 | @@ -189,6 +191,7 @@ | ||
28 | ../../source/components/utilities/utstate.c \ | ||
29 | ../../source/components/utilities/utstring.c \ | ||
30 | ../../source/components/utilities/uttrack.c \ | ||
31 | + ../../source/components/utilities/utuuid.c \ | ||
32 | ../../source/components/utilities/utxface.c \ | ||
33 | ../../source/components/utilities/utxferror.c \ | ||
34 | ../../source/components/utilities/utxfinit.c \ | ||
diff --git a/meta-linaro-integration/recipes-overlayed/acpica/acpitests_20140828.bb b/meta-linaro-integration/recipes-overlayed/acpica/acpitests_20140828.bb new file mode 100644 index 0000000..3f5701b --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/acpica/acpitests_20140828.bb | |||
@@ -0,0 +1,37 @@ | |||
1 | SUMMARY = "Test suite used to validate ACPICA" | ||
2 | HOMEPAGE = "http://www.acpica.org/" | ||
3 | |||
4 | LICENSE = "Intel" | ||
5 | LIC_FILES_CHKSUM = "file://tests/aapits/atexec.c;beginline=1;endline=115;md5=e92bcdfcd01d117d1bda3e814bb2030a" | ||
6 | |||
7 | DEPENDS = "bison flex" | ||
8 | |||
9 | SRC_URI = "https://acpica.org/sites/acpica/files/acpitests-unix-${PV}.tar.gz;name=acpitests \ | ||
10 | https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz;name=acpica \ | ||
11 | file://aapits-linux.patch \ | ||
12 | file://aapits-makefile.patch \ | ||
13 | file://0001-aaptisrun-alter-to-allow-destination-directory-as-ar.patch \ | ||
14 | " | ||
15 | SRC_URI[acpitests.md5sum] = "db9d6fdaa8e3eb101d700ee5ba4938ed" | ||
16 | SRC_URI[acpitests.sha256sum] = "e576c74bf1bf1c9f7348bf9419e05c8acfece7105abcdc052e66670c7af2cf00" | ||
17 | SRC_URI[acpica.md5sum] = "6f05f0d10166a1b1ff6107f3d1cdf1e5" | ||
18 | SRC_URI[acpica.sha256sum] = "01d8867656c5ba41dec307c4383ce676196ad4281ac2c9dec9f5be5fac6d888e" | ||
19 | |||
20 | S = "${WORKDIR}/acpitests-unix-${PV}" | ||
21 | |||
22 | EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'" | ||
23 | |||
24 | # The Makefiles expect a specific layout | ||
25 | do_compile() { | ||
26 | cp -af ${WORKDIR}/acpica-unix2-${PV}/source ${S} | ||
27 | cd tests/aapits | ||
28 | oe_runmake | ||
29 | } | ||
30 | |||
31 | do_install() { | ||
32 | install -d ${D}${bindir} | ||
33 | install -m0755 tests/aapits/bin/aapits ${D}${bindir} | ||
34 | install -m0755 tests/aapits/bin/aapitsrun ${D}${bindir} | ||
35 | } | ||
36 | |||
37 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/acpica/files/no-werror.patch b/meta-linaro-integration/recipes-overlayed/acpica/files/no-werror.patch new file mode 100644 index 0000000..5d28f47 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/acpica/files/no-werror.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Description: remove -Werror flag | ||
2 | Forwarded: not-needed | ||
3 | Author: Fathi Boudra <fathi.boudra@linaro.org> | ||
4 | |||
5 | --- | ||
6 | generate/unix/iasl/Makefile | 12 ++++++------ | ||
7 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
8 | |||
9 | --- a/generate/unix/iasl/Makefile | ||
10 | +++ b/generate/unix/iasl/Makefile | ||
11 | @@ -266,19 +266,19 @@ $(OBJDIR)/prparser.y.h: $(OBJDIR)/prpars | ||
12 | # by the utilities above and they are not necessarily ANSI C, etc. | ||
13 | # | ||
14 | $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c | ||
15 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< | ||
16 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
17 | |||
18 | $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c | ||
19 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< | ||
20 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
21 | |||
22 | $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c | ||
23 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< | ||
24 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
25 | |||
26 | $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c | ||
27 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< | ||
28 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
29 | |||
30 | $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c | ||
31 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< | ||
32 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/configure.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/configure.patch new file mode 100644 index 0000000..966b728 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/configure.patch | |||
@@ -0,0 +1,7345 @@ | |||
1 | diff --git a/configure b/configure | ||
2 | index 4855c99..a5282b6 100755 | ||
3 | --- a/configure | ||
4 | +++ b/configure | ||
5 | @@ -54,6 +54,8 @@ ac_help="$ac_help | ||
6 | 600: Windows Vista | ||
7 | 601: Windows 7" | ||
8 | ac_help="$ac_help | ||
9 | + --with-system-ply Use system installed python ply library" | ||
10 | +ac_help="$ac_help | ||
11 | --enable-macos-target=VER (default=10.5) | ||
12 | Set the minimum MacOS version needed at runtime" | ||
13 | ac_help="$ac_help | ||
14 | @@ -998,7 +1000,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } | ||
15 | fi | ||
16 | |||
17 | echo $ac_n "checking host system type""... $ac_c" 1>&6 | ||
18 | -echo "configure:1002: checking host system type" >&5 | ||
19 | +echo "configure:1004: checking host system type" >&5 | ||
20 | |||
21 | host_alias=$host | ||
22 | case "$host_alias" in | ||
23 | @@ -1019,7 +1021,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
24 | echo "$ac_t""$host" 1>&6 | ||
25 | |||
26 | echo $ac_n "checking target system type""... $ac_c" 1>&6 | ||
27 | -echo "configure:1023: checking target system type" >&5 | ||
28 | +echo "configure:1025: checking target system type" >&5 | ||
29 | |||
30 | target_alias=$target | ||
31 | case "$target_alias" in | ||
32 | @@ -1037,7 +1039,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||
33 | echo "$ac_t""$target" 1>&6 | ||
34 | |||
35 | echo $ac_n "checking build system type""... $ac_c" 1>&6 | ||
36 | -echo "configure:1041: checking build system type" >&5 | ||
37 | +echo "configure:1043: checking build system type" >&5 | ||
38 | |||
39 | build_alias=$build | ||
40 | case "$build_alias" in | ||
41 | @@ -1117,7 +1119,7 @@ do | ||
42 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
43 | set dummy $ac_prog; ac_word=$2 | ||
44 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
45 | -echo "configure:1121: checking for $ac_word" >&5 | ||
46 | +echo "configure:1123: checking for $ac_word" >&5 | ||
47 | if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then | ||
48 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
49 | else | ||
50 | @@ -1247,7 +1249,7 @@ do | ||
51 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
52 | set dummy $ac_prog; ac_word=$2 | ||
53 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
54 | -echo "configure:1251: checking for $ac_word" >&5 | ||
55 | +echo "configure:1253: checking for $ac_word" >&5 | ||
56 | if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then | ||
57 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
58 | else | ||
59 | @@ -1405,7 +1407,7 @@ case "$target" in | ||
60 | |||
61 | if test -z "$android_toolchain" ; then | ||
62 | echo $ac_n "checking for android toolchain directory""... $ac_c" 1>&6 | ||
63 | -echo "configure:1409: checking for android toolchain directory" >&5 | ||
64 | +echo "configure:1411: checking for android toolchain directory" >&5 | ||
65 | |||
66 | kernel_name=`uname -s | tr "[:upper:]" "[:lower:]"` | ||
67 | |||
68 | @@ -1425,7 +1427,7 @@ echo "configure:1409: checking for android toolchain directory" >&5 | ||
69 | |||
70 | if test -z "$android_platform" ; then | ||
71 | echo $ac_n "checking for android platform directory""... $ac_c" 1>&6 | ||
72 | -echo "configure:1429: checking for android platform directory" >&5 | ||
73 | +echo "configure:1431: checking for android platform directory" >&5 | ||
74 | |||
75 | android_platform="$android_ndk"/build/platforms/android-"$android_version"/arch-"$target_cpu" | ||
76 | |||
77 | @@ -1497,7 +1499,7 @@ EOF | ||
78 | # Extract the first word of "objcopy", so it can be a program name with args. | ||
79 | set dummy objcopy; ac_word=$2 | ||
80 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
81 | -echo "configure:1501: checking for $ac_word" >&5 | ||
82 | +echo "configure:1503: checking for $ac_word" >&5 | ||
83 | if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY'+set}'`\" = set"; then | ||
84 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
85 | else | ||
86 | @@ -1554,13 +1556,13 @@ if test -n "$CROSS_COMPILE" -a "$target" != "$host"; then | ||
87 | _SAVE_LDFLAGS="$LDFLAGS" | ||
88 | |||
89 | echo $ac_n "checking for host c compiler""... $ac_c" 1>&6 | ||
90 | -echo "configure:1558: checking for host c compiler" >&5 | ||
91 | +echo "configure:1560: checking for host c compiler" >&5 | ||
92 | for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc | ||
93 | do | ||
94 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
95 | set dummy $ac_prog; ac_word=$2 | ||
96 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
97 | -echo "configure:1564: checking for $ac_word" >&5 | ||
98 | +echo "configure:1566: checking for $ac_word" >&5 | ||
99 | if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then | ||
100 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
101 | else | ||
102 | @@ -1595,13 +1597,13 @@ test -n "$HOST_CC" || HOST_CC="""" | ||
103 | fi | ||
104 | echo "$ac_t""$HOST_CC" 1>&6 | ||
105 | echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6 | ||
106 | -echo "configure:1599: checking for host c++ compiler" >&5 | ||
107 | +echo "configure:1601: checking for host c++ compiler" >&5 | ||
108 | for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc | ||
109 | do | ||
110 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
111 | set dummy $ac_prog; ac_word=$2 | ||
112 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
113 | -echo "configure:1605: checking for $ac_word" >&5 | ||
114 | +echo "configure:1607: checking for $ac_word" >&5 | ||
115 | if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then | ||
116 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
117 | else | ||
118 | @@ -1653,7 +1655,7 @@ do | ||
119 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
120 | set dummy $ac_prog; ac_word=$2 | ||
121 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
122 | -echo "configure:1657: checking for $ac_word" >&5 | ||
123 | +echo "configure:1659: checking for $ac_word" >&5 | ||
124 | if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then | ||
125 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
126 | else | ||
127 | @@ -1688,7 +1690,7 @@ do | ||
128 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
129 | set dummy $ac_prog; ac_word=$2 | ||
130 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
131 | -echo "configure:1692: checking for $ac_word" >&5 | ||
132 | +echo "configure:1694: checking for $ac_word" >&5 | ||
133 | if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then | ||
134 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
135 | else | ||
136 | @@ -1723,16 +1725,16 @@ test -n "$HOST_AR" || HOST_AR="ar" | ||
137 | LDFLAGS="$HOST_LDFLAGS" | ||
138 | |||
139 | echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 | ||
140 | -echo "configure:1727: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 | ||
141 | +echo "configure:1729: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 | ||
142 | cat > conftest.$ac_ext <<EOF | ||
143 | -#line 1729 "configure" | ||
144 | +#line 1731 "configure" | ||
145 | #include "confdefs.h" | ||
146 | |||
147 | int main() { | ||
148 | return(0); | ||
149 | ; return 0; } | ||
150 | EOF | ||
151 | -if { (eval echo configure:1736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
152 | +if { (eval echo configure:1738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
153 | rm -rf conftest* | ||
154 | ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6 | ||
155 | else | ||
156 | @@ -1747,16 +1749,16 @@ rm -f conftest* | ||
157 | CFLAGS="$HOST_CXXFLAGS" | ||
158 | |||
159 | echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 | ||
160 | -echo "configure:1751: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 | ||
161 | +echo "configure:1753: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 | ||
162 | cat > conftest.$ac_ext <<EOF | ||
163 | -#line 1753 "configure" | ||
164 | +#line 1755 "configure" | ||
165 | #include "confdefs.h" | ||
166 | |||
167 | int main() { | ||
168 | return(0); | ||
169 | ; return 0; } | ||
170 | EOF | ||
171 | -if { (eval echo configure:1760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
172 | +if { (eval echo configure:1762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
173 | rm -rf conftest* | ||
174 | ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6 | ||
175 | else | ||
176 | @@ -1785,7 +1787,7 @@ do | ||
177 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
178 | set dummy $ac_prog; ac_word=$2 | ||
179 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
180 | -echo "configure:1789: checking for $ac_word" >&5 | ||
181 | +echo "configure:1791: checking for $ac_word" >&5 | ||
182 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
183 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
184 | else | ||
185 | @@ -1819,7 +1821,7 @@ test -n "$CC" || CC=":" | ||
186 | # Extract the first word of "gcc", so it can be a program name with args. | ||
187 | set dummy gcc; ac_word=$2 | ||
188 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
189 | -echo "configure:1823: checking for $ac_word" >&5 | ||
190 | +echo "configure:1825: checking for $ac_word" >&5 | ||
191 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
192 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
193 | else | ||
194 | @@ -1849,7 +1851,7 @@ if test -z "$CC"; then | ||
195 | # Extract the first word of "cc", so it can be a program name with args. | ||
196 | set dummy cc; ac_word=$2 | ||
197 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
198 | -echo "configure:1853: checking for $ac_word" >&5 | ||
199 | +echo "configure:1855: checking for $ac_word" >&5 | ||
200 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
201 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
202 | else | ||
203 | @@ -1900,7 +1902,7 @@ fi | ||
204 | # Extract the first word of "cl", so it can be a program name with args. | ||
205 | set dummy cl; ac_word=$2 | ||
206 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
207 | -echo "configure:1904: checking for $ac_word" >&5 | ||
208 | +echo "configure:1906: checking for $ac_word" >&5 | ||
209 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
210 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
211 | else | ||
212 | @@ -1932,7 +1934,7 @@ fi | ||
213 | fi | ||
214 | |||
215 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | ||
216 | -echo "configure:1936: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | ||
217 | +echo "configure:1938: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | ||
218 | |||
219 | ac_ext=c | ||
220 | # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
221 | @@ -1943,12 +1945,12 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
222 | |||
223 | cat > conftest.$ac_ext << EOF | ||
224 | |||
225 | -#line 1947 "configure" | ||
226 | +#line 1949 "configure" | ||
227 | #include "confdefs.h" | ||
228 | |||
229 | main(){return(0);} | ||
230 | EOF | ||
231 | -if { (eval echo configure:1952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
232 | +if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
233 | ac_cv_prog_cc_works=yes | ||
234 | # If we can't run a trivial program, we are probably using a cross compiler. | ||
235 | if (./conftest; exit) 2>/dev/null; then | ||
236 | @@ -1974,12 +1976,12 @@ if test $ac_cv_prog_cc_works = no; then | ||
237 | { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } | ||
238 | fi | ||
239 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | ||
240 | -echo "configure:1978: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
241 | +echo "configure:1980: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
242 | echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 | ||
243 | cross_compiling=$ac_cv_prog_cc_cross | ||
244 | |||
245 | echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 | ||
246 | -echo "configure:1983: checking whether we are using GNU C" >&5 | ||
247 | +echo "configure:1985: checking whether we are using GNU C" >&5 | ||
248 | if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then | ||
249 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
250 | else | ||
251 | @@ -1988,7 +1990,7 @@ else | ||
252 | yes; | ||
253 | #endif | ||
254 | EOF | ||
255 | -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
256 | +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
257 | ac_cv_prog_gcc=yes | ||
258 | else | ||
259 | ac_cv_prog_gcc=no | ||
260 | @@ -2007,7 +2009,7 @@ ac_test_CFLAGS="${CFLAGS+set}" | ||
261 | ac_save_CFLAGS="$CFLAGS" | ||
262 | CFLAGS= | ||
263 | echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | ||
264 | -echo "configure:2011: checking whether ${CC-cc} accepts -g" >&5 | ||
265 | +echo "configure:2013: checking whether ${CC-cc} accepts -g" >&5 | ||
266 | if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then | ||
267 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
268 | else | ||
269 | @@ -2043,7 +2045,7 @@ do | ||
270 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
271 | set dummy $ac_prog; ac_word=$2 | ||
272 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
273 | -echo "configure:2047: checking for $ac_word" >&5 | ||
274 | +echo "configure:2049: checking for $ac_word" >&5 | ||
275 | if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then | ||
276 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
277 | else | ||
278 | @@ -2079,7 +2081,7 @@ do | ||
279 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
280 | set dummy $ac_prog; ac_word=$2 | ||
281 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
282 | -echo "configure:2083: checking for $ac_word" >&5 | ||
283 | +echo "configure:2085: checking for $ac_word" >&5 | ||
284 | if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then | ||
285 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
286 | else | ||
287 | @@ -2111,7 +2113,7 @@ test -n "$CXX" || CXX="gcc" | ||
288 | |||
289 | |||
290 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | ||
291 | -echo "configure:2115: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | ||
292 | +echo "configure:2117: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | ||
293 | |||
294 | ac_ext=C | ||
295 | # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
296 | @@ -2122,12 +2124,12 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
297 | |||
298 | cat > conftest.$ac_ext << EOF | ||
299 | |||
300 | -#line 2126 "configure" | ||
301 | +#line 2128 "configure" | ||
302 | #include "confdefs.h" | ||
303 | |||
304 | int main(){return(0);} | ||
305 | EOF | ||
306 | -if { (eval echo configure:2131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
307 | +if { (eval echo configure:2133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
308 | ac_cv_prog_cxx_works=yes | ||
309 | # If we can't run a trivial program, we are probably using a cross compiler. | ||
310 | if (./conftest; exit) 2>/dev/null; then | ||
311 | @@ -2153,12 +2155,12 @@ if test $ac_cv_prog_cxx_works = no; then | ||
312 | { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } | ||
313 | fi | ||
314 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | ||
315 | -echo "configure:2157: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
316 | +echo "configure:2159: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
317 | echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 | ||
318 | cross_compiling=$ac_cv_prog_cxx_cross | ||
319 | |||
320 | echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 | ||
321 | -echo "configure:2162: checking whether we are using GNU C++" >&5 | ||
322 | +echo "configure:2164: checking whether we are using GNU C++" >&5 | ||
323 | if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then | ||
324 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
325 | else | ||
326 | @@ -2167,7 +2169,7 @@ else | ||
327 | yes; | ||
328 | #endif | ||
329 | EOF | ||
330 | -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
331 | +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
332 | ac_cv_prog_gxx=yes | ||
333 | else | ||
334 | ac_cv_prog_gxx=no | ||
335 | @@ -2186,7 +2188,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" | ||
336 | ac_save_CXXFLAGS="$CXXFLAGS" | ||
337 | CXXFLAGS= | ||
338 | echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 | ||
339 | -echo "configure:2190: checking whether ${CXX-g++} accepts -g" >&5 | ||
340 | +echo "configure:2192: checking whether ${CXX-g++} accepts -g" >&5 | ||
341 | if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then | ||
342 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
343 | else | ||
344 | @@ -2227,7 +2229,7 @@ for ac_declaration in \ | ||
345 | 'void exit (int);' | ||
346 | do | ||
347 | cat > conftest.$ac_ext <<EOF | ||
348 | -#line 2231 "configure" | ||
349 | +#line 2233 "configure" | ||
350 | #include "confdefs.h" | ||
351 | #include <stdlib.h> | ||
352 | $ac_declaration | ||
353 | @@ -2235,7 +2237,7 @@ int main() { | ||
354 | exit (42); | ||
355 | ; return 0; } | ||
356 | EOF | ||
357 | -if { (eval echo configure:2239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
358 | +if { (eval echo configure:2241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
359 | : | ||
360 | else | ||
361 | echo "configure: failed program was:" >&5 | ||
362 | @@ -2245,14 +2247,14 @@ else | ||
363 | fi | ||
364 | rm -f conftest* | ||
365 | cat > conftest.$ac_ext <<EOF | ||
366 | -#line 2249 "configure" | ||
367 | +#line 2251 "configure" | ||
368 | #include "confdefs.h" | ||
369 | $ac_declaration | ||
370 | int main() { | ||
371 | exit (42); | ||
372 | ; return 0; } | ||
373 | EOF | ||
374 | -if { (eval echo configure:2256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
375 | +if { (eval echo configure:2258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
376 | rm -rf conftest* | ||
377 | break | ||
378 | else | ||
379 | @@ -2281,7 +2283,7 @@ do | ||
380 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
381 | set dummy $ac_prog; ac_word=$2 | ||
382 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
383 | -echo "configure:2285: checking for $ac_word" >&5 | ||
384 | +echo "configure:2287: checking for $ac_word" >&5 | ||
385 | if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then | ||
386 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
387 | else | ||
388 | @@ -2316,7 +2318,7 @@ do | ||
389 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
390 | set dummy $ac_prog; ac_word=$2 | ||
391 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
392 | -echo "configure:2320: checking for $ac_word" >&5 | ||
393 | +echo "configure:2322: checking for $ac_word" >&5 | ||
394 | if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then | ||
395 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
396 | else | ||
397 | @@ -2351,7 +2353,7 @@ do | ||
398 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
399 | set dummy $ac_prog; ac_word=$2 | ||
400 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
401 | -echo "configure:2355: checking for $ac_word" >&5 | ||
402 | +echo "configure:2357: checking for $ac_word" >&5 | ||
403 | if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then | ||
404 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
405 | else | ||
406 | @@ -2405,7 +2407,7 @@ do | ||
407 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
408 | set dummy $ac_prog; ac_word=$2 | ||
409 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
410 | -echo "configure:2409: checking for $ac_word" >&5 | ||
411 | +echo "configure:2411: checking for $ac_word" >&5 | ||
412 | if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then | ||
413 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
414 | else | ||
415 | @@ -2440,7 +2442,7 @@ do | ||
416 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
417 | set dummy $ac_prog; ac_word=$2 | ||
418 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
419 | -echo "configure:2444: checking for $ac_word" >&5 | ||
420 | +echo "configure:2446: checking for $ac_word" >&5 | ||
421 | if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then | ||
422 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
423 | else | ||
424 | @@ -2475,7 +2477,7 @@ do | ||
425 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
426 | set dummy $ac_prog; ac_word=$2 | ||
427 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
428 | -echo "configure:2479: checking for $ac_word" >&5 | ||
429 | +echo "configure:2481: checking for $ac_word" >&5 | ||
430 | if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then | ||
431 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
432 | else | ||
433 | @@ -2513,7 +2515,7 @@ else | ||
434 | # Extract the first word of "gcc", so it can be a program name with args. | ||
435 | set dummy gcc; ac_word=$2 | ||
436 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
437 | -echo "configure:2517: checking for $ac_word" >&5 | ||
438 | +echo "configure:2519: checking for $ac_word" >&5 | ||
439 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
440 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
441 | else | ||
442 | @@ -2543,7 +2545,7 @@ if test -z "$CC"; then | ||
443 | # Extract the first word of "cc", so it can be a program name with args. | ||
444 | set dummy cc; ac_word=$2 | ||
445 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
446 | -echo "configure:2547: checking for $ac_word" >&5 | ||
447 | +echo "configure:2549: checking for $ac_word" >&5 | ||
448 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
449 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
450 | else | ||
451 | @@ -2594,7 +2596,7 @@ fi | ||
452 | # Extract the first word of "cl", so it can be a program name with args. | ||
453 | set dummy cl; ac_word=$2 | ||
454 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
455 | -echo "configure:2598: checking for $ac_word" >&5 | ||
456 | +echo "configure:2600: checking for $ac_word" >&5 | ||
457 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | ||
458 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
459 | else | ||
460 | @@ -2626,7 +2628,7 @@ fi | ||
461 | fi | ||
462 | |||
463 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | ||
464 | -echo "configure:2630: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | ||
465 | +echo "configure:2632: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | ||
466 | |||
467 | ac_ext=c | ||
468 | # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
469 | @@ -2637,12 +2639,12 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
470 | |||
471 | cat > conftest.$ac_ext << EOF | ||
472 | |||
473 | -#line 2641 "configure" | ||
474 | +#line 2643 "configure" | ||
475 | #include "confdefs.h" | ||
476 | |||
477 | main(){return(0);} | ||
478 | EOF | ||
479 | -if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
480 | +if { (eval echo configure:2648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
481 | ac_cv_prog_cc_works=yes | ||
482 | # If we can't run a trivial program, we are probably using a cross compiler. | ||
483 | if (./conftest; exit) 2>/dev/null; then | ||
484 | @@ -2668,12 +2670,12 @@ if test $ac_cv_prog_cc_works = no; then | ||
485 | { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } | ||
486 | fi | ||
487 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | ||
488 | -echo "configure:2672: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
489 | +echo "configure:2674: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
490 | echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 | ||
491 | cross_compiling=$ac_cv_prog_cc_cross | ||
492 | |||
493 | echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 | ||
494 | -echo "configure:2677: checking whether we are using GNU C" >&5 | ||
495 | +echo "configure:2679: checking whether we are using GNU C" >&5 | ||
496 | if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then | ||
497 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
498 | else | ||
499 | @@ -2682,7 +2684,7 @@ else | ||
500 | yes; | ||
501 | #endif | ||
502 | EOF | ||
503 | -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
504 | +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
505 | ac_cv_prog_gcc=yes | ||
506 | else | ||
507 | ac_cv_prog_gcc=no | ||
508 | @@ -2701,7 +2703,7 @@ ac_test_CFLAGS="${CFLAGS+set}" | ||
509 | ac_save_CFLAGS="$CFLAGS" | ||
510 | CFLAGS= | ||
511 | echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | ||
512 | -echo "configure:2705: checking whether ${CC-cc} accepts -g" >&5 | ||
513 | +echo "configure:2707: checking whether ${CC-cc} accepts -g" >&5 | ||
514 | if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then | ||
515 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
516 | else | ||
517 | @@ -2737,7 +2739,7 @@ do | ||
518 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
519 | set dummy $ac_prog; ac_word=$2 | ||
520 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
521 | -echo "configure:2741: checking for $ac_word" >&5 | ||
522 | +echo "configure:2743: checking for $ac_word" >&5 | ||
523 | if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then | ||
524 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
525 | else | ||
526 | @@ -2769,7 +2771,7 @@ test -n "$CXX" || CXX="gcc" | ||
527 | |||
528 | |||
529 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | ||
530 | -echo "configure:2773: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | ||
531 | +echo "configure:2775: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | ||
532 | |||
533 | ac_ext=C | ||
534 | # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
535 | @@ -2780,12 +2782,12 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
536 | |||
537 | cat > conftest.$ac_ext << EOF | ||
538 | |||
539 | -#line 2784 "configure" | ||
540 | +#line 2786 "configure" | ||
541 | #include "confdefs.h" | ||
542 | |||
543 | int main(){return(0);} | ||
544 | EOF | ||
545 | -if { (eval echo configure:2789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
546 | +if { (eval echo configure:2791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
547 | ac_cv_prog_cxx_works=yes | ||
548 | # If we can't run a trivial program, we are probably using a cross compiler. | ||
549 | if (./conftest; exit) 2>/dev/null; then | ||
550 | @@ -2811,12 +2813,12 @@ if test $ac_cv_prog_cxx_works = no; then | ||
551 | { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } | ||
552 | fi | ||
553 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | ||
554 | -echo "configure:2815: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
555 | +echo "configure:2817: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | ||
556 | echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 | ||
557 | cross_compiling=$ac_cv_prog_cxx_cross | ||
558 | |||
559 | echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 | ||
560 | -echo "configure:2820: checking whether we are using GNU C++" >&5 | ||
561 | +echo "configure:2822: checking whether we are using GNU C++" >&5 | ||
562 | if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then | ||
563 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
564 | else | ||
565 | @@ -2825,7 +2827,7 @@ else | ||
566 | yes; | ||
567 | #endif | ||
568 | EOF | ||
569 | -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
570 | +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | ||
571 | ac_cv_prog_gxx=yes | ||
572 | else | ||
573 | ac_cv_prog_gxx=no | ||
574 | @@ -2844,7 +2846,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" | ||
575 | ac_save_CXXFLAGS="$CXXFLAGS" | ||
576 | CXXFLAGS= | ||
577 | echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 | ||
578 | -echo "configure:2848: checking whether ${CXX-g++} accepts -g" >&5 | ||
579 | +echo "configure:2850: checking whether ${CXX-g++} accepts -g" >&5 | ||
580 | if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then | ||
581 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
582 | else | ||
583 | @@ -2885,7 +2887,7 @@ for ac_declaration in \ | ||
584 | 'void exit (int);' | ||
585 | do | ||
586 | cat > conftest.$ac_ext <<EOF | ||
587 | -#line 2889 "configure" | ||
588 | +#line 2891 "configure" | ||
589 | #include "confdefs.h" | ||
590 | #include <stdlib.h> | ||
591 | $ac_declaration | ||
592 | @@ -2893,7 +2895,7 @@ int main() { | ||
593 | exit (42); | ||
594 | ; return 0; } | ||
595 | EOF | ||
596 | -if { (eval echo configure:2897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
597 | +if { (eval echo configure:2899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
598 | : | ||
599 | else | ||
600 | echo "configure: failed program was:" >&5 | ||
601 | @@ -2903,14 +2905,14 @@ else | ||
602 | fi | ||
603 | rm -f conftest* | ||
604 | cat > conftest.$ac_ext <<EOF | ||
605 | -#line 2907 "configure" | ||
606 | +#line 2909 "configure" | ||
607 | #include "confdefs.h" | ||
608 | $ac_declaration | ||
609 | int main() { | ||
610 | exit (42); | ||
611 | ; return 0; } | ||
612 | EOF | ||
613 | -if { (eval echo configure:2914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
614 | +if { (eval echo configure:2916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
615 | rm -rf conftest* | ||
616 | break | ||
617 | else | ||
618 | @@ -2929,7 +2931,7 @@ fi | ||
619 | # Extract the first word of "ranlib", so it can be a program name with args. | ||
620 | set dummy ranlib; ac_word=$2 | ||
621 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
622 | -echo "configure:2933: checking for $ac_word" >&5 | ||
623 | +echo "configure:2935: checking for $ac_word" >&5 | ||
624 | if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then | ||
625 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
626 | else | ||
627 | @@ -2961,7 +2963,7 @@ do | ||
628 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
629 | set dummy $ac_prog; ac_word=$2 | ||
630 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
631 | -echo "configure:2965: checking for $ac_word" >&5 | ||
632 | +echo "configure:2967: checking for $ac_word" >&5 | ||
633 | if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then | ||
634 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
635 | else | ||
636 | @@ -3015,7 +3017,7 @@ do | ||
637 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
638 | set dummy $ac_prog; ac_word=$2 | ||
639 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
640 | -echo "configure:3019: checking for $ac_word" >&5 | ||
641 | +echo "configure:3021: checking for $ac_word" >&5 | ||
642 | if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then | ||
643 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
644 | else | ||
645 | @@ -3050,7 +3052,7 @@ do | ||
646 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
647 | set dummy $ac_prog; ac_word=$2 | ||
648 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
649 | -echo "configure:3054: checking for $ac_word" >&5 | ||
650 | +echo "configure:3056: checking for $ac_word" >&5 | ||
651 | if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then | ||
652 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
653 | else | ||
654 | @@ -3085,7 +3087,7 @@ do | ||
655 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
656 | set dummy $ac_prog; ac_word=$2 | ||
657 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
658 | -echo "configure:3089: checking for $ac_word" >&5 | ||
659 | +echo "configure:3091: checking for $ac_word" >&5 | ||
660 | if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then | ||
661 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
662 | else | ||
663 | @@ -3120,7 +3122,7 @@ do | ||
664 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
665 | set dummy $ac_prog; ac_word=$2 | ||
666 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
667 | -echo "configure:3124: checking for $ac_word" >&5 | ||
668 | +echo "configure:3126: checking for $ac_word" >&5 | ||
669 | if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then | ||
670 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
671 | else | ||
672 | @@ -3268,7 +3270,7 @@ do | ||
673 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
674 | set dummy $ac_prog; ac_word=$2 | ||
675 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
676 | -echo "configure:3272: checking for $ac_word" >&5 | ||
677 | +echo "configure:3274: checking for $ac_word" >&5 | ||
678 | if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then | ||
679 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
680 | else | ||
681 | @@ -3310,14 +3312,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a | ||
682 | cross_compiling=$ac_cv_prog_cc_cross | ||
683 | |||
684 | cat > conftest.$ac_ext <<EOF | ||
685 | -#line 3314 "configure" | ||
686 | +#line 3316 "configure" | ||
687 | #include "confdefs.h" | ||
688 | #include <stdio.h> | ||
689 | int main() { | ||
690 | printf("Hello World\n"); | ||
691 | ; return 0; } | ||
692 | EOF | ||
693 | -if { (eval echo configure:3321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
694 | +if { (eval echo configure:3323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
695 | : | ||
696 | else | ||
697 | echo "configure: failed program was:" >&5 | ||
698 | @@ -3335,14 +3337,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
699 | cross_compiling=$ac_cv_prog_cxx_cross | ||
700 | |||
701 | cat > conftest.$ac_ext <<EOF | ||
702 | -#line 3339 "configure" | ||
703 | +#line 3341 "configure" | ||
704 | #include "confdefs.h" | ||
705 | #include <new.h> | ||
706 | int main() { | ||
707 | unsigned *test = new unsigned(42); | ||
708 | ; return 0; } | ||
709 | EOF | ||
710 | -if { (eval echo configure:3346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
711 | +if { (eval echo configure:3348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
712 | : | ||
713 | else | ||
714 | echo "configure: failed program was:" >&5 | ||
715 | @@ -3473,7 +3475,7 @@ EOF | ||
716 | _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` | ||
717 | # Add flags if necessary | ||
718 | echo $ac_n "checking for midl flags""... $ac_c" 1>&6 | ||
719 | -echo "configure:3477: checking for midl flags" >&5 | ||
720 | +echo "configure:3479: checking for midl flags" >&5 | ||
721 | case "$target" in | ||
722 | i*86-*) | ||
723 | if test \( "$_MIDL_MAJOR_VERSION" = "7" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" = "0499" \); then | ||
724 | @@ -3500,19 +3502,19 @@ echo "configure:3477: checking for midl flags" >&5 | ||
725 | do | ||
726 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
727 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
728 | -echo "configure:3504: checking for $ac_hdr" >&5 | ||
729 | +echo "configure:3506: checking for $ac_hdr" >&5 | ||
730 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
731 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
732 | else | ||
733 | cat > conftest.$ac_ext <<EOF | ||
734 | -#line 3509 "configure" | ||
735 | +#line 3511 "configure" | ||
736 | #include "confdefs.h" | ||
737 | #include <$ac_hdr> | ||
738 | int main() { | ||
739 | |||
740 | ; return 0; } | ||
741 | EOF | ||
742 | -if { (eval echo configure:3516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
743 | +if { (eval echo configure:3518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
744 | rm -rf conftest* | ||
745 | eval "ac_cv_header_$ac_safe=yes" | ||
746 | else | ||
747 | @@ -3544,7 +3546,7 @@ EOF | ||
748 | # This is done because the Windows 7 beta SDK reports its | ||
749 | # NTDDI_MAXVER to be 0x06000100 instead of 0x06010000, as it should | ||
750 | echo $ac_n "checking for highest Windows version supported by this SDK""... $ac_c" 1>&6 | ||
751 | -echo "configure:3548: checking for highest Windows version supported by this SDK" >&5 | ||
752 | +echo "configure:3550: checking for highest Windows version supported by this SDK" >&5 | ||
753 | if eval "test \"`echo '$''{'ac_cv_winsdk_maxver'+set}'`\" = set"; then | ||
754 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
755 | else | ||
756 | @@ -3574,19 +3576,19 @@ echo "$ac_t""$ac_cv_winsdk_maxver" 1>&6 | ||
757 | do | ||
758 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
759 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
760 | -echo "configure:3578: checking for $ac_hdr" >&5 | ||
761 | +echo "configure:3580: checking for $ac_hdr" >&5 | ||
762 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
763 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
764 | else | ||
765 | cat > conftest.$ac_ext <<EOF | ||
766 | -#line 3583 "configure" | ||
767 | +#line 3585 "configure" | ||
768 | #include "confdefs.h" | ||
769 | #include <$ac_hdr> | ||
770 | int main() { | ||
771 | |||
772 | ; return 0; } | ||
773 | EOF | ||
774 | -if { (eval echo configure:3590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
775 | +if { (eval echo configure:3592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
776 | rm -rf conftest* | ||
777 | eval "ac_cv_header_$ac_safe=yes" | ||
778 | else | ||
779 | @@ -3623,7 +3625,7 @@ EOF | ||
780 | unset _MSVC_VER_FILTER | ||
781 | |||
782 | echo $ac_n "checking for std::_Throw""... $ac_c" 1>&6 | ||
783 | -echo "configure:3627: checking for std::_Throw" >&5 | ||
784 | +echo "configure:3629: checking for std::_Throw" >&5 | ||
785 | if eval "test \"`echo '$''{'ac_cv_have_std__Throw'+set}'`\" = set"; then | ||
786 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
787 | else | ||
788 | @@ -3639,14 +3641,14 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
789 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
790 | CXXFLAGS="${CXXFLAGS} -D_HAS_EXCEPTIONS=0" | ||
791 | cat > conftest.$ac_ext <<EOF | ||
792 | -#line 3643 "configure" | ||
793 | +#line 3645 "configure" | ||
794 | #include "confdefs.h" | ||
795 | #include <exception> | ||
796 | int main() { | ||
797 | std::_Throw(std::exception()); return 0; | ||
798 | ; return 0; } | ||
799 | EOF | ||
800 | -if { (eval echo configure:3650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
801 | +if { (eval echo configure:3652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
802 | rm -rf conftest* | ||
803 | ac_cv_have_std__Throw="yes" | ||
804 | else | ||
805 | @@ -3671,7 +3673,7 @@ echo "$ac_t""$ac_cv_have_std__Throw" 1>&6 | ||
806 | |||
807 | if test "$ac_cv_have_std__Throw" = "yes"; then | ||
808 | echo $ac_n "checking for |class __declspec(dllimport) exception| bug""... $ac_c" 1>&6 | ||
809 | -echo "configure:3675: checking for |class __declspec(dllimport) exception| bug" >&5 | ||
810 | +echo "configure:3677: checking for |class __declspec(dllimport) exception| bug" >&5 | ||
811 | if eval "test \"`echo '$''{'ac_cv_have_dllimport_exception_bug'+set}'`\" = set"; then | ||
812 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
813 | else | ||
814 | @@ -3687,14 +3689,14 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
815 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
816 | CXXFLAGS="${CXXFLAGS} -D_HAS_EXCEPTIONS=0" | ||
817 | cat > conftest.$ac_ext <<EOF | ||
818 | -#line 3691 "configure" | ||
819 | +#line 3693 "configure" | ||
820 | #include "confdefs.h" | ||
821 | #include <vector> | ||
822 | int main() { | ||
823 | std::vector<int> v; return v.at(1); | ||
824 | ; return 0; } | ||
825 | EOF | ||
826 | -if { (eval echo configure:3698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
827 | +if { (eval echo configure:3700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
828 | rm -rf conftest* | ||
829 | ac_cv_have_dllimport_exception_bug="no" | ||
830 | else | ||
831 | @@ -3726,7 +3728,7 @@ EOF | ||
832 | fi | ||
833 | else | ||
834 | echo $ac_n "checking for overridable _RAISE""... $ac_c" 1>&6 | ||
835 | -echo "configure:3730: checking for overridable _RAISE" >&5 | ||
836 | +echo "configure:3732: checking for overridable _RAISE" >&5 | ||
837 | if eval "test \"`echo '$''{'ac_cv_have__RAISE'+set}'`\" = set"; then | ||
838 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
839 | else | ||
840 | @@ -3742,7 +3744,7 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
841 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
842 | CXXFLAGS="${CXXFLAGS} -D_HAS_EXCEPTIONS=0" | ||
843 | cat > conftest.$ac_ext <<EOF | ||
844 | -#line 3746 "configure" | ||
845 | +#line 3748 "configure" | ||
846 | #include "confdefs.h" | ||
847 | #include <xstddef> | ||
848 | #undef _RAISE | ||
849 | @@ -3753,7 +3755,7 @@ int main() { | ||
850 | std::vector<int> v; return v.at(1); | ||
851 | ; return 0; } | ||
852 | EOF | ||
853 | -if { (eval echo configure:3757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
854 | +if { (eval echo configure:3759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
855 | rm -rf conftest* | ||
856 | ac_cv_have__RAISE="no" | ||
857 | else | ||
858 | @@ -3795,9 +3797,9 @@ EOF | ||
859 | _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` | ||
860 | _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` | ||
861 | echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 | ||
862 | -echo "configure:3799: checking for w32api version >= $W32API_VERSION" >&5 | ||
863 | +echo "configure:3801: checking for w32api version >= $W32API_VERSION" >&5 | ||
864 | cat > conftest.$ac_ext <<EOF | ||
865 | -#line 3801 "configure" | ||
866 | +#line 3803 "configure" | ||
867 | #include "confdefs.h" | ||
868 | #include <w32api.h> | ||
869 | int main() { | ||
870 | @@ -3809,7 +3811,7 @@ int main() { | ||
871 | |||
872 | ; return 0; } | ||
873 | EOF | ||
874 | -if { (eval echo configure:3813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
875 | +if { (eval echo configure:3815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
876 | rm -rf conftest* | ||
877 | res=yes | ||
878 | else | ||
879 | @@ -3825,7 +3827,7 @@ rm -f conftest* | ||
880 | fi | ||
881 | # Check windres version | ||
882 | echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 | ||
883 | -echo "configure:3829: checking for windres version >= $WINDRES_VERSION" >&5 | ||
884 | +echo "configure:3831: checking for windres version >= $WINDRES_VERSION" >&5 | ||
885 | _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` | ||
886 | echo "$ac_t""$_WINDRES_VERSION" 1>&6 | ||
887 | _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` | ||
888 | @@ -3864,7 +3866,7 @@ EOF | ||
889 | # If the maximum version supported by this SDK is lower than the target | ||
890 | # version, error out | ||
891 | echo $ac_n "checking for Windows SDK being recent enough""... $ac_c" 1>&6 | ||
892 | -echo "configure:3868: checking for Windows SDK being recent enough" >&5 | ||
893 | +echo "configure:3870: checking for Windows SDK being recent enough" >&5 | ||
894 | if $PERL -e "exit(0x$MOZ_WINSDK_TARGETVER > $MOZ_WINSDK_MAXVER)"; then | ||
895 | echo "$ac_t"""yes"" 1>&6 | ||
896 | else | ||
897 | @@ -3893,7 +3895,7 @@ EOF | ||
898 | esac | ||
899 | |||
900 | echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 | ||
901 | -echo "configure:3897: checking how to run the C preprocessor" >&5 | ||
902 | +echo "configure:3899: checking how to run the C preprocessor" >&5 | ||
903 | # On Suns, sometimes $CPP names a directory. | ||
904 | if test -n "$CPP" && test -d "$CPP"; then | ||
905 | CPP= | ||
906 | @@ -3908,13 +3910,13 @@ else | ||
907 | # On the NeXT, cc -E runs the code through the compiler's parser, | ||
908 | # not just through cpp. | ||
909 | cat > conftest.$ac_ext <<EOF | ||
910 | -#line 3912 "configure" | ||
911 | +#line 3914 "configure" | ||
912 | #include "confdefs.h" | ||
913 | #include <assert.h> | ||
914 | Syntax Error | ||
915 | EOF | ||
916 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
917 | -{ (eval echo configure:3918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
918 | +{ (eval echo configure:3920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
919 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
920 | if test -z "$ac_err"; then | ||
921 | : | ||
922 | @@ -3925,13 +3927,13 @@ else | ||
923 | rm -rf conftest* | ||
924 | CPP="${CC-cc} -E -traditional-cpp" | ||
925 | cat > conftest.$ac_ext <<EOF | ||
926 | -#line 3929 "configure" | ||
927 | +#line 3931 "configure" | ||
928 | #include "confdefs.h" | ||
929 | #include <assert.h> | ||
930 | Syntax Error | ||
931 | EOF | ||
932 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
933 | -{ (eval echo configure:3935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
934 | +{ (eval echo configure:3937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
935 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
936 | if test -z "$ac_err"; then | ||
937 | : | ||
938 | @@ -3942,13 +3944,13 @@ else | ||
939 | rm -rf conftest* | ||
940 | CPP="${CC-cc} -nologo -E" | ||
941 | cat > conftest.$ac_ext <<EOF | ||
942 | -#line 3946 "configure" | ||
943 | +#line 3948 "configure" | ||
944 | #include "confdefs.h" | ||
945 | #include <assert.h> | ||
946 | Syntax Error | ||
947 | EOF | ||
948 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
949 | -{ (eval echo configure:3952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
950 | +{ (eval echo configure:3954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
951 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
952 | if test -z "$ac_err"; then | ||
953 | : | ||
954 | @@ -3973,7 +3975,7 @@ fi | ||
955 | echo "$ac_t""$CPP" 1>&6 | ||
956 | |||
957 | echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 | ||
958 | -echo "configure:3977: checking how to run the C++ preprocessor" >&5 | ||
959 | +echo "configure:3979: checking how to run the C++ preprocessor" >&5 | ||
960 | if test -z "$CXXCPP"; then | ||
961 | if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then | ||
962 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
963 | @@ -3986,12 +3988,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
964 | cross_compiling=$ac_cv_prog_cxx_cross | ||
965 | CXXCPP="${CXX-g++} -E" | ||
966 | cat > conftest.$ac_ext <<EOF | ||
967 | -#line 3990 "configure" | ||
968 | +#line 3992 "configure" | ||
969 | #include "confdefs.h" | ||
970 | #include <stdlib.h> | ||
971 | EOF | ||
972 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
973 | -{ (eval echo configure:3995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
974 | +{ (eval echo configure:3997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
975 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
976 | if test -z "$ac_err"; then | ||
977 | : | ||
978 | @@ -4068,7 +4070,7 @@ fi # COMPILE_ENVIRONMENT | ||
979 | # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | ||
980 | # ./install, which can be erroneously created by make from ./install.sh. | ||
981 | echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 | ||
982 | -echo "configure:4072: checking for a BSD compatible install" >&5 | ||
983 | +echo "configure:4074: checking for a BSD compatible install" >&5 | ||
984 | if test -z "$INSTALL"; then | ||
985 | if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then | ||
986 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
987 | @@ -4121,7 +4123,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' | ||
988 | test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | ||
989 | |||
990 | echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 | ||
991 | -echo "configure:4125: checking whether ln -s works" >&5 | ||
992 | +echo "configure:4127: checking whether ln -s works" >&5 | ||
993 | if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then | ||
994 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
995 | else | ||
996 | @@ -4144,7 +4146,7 @@ fi | ||
997 | |||
998 | if test -z "$TINDERBOX_SKIP_PERL_VERSION_CHECK"; then | ||
999 | echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 | ||
1000 | -echo "configure:4148: checking for minimum required perl version >= $PERL_VERSION" >&5 | ||
1001 | +echo "configure:4150: checking for minimum required perl version >= $PERL_VERSION" >&5 | ||
1002 | _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` | ||
1003 | _perl_res=$? | ||
1004 | echo "$ac_t""$_perl_version" 1>&6 | ||
1005 | @@ -4155,7 +4157,7 @@ fi | ||
1006 | fi | ||
1007 | |||
1008 | echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 | ||
1009 | -echo "configure:4159: checking for full perl installation" >&5 | ||
1010 | +echo "configure:4161: checking for full perl installation" >&5 | ||
1011 | _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5` | ||
1012 | _perl_res=$? | ||
1013 | if test "$_perl_res" != 0; then | ||
1014 | @@ -4170,7 +4172,7 @@ do | ||
1015 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
1016 | set dummy $ac_prog; ac_word=$2 | ||
1017 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1018 | -echo "configure:4174: checking for $ac_word" >&5 | ||
1019 | +echo "configure:4176: checking for $ac_word" >&5 | ||
1020 | if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then | ||
1021 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1022 | else | ||
1023 | @@ -4222,6 +4224,25 @@ if test -z "$PYTHON"; then | ||
1024 | { echo "configure: error: python was not found in \$PATH" 1>&2; exit 1; } | ||
1025 | fi | ||
1026 | |||
1027 | +# Check whether --with-system-ply or --without-system-ply was given. | ||
1028 | +if test "${with_system_ply+set}" = set; then | ||
1029 | + withval="$with_system_ply" | ||
1030 | + if test "$withval" = "yes"; then | ||
1031 | + if $PYTHON -c 'import ply' 2>&5; then | ||
1032 | + MOZ_SYSTEM_PLY=1 | ||
1033 | + else | ||
1034 | + { echo "configure: error: python ply library is not found but --with-system-ply was requested" 1>&2; exit 1; } | ||
1035 | + fi | ||
1036 | + elif test "$withval" = "no"; then | ||
1037 | + : | ||
1038 | + else | ||
1039 | + { echo "configure: error: Option, system-ply, does not take an argument ($withval)." 1>&2; exit 1; } | ||
1040 | + fi | ||
1041 | +fi | ||
1042 | + | ||
1043 | + | ||
1044 | + | ||
1045 | + | ||
1046 | if test -z "$COMPILE_ENVIRONMENT"; then | ||
1047 | NSINSTALL_BIN='$(PYTHON) $(topsrcdir)/config/nsinstall.py' | ||
1048 | fi | ||
1049 | @@ -4230,7 +4251,7 @@ fi | ||
1050 | # Extract the first word of "doxygen", so it can be a program name with args. | ||
1051 | set dummy doxygen; ac_word=$2 | ||
1052 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1053 | -echo "configure:4234: checking for $ac_word" >&5 | ||
1054 | +echo "configure:4255: checking for $ac_word" >&5 | ||
1055 | if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then | ||
1056 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1057 | else | ||
1058 | @@ -4279,7 +4300,7 @@ fi | ||
1059 | # Extract the first word of "autoconf", so it can be a program name with args. | ||
1060 | set dummy autoconf; ac_word=$2 | ||
1061 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1062 | -echo "configure:4283: checking for $ac_word" >&5 | ||
1063 | +echo "configure:4304: checking for $ac_word" >&5 | ||
1064 | if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then | ||
1065 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1066 | else | ||
1067 | @@ -4330,7 +4351,7 @@ do | ||
1068 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
1069 | set dummy $ac_prog; ac_word=$2 | ||
1070 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1071 | -echo "configure:4334: checking for $ac_word" >&5 | ||
1072 | +echo "configure:4355: checking for $ac_word" >&5 | ||
1073 | if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then | ||
1074 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1075 | else | ||
1076 | @@ -4386,7 +4407,7 @@ do | ||
1077 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
1078 | set dummy $ac_prog; ac_word=$2 | ||
1079 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1080 | -echo "configure:4390: checking for $ac_word" >&5 | ||
1081 | +echo "configure:4411: checking for $ac_word" >&5 | ||
1082 | if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then | ||
1083 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1084 | else | ||
1085 | @@ -4440,7 +4461,7 @@ fi | ||
1086 | # Extract the first word of "makedepend", so it can be a program name with args. | ||
1087 | set dummy makedepend; ac_word=$2 | ||
1088 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1089 | -echo "configure:4444: checking for $ac_word" >&5 | ||
1090 | +echo "configure:4465: checking for $ac_word" >&5 | ||
1091 | if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then | ||
1092 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1093 | else | ||
1094 | @@ -4488,7 +4509,7 @@ fi | ||
1095 | # Extract the first word of "xargs", so it can be a program name with args. | ||
1096 | set dummy xargs; ac_word=$2 | ||
1097 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1098 | -echo "configure:4492: checking for $ac_word" >&5 | ||
1099 | +echo "configure:4513: checking for $ac_word" >&5 | ||
1100 | if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then | ||
1101 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1102 | else | ||
1103 | @@ -4540,7 +4561,7 @@ fi | ||
1104 | # Extract the first word of "rpmbuild", so it can be a program name with args. | ||
1105 | set dummy rpmbuild; ac_word=$2 | ||
1106 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1107 | -echo "configure:4544: checking for $ac_word" >&5 | ||
1108 | +echo "configure:4565: checking for $ac_word" >&5 | ||
1109 | if eval "test \"`echo '$''{'ac_cv_path_RPMBUILD'+set}'`\" = set"; then | ||
1110 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1111 | else | ||
1112 | @@ -4613,7 +4634,7 @@ do | ||
1113 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
1114 | set dummy $ac_prog; ac_word=$2 | ||
1115 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1116 | -echo "configure:4617: checking for $ac_word" >&5 | ||
1117 | +echo "configure:4638: checking for $ac_word" >&5 | ||
1118 | if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then | ||
1119 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1120 | else | ||
1121 | @@ -4665,7 +4686,7 @@ done | ||
1122 | # Extract the first word of "sdp", so it can be a program name with args. | ||
1123 | set dummy sdp; ac_word=$2 | ||
1124 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1125 | -echo "configure:4669: checking for $ac_word" >&5 | ||
1126 | +echo "configure:4690: checking for $ac_word" >&5 | ||
1127 | if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then | ||
1128 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1129 | else | ||
1130 | @@ -4786,7 +4807,7 @@ tools are selected during the Xcode/Developer Tools installation." 1>&2; exit 1; | ||
1131 | |||
1132 | |||
1133 | echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 | ||
1134 | -echo "configure:4790: checking for valid compiler/Mac OS X SDK combination" >&5 | ||
1135 | +echo "configure:4811: checking for valid compiler/Mac OS X SDK combination" >&5 | ||
1136 | ac_ext=C | ||
1137 | # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
1138 | ac_cpp='$CXXCPP $CPPFLAGS' | ||
1139 | @@ -4795,14 +4816,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
1140 | cross_compiling=$ac_cv_prog_cxx_cross | ||
1141 | |||
1142 | cat > conftest.$ac_ext <<EOF | ||
1143 | -#line 4799 "configure" | ||
1144 | +#line 4820 "configure" | ||
1145 | #include "confdefs.h" | ||
1146 | #include <new> | ||
1147 | int main() { | ||
1148 | |||
1149 | ; return 0; } | ||
1150 | EOF | ||
1151 | -if { (eval echo configure:4806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1152 | +if { (eval echo configure:4827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1153 | rm -rf conftest* | ||
1154 | result=yes | ||
1155 | else | ||
1156 | @@ -4829,7 +4850,7 @@ fi | ||
1157 | fi # COMPILE_ENVIRONMENT | ||
1158 | |||
1159 | echo $ac_n "checking whether the C compiler is clang older than version 2.9""... $ac_c" 1>&6 | ||
1160 | -echo "configure:4833: checking whether the C compiler is clang older than version 2.9" >&5 | ||
1161 | +echo "configure:4854: checking whether the C compiler is clang older than version 2.9" >&5 | ||
1162 | |||
1163 | ac_ext=c | ||
1164 | # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
1165 | @@ -4839,7 +4860,7 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a | ||
1166 | cross_compiling=$ac_cv_prog_cc_cross | ||
1167 | |||
1168 | cat > conftest.$ac_ext <<EOF | ||
1169 | -#line 4843 "configure" | ||
1170 | +#line 4864 "configure" | ||
1171 | #include "confdefs.h" | ||
1172 | |||
1173 | #if defined(__clang__) | ||
1174 | @@ -4852,7 +4873,7 @@ int main() { | ||
1175 | |||
1176 | ; return 0; } | ||
1177 | EOF | ||
1178 | -if { (eval echo configure:4856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1179 | +if { (eval echo configure:4877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1180 | rm -rf conftest* | ||
1181 | result="no" | ||
1182 | else | ||
1183 | @@ -4874,7 +4895,7 @@ if test "$result" = "yes"; then | ||
1184 | MOZ_NO_THEORA_ASM=1 | ||
1185 | fi | ||
1186 | echo $ac_n "checking bad gcc versions""... $ac_c" 1>&6 | ||
1187 | -echo "configure:4878: checking bad gcc versions" >&5 | ||
1188 | +echo "configure:4899: checking bad gcc versions" >&5 | ||
1189 | if `$CC --version | grep -q "Apple Inc. build 5658"`; then | ||
1190 | echo "$ac_t""Apple build 5658" 1>&6 | ||
1191 | MOZ_NO_THEORA_ASM=1 | ||
1192 | @@ -4901,7 +4922,7 @@ do | ||
1193 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
1194 | set dummy $ac_prog; ac_word=$2 | ||
1195 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1196 | -echo "configure:4905: checking for $ac_word" >&5 | ||
1197 | +echo "configure:4926: checking for $ac_word" >&5 | ||
1198 | if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then | ||
1199 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1200 | else | ||
1201 | @@ -4957,7 +4978,7 @@ do | ||
1202 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
1203 | set dummy $ac_prog; ac_word=$2 | ||
1204 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
1205 | -echo "configure:4961: checking for $ac_word" >&5 | ||
1206 | +echo "configure:4982: checking for $ac_word" >&5 | ||
1207 | if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then | ||
1208 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1209 | else | ||
1210 | @@ -5020,7 +5041,7 @@ if test "$COMPILE_ENVIRONMENT"; then | ||
1211 | # Uses ac_ vars as temps to allow command line to override cache and checks. | ||
1212 | # --without-x overrides everything else, but does not touch the cache. | ||
1213 | echo $ac_n "checking for X""... $ac_c" 1>&6 | ||
1214 | -echo "configure:5024: checking for X" >&5 | ||
1215 | +echo "configure:5045: checking for X" >&5 | ||
1216 | |||
1217 | # Check whether --with-x or --without-x was given. | ||
1218 | if test "${with_x+set}" = set; then | ||
1219 | @@ -5082,12 +5103,12 @@ if test "$ac_x_includes" = NO; then | ||
1220 | |||
1221 | # First, try using that file with no special directory specified. | ||
1222 | cat > conftest.$ac_ext <<EOF | ||
1223 | -#line 5086 "configure" | ||
1224 | +#line 5107 "configure" | ||
1225 | #include "confdefs.h" | ||
1226 | #include <$x_direct_test_include> | ||
1227 | EOF | ||
1228 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
1229 | -{ (eval echo configure:5091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
1230 | +{ (eval echo configure:5112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
1231 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
1232 | if test -z "$ac_err"; then | ||
1233 | rm -rf conftest* | ||
1234 | @@ -5156,14 +5177,14 @@ if test "$ac_x_libraries" = NO; then | ||
1235 | ac_save_LIBS="$LIBS" | ||
1236 | LIBS="-l$x_direct_test_library $LIBS" | ||
1237 | cat > conftest.$ac_ext <<EOF | ||
1238 | -#line 5160 "configure" | ||
1239 | +#line 5181 "configure" | ||
1240 | #include "confdefs.h" | ||
1241 | |||
1242 | int main() { | ||
1243 | ${x_direct_test_function}() | ||
1244 | ; return 0; } | ||
1245 | EOF | ||
1246 | -if { (eval echo configure:5167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1247 | +if { (eval echo configure:5188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1248 | rm -rf conftest* | ||
1249 | LIBS="$ac_save_LIBS" | ||
1250 | # We can link X programs with no special library path. | ||
1251 | @@ -5269,17 +5290,17 @@ else | ||
1252 | case "`(uname -sr) 2>/dev/null`" in | ||
1253 | "SunOS 5"*) | ||
1254 | echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 | ||
1255 | -echo "configure:5273: checking whether -R must be followed by a space" >&5 | ||
1256 | +echo "configure:5294: checking whether -R must be followed by a space" >&5 | ||
1257 | ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" | ||
1258 | cat > conftest.$ac_ext <<EOF | ||
1259 | -#line 5276 "configure" | ||
1260 | +#line 5297 "configure" | ||
1261 | #include "confdefs.h" | ||
1262 | |||
1263 | int main() { | ||
1264 | |||
1265 | ; return 0; } | ||
1266 | EOF | ||
1267 | -if { (eval echo configure:5283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1268 | +if { (eval echo configure:5304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1269 | rm -rf conftest* | ||
1270 | ac_R_nospace=yes | ||
1271 | else | ||
1272 | @@ -5295,14 +5316,14 @@ rm -f conftest* | ||
1273 | else | ||
1274 | LIBS="$ac_xsave_LIBS -R $x_libraries" | ||
1275 | cat > conftest.$ac_ext <<EOF | ||
1276 | -#line 5299 "configure" | ||
1277 | +#line 5320 "configure" | ||
1278 | #include "confdefs.h" | ||
1279 | |||
1280 | int main() { | ||
1281 | |||
1282 | ; return 0; } | ||
1283 | EOF | ||
1284 | -if { (eval echo configure:5306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1285 | +if { (eval echo configure:5327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1286 | rm -rf conftest* | ||
1287 | ac_R_space=yes | ||
1288 | else | ||
1289 | @@ -5334,7 +5355,7 @@ rm -f conftest* | ||
1290 | # libraries were built with DECnet support. And karl@cs.umb.edu says | ||
1291 | # the Alpha needs dnet_stub (dnet does not exist). | ||
1292 | echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 | ||
1293 | -echo "configure:5338: checking for dnet_ntoa in -ldnet" >&5 | ||
1294 | +echo "configure:5359: checking for dnet_ntoa in -ldnet" >&5 | ||
1295 | ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` | ||
1296 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1297 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1298 | @@ -5342,7 +5363,7 @@ else | ||
1299 | ac_save_LIBS="$LIBS" | ||
1300 | LIBS="-ldnet $LIBS" | ||
1301 | cat > conftest.$ac_ext <<EOF | ||
1302 | -#line 5346 "configure" | ||
1303 | +#line 5367 "configure" | ||
1304 | #include "confdefs.h" | ||
1305 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1306 | /* We use char because int might match the return type of a gcc2 | ||
1307 | @@ -5353,7 +5374,7 @@ int main() { | ||
1308 | dnet_ntoa() | ||
1309 | ; return 0; } | ||
1310 | EOF | ||
1311 | -if { (eval echo configure:5357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1312 | +if { (eval echo configure:5378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1313 | rm -rf conftest* | ||
1314 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1315 | else | ||
1316 | @@ -5375,7 +5396,7 @@ fi | ||
1317 | |||
1318 | if test $ac_cv_lib_dnet_dnet_ntoa = no; then | ||
1319 | echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 | ||
1320 | -echo "configure:5379: checking for dnet_ntoa in -ldnet_stub" >&5 | ||
1321 | +echo "configure:5400: checking for dnet_ntoa in -ldnet_stub" >&5 | ||
1322 | ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` | ||
1323 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1324 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1325 | @@ -5383,7 +5404,7 @@ else | ||
1326 | ac_save_LIBS="$LIBS" | ||
1327 | LIBS="-ldnet_stub $LIBS" | ||
1328 | cat > conftest.$ac_ext <<EOF | ||
1329 | -#line 5387 "configure" | ||
1330 | +#line 5408 "configure" | ||
1331 | #include "confdefs.h" | ||
1332 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1333 | /* We use char because int might match the return type of a gcc2 | ||
1334 | @@ -5394,7 +5415,7 @@ int main() { | ||
1335 | dnet_ntoa() | ||
1336 | ; return 0; } | ||
1337 | EOF | ||
1338 | -if { (eval echo configure:5398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1339 | +if { (eval echo configure:5419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1340 | rm -rf conftest* | ||
1341 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1342 | else | ||
1343 | @@ -5423,12 +5444,12 @@ fi | ||
1344 | # The nsl library prevents programs from opening the X display | ||
1345 | # on Irix 5.2, according to dickey@clark.net. | ||
1346 | echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 | ||
1347 | -echo "configure:5427: checking for gethostbyname" >&5 | ||
1348 | +echo "configure:5448: checking for gethostbyname" >&5 | ||
1349 | if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then | ||
1350 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1351 | else | ||
1352 | cat > conftest.$ac_ext <<EOF | ||
1353 | -#line 5432 "configure" | ||
1354 | +#line 5453 "configure" | ||
1355 | #include "confdefs.h" | ||
1356 | /* System header to define __stub macros and hopefully few prototypes, | ||
1357 | which can conflict with char gethostbyname(); below. */ | ||
1358 | @@ -5451,7 +5472,7 @@ gethostbyname(); | ||
1359 | |||
1360 | ; return 0; } | ||
1361 | EOF | ||
1362 | -if { (eval echo configure:5455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1363 | +if { (eval echo configure:5476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1364 | rm -rf conftest* | ||
1365 | eval "ac_cv_func_gethostbyname=yes" | ||
1366 | else | ||
1367 | @@ -5472,7 +5493,7 @@ fi | ||
1368 | |||
1369 | if test $ac_cv_func_gethostbyname = no; then | ||
1370 | echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 | ||
1371 | -echo "configure:5476: checking for gethostbyname in -lnsl" >&5 | ||
1372 | +echo "configure:5497: checking for gethostbyname in -lnsl" >&5 | ||
1373 | ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` | ||
1374 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1375 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1376 | @@ -5480,7 +5501,7 @@ else | ||
1377 | ac_save_LIBS="$LIBS" | ||
1378 | LIBS="-lnsl $LIBS" | ||
1379 | cat > conftest.$ac_ext <<EOF | ||
1380 | -#line 5484 "configure" | ||
1381 | +#line 5505 "configure" | ||
1382 | #include "confdefs.h" | ||
1383 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1384 | /* We use char because int might match the return type of a gcc2 | ||
1385 | @@ -5491,7 +5512,7 @@ int main() { | ||
1386 | gethostbyname() | ||
1387 | ; return 0; } | ||
1388 | EOF | ||
1389 | -if { (eval echo configure:5495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1390 | +if { (eval echo configure:5516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1391 | rm -rf conftest* | ||
1392 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1393 | else | ||
1394 | @@ -5521,12 +5542,12 @@ fi | ||
1395 | # -lsocket must be given before -lnsl if both are needed. | ||
1396 | # We assume that if connect needs -lnsl, so does gethostbyname. | ||
1397 | echo $ac_n "checking for connect""... $ac_c" 1>&6 | ||
1398 | -echo "configure:5525: checking for connect" >&5 | ||
1399 | +echo "configure:5546: checking for connect" >&5 | ||
1400 | if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then | ||
1401 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1402 | else | ||
1403 | cat > conftest.$ac_ext <<EOF | ||
1404 | -#line 5530 "configure" | ||
1405 | +#line 5551 "configure" | ||
1406 | #include "confdefs.h" | ||
1407 | /* System header to define __stub macros and hopefully few prototypes, | ||
1408 | which can conflict with char connect(); below. */ | ||
1409 | @@ -5549,7 +5570,7 @@ connect(); | ||
1410 | |||
1411 | ; return 0; } | ||
1412 | EOF | ||
1413 | -if { (eval echo configure:5553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1414 | +if { (eval echo configure:5574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1415 | rm -rf conftest* | ||
1416 | eval "ac_cv_func_connect=yes" | ||
1417 | else | ||
1418 | @@ -5570,7 +5591,7 @@ fi | ||
1419 | |||
1420 | if test $ac_cv_func_connect = no; then | ||
1421 | echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 | ||
1422 | -echo "configure:5574: checking for connect in -lsocket" >&5 | ||
1423 | +echo "configure:5595: checking for connect in -lsocket" >&5 | ||
1424 | ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` | ||
1425 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1426 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1427 | @@ -5578,7 +5599,7 @@ else | ||
1428 | ac_save_LIBS="$LIBS" | ||
1429 | LIBS="-lsocket $X_EXTRA_LIBS $LIBS" | ||
1430 | cat > conftest.$ac_ext <<EOF | ||
1431 | -#line 5582 "configure" | ||
1432 | +#line 5603 "configure" | ||
1433 | #include "confdefs.h" | ||
1434 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1435 | /* We use char because int might match the return type of a gcc2 | ||
1436 | @@ -5589,7 +5610,7 @@ int main() { | ||
1437 | connect() | ||
1438 | ; return 0; } | ||
1439 | EOF | ||
1440 | -if { (eval echo configure:5593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1441 | +if { (eval echo configure:5614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1442 | rm -rf conftest* | ||
1443 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1444 | else | ||
1445 | @@ -5613,12 +5634,12 @@ fi | ||
1446 | |||
1447 | # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. | ||
1448 | echo $ac_n "checking for remove""... $ac_c" 1>&6 | ||
1449 | -echo "configure:5617: checking for remove" >&5 | ||
1450 | +echo "configure:5638: checking for remove" >&5 | ||
1451 | if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then | ||
1452 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1453 | else | ||
1454 | cat > conftest.$ac_ext <<EOF | ||
1455 | -#line 5622 "configure" | ||
1456 | +#line 5643 "configure" | ||
1457 | #include "confdefs.h" | ||
1458 | /* System header to define __stub macros and hopefully few prototypes, | ||
1459 | which can conflict with char remove(); below. */ | ||
1460 | @@ -5641,7 +5662,7 @@ remove(); | ||
1461 | |||
1462 | ; return 0; } | ||
1463 | EOF | ||
1464 | -if { (eval echo configure:5645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1465 | +if { (eval echo configure:5666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1466 | rm -rf conftest* | ||
1467 | eval "ac_cv_func_remove=yes" | ||
1468 | else | ||
1469 | @@ -5662,7 +5683,7 @@ fi | ||
1470 | |||
1471 | if test $ac_cv_func_remove = no; then | ||
1472 | echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 | ||
1473 | -echo "configure:5666: checking for remove in -lposix" >&5 | ||
1474 | +echo "configure:5687: checking for remove in -lposix" >&5 | ||
1475 | ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` | ||
1476 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1477 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1478 | @@ -5670,7 +5691,7 @@ else | ||
1479 | ac_save_LIBS="$LIBS" | ||
1480 | LIBS="-lposix $LIBS" | ||
1481 | cat > conftest.$ac_ext <<EOF | ||
1482 | -#line 5674 "configure" | ||
1483 | +#line 5695 "configure" | ||
1484 | #include "confdefs.h" | ||
1485 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1486 | /* We use char because int might match the return type of a gcc2 | ||
1487 | @@ -5681,7 +5702,7 @@ int main() { | ||
1488 | remove() | ||
1489 | ; return 0; } | ||
1490 | EOF | ||
1491 | -if { (eval echo configure:5685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1492 | +if { (eval echo configure:5706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1493 | rm -rf conftest* | ||
1494 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1495 | else | ||
1496 | @@ -5705,12 +5726,12 @@ fi | ||
1497 | |||
1498 | # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. | ||
1499 | echo $ac_n "checking for shmat""... $ac_c" 1>&6 | ||
1500 | -echo "configure:5709: checking for shmat" >&5 | ||
1501 | +echo "configure:5730: checking for shmat" >&5 | ||
1502 | if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then | ||
1503 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1504 | else | ||
1505 | cat > conftest.$ac_ext <<EOF | ||
1506 | -#line 5714 "configure" | ||
1507 | +#line 5735 "configure" | ||
1508 | #include "confdefs.h" | ||
1509 | /* System header to define __stub macros and hopefully few prototypes, | ||
1510 | which can conflict with char shmat(); below. */ | ||
1511 | @@ -5733,7 +5754,7 @@ shmat(); | ||
1512 | |||
1513 | ; return 0; } | ||
1514 | EOF | ||
1515 | -if { (eval echo configure:5737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1516 | +if { (eval echo configure:5758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1517 | rm -rf conftest* | ||
1518 | eval "ac_cv_func_shmat=yes" | ||
1519 | else | ||
1520 | @@ -5754,7 +5775,7 @@ fi | ||
1521 | |||
1522 | if test $ac_cv_func_shmat = no; then | ||
1523 | echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 | ||
1524 | -echo "configure:5758: checking for shmat in -lipc" >&5 | ||
1525 | +echo "configure:5779: checking for shmat in -lipc" >&5 | ||
1526 | ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` | ||
1527 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1528 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1529 | @@ -5762,7 +5783,7 @@ else | ||
1530 | ac_save_LIBS="$LIBS" | ||
1531 | LIBS="-lipc $LIBS" | ||
1532 | cat > conftest.$ac_ext <<EOF | ||
1533 | -#line 5766 "configure" | ||
1534 | +#line 5787 "configure" | ||
1535 | #include "confdefs.h" | ||
1536 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1537 | /* We use char because int might match the return type of a gcc2 | ||
1538 | @@ -5773,7 +5794,7 @@ int main() { | ||
1539 | shmat() | ||
1540 | ; return 0; } | ||
1541 | EOF | ||
1542 | -if { (eval echo configure:5777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1543 | +if { (eval echo configure:5798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1544 | rm -rf conftest* | ||
1545 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1546 | else | ||
1547 | @@ -5806,7 +5827,7 @@ fi | ||
1548 | # libraries we check for below, so use a different variable. | ||
1549 | # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. | ||
1550 | echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 | ||
1551 | -echo "configure:5810: checking for IceConnectionNumber in -lICE" >&5 | ||
1552 | +echo "configure:5831: checking for IceConnectionNumber in -lICE" >&5 | ||
1553 | ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` | ||
1554 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1555 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1556 | @@ -5814,7 +5835,7 @@ else | ||
1557 | ac_save_LIBS="$LIBS" | ||
1558 | LIBS="-lICE $X_EXTRA_LIBS $LIBS" | ||
1559 | cat > conftest.$ac_ext <<EOF | ||
1560 | -#line 5818 "configure" | ||
1561 | +#line 5839 "configure" | ||
1562 | #include "confdefs.h" | ||
1563 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1564 | /* We use char because int might match the return type of a gcc2 | ||
1565 | @@ -5825,7 +5846,7 @@ int main() { | ||
1566 | IceConnectionNumber() | ||
1567 | ; return 0; } | ||
1568 | EOF | ||
1569 | -if { (eval echo configure:5829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1570 | +if { (eval echo configure:5850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1571 | rm -rf conftest* | ||
1572 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1573 | else | ||
1574 | @@ -6220,14 +6241,14 @@ no) | ||
1575 | _SAVE_CFLAGS="$CFLAGS" | ||
1576 | CFLAGS="$arch_flag" | ||
1577 | cat > conftest.$ac_ext <<EOF | ||
1578 | -#line 6224 "configure" | ||
1579 | +#line 6245 "configure" | ||
1580 | #include "confdefs.h" | ||
1581 | |||
1582 | int main() { | ||
1583 | return sizeof(__thumb2__); | ||
1584 | ; return 0; } | ||
1585 | EOF | ||
1586 | -if { (eval echo configure:6231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1587 | +if { (eval echo configure:6252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1588 | rm -rf conftest* | ||
1589 | MOZ_THUMB2=1 | ||
1590 | else | ||
1591 | @@ -6296,16 +6317,16 @@ if test -n "$all_flags"; then | ||
1592 | _SAVE_CFLAGS="$CFLAGS" | ||
1593 | CFLAGS="$all_flags" | ||
1594 | echo $ac_n "checking whether the chosen combination of compiler flags ($all_flags) works""... $ac_c" 1>&6 | ||
1595 | -echo "configure:6300: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 | ||
1596 | +echo "configure:6321: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 | ||
1597 | cat > conftest.$ac_ext <<EOF | ||
1598 | -#line 6302 "configure" | ||
1599 | +#line 6323 "configure" | ||
1600 | #include "confdefs.h" | ||
1601 | |||
1602 | int main() { | ||
1603 | return 0; | ||
1604 | ; return 0; } | ||
1605 | EOF | ||
1606 | -if { (eval echo configure:6309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1607 | +if { (eval echo configure:6330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1608 | rm -rf conftest* | ||
1609 | echo "$ac_t""yes" 1>&6 | ||
1610 | else | ||
1611 | @@ -6328,18 +6349,18 @@ fi | ||
1612 | |||
1613 | if test "$CPU_ARCH" = "arm"; then | ||
1614 | echo $ac_n "checking for ARM SIMD support in compiler""... $ac_c" 1>&6 | ||
1615 | -echo "configure:6332: checking for ARM SIMD support in compiler" >&5 | ||
1616 | +echo "configure:6353: checking for ARM SIMD support in compiler" >&5 | ||
1617 | # We try to link so that this also fails when | ||
1618 | # building with LTO. | ||
1619 | cat > conftest.$ac_ext <<EOF | ||
1620 | -#line 6336 "configure" | ||
1621 | +#line 6357 "configure" | ||
1622 | #include "confdefs.h" | ||
1623 | |||
1624 | int main() { | ||
1625 | asm("uqadd8 r1, r1, r2"); | ||
1626 | ; return 0; } | ||
1627 | EOF | ||
1628 | -if { (eval echo configure:6343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1629 | +if { (eval echo configure:6364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1630 | rm -rf conftest* | ||
1631 | result="yes" | ||
1632 | else | ||
1633 | @@ -6359,18 +6380,18 @@ EOF | ||
1634 | fi | ||
1635 | |||
1636 | echo $ac_n "checking for ARM NEON support in compiler""... $ac_c" 1>&6 | ||
1637 | -echo "configure:6363: checking for ARM NEON support in compiler" >&5 | ||
1638 | +echo "configure:6384: checking for ARM NEON support in compiler" >&5 | ||
1639 | # We try to link so that this also fails when | ||
1640 | # building with LTO. | ||
1641 | cat > conftest.$ac_ext <<EOF | ||
1642 | -#line 6367 "configure" | ||
1643 | +#line 6388 "configure" | ||
1644 | #include "confdefs.h" | ||
1645 | |||
1646 | int main() { | ||
1647 | asm(".fpu neon\n vadd.i8 d0, d0, d0"); | ||
1648 | ; return 0; } | ||
1649 | EOF | ||
1650 | -if { (eval echo configure:6374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1651 | +if { (eval echo configure:6395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1652 | rm -rf conftest* | ||
1653 | result="yes" | ||
1654 | else | ||
1655 | @@ -6521,7 +6542,7 @@ if test "$GNU_CXX"; then | ||
1656 | _USE_CPP_INCLUDE_FLAG=1 | ||
1657 | |||
1658 | echo $ac_n "checking whether the compiler supports -Wno-invalid-offsetof""... $ac_c" 1>&6 | ||
1659 | -echo "configure:6525: checking whether the compiler supports -Wno-invalid-offsetof" >&5 | ||
1660 | +echo "configure:6546: checking whether the compiler supports -Wno-invalid-offsetof" >&5 | ||
1661 | if eval "test \"`echo '$''{'ac_has_wno_invalid_offsetof'+set}'`\" = set"; then | ||
1662 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1663 | else | ||
1664 | @@ -6537,14 +6558,14 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
1665 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
1666 | CXXFLAGS="$CXXFLAGS ${_COMPILER_PREFIX}-Wno-invalid-offsetof" | ||
1667 | cat > conftest.$ac_ext <<EOF | ||
1668 | -#line 6541 "configure" | ||
1669 | +#line 6562 "configure" | ||
1670 | #include "confdefs.h" | ||
1671 | |||
1672 | int main() { | ||
1673 | return(0); | ||
1674 | ; return 0; } | ||
1675 | EOF | ||
1676 | -if { (eval echo configure:6548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1677 | +if { (eval echo configure:6569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1678 | rm -rf conftest* | ||
1679 | ac_has_wno_invalid_offsetof="yes" | ||
1680 | else | ||
1681 | @@ -6571,7 +6592,7 @@ echo "$ac_t""$ac_has_wno_invalid_offsetof" 1>&6 | ||
1682 | fi | ||
1683 | |||
1684 | echo $ac_n "checking whether the compiler supports -Wno-variadic-macros""... $ac_c" 1>&6 | ||
1685 | -echo "configure:6575: checking whether the compiler supports -Wno-variadic-macros" >&5 | ||
1686 | +echo "configure:6596: checking whether the compiler supports -Wno-variadic-macros" >&5 | ||
1687 | if eval "test \"`echo '$''{'ac_has_wno_variadic_macros'+set}'`\" = set"; then | ||
1688 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1689 | else | ||
1690 | @@ -6587,14 +6608,14 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
1691 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
1692 | CXXFLAGS="$CXXFLAGS ${_COMPILER_PREFIX}-Wno-variadic-macros" | ||
1693 | cat > conftest.$ac_ext <<EOF | ||
1694 | -#line 6591 "configure" | ||
1695 | +#line 6612 "configure" | ||
1696 | #include "confdefs.h" | ||
1697 | |||
1698 | int main() { | ||
1699 | return(0); | ||
1700 | ; return 0; } | ||
1701 | EOF | ||
1702 | -if { (eval echo configure:6598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1703 | +if { (eval echo configure:6619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1704 | rm -rf conftest* | ||
1705 | ac_has_wno_variadic_macros="yes" | ||
1706 | else | ||
1707 | @@ -6621,7 +6642,7 @@ echo "$ac_t""$ac_has_wno_variadic_macros" 1>&6 | ||
1708 | fi | ||
1709 | |||
1710 | echo $ac_n "checking whether the compiler supports -Werror=return-type""... $ac_c" 1>&6 | ||
1711 | -echo "configure:6625: checking whether the compiler supports -Werror=return-type" >&5 | ||
1712 | +echo "configure:6646: checking whether the compiler supports -Werror=return-type" >&5 | ||
1713 | if eval "test \"`echo '$''{'ac_has_werror_return_type'+set}'`\" = set"; then | ||
1714 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1715 | else | ||
1716 | @@ -6637,14 +6658,14 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
1717 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
1718 | CXXFLAGS="$CXXFLAGS -Werror=return-type" | ||
1719 | cat > conftest.$ac_ext <<EOF | ||
1720 | -#line 6641 "configure" | ||
1721 | +#line 6662 "configure" | ||
1722 | #include "confdefs.h" | ||
1723 | |||
1724 | int main() { | ||
1725 | return(0); | ||
1726 | ; return 0; } | ||
1727 | EOF | ||
1728 | -if { (eval echo configure:6648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1729 | +if { (eval echo configure:6669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1730 | rm -rf conftest* | ||
1731 | ac_has_werror_return_type="yes" | ||
1732 | else | ||
1733 | @@ -6680,7 +6701,7 @@ MKSHLIB_UNFORCE_ALL= | ||
1734 | if test "$COMPILE_ENVIRONMENT"; then | ||
1735 | if test "$GNU_CC"; then | ||
1736 | echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 | ||
1737 | -echo "configure:6684: checking whether ld has archive extraction flags" >&5 | ||
1738 | +echo "configure:6705: checking whether ld has archive extraction flags" >&5 | ||
1739 | if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then | ||
1740 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1741 | else | ||
1742 | @@ -6697,14 +6718,14 @@ LOOP_INPUT | ||
1743 | LDFLAGS=$force | ||
1744 | LIBS=$unforce | ||
1745 | cat > conftest.$ac_ext <<EOF | ||
1746 | -#line 6701 "configure" | ||
1747 | +#line 6722 "configure" | ||
1748 | #include "confdefs.h" | ||
1749 | |||
1750 | int main() { | ||
1751 | |||
1752 | ; return 0; } | ||
1753 | EOF | ||
1754 | -if { (eval echo configure:6708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1755 | +if { (eval echo configure:6729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1756 | rm -rf conftest* | ||
1757 | ac_cv_mkshlib_force_and_unforce=$line; break | ||
1758 | else | ||
1759 | @@ -6737,7 +6758,7 @@ configure_static_assert_macros=' | ||
1760 | ' | ||
1761 | |||
1762 | echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 | ||
1763 | -echo "configure:6741: checking that static assertion macros used in autoconf tests work" >&5 | ||
1764 | +echo "configure:6762: checking that static assertion macros used in autoconf tests work" >&5 | ||
1765 | if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then | ||
1766 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1767 | else | ||
1768 | @@ -6751,14 +6772,14 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
1769 | |||
1770 | ac_cv_static_assertion_macros_work="yes" | ||
1771 | cat > conftest.$ac_ext <<EOF | ||
1772 | -#line 6755 "configure" | ||
1773 | +#line 6776 "configure" | ||
1774 | #include "confdefs.h" | ||
1775 | $configure_static_assert_macros | ||
1776 | int main() { | ||
1777 | CONFIGURE_STATIC_ASSERT(1) | ||
1778 | ; return 0; } | ||
1779 | EOF | ||
1780 | -if { (eval echo configure:6762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1781 | +if { (eval echo configure:6783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1782 | : | ||
1783 | else | ||
1784 | echo "configure: failed program was:" >&5 | ||
1785 | @@ -6768,14 +6789,14 @@ else | ||
1786 | fi | ||
1787 | rm -f conftest* | ||
1788 | cat > conftest.$ac_ext <<EOF | ||
1789 | -#line 6772 "configure" | ||
1790 | +#line 6793 "configure" | ||
1791 | #include "confdefs.h" | ||
1792 | $configure_static_assert_macros | ||
1793 | int main() { | ||
1794 | CONFIGURE_STATIC_ASSERT(0) | ||
1795 | ; return 0; } | ||
1796 | EOF | ||
1797 | -if { (eval echo configure:6779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1798 | +if { (eval echo configure:6800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1799 | rm -rf conftest* | ||
1800 | ac_cv_static_assertion_macros_work="no" | ||
1801 | else | ||
1802 | @@ -6791,14 +6812,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
1803 | cross_compiling=$ac_cv_prog_cxx_cross | ||
1804 | |||
1805 | cat > conftest.$ac_ext <<EOF | ||
1806 | -#line 6795 "configure" | ||
1807 | +#line 6816 "configure" | ||
1808 | #include "confdefs.h" | ||
1809 | $configure_static_assert_macros | ||
1810 | int main() { | ||
1811 | CONFIGURE_STATIC_ASSERT(1) | ||
1812 | ; return 0; } | ||
1813 | EOF | ||
1814 | -if { (eval echo configure:6802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1815 | +if { (eval echo configure:6823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1816 | : | ||
1817 | else | ||
1818 | echo "configure: failed program was:" >&5 | ||
1819 | @@ -6808,14 +6829,14 @@ else | ||
1820 | fi | ||
1821 | rm -f conftest* | ||
1822 | cat > conftest.$ac_ext <<EOF | ||
1823 | -#line 6812 "configure" | ||
1824 | +#line 6833 "configure" | ||
1825 | #include "confdefs.h" | ||
1826 | $configure_static_assert_macros | ||
1827 | int main() { | ||
1828 | CONFIGURE_STATIC_ASSERT(0) | ||
1829 | ; return 0; } | ||
1830 | EOF | ||
1831 | -if { (eval echo configure:6819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1832 | +if { (eval echo configure:6840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1833 | rm -rf conftest* | ||
1834 | ac_cv_static_assertion_macros_work="no" | ||
1835 | else | ||
1836 | @@ -6849,16 +6870,16 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a | ||
1837 | cross_compiling=$ac_cv_prog_cc_cross | ||
1838 | |||
1839 | echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 | ||
1840 | -echo "configure:6853: checking for 64-bit OS" >&5 | ||
1841 | +echo "configure:6874: checking for 64-bit OS" >&5 | ||
1842 | cat > conftest.$ac_ext <<EOF | ||
1843 | -#line 6855 "configure" | ||
1844 | +#line 6876 "configure" | ||
1845 | #include "confdefs.h" | ||
1846 | $configure_static_assert_macros | ||
1847 | int main() { | ||
1848 | CONFIGURE_STATIC_ASSERT(sizeof(void*) == 8) | ||
1849 | ; return 0; } | ||
1850 | EOF | ||
1851 | -if { (eval echo configure:6862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1852 | +if { (eval echo configure:6883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1853 | rm -rf conftest* | ||
1854 | result="yes" | ||
1855 | else | ||
1856 | @@ -6929,19 +6950,19 @@ fi | ||
1857 | if test -n "$MOZ_VALGRIND"; then | ||
1858 | ac_safe=`echo "valgrind/valgrind.h" | sed 'y%./+-%__p_%'` | ||
1859 | echo $ac_n "checking for valgrind/valgrind.h""... $ac_c" 1>&6 | ||
1860 | -echo "configure:6933: checking for valgrind/valgrind.h" >&5 | ||
1861 | +echo "configure:6954: checking for valgrind/valgrind.h" >&5 | ||
1862 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1863 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1864 | else | ||
1865 | cat > conftest.$ac_ext <<EOF | ||
1866 | -#line 6938 "configure" | ||
1867 | +#line 6959 "configure" | ||
1868 | #include "confdefs.h" | ||
1869 | #include <valgrind/valgrind.h> | ||
1870 | int main() { | ||
1871 | |||
1872 | ; return 0; } | ||
1873 | EOF | ||
1874 | -if { (eval echo configure:6945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1875 | +if { (eval echo configure:6966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1876 | rm -rf conftest* | ||
1877 | eval "ac_cv_header_$ac_safe=yes" | ||
1878 | else | ||
1879 | @@ -7129,7 +7150,7 @@ case "$host" in | ||
1880 | esac | ||
1881 | |||
1882 | echo $ac_n "checking for Python version >= $PYTHON_VERSION but not 3.x""... $ac_c" 1>&6 | ||
1883 | -echo "configure:7133: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 | ||
1884 | +echo "configure:7154: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 | ||
1885 | |||
1886 | $PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1] or sys.version[:2] != '2.')" $PYTHON_VERSION | ||
1887 | _python_res=$? | ||
1888 | @@ -7207,9 +7228,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
1889 | cross_compiling=$ac_cv_prog_cxx_cross | ||
1890 | |||
1891 | echo $ac_n "checking for IBM XLC/C++ compiler version >= 9.0.0.7""... $ac_c" 1>&6 | ||
1892 | -echo "configure:7211: checking for IBM XLC/C++ compiler version >= 9.0.0.7" >&5 | ||
1893 | +echo "configure:7232: checking for IBM XLC/C++ compiler version >= 9.0.0.7" >&5 | ||
1894 | cat > conftest.$ac_ext <<EOF | ||
1895 | -#line 7213 "configure" | ||
1896 | +#line 7234 "configure" | ||
1897 | #include "confdefs.h" | ||
1898 | |||
1899 | int main() { | ||
1900 | @@ -7218,7 +7239,7 @@ int main() { | ||
1901 | #endif | ||
1902 | ; return 0; } | ||
1903 | EOF | ||
1904 | -if { (eval echo configure:7222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1905 | +if { (eval echo configure:7243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1906 | rm -rf conftest* | ||
1907 | _BAD_COMPILER= | ||
1908 | else | ||
1909 | @@ -7256,19 +7277,19 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
1910 | do | ||
1911 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
1912 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
1913 | -echo "configure:7260: checking for $ac_hdr" >&5 | ||
1914 | +echo "configure:7281: checking for $ac_hdr" >&5 | ||
1915 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1916 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1917 | else | ||
1918 | cat > conftest.$ac_ext <<EOF | ||
1919 | -#line 7265 "configure" | ||
1920 | +#line 7286 "configure" | ||
1921 | #include "confdefs.h" | ||
1922 | #include <$ac_hdr> | ||
1923 | int main() { | ||
1924 | |||
1925 | ; return 0; } | ||
1926 | EOF | ||
1927 | -if { (eval echo configure:7272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1928 | +if { (eval echo configure:7293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1929 | rm -rf conftest* | ||
1930 | eval "ac_cv_header_$ac_safe=yes" | ||
1931 | else | ||
1932 | @@ -7335,12 +7356,12 @@ EOF | ||
1933 | STRIP="$STRIP -x -S" | ||
1934 | # Check whether we're targeting OS X or iOS | ||
1935 | echo $ac_n "checking for iOS target""... $ac_c" 1>&6 | ||
1936 | -echo "configure:7339: checking for iOS target" >&5 | ||
1937 | +echo "configure:7360: checking for iOS target" >&5 | ||
1938 | if eval "test \"`echo '$''{'ac_cv_ios_target'+set}'`\" = set"; then | ||
1939 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1940 | else | ||
1941 | cat > conftest.$ac_ext <<EOF | ||
1942 | -#line 7344 "configure" | ||
1943 | +#line 7365 "configure" | ||
1944 | #include "confdefs.h" | ||
1945 | #include <TargetConditionals.h> | ||
1946 | #if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR) | ||
1947 | @@ -7350,7 +7371,7 @@ int main() { | ||
1948 | |||
1949 | ; return 0; } | ||
1950 | EOF | ||
1951 | -if { (eval echo configure:7354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1952 | +if { (eval echo configure:7375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1953 | rm -rf conftest* | ||
1954 | ac_cv_ios_target="yes" | ||
1955 | else | ||
1956 | @@ -7397,18 +7418,18 @@ EOF | ||
1957 | echo "Skipping -dead_strip because DTrace is enabled. See bug 403132." | ||
1958 | else | ||
1959 | echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 | ||
1960 | -echo "configure:7401: checking for -dead_strip option to ld" >&5 | ||
1961 | +echo "configure:7422: checking for -dead_strip option to ld" >&5 | ||
1962 | _SAVE_LDFLAGS=$LDFLAGS | ||
1963 | LDFLAGS="$LDFLAGS -Wl,-dead_strip" | ||
1964 | cat > conftest.$ac_ext <<EOF | ||
1965 | -#line 7405 "configure" | ||
1966 | +#line 7426 "configure" | ||
1967 | #include "confdefs.h" | ||
1968 | |||
1969 | int main() { | ||
1970 | return 0; | ||
1971 | ; return 0; } | ||
1972 | EOF | ||
1973 | -if { (eval echo configure:7412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1974 | +if { (eval echo configure:7433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1975 | rm -rf conftest* | ||
1976 | _HAVE_DEAD_STRIP=1 | ||
1977 | else | ||
1978 | @@ -7731,19 +7752,19 @@ EOF | ||
1979 | do | ||
1980 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
1981 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
1982 | -echo "configure:7735: checking for $ac_hdr" >&5 | ||
1983 | +echo "configure:7756: checking for $ac_hdr" >&5 | ||
1984 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1985 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1986 | else | ||
1987 | cat > conftest.$ac_ext <<EOF | ||
1988 | -#line 7740 "configure" | ||
1989 | +#line 7761 "configure" | ||
1990 | #include "confdefs.h" | ||
1991 | #include <$ac_hdr> | ||
1992 | int main() { | ||
1993 | |||
1994 | ; return 0; } | ||
1995 | EOF | ||
1996 | -if { (eval echo configure:7747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1997 | +if { (eval echo configure:7768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1998 | rm -rf conftest* | ||
1999 | eval "ac_cv_header_$ac_safe=yes" | ||
2000 | else | ||
2001 | @@ -7904,19 +7925,19 @@ EOF | ||
2002 | _DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__" | ||
2003 | |||
2004 | echo $ac_n "checking for __declspec(dllexport)""... $ac_c" 1>&6 | ||
2005 | -echo "configure:7908: checking for __declspec(dllexport)" >&5 | ||
2006 | +echo "configure:7929: checking for __declspec(dllexport)" >&5 | ||
2007 | if eval "test \"`echo '$''{'ac_os2_declspec'+set}'`\" = set"; then | ||
2008 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2009 | else | ||
2010 | cat > conftest.$ac_ext <<EOF | ||
2011 | -#line 7913 "configure" | ||
2012 | +#line 7934 "configure" | ||
2013 | #include "confdefs.h" | ||
2014 | __declspec(dllexport) void ac_os2_declspec(void) {} | ||
2015 | int main() { | ||
2016 | return 0; | ||
2017 | ; return 0; } | ||
2018 | EOF | ||
2019 | -if { (eval echo configure:7920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2020 | +if { (eval echo configure:7941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2021 | rm -rf conftest* | ||
2022 | ac_os2_declspec="yes" | ||
2023 | else | ||
2024 | @@ -7958,14 +7979,14 @@ EOF | ||
2025 | _SAVE_LDFLAGS=$LDFLAGS | ||
2026 | LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" | ||
2027 | cat > conftest.$ac_ext <<EOF | ||
2028 | -#line 7962 "configure" | ||
2029 | +#line 7983 "configure" | ||
2030 | #include "confdefs.h" | ||
2031 | #include <stdio.h> | ||
2032 | int main() { | ||
2033 | printf("Hello World\n"); | ||
2034 | ; return 0; } | ||
2035 | EOF | ||
2036 | -if { (eval echo configure:7969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2037 | +if { (eval echo configure:7990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2038 | : | ||
2039 | else | ||
2040 | echo "configure: failed program was:" >&5 | ||
2041 | @@ -7993,7 +8014,7 @@ rm -f conftest* | ||
2042 | CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` | ||
2043 | CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` | ||
2044 | echo $ac_n "checking for Sun C++ compiler version >= 5.9""... $ac_c" 1>&6 | ||
2045 | -echo "configure:7997: checking for Sun C++ compiler version >= 5.9" >&5 | ||
2046 | +echo "configure:8018: checking for Sun C++ compiler version >= 5.9" >&5 | ||
2047 | |||
2048 | ac_ext=C | ||
2049 | # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
2050 | @@ -8003,7 +8024,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
2051 | cross_compiling=$ac_cv_prog_cxx_cross | ||
2052 | |||
2053 | cat > conftest.$ac_ext <<EOF | ||
2054 | -#line 8007 "configure" | ||
2055 | +#line 8028 "configure" | ||
2056 | #include "confdefs.h" | ||
2057 | |||
2058 | int main() { | ||
2059 | @@ -8012,7 +8033,7 @@ int main() { | ||
2060 | #endif | ||
2061 | ; return 0; } | ||
2062 | EOF | ||
2063 | -if { (eval echo configure:8016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2064 | +if { (eval echo configure:8037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2065 | rm -rf conftest* | ||
2066 | _BAD_COMPILER= | ||
2067 | else | ||
2068 | @@ -8029,7 +8050,7 @@ rm -f conftest* | ||
2069 | _res="yes" | ||
2070 | fi | ||
2071 | cat > conftest.$ac_ext <<EOF | ||
2072 | -#line 8033 "configure" | ||
2073 | +#line 8054 "configure" | ||
2074 | #include "confdefs.h" | ||
2075 | |||
2076 | int main() { | ||
2077 | @@ -8038,7 +8059,7 @@ int main() { | ||
2078 | #endif | ||
2079 | ; return 0; } | ||
2080 | EOF | ||
2081 | -if { (eval echo configure:8042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2082 | +if { (eval echo configure:8063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2083 | rm -rf conftest* | ||
2084 | _ABOVE_SS12U1= | ||
2085 | else | ||
2086 | @@ -8166,12 +8187,12 @@ fi | ||
2087 | |||
2088 | if test -z "$SKIP_COMPILER_CHECKS"; then | ||
2089 | echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | ||
2090 | -echo "configure:8170: checking for ANSI C header files" >&5 | ||
2091 | +echo "configure:8191: checking for ANSI C header files" >&5 | ||
2092 | if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then | ||
2093 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2094 | else | ||
2095 | cat > conftest.$ac_ext <<EOF | ||
2096 | -#line 8175 "configure" | ||
2097 | +#line 8196 "configure" | ||
2098 | #include "confdefs.h" | ||
2099 | #include <stdlib.h> | ||
2100 | #include <stdarg.h> | ||
2101 | @@ -8179,7 +8200,7 @@ else | ||
2102 | #include <float.h> | ||
2103 | EOF | ||
2104 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
2105 | -{ (eval echo configure:8183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
2106 | +{ (eval echo configure:8204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
2107 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
2108 | if test -z "$ac_err"; then | ||
2109 | rm -rf conftest* | ||
2110 | @@ -8196,7 +8217,7 @@ rm -f conftest* | ||
2111 | if test $ac_cv_header_stdc = yes; then | ||
2112 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
2113 | cat > conftest.$ac_ext <<EOF | ||
2114 | -#line 8200 "configure" | ||
2115 | +#line 8221 "configure" | ||
2116 | #include "confdefs.h" | ||
2117 | #include <string.h> | ||
2118 | EOF | ||
2119 | @@ -8214,7 +8235,7 @@ fi | ||
2120 | if test $ac_cv_header_stdc = yes; then | ||
2121 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
2122 | cat > conftest.$ac_ext <<EOF | ||
2123 | -#line 8218 "configure" | ||
2124 | +#line 8239 "configure" | ||
2125 | #include "confdefs.h" | ||
2126 | #include <stdlib.h> | ||
2127 | EOF | ||
2128 | @@ -8235,7 +8256,7 @@ if test "$cross_compiling" = yes; then | ||
2129 | : | ||
2130 | else | ||
2131 | cat > conftest.$ac_ext <<EOF | ||
2132 | -#line 8239 "configure" | ||
2133 | +#line 8260 "configure" | ||
2134 | #include "confdefs.h" | ||
2135 | #include <ctype.h> | ||
2136 | #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | ||
2137 | @@ -8246,7 +8267,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); | ||
2138 | exit (0); } | ||
2139 | |||
2140 | EOF | ||
2141 | -if { (eval echo configure:8250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2142 | +if { (eval echo configure:8271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2143 | then | ||
2144 | : | ||
2145 | else | ||
2146 | @@ -8270,12 +8291,12 @@ EOF | ||
2147 | fi | ||
2148 | |||
2149 | echo $ac_n "checking for working const""... $ac_c" 1>&6 | ||
2150 | -echo "configure:8274: checking for working const" >&5 | ||
2151 | +echo "configure:8295: checking for working const" >&5 | ||
2152 | if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then | ||
2153 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2154 | else | ||
2155 | cat > conftest.$ac_ext <<EOF | ||
2156 | -#line 8279 "configure" | ||
2157 | +#line 8300 "configure" | ||
2158 | #include "confdefs.h" | ||
2159 | |||
2160 | int main() { | ||
2161 | @@ -8324,7 +8345,7 @@ ccp = (char const *const *) p; | ||
2162 | |||
2163 | ; return 0; } | ||
2164 | EOF | ||
2165 | -if { (eval echo configure:8328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2166 | +if { (eval echo configure:8349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2167 | rm -rf conftest* | ||
2168 | ac_cv_c_const=yes | ||
2169 | else | ||
2170 | @@ -8345,12 +8366,12 @@ EOF | ||
2171 | fi | ||
2172 | |||
2173 | echo $ac_n "checking for mode_t""... $ac_c" 1>&6 | ||
2174 | -echo "configure:8349: checking for mode_t" >&5 | ||
2175 | +echo "configure:8370: checking for mode_t" >&5 | ||
2176 | if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then | ||
2177 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2178 | else | ||
2179 | cat > conftest.$ac_ext <<EOF | ||
2180 | -#line 8354 "configure" | ||
2181 | +#line 8375 "configure" | ||
2182 | #include "confdefs.h" | ||
2183 | #include <sys/types.h> | ||
2184 | #if STDC_HEADERS | ||
2185 | @@ -8378,12 +8399,12 @@ EOF | ||
2186 | fi | ||
2187 | |||
2188 | echo $ac_n "checking for off_t""... $ac_c" 1>&6 | ||
2189 | -echo "configure:8382: checking for off_t" >&5 | ||
2190 | +echo "configure:8403: checking for off_t" >&5 | ||
2191 | if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then | ||
2192 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2193 | else | ||
2194 | cat > conftest.$ac_ext <<EOF | ||
2195 | -#line 8387 "configure" | ||
2196 | +#line 8408 "configure" | ||
2197 | #include "confdefs.h" | ||
2198 | #include <sys/types.h> | ||
2199 | #if STDC_HEADERS | ||
2200 | @@ -8411,12 +8432,12 @@ EOF | ||
2201 | fi | ||
2202 | |||
2203 | echo $ac_n "checking for pid_t""... $ac_c" 1>&6 | ||
2204 | -echo "configure:8415: checking for pid_t" >&5 | ||
2205 | +echo "configure:8436: checking for pid_t" >&5 | ||
2206 | if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then | ||
2207 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2208 | else | ||
2209 | cat > conftest.$ac_ext <<EOF | ||
2210 | -#line 8420 "configure" | ||
2211 | +#line 8441 "configure" | ||
2212 | #include "confdefs.h" | ||
2213 | #include <sys/types.h> | ||
2214 | #if STDC_HEADERS | ||
2215 | @@ -8444,12 +8465,12 @@ EOF | ||
2216 | fi | ||
2217 | |||
2218 | echo $ac_n "checking for size_t""... $ac_c" 1>&6 | ||
2219 | -echo "configure:8448: checking for size_t" >&5 | ||
2220 | +echo "configure:8469: checking for size_t" >&5 | ||
2221 | if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then | ||
2222 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2223 | else | ||
2224 | cat > conftest.$ac_ext <<EOF | ||
2225 | -#line 8453 "configure" | ||
2226 | +#line 8474 "configure" | ||
2227 | #include "confdefs.h" | ||
2228 | #include <sys/types.h> | ||
2229 | #if STDC_HEADERS | ||
2230 | @@ -8484,12 +8505,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
2231 | cross_compiling=$ac_cv_prog_cxx_cross | ||
2232 | |||
2233 | echo $ac_n "checking for __stdcall""... $ac_c" 1>&6 | ||
2234 | -echo "configure:8488: checking for __stdcall" >&5 | ||
2235 | +echo "configure:8509: checking for __stdcall" >&5 | ||
2236 | if eval "test \"`echo '$''{'ac_cv___stdcall'+set}'`\" = set"; then | ||
2237 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2238 | else | ||
2239 | cat > conftest.$ac_ext <<EOF | ||
2240 | -#line 8493 "configure" | ||
2241 | +#line 8514 "configure" | ||
2242 | #include "confdefs.h" | ||
2243 | template <typename Method> struct foo; | ||
2244 | template <> struct foo<void (*)()> {}; | ||
2245 | @@ -8498,7 +8519,7 @@ int main() { | ||
2246 | |||
2247 | ; return 0; } | ||
2248 | EOF | ||
2249 | -if { (eval echo configure:8502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2250 | +if { (eval echo configure:8523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2251 | rm -rf conftest* | ||
2252 | ac_cv___stdcall=true | ||
2253 | else | ||
2254 | @@ -8527,12 +8548,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a | ||
2255 | cross_compiling=$ac_cv_prog_cc_cross | ||
2256 | |||
2257 | echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 | ||
2258 | -echo "configure:8531: checking for ssize_t" >&5 | ||
2259 | +echo "configure:8552: checking for ssize_t" >&5 | ||
2260 | if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then | ||
2261 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2262 | else | ||
2263 | cat > conftest.$ac_ext <<EOF | ||
2264 | -#line 8536 "configure" | ||
2265 | +#line 8557 "configure" | ||
2266 | #include "confdefs.h" | ||
2267 | #include <stdio.h> | ||
2268 | #include <sys/types.h> | ||
2269 | @@ -8540,7 +8561,7 @@ int main() { | ||
2270 | ssize_t foo = 0; | ||
2271 | ; return 0; } | ||
2272 | EOF | ||
2273 | -if { (eval echo configure:8544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2274 | +if { (eval echo configure:8565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2275 | rm -rf conftest* | ||
2276 | ac_cv_type_ssize_t=true | ||
2277 | else | ||
2278 | @@ -8562,12 +8583,12 @@ else | ||
2279 | echo "$ac_t""no" 1>&6 | ||
2280 | fi | ||
2281 | echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 | ||
2282 | -echo "configure:8566: checking for st_blksize in struct stat" >&5 | ||
2283 | +echo "configure:8587: checking for st_blksize in struct stat" >&5 | ||
2284 | if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then | ||
2285 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2286 | else | ||
2287 | cat > conftest.$ac_ext <<EOF | ||
2288 | -#line 8571 "configure" | ||
2289 | +#line 8592 "configure" | ||
2290 | #include "confdefs.h" | ||
2291 | #include <sys/types.h> | ||
2292 | #include <sys/stat.h> | ||
2293 | @@ -8575,7 +8596,7 @@ int main() { | ||
2294 | struct stat s; s.st_blksize; | ||
2295 | ; return 0; } | ||
2296 | EOF | ||
2297 | -if { (eval echo configure:8579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2298 | +if { (eval echo configure:8600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2299 | rm -rf conftest* | ||
2300 | ac_cv_struct_st_blksize=yes | ||
2301 | else | ||
2302 | @@ -8596,12 +8617,12 @@ EOF | ||
2303 | fi | ||
2304 | |||
2305 | echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 | ||
2306 | -echo "configure:8600: checking for siginfo_t" >&5 | ||
2307 | +echo "configure:8621: checking for siginfo_t" >&5 | ||
2308 | if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then | ||
2309 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2310 | else | ||
2311 | cat > conftest.$ac_ext <<EOF | ||
2312 | -#line 8605 "configure" | ||
2313 | +#line 8626 "configure" | ||
2314 | #include "confdefs.h" | ||
2315 | #define _POSIX_C_SOURCE 199506L | ||
2316 | #include <signal.h> | ||
2317 | @@ -8609,7 +8630,7 @@ int main() { | ||
2318 | siginfo_t* info; | ||
2319 | ; return 0; } | ||
2320 | EOF | ||
2321 | -if { (eval echo configure:8613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2322 | +if { (eval echo configure:8634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2323 | rm -rf conftest* | ||
2324 | ac_cv_siginfo_t=true | ||
2325 | else | ||
2326 | @@ -8632,12 +8653,12 @@ else | ||
2327 | fi | ||
2328 | |||
2329 | echo $ac_n "checking for int16_t""... $ac_c" 1>&6 | ||
2330 | -echo "configure:8636: checking for int16_t" >&5 | ||
2331 | +echo "configure:8657: checking for int16_t" >&5 | ||
2332 | if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then | ||
2333 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2334 | else | ||
2335 | cat > conftest.$ac_ext <<EOF | ||
2336 | -#line 8641 "configure" | ||
2337 | +#line 8662 "configure" | ||
2338 | #include "confdefs.h" | ||
2339 | #include <stdio.h> | ||
2340 | #include <sys/types.h> | ||
2341 | @@ -8645,7 +8666,7 @@ int main() { | ||
2342 | int16_t foo = 0; | ||
2343 | ; return 0; } | ||
2344 | EOF | ||
2345 | -if { (eval echo configure:8649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2346 | +if { (eval echo configure:8670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2347 | rm -rf conftest* | ||
2348 | ac_cv_int16_t=true | ||
2349 | else | ||
2350 | @@ -8667,12 +8688,12 @@ else | ||
2351 | echo "$ac_t""no" 1>&6 | ||
2352 | fi | ||
2353 | echo $ac_n "checking for int32_t""... $ac_c" 1>&6 | ||
2354 | -echo "configure:8671: checking for int32_t" >&5 | ||
2355 | +echo "configure:8692: checking for int32_t" >&5 | ||
2356 | if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then | ||
2357 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2358 | else | ||
2359 | cat > conftest.$ac_ext <<EOF | ||
2360 | -#line 8676 "configure" | ||
2361 | +#line 8697 "configure" | ||
2362 | #include "confdefs.h" | ||
2363 | #include <stdio.h> | ||
2364 | #include <sys/types.h> | ||
2365 | @@ -8680,7 +8701,7 @@ int main() { | ||
2366 | int32_t foo = 0; | ||
2367 | ; return 0; } | ||
2368 | EOF | ||
2369 | -if { (eval echo configure:8684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2370 | +if { (eval echo configure:8705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2371 | rm -rf conftest* | ||
2372 | ac_cv_int32_t=true | ||
2373 | else | ||
2374 | @@ -8702,12 +8723,12 @@ else | ||
2375 | echo "$ac_t""no" 1>&6 | ||
2376 | fi | ||
2377 | echo $ac_n "checking for int64_t""... $ac_c" 1>&6 | ||
2378 | -echo "configure:8706: checking for int64_t" >&5 | ||
2379 | +echo "configure:8727: checking for int64_t" >&5 | ||
2380 | if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then | ||
2381 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2382 | else | ||
2383 | cat > conftest.$ac_ext <<EOF | ||
2384 | -#line 8711 "configure" | ||
2385 | +#line 8732 "configure" | ||
2386 | #include "confdefs.h" | ||
2387 | #include <stdio.h> | ||
2388 | #include <sys/types.h> | ||
2389 | @@ -8715,7 +8736,7 @@ int main() { | ||
2390 | int64_t foo = 0; | ||
2391 | ; return 0; } | ||
2392 | EOF | ||
2393 | -if { (eval echo configure:8719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2394 | +if { (eval echo configure:8740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2395 | rm -rf conftest* | ||
2396 | ac_cv_int64_t=true | ||
2397 | else | ||
2398 | @@ -8737,12 +8758,12 @@ else | ||
2399 | echo "$ac_t""no" 1>&6 | ||
2400 | fi | ||
2401 | echo $ac_n "checking for int64""... $ac_c" 1>&6 | ||
2402 | -echo "configure:8741: checking for int64" >&5 | ||
2403 | +echo "configure:8762: checking for int64" >&5 | ||
2404 | if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then | ||
2405 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2406 | else | ||
2407 | cat > conftest.$ac_ext <<EOF | ||
2408 | -#line 8746 "configure" | ||
2409 | +#line 8767 "configure" | ||
2410 | #include "confdefs.h" | ||
2411 | #include <stdio.h> | ||
2412 | #include <sys/types.h> | ||
2413 | @@ -8750,7 +8771,7 @@ int main() { | ||
2414 | int64 foo = 0; | ||
2415 | ; return 0; } | ||
2416 | EOF | ||
2417 | -if { (eval echo configure:8754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2418 | +if { (eval echo configure:8775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2419 | rm -rf conftest* | ||
2420 | ac_cv_int64=true | ||
2421 | else | ||
2422 | @@ -8772,12 +8793,12 @@ else | ||
2423 | echo "$ac_t""no" 1>&6 | ||
2424 | fi | ||
2425 | echo $ac_n "checking for uint""... $ac_c" 1>&6 | ||
2426 | -echo "configure:8776: checking for uint" >&5 | ||
2427 | +echo "configure:8797: checking for uint" >&5 | ||
2428 | if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then | ||
2429 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2430 | else | ||
2431 | cat > conftest.$ac_ext <<EOF | ||
2432 | -#line 8781 "configure" | ||
2433 | +#line 8802 "configure" | ||
2434 | #include "confdefs.h" | ||
2435 | #include <stdio.h> | ||
2436 | #include <sys/types.h> | ||
2437 | @@ -8785,7 +8806,7 @@ int main() { | ||
2438 | uint foo = 0; | ||
2439 | ; return 0; } | ||
2440 | EOF | ||
2441 | -if { (eval echo configure:8789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2442 | +if { (eval echo configure:8810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2443 | rm -rf conftest* | ||
2444 | ac_cv_uint=true | ||
2445 | else | ||
2446 | @@ -8807,12 +8828,12 @@ else | ||
2447 | echo "$ac_t""no" 1>&6 | ||
2448 | fi | ||
2449 | echo $ac_n "checking for uint_t""... $ac_c" 1>&6 | ||
2450 | -echo "configure:8811: checking for uint_t" >&5 | ||
2451 | +echo "configure:8832: checking for uint_t" >&5 | ||
2452 | if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then | ||
2453 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2454 | else | ||
2455 | cat > conftest.$ac_ext <<EOF | ||
2456 | -#line 8816 "configure" | ||
2457 | +#line 8837 "configure" | ||
2458 | #include "confdefs.h" | ||
2459 | #include <stdio.h> | ||
2460 | #include <sys/types.h> | ||
2461 | @@ -8820,7 +8841,7 @@ int main() { | ||
2462 | uint_t foo = 0; | ||
2463 | ; return 0; } | ||
2464 | EOF | ||
2465 | -if { (eval echo configure:8824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2466 | +if { (eval echo configure:8845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2467 | rm -rf conftest* | ||
2468 | ac_cv_uint_t=true | ||
2469 | else | ||
2470 | @@ -8842,12 +8863,12 @@ else | ||
2471 | echo "$ac_t""no" 1>&6 | ||
2472 | fi | ||
2473 | echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 | ||
2474 | -echo "configure:8846: checking for uint16_t" >&5 | ||
2475 | +echo "configure:8867: checking for uint16_t" >&5 | ||
2476 | if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then | ||
2477 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2478 | else | ||
2479 | cat > conftest.$ac_ext <<EOF | ||
2480 | -#line 8851 "configure" | ||
2481 | +#line 8872 "configure" | ||
2482 | #include "confdefs.h" | ||
2483 | #include <stdio.h> | ||
2484 | #include <sys/types.h> | ||
2485 | @@ -8855,7 +8876,7 @@ int main() { | ||
2486 | uint16_t foo = 0; | ||
2487 | ; return 0; } | ||
2488 | EOF | ||
2489 | -if { (eval echo configure:8859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2490 | +if { (eval echo configure:8880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2491 | rm -rf conftest* | ||
2492 | ac_cv_uint16_t=true | ||
2493 | else | ||
2494 | @@ -8886,12 +8907,12 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
2495 | |||
2496 | |||
2497 | echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 | ||
2498 | -echo "configure:8890: checking for uname.domainname" >&5 | ||
2499 | +echo "configure:8911: checking for uname.domainname" >&5 | ||
2500 | if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then | ||
2501 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2502 | else | ||
2503 | cat > conftest.$ac_ext <<EOF | ||
2504 | -#line 8895 "configure" | ||
2505 | +#line 8916 "configure" | ||
2506 | #include "confdefs.h" | ||
2507 | #include <sys/utsname.h> | ||
2508 | int main() { | ||
2509 | @@ -8899,7 +8920,7 @@ int main() { | ||
2510 | (void)uname(res); if (res != 0) { domain = res->domainname; } | ||
2511 | ; return 0; } | ||
2512 | EOF | ||
2513 | -if { (eval echo configure:8903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2514 | +if { (eval echo configure:8924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2515 | rm -rf conftest* | ||
2516 | ac_cv_have_uname_domainname_field=true | ||
2517 | else | ||
2518 | @@ -8923,12 +8944,12 @@ else | ||
2519 | fi | ||
2520 | |||
2521 | echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 | ||
2522 | -echo "configure:8927: checking for uname.__domainname" >&5 | ||
2523 | +echo "configure:8948: checking for uname.__domainname" >&5 | ||
2524 | if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then | ||
2525 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2526 | else | ||
2527 | cat > conftest.$ac_ext <<EOF | ||
2528 | -#line 8932 "configure" | ||
2529 | +#line 8953 "configure" | ||
2530 | #include "confdefs.h" | ||
2531 | #include <sys/utsname.h> | ||
2532 | int main() { | ||
2533 | @@ -8936,7 +8957,7 @@ int main() { | ||
2534 | (void)uname(res); if (res != 0) { domain = res->__domainname; } | ||
2535 | ; return 0; } | ||
2536 | EOF | ||
2537 | -if { (eval echo configure:8940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2538 | +if { (eval echo configure:8961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2539 | rm -rf conftest* | ||
2540 | ac_cv_have_uname_us_domainname_field=true | ||
2541 | else | ||
2542 | @@ -8996,19 +9017,19 @@ if test "$GNU_CXX"; then | ||
2543 | if test -z "$_MOZ_USE_RTTI"; then | ||
2544 | CXXFLAGS="$CXXFLAGS $_MOZ_RTTI_FLAGS" | ||
2545 | echo $ac_n "checking for gcc c++0x headers bug without rtti""... $ac_c" 1>&6 | ||
2546 | -echo "configure:9000: checking for gcc c++0x headers bug without rtti" >&5 | ||
2547 | +echo "configure:9021: checking for gcc c++0x headers bug without rtti" >&5 | ||
2548 | if eval "test \"`echo '$''{'ac_cv_cxx0x_headers_bug'+set}'`\" = set"; then | ||
2549 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2550 | else | ||
2551 | cat > conftest.$ac_ext <<EOF | ||
2552 | -#line 9005 "configure" | ||
2553 | +#line 9026 "configure" | ||
2554 | #include "confdefs.h" | ||
2555 | #include <memory> | ||
2556 | int main() { | ||
2557 | |||
2558 | ; return 0; } | ||
2559 | EOF | ||
2560 | -if { (eval echo configure:9012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2561 | +if { (eval echo configure:9033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2562 | rm -rf conftest* | ||
2563 | ac_cv_cxx0x_headers_bug="no" | ||
2564 | else | ||
2565 | @@ -9029,12 +9050,12 @@ echo "$ac_t""$ac_cv_cxx0x_headers_bug" 1>&6 | ||
2566 | fi | ||
2567 | |||
2568 | echo $ac_n "checking for usable char16_t (2 bytes, unsigned)""... $ac_c" 1>&6 | ||
2569 | -echo "configure:9033: checking for usable char16_t (2 bytes, unsigned)" >&5 | ||
2570 | +echo "configure:9054: checking for usable char16_t (2 bytes, unsigned)" >&5 | ||
2571 | if eval "test \"`echo '$''{'ac_cv_have_usable_char16_t'+set}'`\" = set"; then | ||
2572 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2573 | else | ||
2574 | cat > conftest.$ac_ext <<EOF | ||
2575 | -#line 9038 "configure" | ||
2576 | +#line 9059 "configure" | ||
2577 | #include "confdefs.h" | ||
2578 | $configure_static_assert_macros | ||
2579 | int main() { | ||
2580 | @@ -9045,7 +9066,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(char16_t) == 2); | ||
2581 | CONFIGURE_STATIC_ASSERT(u'\xFFFF' > u'\x0') | ||
2582 | ; return 0; } | ||
2583 | EOF | ||
2584 | -if { (eval echo configure:9049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2585 | +if { (eval echo configure:9070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2586 | rm -rf conftest* | ||
2587 | ac_cv_have_usable_char16_t="yes" | ||
2588 | else | ||
2589 | @@ -9070,12 +9091,12 @@ fi | ||
2590 | |||
2591 | |||
2592 | echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 | ||
2593 | -echo "configure:9074: checking for usable wchar_t (2 bytes, unsigned)" >&5 | ||
2594 | +echo "configure:9095: checking for usable wchar_t (2 bytes, unsigned)" >&5 | ||
2595 | if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then | ||
2596 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2597 | else | ||
2598 | cat > conftest.$ac_ext <<EOF | ||
2599 | -#line 9079 "configure" | ||
2600 | +#line 9100 "configure" | ||
2601 | #include "confdefs.h" | ||
2602 | #include <stddef.h> | ||
2603 | $configure_static_assert_macros | ||
2604 | @@ -9084,7 +9105,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); | ||
2605 | CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) | ||
2606 | ; return 0; } | ||
2607 | EOF | ||
2608 | -if { (eval echo configure:9088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2609 | +if { (eval echo configure:9109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2610 | rm -rf conftest* | ||
2611 | ac_cv_have_usable_wchar_v2="yes" | ||
2612 | else | ||
2613 | @@ -9109,12 +9130,12 @@ elif test "$ac_cv_have_usable_char16_t" != "yes"; then | ||
2614 | CXXFLAGS="$CXXFLAGS -fshort-wchar" | ||
2615 | |||
2616 | echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 | ||
2617 | -echo "configure:9113: checking for compiler -fshort-wchar option" >&5 | ||
2618 | +echo "configure:9134: checking for compiler -fshort-wchar option" >&5 | ||
2619 | if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then | ||
2620 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2621 | else | ||
2622 | cat > conftest.$ac_ext <<EOF | ||
2623 | -#line 9118 "configure" | ||
2624 | +#line 9139 "configure" | ||
2625 | #include "confdefs.h" | ||
2626 | #include <stddef.h> | ||
2627 | $configure_static_assert_macros | ||
2628 | @@ -9123,7 +9144,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); | ||
2629 | CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) | ||
2630 | ; return 0; } | ||
2631 | EOF | ||
2632 | -if { (eval echo configure:9127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2633 | +if { (eval echo configure:9148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2634 | rm -rf conftest* | ||
2635 | ac_cv_have_usable_wchar_option_v2="yes" | ||
2636 | else | ||
2637 | @@ -9166,7 +9187,7 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
2638 | |||
2639 | if test "$GNU_CC"; then | ||
2640 | echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 | ||
2641 | -echo "configure:9170: checking for visibility(hidden) attribute" >&5 | ||
2642 | +echo "configure:9191: checking for visibility(hidden) attribute" >&5 | ||
2643 | if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then | ||
2644 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2645 | else | ||
2646 | @@ -9191,7 +9212,7 @@ EOF | ||
2647 | |||
2648 | |||
2649 | echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 | ||
2650 | -echo "configure:9195: checking for visibility(default) attribute" >&5 | ||
2651 | +echo "configure:9216: checking for visibility(default) attribute" >&5 | ||
2652 | if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then | ||
2653 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2654 | else | ||
2655 | @@ -9216,7 +9237,7 @@ EOF | ||
2656 | |||
2657 | |||
2658 | echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 | ||
2659 | -echo "configure:9220: checking for visibility pragma support" >&5 | ||
2660 | +echo "configure:9241: checking for visibility pragma support" >&5 | ||
2661 | if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then | ||
2662 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2663 | else | ||
2664 | @@ -9241,7 +9262,7 @@ fi | ||
2665 | echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 | ||
2666 | if test "$ac_cv_visibility_pragma" = "yes"; then | ||
2667 | echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 | ||
2668 | -echo "configure:9245: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 | ||
2669 | +echo "configure:9266: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 | ||
2670 | if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then | ||
2671 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2672 | else | ||
2673 | @@ -9269,7 +9290,7 @@ fi | ||
2674 | echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 | ||
2675 | |||
2676 | echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 | ||
2677 | -echo "configure:9273: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 | ||
2678 | +echo "configure:9294: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 | ||
2679 | if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then | ||
2680 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2681 | else | ||
2682 | @@ -9323,7 +9344,7 @@ fi # Sun Studio on Solaris | ||
2683 | if test "$GNU_CC"; then | ||
2684 | |||
2685 | echo $ac_n "checking for gcc PR49911""... $ac_c" 1>&6 | ||
2686 | -echo "configure:9327: checking for gcc PR49911" >&5 | ||
2687 | +echo "configure:9348: checking for gcc PR49911" >&5 | ||
2688 | ac_have_gcc_pr49911="no" | ||
2689 | |||
2690 | ac_ext=C | ||
2691 | @@ -9340,7 +9361,7 @@ if test "$cross_compiling" = yes; then | ||
2692 | true | ||
2693 | else | ||
2694 | cat > conftest.$ac_ext <<EOF | ||
2695 | -#line 9344 "configure" | ||
2696 | +#line 9365 "configure" | ||
2697 | #include "confdefs.h" | ||
2698 | |||
2699 | extern "C" void abort(void); | ||
2700 | @@ -9381,7 +9402,7 @@ int main(void) { | ||
2701 | } | ||
2702 | |||
2703 | EOF | ||
2704 | -if { (eval echo configure:9385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2705 | +if { (eval echo configure:9406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2706 | then | ||
2707 | true | ||
2708 | else | ||
2709 | @@ -9417,19 +9438,19 @@ if test "$GNU_CC"; then | ||
2710 | CFLAGS_save="${CFLAGS}" | ||
2711 | CFLAGS="${CFLAGS} -Werror" | ||
2712 | echo $ac_n "checking for __force_align_arg_pointer__ attribute""... $ac_c" 1>&6 | ||
2713 | -echo "configure:9421: checking for __force_align_arg_pointer__ attribute" >&5 | ||
2714 | +echo "configure:9442: checking for __force_align_arg_pointer__ attribute" >&5 | ||
2715 | if eval "test \"`echo '$''{'ac_cv_force_align_arg_pointer'+set}'`\" = set"; then | ||
2716 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2717 | else | ||
2718 | cat > conftest.$ac_ext <<EOF | ||
2719 | -#line 9426 "configure" | ||
2720 | +#line 9447 "configure" | ||
2721 | #include "confdefs.h" | ||
2722 | __attribute__ ((__force_align_arg_pointer__)) void test() {} | ||
2723 | int main() { | ||
2724 | |||
2725 | ; return 0; } | ||
2726 | EOF | ||
2727 | -if { (eval echo configure:9433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2728 | +if { (eval echo configure:9454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2729 | rm -rf conftest* | ||
2730 | ac_cv_force_align_arg_pointer="yes" | ||
2731 | else | ||
2732 | @@ -9456,12 +9477,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h | ||
2733 | do | ||
2734 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
2735 | echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 | ||
2736 | -echo "configure:9460: checking for $ac_hdr that defines DIR" >&5 | ||
2737 | +echo "configure:9481: checking for $ac_hdr that defines DIR" >&5 | ||
2738 | if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then | ||
2739 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2740 | else | ||
2741 | cat > conftest.$ac_ext <<EOF | ||
2742 | -#line 9465 "configure" | ||
2743 | +#line 9486 "configure" | ||
2744 | #include "confdefs.h" | ||
2745 | #include <sys/types.h> | ||
2746 | #include <$ac_hdr> | ||
2747 | @@ -9469,7 +9490,7 @@ int main() { | ||
2748 | DIR *dirp = 0; | ||
2749 | ; return 0; } | ||
2750 | EOF | ||
2751 | -if { (eval echo configure:9473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2752 | +if { (eval echo configure:9494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2753 | rm -rf conftest* | ||
2754 | eval "ac_cv_header_dirent_$ac_safe=yes" | ||
2755 | else | ||
2756 | @@ -9494,7 +9515,7 @@ done | ||
2757 | # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. | ||
2758 | if test $ac_header_dirent = dirent.h; then | ||
2759 | echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 | ||
2760 | -echo "configure:9498: checking for opendir in -ldir" >&5 | ||
2761 | +echo "configure:9519: checking for opendir in -ldir" >&5 | ||
2762 | ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` | ||
2763 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
2764 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2765 | @@ -9502,7 +9523,7 @@ else | ||
2766 | ac_save_LIBS="$LIBS" | ||
2767 | LIBS="-ldir $LIBS" | ||
2768 | cat > conftest.$ac_ext <<EOF | ||
2769 | -#line 9506 "configure" | ||
2770 | +#line 9527 "configure" | ||
2771 | #include "confdefs.h" | ||
2772 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
2773 | /* We use char because int might match the return type of a gcc2 | ||
2774 | @@ -9513,7 +9534,7 @@ int main() { | ||
2775 | opendir() | ||
2776 | ; return 0; } | ||
2777 | EOF | ||
2778 | -if { (eval echo configure:9517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2779 | +if { (eval echo configure:9538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2780 | rm -rf conftest* | ||
2781 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
2782 | else | ||
2783 | @@ -9535,7 +9556,7 @@ fi | ||
2784 | |||
2785 | else | ||
2786 | echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 | ||
2787 | -echo "configure:9539: checking for opendir in -lx" >&5 | ||
2788 | +echo "configure:9560: checking for opendir in -lx" >&5 | ||
2789 | ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` | ||
2790 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
2791 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2792 | @@ -9543,7 +9564,7 @@ else | ||
2793 | ac_save_LIBS="$LIBS" | ||
2794 | LIBS="-lx $LIBS" | ||
2795 | cat > conftest.$ac_ext <<EOF | ||
2796 | -#line 9547 "configure" | ||
2797 | +#line 9568 "configure" | ||
2798 | #include "confdefs.h" | ||
2799 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
2800 | /* We use char because int might match the return type of a gcc2 | ||
2801 | @@ -9554,7 +9575,7 @@ int main() { | ||
2802 | opendir() | ||
2803 | ; return 0; } | ||
2804 | EOF | ||
2805 | -if { (eval echo configure:9558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2806 | +if { (eval echo configure:9579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2807 | rm -rf conftest* | ||
2808 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
2809 | else | ||
2810 | @@ -9586,19 +9607,19 @@ esac | ||
2811 | do | ||
2812 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
2813 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
2814 | -echo "configure:9590: checking for $ac_hdr" >&5 | ||
2815 | +echo "configure:9611: checking for $ac_hdr" >&5 | ||
2816 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2817 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2818 | else | ||
2819 | cat > conftest.$ac_ext <<EOF | ||
2820 | -#line 9595 "configure" | ||
2821 | +#line 9616 "configure" | ||
2822 | #include "confdefs.h" | ||
2823 | #include <$ac_hdr> | ||
2824 | int main() { | ||
2825 | |||
2826 | ; return 0; } | ||
2827 | EOF | ||
2828 | -if { (eval echo configure:9602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2829 | +if { (eval echo configure:9623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2830 | rm -rf conftest* | ||
2831 | eval "ac_cv_header_$ac_safe=yes" | ||
2832 | else | ||
2833 | @@ -9628,19 +9649,19 @@ EOF | ||
2834 | do | ||
2835 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
2836 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
2837 | -echo "configure:9632: checking for $ac_hdr" >&5 | ||
2838 | +echo "configure:9653: checking for $ac_hdr" >&5 | ||
2839 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2840 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2841 | else | ||
2842 | cat > conftest.$ac_ext <<EOF | ||
2843 | -#line 9637 "configure" | ||
2844 | +#line 9658 "configure" | ||
2845 | #include "confdefs.h" | ||
2846 | #include <$ac_hdr> | ||
2847 | int main() { | ||
2848 | |||
2849 | ; return 0; } | ||
2850 | EOF | ||
2851 | -if { (eval echo configure:9644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2852 | +if { (eval echo configure:9665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2853 | rm -rf conftest* | ||
2854 | eval "ac_cv_header_$ac_safe=yes" | ||
2855 | else | ||
2856 | @@ -9670,19 +9691,19 @@ EOF | ||
2857 | do | ||
2858 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
2859 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
2860 | -echo "configure:9674: checking for $ac_hdr" >&5 | ||
2861 | +echo "configure:9695: checking for $ac_hdr" >&5 | ||
2862 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2863 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2864 | else | ||
2865 | cat > conftest.$ac_ext <<EOF | ||
2866 | -#line 9679 "configure" | ||
2867 | +#line 9700 "configure" | ||
2868 | #include "confdefs.h" | ||
2869 | #include <$ac_hdr> | ||
2870 | int main() { | ||
2871 | |||
2872 | ; return 0; } | ||
2873 | EOF | ||
2874 | -if { (eval echo configure:9686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2875 | +if { (eval echo configure:9707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2876 | rm -rf conftest* | ||
2877 | eval "ac_cv_header_$ac_safe=yes" | ||
2878 | else | ||
2879 | @@ -9712,19 +9733,19 @@ EOF | ||
2880 | do | ||
2881 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
2882 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
2883 | -echo "configure:9716: checking for $ac_hdr" >&5 | ||
2884 | +echo "configure:9737: checking for $ac_hdr" >&5 | ||
2885 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2886 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2887 | else | ||
2888 | cat > conftest.$ac_ext <<EOF | ||
2889 | -#line 9721 "configure" | ||
2890 | +#line 9742 "configure" | ||
2891 | #include "confdefs.h" | ||
2892 | #include <$ac_hdr> | ||
2893 | int main() { | ||
2894 | |||
2895 | ; return 0; } | ||
2896 | EOF | ||
2897 | -if { (eval echo configure:9728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2898 | +if { (eval echo configure:9749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2899 | rm -rf conftest* | ||
2900 | eval "ac_cv_header_$ac_safe=yes" | ||
2901 | else | ||
2902 | @@ -9754,19 +9775,19 @@ EOF | ||
2903 | do | ||
2904 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
2905 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
2906 | -echo "configure:9758: checking for $ac_hdr" >&5 | ||
2907 | +echo "configure:9779: checking for $ac_hdr" >&5 | ||
2908 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2909 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2910 | else | ||
2911 | cat > conftest.$ac_ext <<EOF | ||
2912 | -#line 9763 "configure" | ||
2913 | +#line 9784 "configure" | ||
2914 | #include "confdefs.h" | ||
2915 | #include <$ac_hdr> | ||
2916 | int main() { | ||
2917 | |||
2918 | ; return 0; } | ||
2919 | EOF | ||
2920 | -if { (eval echo configure:9770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2921 | +if { (eval echo configure:9791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2922 | rm -rf conftest* | ||
2923 | eval "ac_cv_header_$ac_safe=yes" | ||
2924 | else | ||
2925 | @@ -9796,19 +9817,19 @@ EOF | ||
2926 | do | ||
2927 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
2928 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
2929 | -echo "configure:9800: checking for $ac_hdr" >&5 | ||
2930 | +echo "configure:9821: checking for $ac_hdr" >&5 | ||
2931 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2932 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2933 | else | ||
2934 | cat > conftest.$ac_ext <<EOF | ||
2935 | -#line 9805 "configure" | ||
2936 | +#line 9826 "configure" | ||
2937 | #include "confdefs.h" | ||
2938 | #include <$ac_hdr> | ||
2939 | int main() { | ||
2940 | |||
2941 | ; return 0; } | ||
2942 | EOF | ||
2943 | -if { (eval echo configure:9812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2944 | +if { (eval echo configure:9833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2945 | rm -rf conftest* | ||
2946 | eval "ac_cv_header_$ac_safe=yes" | ||
2947 | else | ||
2948 | @@ -9839,19 +9860,19 @@ EOF | ||
2949 | do | ||
2950 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
2951 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
2952 | -echo "configure:9843: checking for $ac_hdr" >&5 | ||
2953 | +echo "configure:9864: checking for $ac_hdr" >&5 | ||
2954 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2955 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2956 | else | ||
2957 | cat > conftest.$ac_ext <<EOF | ||
2958 | -#line 9848 "configure" | ||
2959 | +#line 9869 "configure" | ||
2960 | #include "confdefs.h" | ||
2961 | #include <$ac_hdr> | ||
2962 | int main() { | ||
2963 | |||
2964 | ; return 0; } | ||
2965 | EOF | ||
2966 | -if { (eval echo configure:9855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2967 | +if { (eval echo configure:9876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2968 | rm -rf conftest* | ||
2969 | eval "ac_cv_header_$ac_safe=yes" | ||
2970 | else | ||
2971 | @@ -9882,19 +9903,19 @@ EOF | ||
2972 | do | ||
2973 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
2974 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
2975 | -echo "configure:9886: checking for $ac_hdr" >&5 | ||
2976 | +echo "configure:9907: checking for $ac_hdr" >&5 | ||
2977 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2978 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2979 | else | ||
2980 | cat > conftest.$ac_ext <<EOF | ||
2981 | -#line 9891 "configure" | ||
2982 | +#line 9912 "configure" | ||
2983 | #include "confdefs.h" | ||
2984 | #include <$ac_hdr> | ||
2985 | int main() { | ||
2986 | |||
2987 | ; return 0; } | ||
2988 | EOF | ||
2989 | -if { (eval echo configure:9898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2990 | +if { (eval echo configure:9919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2991 | rm -rf conftest* | ||
2992 | eval "ac_cv_header_$ac_safe=yes" | ||
2993 | else | ||
2994 | @@ -9924,19 +9945,19 @@ EOF | ||
2995 | do | ||
2996 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
2997 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
2998 | -echo "configure:9928: checking for $ac_hdr" >&5 | ||
2999 | +echo "configure:9949: checking for $ac_hdr" >&5 | ||
3000 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
3001 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3002 | else | ||
3003 | cat > conftest.$ac_ext <<EOF | ||
3004 | -#line 9933 "configure" | ||
3005 | +#line 9954 "configure" | ||
3006 | #include "confdefs.h" | ||
3007 | #include <$ac_hdr> | ||
3008 | int main() { | ||
3009 | |||
3010 | ; return 0; } | ||
3011 | EOF | ||
3012 | -if { (eval echo configure:9940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3013 | +if { (eval echo configure:9961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3014 | rm -rf conftest* | ||
3015 | eval "ac_cv_header_$ac_safe=yes" | ||
3016 | else | ||
3017 | @@ -9967,19 +9988,19 @@ EOF | ||
3018 | do | ||
3019 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
3020 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
3021 | -echo "configure:9971: checking for $ac_hdr" >&5 | ||
3022 | +echo "configure:9992: checking for $ac_hdr" >&5 | ||
3023 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
3024 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3025 | else | ||
3026 | cat > conftest.$ac_ext <<EOF | ||
3027 | -#line 9976 "configure" | ||
3028 | +#line 9997 "configure" | ||
3029 | #include "confdefs.h" | ||
3030 | #include <$ac_hdr> | ||
3031 | int main() { | ||
3032 | |||
3033 | ; return 0; } | ||
3034 | EOF | ||
3035 | -if { (eval echo configure:9983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3036 | +if { (eval echo configure:10004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3037 | rm -rf conftest* | ||
3038 | eval "ac_cv_header_$ac_safe=yes" | ||
3039 | else | ||
3040 | @@ -10016,19 +10037,19 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
3041 | NEW_H=new.h | ||
3042 | ac_safe=`echo "new" | sed 'y%./+-%__p_%'` | ||
3043 | echo $ac_n "checking for new""... $ac_c" 1>&6 | ||
3044 | -echo "configure:10020: checking for new" >&5 | ||
3045 | +echo "configure:10041: checking for new" >&5 | ||
3046 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
3047 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3048 | else | ||
3049 | cat > conftest.$ac_ext <<EOF | ||
3050 | -#line 10025 "configure" | ||
3051 | +#line 10046 "configure" | ||
3052 | #include "confdefs.h" | ||
3053 | #include <new> | ||
3054 | int main() { | ||
3055 | |||
3056 | ; return 0; } | ||
3057 | EOF | ||
3058 | -if { (eval echo configure:10032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3059 | +if { (eval echo configure:10053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3060 | rm -rf conftest* | ||
3061 | eval "ac_cv_header_$ac_safe=yes" | ||
3062 | else | ||
3063 | @@ -10069,19 +10090,19 @@ fi | ||
3064 | if test "x$enable_dtrace" = "xyes"; then | ||
3065 | ac_safe=`echo "sys/sdt.h" | sed 'y%./+-%__p_%'` | ||
3066 | echo $ac_n "checking for sys/sdt.h""... $ac_c" 1>&6 | ||
3067 | -echo "configure:10073: checking for sys/sdt.h" >&5 | ||
3068 | +echo "configure:10094: checking for sys/sdt.h" >&5 | ||
3069 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
3070 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3071 | else | ||
3072 | cat > conftest.$ac_ext <<EOF | ||
3073 | -#line 10078 "configure" | ||
3074 | +#line 10099 "configure" | ||
3075 | #include "confdefs.h" | ||
3076 | #include <sys/sdt.h> | ||
3077 | int main() { | ||
3078 | |||
3079 | ; return 0; } | ||
3080 | EOF | ||
3081 | -if { (eval echo configure:10085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3082 | +if { (eval echo configure:10106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3083 | rm -rf conftest* | ||
3084 | eval "ac_cv_header_$ac_safe=yes" | ||
3085 | else | ||
3086 | @@ -10120,19 +10141,19 @@ case $target in | ||
3087 | do | ||
3088 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
3089 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
3090 | -echo "configure:10124: checking for $ac_hdr" >&5 | ||
3091 | +echo "configure:10145: checking for $ac_hdr" >&5 | ||
3092 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
3093 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3094 | else | ||
3095 | cat > conftest.$ac_ext <<EOF | ||
3096 | -#line 10129 "configure" | ||
3097 | +#line 10150 "configure" | ||
3098 | #include "confdefs.h" | ||
3099 | #include <$ac_hdr> | ||
3100 | int main() { | ||
3101 | |||
3102 | ; return 0; } | ||
3103 | EOF | ||
3104 | -if { (eval echo configure:10136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3105 | +if { (eval echo configure:10157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3106 | rm -rf conftest* | ||
3107 | eval "ac_cv_header_$ac_safe=yes" | ||
3108 | else | ||
3109 | @@ -10166,7 +10187,7 @@ case $target in | ||
3110 | ;; | ||
3111 | *) | ||
3112 | echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 | ||
3113 | -echo "configure:10170: checking for gethostbyname_r in -lc_r" >&5 | ||
3114 | +echo "configure:10191: checking for gethostbyname_r in -lc_r" >&5 | ||
3115 | ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` | ||
3116 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3117 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3118 | @@ -10174,7 +10195,7 @@ else | ||
3119 | ac_save_LIBS="$LIBS" | ||
3120 | LIBS="-lc_r $LIBS" | ||
3121 | cat > conftest.$ac_ext <<EOF | ||
3122 | -#line 10178 "configure" | ||
3123 | +#line 10199 "configure" | ||
3124 | #include "confdefs.h" | ||
3125 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3126 | /* We use char because int might match the return type of a gcc2 | ||
3127 | @@ -10185,7 +10206,7 @@ int main() { | ||
3128 | gethostbyname_r() | ||
3129 | ; return 0; } | ||
3130 | EOF | ||
3131 | -if { (eval echo configure:10189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3132 | +if { (eval echo configure:10210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3133 | rm -rf conftest* | ||
3134 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3135 | else | ||
3136 | @@ -10223,14 +10244,14 @@ case $target in | ||
3137 | *) | ||
3138 | |||
3139 | echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 | ||
3140 | -echo "configure:10227: checking for library containing dlopen" >&5 | ||
3141 | +echo "configure:10248: checking for library containing dlopen" >&5 | ||
3142 | if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then | ||
3143 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3144 | else | ||
3145 | ac_func_search_save_LIBS="$LIBS" | ||
3146 | ac_cv_search_dlopen="no" | ||
3147 | cat > conftest.$ac_ext <<EOF | ||
3148 | -#line 10234 "configure" | ||
3149 | +#line 10255 "configure" | ||
3150 | #include "confdefs.h" | ||
3151 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3152 | /* We use char because int might match the return type of a gcc2 | ||
3153 | @@ -10241,7 +10262,7 @@ int main() { | ||
3154 | dlopen() | ||
3155 | ; return 0; } | ||
3156 | EOF | ||
3157 | -if { (eval echo configure:10245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3158 | +if { (eval echo configure:10266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3159 | rm -rf conftest* | ||
3160 | ac_cv_search_dlopen="none required" | ||
3161 | else | ||
3162 | @@ -10252,7 +10273,7 @@ rm -f conftest* | ||
3163 | test "$ac_cv_search_dlopen" = "no" && for i in dl; do | ||
3164 | LIBS="-l$i $ac_func_search_save_LIBS" | ||
3165 | cat > conftest.$ac_ext <<EOF | ||
3166 | -#line 10256 "configure" | ||
3167 | +#line 10277 "configure" | ||
3168 | #include "confdefs.h" | ||
3169 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3170 | /* We use char because int might match the return type of a gcc2 | ||
3171 | @@ -10263,7 +10284,7 @@ int main() { | ||
3172 | dlopen() | ||
3173 | ; return 0; } | ||
3174 | EOF | ||
3175 | -if { (eval echo configure:10267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3176 | +if { (eval echo configure:10288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3177 | rm -rf conftest* | ||
3178 | ac_cv_search_dlopen="-l$i" | ||
3179 | break | ||
3180 | @@ -10281,19 +10302,19 @@ if test "$ac_cv_search_dlopen" != "no"; then | ||
3181 | test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS" | ||
3182 | ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` | ||
3183 | echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 | ||
3184 | -echo "configure:10285: checking for dlfcn.h" >&5 | ||
3185 | +echo "configure:10306: checking for dlfcn.h" >&5 | ||
3186 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
3187 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3188 | else | ||
3189 | cat > conftest.$ac_ext <<EOF | ||
3190 | -#line 10290 "configure" | ||
3191 | +#line 10311 "configure" | ||
3192 | #include "confdefs.h" | ||
3193 | #include <dlfcn.h> | ||
3194 | int main() { | ||
3195 | |||
3196 | ; return 0; } | ||
3197 | EOF | ||
3198 | -if { (eval echo configure:10297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3199 | +if { (eval echo configure:10318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3200 | rm -rf conftest* | ||
3201 | eval "ac_cv_header_$ac_safe=yes" | ||
3202 | else | ||
3203 | @@ -10327,12 +10348,12 @@ CFLAGS="$CFLAGS -D_GNU_SOURCE" | ||
3204 | for ac_func in dladdr memmem | ||
3205 | do | ||
3206 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
3207 | -echo "configure:10331: checking for $ac_func" >&5 | ||
3208 | +echo "configure:10352: checking for $ac_func" >&5 | ||
3209 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
3210 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3211 | else | ||
3212 | cat > conftest.$ac_ext <<EOF | ||
3213 | -#line 10336 "configure" | ||
3214 | +#line 10357 "configure" | ||
3215 | #include "confdefs.h" | ||
3216 | /* System header to define __stub macros and hopefully few prototypes, | ||
3217 | which can conflict with char $ac_func(); below. */ | ||
3218 | @@ -10355,7 +10376,7 @@ $ac_func(); | ||
3219 | |||
3220 | ; return 0; } | ||
3221 | EOF | ||
3222 | -if { (eval echo configure:10359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3223 | +if { (eval echo configure:10380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3224 | rm -rf conftest* | ||
3225 | eval "ac_cv_func_$ac_func=yes" | ||
3226 | else | ||
3227 | @@ -10386,7 +10407,7 @@ if test ! "$GNU_CXX"; then | ||
3228 | case $target in | ||
3229 | *-aix*) | ||
3230 | echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 | ||
3231 | -echo "configure:10390: checking for demangle in -lC_r" >&5 | ||
3232 | +echo "configure:10411: checking for demangle in -lC_r" >&5 | ||
3233 | ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` | ||
3234 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3235 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3236 | @@ -10394,7 +10415,7 @@ else | ||
3237 | ac_save_LIBS="$LIBS" | ||
3238 | LIBS="-lC_r $LIBS" | ||
3239 | cat > conftest.$ac_ext <<EOF | ||
3240 | -#line 10398 "configure" | ||
3241 | +#line 10419 "configure" | ||
3242 | #include "confdefs.h" | ||
3243 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3244 | /* We use char because int might match the return type of a gcc2 | ||
3245 | @@ -10405,7 +10426,7 @@ int main() { | ||
3246 | demangle() | ||
3247 | ; return 0; } | ||
3248 | EOF | ||
3249 | -if { (eval echo configure:10409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3250 | +if { (eval echo configure:10430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3251 | rm -rf conftest* | ||
3252 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3253 | else | ||
3254 | @@ -10435,7 +10456,7 @@ fi | ||
3255 | ;; | ||
3256 | *) | ||
3257 | echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 | ||
3258 | -echo "configure:10439: checking for demangle in -lC" >&5 | ||
3259 | +echo "configure:10460: checking for demangle in -lC" >&5 | ||
3260 | ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` | ||
3261 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3262 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3263 | @@ -10443,7 +10464,7 @@ else | ||
3264 | ac_save_LIBS="$LIBS" | ||
3265 | LIBS="-lC $LIBS" | ||
3266 | cat > conftest.$ac_ext <<EOF | ||
3267 | -#line 10447 "configure" | ||
3268 | +#line 10468 "configure" | ||
3269 | #include "confdefs.h" | ||
3270 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3271 | /* We use char because int might match the return type of a gcc2 | ||
3272 | @@ -10454,7 +10475,7 @@ int main() { | ||
3273 | demangle() | ||
3274 | ; return 0; } | ||
3275 | EOF | ||
3276 | -if { (eval echo configure:10458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3277 | +if { (eval echo configure:10479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3278 | rm -rf conftest* | ||
3279 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3280 | else | ||
3281 | @@ -10490,7 +10511,7 @@ case $target in | ||
3282 | ;; | ||
3283 | *) | ||
3284 | echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 | ||
3285 | -echo "configure:10494: checking for socket in -lsocket" >&5 | ||
3286 | +echo "configure:10515: checking for socket in -lsocket" >&5 | ||
3287 | ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` | ||
3288 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3289 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3290 | @@ -10498,7 +10519,7 @@ else | ||
3291 | ac_save_LIBS="$LIBS" | ||
3292 | LIBS="-lsocket $LIBS" | ||
3293 | cat > conftest.$ac_ext <<EOF | ||
3294 | -#line 10502 "configure" | ||
3295 | +#line 10523 "configure" | ||
3296 | #include "confdefs.h" | ||
3297 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3298 | /* We use char because int might match the return type of a gcc2 | ||
3299 | @@ -10509,7 +10530,7 @@ int main() { | ||
3300 | socket() | ||
3301 | ; return 0; } | ||
3302 | EOF | ||
3303 | -if { (eval echo configure:10513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3304 | +if { (eval echo configure:10534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3305 | rm -rf conftest* | ||
3306 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3307 | else | ||
3308 | @@ -10555,7 +10576,7 @@ EOF | ||
3309 | _SAVE_LDFLAGS="$LDFLAGS" | ||
3310 | LDFLAGS="$XLDFLAGS $LDFLAGS" | ||
3311 | echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 | ||
3312 | -echo "configure:10559: checking for XDrawLines in -lX11" >&5 | ||
3313 | +echo "configure:10580: checking for XDrawLines in -lX11" >&5 | ||
3314 | ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` | ||
3315 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3316 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3317 | @@ -10563,7 +10584,7 @@ else | ||
3318 | ac_save_LIBS="$LIBS" | ||
3319 | LIBS="-lX11 $XLIBS $LIBS" | ||
3320 | cat > conftest.$ac_ext <<EOF | ||
3321 | -#line 10567 "configure" | ||
3322 | +#line 10588 "configure" | ||
3323 | #include "confdefs.h" | ||
3324 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3325 | /* We use char because int might match the return type of a gcc2 | ||
3326 | @@ -10574,7 +10595,7 @@ int main() { | ||
3327 | XDrawLines() | ||
3328 | ; return 0; } | ||
3329 | EOF | ||
3330 | -if { (eval echo configure:10578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3331 | +if { (eval echo configure:10599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3332 | rm -rf conftest* | ||
3333 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3334 | else | ||
3335 | @@ -10596,7 +10617,7 @@ MISSING_X="$MISSING_X -lX11" | ||
3336 | fi | ||
3337 | |||
3338 | echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 | ||
3339 | -echo "configure:10600: checking for XextAddDisplay in -lXext" >&5 | ||
3340 | +echo "configure:10621: checking for XextAddDisplay in -lXext" >&5 | ||
3341 | ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` | ||
3342 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3343 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3344 | @@ -10604,7 +10625,7 @@ else | ||
3345 | ac_save_LIBS="$LIBS" | ||
3346 | LIBS="-lXext $XLIBS $LIBS" | ||
3347 | cat > conftest.$ac_ext <<EOF | ||
3348 | -#line 10608 "configure" | ||
3349 | +#line 10629 "configure" | ||
3350 | #include "confdefs.h" | ||
3351 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3352 | /* We use char because int might match the return type of a gcc2 | ||
3353 | @@ -10615,7 +10636,7 @@ int main() { | ||
3354 | XextAddDisplay() | ||
3355 | ; return 0; } | ||
3356 | EOF | ||
3357 | -if { (eval echo configure:10619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3358 | +if { (eval echo configure:10640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3359 | rm -rf conftest* | ||
3360 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3361 | else | ||
3362 | @@ -10638,7 +10659,7 @@ fi | ||
3363 | |||
3364 | |||
3365 | echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 | ||
3366 | -echo "configure:10642: checking for XtFree in -lXt" >&5 | ||
3367 | +echo "configure:10663: checking for XtFree in -lXt" >&5 | ||
3368 | ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` | ||
3369 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3370 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3371 | @@ -10646,7 +10667,7 @@ else | ||
3372 | ac_save_LIBS="$LIBS" | ||
3373 | LIBS="-lXt $LIBS" | ||
3374 | cat > conftest.$ac_ext <<EOF | ||
3375 | -#line 10650 "configure" | ||
3376 | +#line 10671 "configure" | ||
3377 | #include "confdefs.h" | ||
3378 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3379 | /* We use char because int might match the return type of a gcc2 | ||
3380 | @@ -10657,7 +10678,7 @@ int main() { | ||
3381 | XtFree() | ||
3382 | ; return 0; } | ||
3383 | EOF | ||
3384 | -if { (eval echo configure:10661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3385 | +if { (eval echo configure:10682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3386 | rm -rf conftest* | ||
3387 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3388 | else | ||
3389 | @@ -10678,7 +10699,7 @@ else | ||
3390 | |||
3391 | unset ac_cv_lib_Xt_XtFree | ||
3392 | echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 | ||
3393 | -echo "configure:10682: checking for IceFlush in -lICE" >&5 | ||
3394 | +echo "configure:10703: checking for IceFlush in -lICE" >&5 | ||
3395 | ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` | ||
3396 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3397 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3398 | @@ -10686,7 +10707,7 @@ else | ||
3399 | ac_save_LIBS="$LIBS" | ||
3400 | LIBS="-lICE $XT_LIBS $XLIBS $LIBS" | ||
3401 | cat > conftest.$ac_ext <<EOF | ||
3402 | -#line 10690 "configure" | ||
3403 | +#line 10711 "configure" | ||
3404 | #include "confdefs.h" | ||
3405 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3406 | /* We use char because int might match the return type of a gcc2 | ||
3407 | @@ -10697,7 +10718,7 @@ int main() { | ||
3408 | IceFlush() | ||
3409 | ; return 0; } | ||
3410 | EOF | ||
3411 | -if { (eval echo configure:10701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3412 | +if { (eval echo configure:10722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3413 | rm -rf conftest* | ||
3414 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3415 | else | ||
3416 | @@ -10718,7 +10739,7 @@ else | ||
3417 | fi | ||
3418 | |||
3419 | echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 | ||
3420 | -echo "configure:10722: checking for SmcCloseConnection in -lSM" >&5 | ||
3421 | +echo "configure:10743: checking for SmcCloseConnection in -lSM" >&5 | ||
3422 | ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` | ||
3423 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3424 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3425 | @@ -10726,7 +10747,7 @@ else | ||
3426 | ac_save_LIBS="$LIBS" | ||
3427 | LIBS="-lSM $XT_LIBS $XLIBS $LIBS" | ||
3428 | cat > conftest.$ac_ext <<EOF | ||
3429 | -#line 10730 "configure" | ||
3430 | +#line 10751 "configure" | ||
3431 | #include "confdefs.h" | ||
3432 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3433 | /* We use char because int might match the return type of a gcc2 | ||
3434 | @@ -10737,7 +10758,7 @@ int main() { | ||
3435 | SmcCloseConnection() | ||
3436 | ; return 0; } | ||
3437 | EOF | ||
3438 | -if { (eval echo configure:10741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3439 | +if { (eval echo configure:10762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3440 | rm -rf conftest* | ||
3441 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3442 | else | ||
3443 | @@ -10758,7 +10779,7 @@ else | ||
3444 | fi | ||
3445 | |||
3446 | echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 | ||
3447 | -echo "configure:10762: checking for XtFree in -lXt" >&5 | ||
3448 | +echo "configure:10783: checking for XtFree in -lXt" >&5 | ||
3449 | ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` | ||
3450 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3451 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3452 | @@ -10766,7 +10787,7 @@ else | ||
3453 | ac_save_LIBS="$LIBS" | ||
3454 | LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" | ||
3455 | cat > conftest.$ac_ext <<EOF | ||
3456 | -#line 10770 "configure" | ||
3457 | +#line 10791 "configure" | ||
3458 | #include "confdefs.h" | ||
3459 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3460 | /* We use char because int might match the return type of a gcc2 | ||
3461 | @@ -10777,7 +10798,7 @@ int main() { | ||
3462 | XtFree() | ||
3463 | ; return 0; } | ||
3464 | EOF | ||
3465 | -if { (eval echo configure:10781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3466 | +if { (eval echo configure:10802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3467 | rm -rf conftest* | ||
3468 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3469 | else | ||
3470 | @@ -10811,7 +10832,7 @@ fi | ||
3471 | esac | ||
3472 | |||
3473 | echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 | ||
3474 | -echo "configure:10815: checking for XShmCreateImage in -lXext" >&5 | ||
3475 | +echo "configure:10836: checking for XShmCreateImage in -lXext" >&5 | ||
3476 | ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'` | ||
3477 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3478 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3479 | @@ -10819,7 +10840,7 @@ else | ||
3480 | ac_save_LIBS="$LIBS" | ||
3481 | LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" | ||
3482 | cat > conftest.$ac_ext <<EOF | ||
3483 | -#line 10823 "configure" | ||
3484 | +#line 10844 "configure" | ||
3485 | #include "confdefs.h" | ||
3486 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3487 | /* We use char because int might match the return type of a gcc2 | ||
3488 | @@ -10830,7 +10851,7 @@ int main() { | ||
3489 | XShmCreateImage() | ||
3490 | ; return 0; } | ||
3491 | EOF | ||
3492 | -if { (eval echo configure:10834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3493 | +if { (eval echo configure:10855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3494 | rm -rf conftest* | ||
3495 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3496 | else | ||
3497 | @@ -10853,19 +10874,19 @@ fi | ||
3498 | |||
3499 | ac_safe=`echo "X11/extensions/scrnsaver.h" | sed 'y%./+-%__p_%'` | ||
3500 | echo $ac_n "checking for X11/extensions/scrnsaver.h""... $ac_c" 1>&6 | ||
3501 | -echo "configure:10857: checking for X11/extensions/scrnsaver.h" >&5 | ||
3502 | +echo "configure:10878: checking for X11/extensions/scrnsaver.h" >&5 | ||
3503 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
3504 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3505 | else | ||
3506 | cat > conftest.$ac_ext <<EOF | ||
3507 | -#line 10862 "configure" | ||
3508 | +#line 10883 "configure" | ||
3509 | #include "confdefs.h" | ||
3510 | #include <X11/extensions/scrnsaver.h> | ||
3511 | int main() { | ||
3512 | |||
3513 | ; return 0; } | ||
3514 | EOF | ||
3515 | -if { (eval echo configure:10869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3516 | +if { (eval echo configure:10890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3517 | rm -rf conftest* | ||
3518 | eval "ac_cv_header_$ac_safe=yes" | ||
3519 | else | ||
3520 | @@ -10880,7 +10901,7 @@ fi | ||
3521 | if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | ||
3522 | echo "$ac_t""yes" 1>&6 | ||
3523 | echo $ac_n "checking for XScreenSaverQueryInfo in -lXss""... $ac_c" 1>&6 | ||
3524 | -echo "configure:10884: checking for XScreenSaverQueryInfo in -lXss" >&5 | ||
3525 | +echo "configure:10905: checking for XScreenSaverQueryInfo in -lXss" >&5 | ||
3526 | ac_lib_var=`echo Xss'_'XScreenSaverQueryInfo | sed 'y%./+-%__p_%'` | ||
3527 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3528 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3529 | @@ -10888,7 +10909,7 @@ else | ||
3530 | ac_save_LIBS="$LIBS" | ||
3531 | LIBS="-lXss $XEXT_LIBS $XLIBS $LIBS" | ||
3532 | cat > conftest.$ac_ext <<EOF | ||
3533 | -#line 10892 "configure" | ||
3534 | +#line 10913 "configure" | ||
3535 | #include "confdefs.h" | ||
3536 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3537 | /* We use char because int might match the return type of a gcc2 | ||
3538 | @@ -10899,7 +10920,7 @@ int main() { | ||
3539 | XScreenSaverQueryInfo() | ||
3540 | ; return 0; } | ||
3541 | EOF | ||
3542 | -if { (eval echo configure:10903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3543 | +if { (eval echo configure:10924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3544 | rm -rf conftest* | ||
3545 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3546 | else | ||
3547 | @@ -10971,7 +10992,7 @@ fi | ||
3548 | # Extract the first word of "freetype-config", so it can be a program name with args. | ||
3549 | set dummy freetype-config; ac_word=$2 | ||
3550 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
3551 | -echo "configure:10975: checking for $ac_word" >&5 | ||
3552 | +echo "configure:10996: checking for $ac_word" >&5 | ||
3553 | if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then | ||
3554 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3555 | else | ||
3556 | @@ -11007,7 +11028,7 @@ fi | ||
3557 | |||
3558 | min_ft_version=6.1.0 | ||
3559 | echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 | ||
3560 | -echo "configure:11011: checking for FreeType - version >= $min_ft_version" >&5 | ||
3561 | +echo "configure:11032: checking for FreeType - version >= $min_ft_version" >&5 | ||
3562 | no_ft="" | ||
3563 | if test "$FT2_CONFIG" = "no" ; then | ||
3564 | no_ft=yes | ||
3565 | @@ -11055,7 +11076,7 @@ else | ||
3566 | echo $ac_n "cross compiling; assumed OK... $ac_c" | ||
3567 | else | ||
3568 | cat > conftest.$ac_ext <<EOF | ||
3569 | -#line 11059 "configure" | ||
3570 | +#line 11080 "configure" | ||
3571 | #include "confdefs.h" | ||
3572 | |||
3573 | #include <ft2build.h> | ||
3574 | @@ -11081,7 +11102,7 @@ main() | ||
3575 | } | ||
3576 | |||
3577 | EOF | ||
3578 | -if { (eval echo configure:11085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
3579 | +if { (eval echo configure:11106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
3580 | then | ||
3581 | : | ||
3582 | else | ||
3583 | @@ -11131,12 +11152,12 @@ fi | ||
3584 | CFLAGS="$CFLAGS $FT2_CFLAGS" | ||
3585 | |||
3586 | echo $ac_n "checking for FT_Bitmap_Size.y_ppem""... $ac_c" 1>&6 | ||
3587 | -echo "configure:11135: checking for FT_Bitmap_Size.y_ppem" >&5 | ||
3588 | +echo "configure:11156: checking for FT_Bitmap_Size.y_ppem" >&5 | ||
3589 | if eval "test \"`echo '$''{'ac_cv_member_FT_Bitmap_Size_y_ppem'+set}'`\" = set"; then | ||
3590 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3591 | else | ||
3592 | cat > conftest.$ac_ext <<EOF | ||
3593 | -#line 11140 "configure" | ||
3594 | +#line 11161 "configure" | ||
3595 | #include "confdefs.h" | ||
3596 | #include <ft2build.h> | ||
3597 | #include FT_FREETYPE_H | ||
3598 | @@ -11146,7 +11167,7 @@ FT_Bitmap_Size s; | ||
3599 | return 1 | ||
3600 | ; return 0; } | ||
3601 | EOF | ||
3602 | -if { (eval echo configure:11150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3603 | +if { (eval echo configure:11171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3604 | rm -rf conftest* | ||
3605 | ac_cv_member_FT_Bitmap_Size_y_ppem=yes | ||
3606 | else | ||
3607 | @@ -11172,12 +11193,12 @@ EOF | ||
3608 | for ac_func in FT_GlyphSlot_Embolden FT_Load_Sfnt_Table FT_Select_Size | ||
3609 | do | ||
3610 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
3611 | -echo "configure:11176: checking for $ac_func" >&5 | ||
3612 | +echo "configure:11197: checking for $ac_func" >&5 | ||
3613 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
3614 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3615 | else | ||
3616 | cat > conftest.$ac_ext <<EOF | ||
3617 | -#line 11181 "configure" | ||
3618 | +#line 11202 "configure" | ||
3619 | #include "confdefs.h" | ||
3620 | /* System header to define __stub macros and hopefully few prototypes, | ||
3621 | which can conflict with char $ac_func(); below. */ | ||
3622 | @@ -11200,7 +11221,7 @@ $ac_func(); | ||
3623 | |||
3624 | ; return 0; } | ||
3625 | EOF | ||
3626 | -if { (eval echo configure:11204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3627 | +if { (eval echo configure:11225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3628 | rm -rf conftest* | ||
3629 | eval "ac_cv_func_$ac_func=yes" | ||
3630 | else | ||
3631 | @@ -11245,7 +11266,7 @@ darwin*) | ||
3632 | *) | ||
3633 | |||
3634 | echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 | ||
3635 | -echo "configure:11249: checking for pthread_create in -lpthreads" >&5 | ||
3636 | +echo "configure:11270: checking for pthread_create in -lpthreads" >&5 | ||
3637 | echo " | ||
3638 | #include <pthread.h> | ||
3639 | #include <stdlib.h> | ||
3640 | @@ -11268,7 +11289,7 @@ echo " | ||
3641 | echo "$ac_t""no" 1>&6 | ||
3642 | |||
3643 | echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 | ||
3644 | -echo "configure:11272: checking for pthread_create in -lpthread" >&5 | ||
3645 | +echo "configure:11293: checking for pthread_create in -lpthread" >&5 | ||
3646 | echo " | ||
3647 | #include <pthread.h> | ||
3648 | #include <stdlib.h> | ||
3649 | @@ -11291,7 +11312,7 @@ echo " | ||
3650 | echo "$ac_t""no" 1>&6 | ||
3651 | |||
3652 | echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 | ||
3653 | -echo "configure:11295: checking for pthread_create in -lc_r" >&5 | ||
3654 | +echo "configure:11316: checking for pthread_create in -lc_r" >&5 | ||
3655 | echo " | ||
3656 | #include <pthread.h> | ||
3657 | #include <stdlib.h> | ||
3658 | @@ -11314,7 +11335,7 @@ echo " | ||
3659 | echo "$ac_t""no" 1>&6 | ||
3660 | |||
3661 | echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 | ||
3662 | -echo "configure:11318: checking for pthread_create in -lc" >&5 | ||
3663 | +echo "configure:11339: checking for pthread_create in -lc" >&5 | ||
3664 | echo " | ||
3665 | #include <pthread.h> | ||
3666 | #include <stdlib.h> | ||
3667 | @@ -11373,7 +11394,7 @@ then | ||
3668 | rm -f conftest* | ||
3669 | ac_cv_have_dash_pthread=no | ||
3670 | echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 | ||
3671 | -echo "configure:11377: checking whether ${CC-cc} accepts -pthread" >&5 | ||
3672 | +echo "configure:11398: checking whether ${CC-cc} accepts -pthread" >&5 | ||
3673 | echo 'int main() { return 0; }' | cat > conftest.c | ||
3674 | ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 | ||
3675 | if test $? -eq 0; then | ||
3676 | @@ -11396,7 +11417,7 @@ echo "configure:11377: checking whether ${CC-cc} accepts -pthread" >&5 | ||
3677 | ac_cv_have_dash_pthreads=no | ||
3678 | if test "$ac_cv_have_dash_pthread" = "no"; then | ||
3679 | echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 | ||
3680 | -echo "configure:11400: checking whether ${CC-cc} accepts -pthreads" >&5 | ||
3681 | +echo "configure:11421: checking whether ${CC-cc} accepts -pthreads" >&5 | ||
3682 | echo 'int main() { return 0; }' | cat > conftest.c | ||
3683 | ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 | ||
3684 | if test $? -eq 0; then | ||
3685 | @@ -11479,13 +11500,13 @@ fi | ||
3686 | |||
3687 | if test $ac_cv_prog_gcc = yes; then | ||
3688 | echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 | ||
3689 | -echo "configure:11483: checking whether ${CC-cc} needs -traditional" >&5 | ||
3690 | +echo "configure:11504: checking whether ${CC-cc} needs -traditional" >&5 | ||
3691 | if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then | ||
3692 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3693 | else | ||
3694 | ac_pattern="Autoconf.*'x'" | ||
3695 | cat > conftest.$ac_ext <<EOF | ||
3696 | -#line 11489 "configure" | ||
3697 | +#line 11510 "configure" | ||
3698 | #include "confdefs.h" | ||
3699 | #include <sgtty.h> | ||
3700 | Autoconf TIOCGETP | ||
3701 | @@ -11503,7 +11524,7 @@ rm -f conftest* | ||
3702 | |||
3703 | if test $ac_cv_prog_gcc_traditional = no; then | ||
3704 | cat > conftest.$ac_ext <<EOF | ||
3705 | -#line 11507 "configure" | ||
3706 | +#line 11528 "configure" | ||
3707 | #include "confdefs.h" | ||
3708 | #include <termio.h> | ||
3709 | Autoconf TCGETA | ||
3710 | @@ -11525,7 +11546,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 | ||
3711 | fi | ||
3712 | |||
3713 | echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 | ||
3714 | -echo "configure:11529: checking for 8-bit clean memcmp" >&5 | ||
3715 | +echo "configure:11550: checking for 8-bit clean memcmp" >&5 | ||
3716 | if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then | ||
3717 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3718 | else | ||
3719 | @@ -11533,7 +11554,7 @@ else | ||
3720 | ac_cv_func_memcmp_clean=no | ||
3721 | else | ||
3722 | cat > conftest.$ac_ext <<EOF | ||
3723 | -#line 11537 "configure" | ||
3724 | +#line 11558 "configure" | ||
3725 | #include "confdefs.h" | ||
3726 | |||
3727 | main() | ||
3728 | @@ -11543,7 +11564,7 @@ main() | ||
3729 | } | ||
3730 | |||
3731 | EOF | ||
3732 | -if { (eval echo configure:11547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
3733 | +if { (eval echo configure:11568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
3734 | then | ||
3735 | ac_cv_func_memcmp_clean=yes | ||
3736 | else | ||
3737 | @@ -11563,12 +11584,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" | ||
3738 | for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 truncate64 statvfs64 setbuf isatty | ||
3739 | do | ||
3740 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
3741 | -echo "configure:11567: checking for $ac_func" >&5 | ||
3742 | +echo "configure:11588: checking for $ac_func" >&5 | ||
3743 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
3744 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3745 | else | ||
3746 | cat > conftest.$ac_ext <<EOF | ||
3747 | -#line 11572 "configure" | ||
3748 | +#line 11593 "configure" | ||
3749 | #include "confdefs.h" | ||
3750 | /* System header to define __stub macros and hopefully few prototypes, | ||
3751 | which can conflict with char $ac_func(); below. */ | ||
3752 | @@ -11591,7 +11612,7 @@ $ac_func(); | ||
3753 | |||
3754 | ; return 0; } | ||
3755 | EOF | ||
3756 | -if { (eval echo configure:11595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3757 | +if { (eval echo configure:11616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3758 | rm -rf conftest* | ||
3759 | eval "ac_cv_func_$ac_func=yes" | ||
3760 | else | ||
3761 | @@ -11618,12 +11639,12 @@ done | ||
3762 | for ac_func in flockfile getpagesize | ||
3763 | do | ||
3764 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
3765 | -echo "configure:11622: checking for $ac_func" >&5 | ||
3766 | +echo "configure:11643: checking for $ac_func" >&5 | ||
3767 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
3768 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3769 | else | ||
3770 | cat > conftest.$ac_ext <<EOF | ||
3771 | -#line 11627 "configure" | ||
3772 | +#line 11648 "configure" | ||
3773 | #include "confdefs.h" | ||
3774 | /* System header to define __stub macros and hopefully few prototypes, | ||
3775 | which can conflict with char $ac_func(); below. */ | ||
3776 | @@ -11646,7 +11667,7 @@ $ac_func(); | ||
3777 | |||
3778 | ; return 0; } | ||
3779 | EOF | ||
3780 | -if { (eval echo configure:11650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3781 | +if { (eval echo configure:11671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3782 | rm -rf conftest* | ||
3783 | eval "ac_cv_func_$ac_func=yes" | ||
3784 | else | ||
3785 | @@ -11673,12 +11694,12 @@ done | ||
3786 | for ac_func in localtime_r strtok_r | ||
3787 | do | ||
3788 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
3789 | -echo "configure:11677: checking for $ac_func" >&5 | ||
3790 | +echo "configure:11698: checking for $ac_func" >&5 | ||
3791 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
3792 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3793 | else | ||
3794 | cat > conftest.$ac_ext <<EOF | ||
3795 | -#line 11682 "configure" | ||
3796 | +#line 11703 "configure" | ||
3797 | #include "confdefs.h" | ||
3798 | /* System header to define __stub macros and hopefully few prototypes, | ||
3799 | which can conflict with char $ac_func(); below. */ | ||
3800 | @@ -11701,7 +11722,7 @@ $ac_func(); | ||
3801 | |||
3802 | ; return 0; } | ||
3803 | EOF | ||
3804 | -if { (eval echo configure:11705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3805 | +if { (eval echo configure:11726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3806 | rm -rf conftest* | ||
3807 | eval "ac_cv_func_$ac_func=yes" | ||
3808 | else | ||
3809 | @@ -11729,12 +11750,12 @@ done | ||
3810 | _SAVE_LDFLAGS=$LDFLAGS | ||
3811 | LDFLAGS="$LDFLAGS -lrt" | ||
3812 | echo $ac_n "checking for clock_gettime(CLOCK_MONOTONIC) and -lrt""... $ac_c" 1>&6 | ||
3813 | -echo "configure:11733: checking for clock_gettime(CLOCK_MONOTONIC) and -lrt" >&5 | ||
3814 | +echo "configure:11754: checking for clock_gettime(CLOCK_MONOTONIC) and -lrt" >&5 | ||
3815 | if eval "test \"`echo '$''{'ac_cv_have_clock_monotonic'+set}'`\" = set"; then | ||
3816 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3817 | else | ||
3818 | cat > conftest.$ac_ext <<EOF | ||
3819 | -#line 11738 "configure" | ||
3820 | +#line 11759 "configure" | ||
3821 | #include "confdefs.h" | ||
3822 | #include <time.h> | ||
3823 | int main() { | ||
3824 | @@ -11742,7 +11763,7 @@ int main() { | ||
3825 | clock_gettime(CLOCK_MONOTONIC, &ts); | ||
3826 | ; return 0; } | ||
3827 | EOF | ||
3828 | -if { (eval echo configure:11746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3829 | +if { (eval echo configure:11767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3830 | rm -rf conftest* | ||
3831 | ac_cv_have_clock_monotonic=yes | ||
3832 | else | ||
3833 | @@ -11777,19 +11798,19 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
3834 | cross_compiling=$ac_cv_prog_cxx_cross | ||
3835 | |||
3836 | echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 | ||
3837 | -echo "configure:11781: checking for wcrtomb" >&5 | ||
3838 | +echo "configure:11802: checking for wcrtomb" >&5 | ||
3839 | if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then | ||
3840 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3841 | else | ||
3842 | cat > conftest.$ac_ext <<EOF | ||
3843 | -#line 11786 "configure" | ||
3844 | +#line 11807 "configure" | ||
3845 | #include "confdefs.h" | ||
3846 | #include <wchar.h> | ||
3847 | int main() { | ||
3848 | mbstate_t ps={0};wcrtomb(0,'f',&ps); | ||
3849 | ; return 0; } | ||
3850 | EOF | ||
3851 | -if { (eval echo configure:11793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3852 | +if { (eval echo configure:11814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3853 | rm -rf conftest* | ||
3854 | ac_cv_have_wcrtomb="yes" | ||
3855 | else | ||
3856 | @@ -11809,19 +11830,19 @@ EOF | ||
3857 | |||
3858 | fi | ||
3859 | echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 | ||
3860 | -echo "configure:11813: checking for mbrtowc" >&5 | ||
3861 | +echo "configure:11834: checking for mbrtowc" >&5 | ||
3862 | if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then | ||
3863 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3864 | else | ||
3865 | cat > conftest.$ac_ext <<EOF | ||
3866 | -#line 11818 "configure" | ||
3867 | +#line 11839 "configure" | ||
3868 | #include "confdefs.h" | ||
3869 | #include <wchar.h> | ||
3870 | int main() { | ||
3871 | mbstate_t ps={0};mbrtowc(0,0,0,&ps); | ||
3872 | ; return 0; } | ||
3873 | EOF | ||
3874 | -if { (eval echo configure:11825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3875 | +if { (eval echo configure:11846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3876 | rm -rf conftest* | ||
3877 | ac_cv_have_mbrtowc="yes" | ||
3878 | else | ||
3879 | @@ -11850,12 +11871,12 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
3880 | fi | ||
3881 | |||
3882 | echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 | ||
3883 | -echo "configure:11854: checking for res_ninit()" >&5 | ||
3884 | +echo "configure:11875: checking for res_ninit()" >&5 | ||
3885 | if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then | ||
3886 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3887 | else | ||
3888 | cat > conftest.$ac_ext <<EOF | ||
3889 | -#line 11859 "configure" | ||
3890 | +#line 11880 "configure" | ||
3891 | #include "confdefs.h" | ||
3892 | |||
3893 | #ifdef linux | ||
3894 | @@ -11867,7 +11888,7 @@ int main() { | ||
3895 | int foo = res_ninit(&_res); | ||
3896 | ; return 0; } | ||
3897 | EOF | ||
3898 | -if { (eval echo configure:11871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3899 | +if { (eval echo configure:11892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3900 | rm -rf conftest* | ||
3901 | ac_cv_func_res_ninit=yes | ||
3902 | else | ||
3903 | @@ -11897,12 +11918,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
3904 | cross_compiling=$ac_cv_prog_cxx_cross | ||
3905 | |||
3906 | echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 | ||
3907 | -echo "configure:11901: checking for gnu_get_libc_version()" >&5 | ||
3908 | +echo "configure:11922: checking for gnu_get_libc_version()" >&5 | ||
3909 | if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then | ||
3910 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3911 | else | ||
3912 | cat > conftest.$ac_ext <<EOF | ||
3913 | -#line 11906 "configure" | ||
3914 | +#line 11927 "configure" | ||
3915 | #include "confdefs.h" | ||
3916 | |||
3917 | #ifdef HAVE_GNU_LIBC_VERSION_H | ||
3918 | @@ -11913,7 +11934,7 @@ int main() { | ||
3919 | const char *glibc_version = gnu_get_libc_version(); | ||
3920 | ; return 0; } | ||
3921 | EOF | ||
3922 | -if { (eval echo configure:11917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3923 | +if { (eval echo configure:11938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3924 | rm -rf conftest* | ||
3925 | ac_cv_func_gnu_get_libc_version=yes | ||
3926 | else | ||
3927 | @@ -11942,7 +11963,7 @@ case $target_os in | ||
3928 | *) | ||
3929 | |||
3930 | echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 | ||
3931 | -echo "configure:11946: checking for iconv in -lc" >&5 | ||
3932 | +echo "configure:11967: checking for iconv in -lc" >&5 | ||
3933 | ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'` | ||
3934 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3935 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3936 | @@ -11950,7 +11971,7 @@ else | ||
3937 | ac_save_LIBS="$LIBS" | ||
3938 | LIBS="-lc $LIBS" | ||
3939 | cat > conftest.$ac_ext <<EOF | ||
3940 | -#line 11954 "configure" | ||
3941 | +#line 11975 "configure" | ||
3942 | #include "confdefs.h" | ||
3943 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3944 | #ifdef __cplusplus | ||
3945 | @@ -11964,7 +11985,7 @@ int main() { | ||
3946 | iconv() | ||
3947 | ; return 0; } | ||
3948 | EOF | ||
3949 | -if { (eval echo configure:11968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3950 | +if { (eval echo configure:11989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3951 | rm -rf conftest* | ||
3952 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3953 | else | ||
3954 | @@ -11983,7 +12004,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then | ||
3955 | else | ||
3956 | echo "$ac_t""no" 1>&6 | ||
3957 | echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 | ||
3958 | -echo "configure:11987: checking for iconv in -liconv" >&5 | ||
3959 | +echo "configure:12008: checking for iconv in -liconv" >&5 | ||
3960 | ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` | ||
3961 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3962 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3963 | @@ -11991,7 +12012,7 @@ else | ||
3964 | ac_save_LIBS="$LIBS" | ||
3965 | LIBS="-liconv $LIBS" | ||
3966 | cat > conftest.$ac_ext <<EOF | ||
3967 | -#line 11995 "configure" | ||
3968 | +#line 12016 "configure" | ||
3969 | #include "confdefs.h" | ||
3970 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3971 | #ifdef __cplusplus | ||
3972 | @@ -12005,7 +12026,7 @@ int main() { | ||
3973 | iconv() | ||
3974 | ; return 0; } | ||
3975 | EOF | ||
3976 | -if { (eval echo configure:12009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3977 | +if { (eval echo configure:12030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3978 | rm -rf conftest* | ||
3979 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3980 | else | ||
3981 | @@ -12024,7 +12045,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then | ||
3982 | else | ||
3983 | echo "$ac_t""no" 1>&6 | ||
3984 | echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 | ||
3985 | -echo "configure:12028: checking for libiconv in -liconv" >&5 | ||
3986 | +echo "configure:12049: checking for libiconv in -liconv" >&5 | ||
3987 | ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'` | ||
3988 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3989 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3990 | @@ -12032,7 +12053,7 @@ else | ||
3991 | ac_save_LIBS="$LIBS" | ||
3992 | LIBS="-liconv $LIBS" | ||
3993 | cat > conftest.$ac_ext <<EOF | ||
3994 | -#line 12036 "configure" | ||
3995 | +#line 12057 "configure" | ||
3996 | #include "confdefs.h" | ||
3997 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3998 | #ifdef __cplusplus | ||
3999 | @@ -12046,7 +12067,7 @@ int main() { | ||
4000 | libiconv() | ||
4001 | ; return 0; } | ||
4002 | EOF | ||
4003 | -if { (eval echo configure:12050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4004 | +if { (eval echo configure:12071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4005 | rm -rf conftest* | ||
4006 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
4007 | else | ||
4008 | @@ -12073,12 +12094,12 @@ fi | ||
4009 | _SAVE_LIBS=$LIBS | ||
4010 | LIBS="$LIBS $_ICONV_LIBS" | ||
4011 | echo $ac_n "checking for iconv()""... $ac_c" 1>&6 | ||
4012 | -echo "configure:12077: checking for iconv()" >&5 | ||
4013 | +echo "configure:12098: checking for iconv()" >&5 | ||
4014 | if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then | ||
4015 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4016 | else | ||
4017 | cat > conftest.$ac_ext <<EOF | ||
4018 | -#line 12082 "configure" | ||
4019 | +#line 12103 "configure" | ||
4020 | #include "confdefs.h" | ||
4021 | |||
4022 | #include <stdlib.h> | ||
4023 | @@ -12092,7 +12113,7 @@ int main() { | ||
4024 | |||
4025 | ; return 0; } | ||
4026 | EOF | ||
4027 | -if { (eval echo configure:12096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4028 | +if { (eval echo configure:12117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4029 | rm -rf conftest* | ||
4030 | ac_cv_func_iconv=yes | ||
4031 | else | ||
4032 | @@ -12116,12 +12137,12 @@ EOF | ||
4033 | LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" | ||
4034 | LIBICONV="$_ICONV_LIBS" | ||
4035 | echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 | ||
4036 | -echo "configure:12120: checking for iconv() with const input" >&5 | ||
4037 | +echo "configure:12141: checking for iconv() with const input" >&5 | ||
4038 | if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then | ||
4039 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4040 | else | ||
4041 | cat > conftest.$ac_ext <<EOF | ||
4042 | -#line 12125 "configure" | ||
4043 | +#line 12146 "configure" | ||
4044 | #include "confdefs.h" | ||
4045 | |||
4046 | #include <stdlib.h> | ||
4047 | @@ -12136,7 +12157,7 @@ int main() { | ||
4048 | |||
4049 | ; return 0; } | ||
4050 | EOF | ||
4051 | -if { (eval echo configure:12140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4052 | +if { (eval echo configure:12161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4053 | rm -rf conftest* | ||
4054 | ac_cv_func_const_iconv=yes | ||
4055 | else | ||
4056 | @@ -12165,19 +12186,19 @@ esac | ||
4057 | |||
4058 | |||
4059 | echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 | ||
4060 | -echo "configure:12169: checking for nl_langinfo and CODESET" >&5 | ||
4061 | +echo "configure:12190: checking for nl_langinfo and CODESET" >&5 | ||
4062 | if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then | ||
4063 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4064 | else | ||
4065 | cat > conftest.$ac_ext <<EOF | ||
4066 | -#line 12174 "configure" | ||
4067 | +#line 12195 "configure" | ||
4068 | #include "confdefs.h" | ||
4069 | #include <langinfo.h> | ||
4070 | int main() { | ||
4071 | char* cs = nl_langinfo(CODESET); | ||
4072 | ; return 0; } | ||
4073 | EOF | ||
4074 | -if { (eval echo configure:12181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4075 | +if { (eval echo configure:12202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4076 | rm -rf conftest* | ||
4077 | am_cv_langinfo_codeset=yes | ||
4078 | else | ||
4079 | @@ -12209,7 +12230,7 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
4080 | |||
4081 | |||
4082 | echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 | ||
4083 | -echo "configure:12213: checking for an implementation of va_copy()" >&5 | ||
4084 | +echo "configure:12234: checking for an implementation of va_copy()" >&5 | ||
4085 | if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then | ||
4086 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4087 | else | ||
4088 | @@ -12219,7 +12240,7 @@ else | ||
4089 | |||
4090 | else | ||
4091 | cat > conftest.$ac_ext <<EOF | ||
4092 | -#line 12223 "configure" | ||
4093 | +#line 12244 "configure" | ||
4094 | #include "confdefs.h" | ||
4095 | |||
4096 | #include <stdarg.h> | ||
4097 | @@ -12233,7 +12254,7 @@ else | ||
4098 | } | ||
4099 | int main() { f (0, 42); return 0; } | ||
4100 | EOF | ||
4101 | -if { (eval echo configure:12237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
4102 | +if { (eval echo configure:12258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
4103 | then | ||
4104 | ac_cv_va_copy=yes | ||
4105 | else | ||
4106 | @@ -12250,7 +12271,7 @@ fi | ||
4107 | |||
4108 | echo "$ac_t""$ac_cv_va_copy" 1>&6 | ||
4109 | echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 | ||
4110 | -echo "configure:12254: checking for an implementation of __va_copy()" >&5 | ||
4111 | +echo "configure:12275: checking for an implementation of __va_copy()" >&5 | ||
4112 | if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then | ||
4113 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4114 | else | ||
4115 | @@ -12260,7 +12281,7 @@ else | ||
4116 | |||
4117 | else | ||
4118 | cat > conftest.$ac_ext <<EOF | ||
4119 | -#line 12264 "configure" | ||
4120 | +#line 12285 "configure" | ||
4121 | #include "confdefs.h" | ||
4122 | |||
4123 | #include <stdarg.h> | ||
4124 | @@ -12274,7 +12295,7 @@ else | ||
4125 | } | ||
4126 | int main() { f (0, 42); return 0; } | ||
4127 | EOF | ||
4128 | -if { (eval echo configure:12278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
4129 | +if { (eval echo configure:12299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
4130 | then | ||
4131 | ac_cv___va_copy=yes | ||
4132 | else | ||
4133 | @@ -12291,7 +12312,7 @@ fi | ||
4134 | |||
4135 | echo "$ac_t""$ac_cv___va_copy" 1>&6 | ||
4136 | echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 | ||
4137 | -echo "configure:12295: checking whether va_lists can be copied by value" >&5 | ||
4138 | +echo "configure:12316: checking whether va_lists can be copied by value" >&5 | ||
4139 | if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then | ||
4140 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4141 | else | ||
4142 | @@ -12301,7 +12322,7 @@ else | ||
4143 | |||
4144 | else | ||
4145 | cat > conftest.$ac_ext <<EOF | ||
4146 | -#line 12305 "configure" | ||
4147 | +#line 12326 "configure" | ||
4148 | #include "confdefs.h" | ||
4149 | |||
4150 | #include <stdarg.h> | ||
4151 | @@ -12315,7 +12336,7 @@ else | ||
4152 | } | ||
4153 | int main() { f (0, 42); return 0; } | ||
4154 | EOF | ||
4155 | -if { (eval echo configure:12319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
4156 | +if { (eval echo configure:12340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
4157 | then | ||
4158 | ac_cv_va_val_copy=yes | ||
4159 | else | ||
4160 | @@ -12370,12 +12391,12 @@ ARM_ABI_PREFIX= | ||
4161 | if test "$GNU_CC"; then | ||
4162 | if test "$CPU_ARCH" = "arm" ; then | ||
4163 | echo $ac_n "checking for ARM EABI""... $ac_c" 1>&6 | ||
4164 | -echo "configure:12374: checking for ARM EABI" >&5 | ||
4165 | +echo "configure:12395: checking for ARM EABI" >&5 | ||
4166 | if eval "test \"`echo '$''{'ac_cv_gcc_arm_eabi'+set}'`\" = set"; then | ||
4167 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4168 | else | ||
4169 | cat > conftest.$ac_ext <<EOF | ||
4170 | -#line 12379 "configure" | ||
4171 | +#line 12400 "configure" | ||
4172 | #include "confdefs.h" | ||
4173 | |||
4174 | int main() { | ||
4175 | @@ -12388,7 +12409,7 @@ int main() { | ||
4176 | |||
4177 | ; return 0; } | ||
4178 | EOF | ||
4179 | -if { (eval echo configure:12392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4180 | +if { (eval echo configure:12413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4181 | rm -rf conftest* | ||
4182 | ac_cv_gcc_arm_eabi="yes" | ||
4183 | else | ||
4184 | @@ -12413,12 +12434,12 @@ echo "$ac_t""$ac_cv_gcc_arm_eabi" 1>&6 | ||
4185 | fi | ||
4186 | |||
4187 | echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 | ||
4188 | -echo "configure:12417: checking for modern C++ template specialization syntax support" >&5 | ||
4189 | +echo "configure:12438: checking for modern C++ template specialization syntax support" >&5 | ||
4190 | if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then | ||
4191 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4192 | else | ||
4193 | cat > conftest.$ac_ext <<EOF | ||
4194 | -#line 12422 "configure" | ||
4195 | +#line 12443 "configure" | ||
4196 | #include "confdefs.h" | ||
4197 | template <class T> struct X { int a; }; | ||
4198 | class Y {}; | ||
4199 | @@ -12428,7 +12449,7 @@ X<int> int_x; | ||
4200 | X<Y> y_x; | ||
4201 | ; return 0; } | ||
4202 | EOF | ||
4203 | -if { (eval echo configure:12432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4204 | +if { (eval echo configure:12453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4205 | rm -rf conftest* | ||
4206 | ac_cv_cpp_modern_specialize_template_syntax=yes | ||
4207 | else | ||
4208 | @@ -12450,12 +12471,12 @@ fi | ||
4209 | |||
4210 | |||
4211 | echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 | ||
4212 | -echo "configure:12454: checking whether partial template specialization works" >&5 | ||
4213 | +echo "configure:12475: checking whether partial template specialization works" >&5 | ||
4214 | if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then | ||
4215 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4216 | else | ||
4217 | cat > conftest.$ac_ext <<EOF | ||
4218 | -#line 12459 "configure" | ||
4219 | +#line 12480 "configure" | ||
4220 | #include "confdefs.h" | ||
4221 | template <class T> class Foo {}; | ||
4222 | template <class T> class Foo<T*> {}; | ||
4223 | @@ -12463,7 +12484,7 @@ int main() { | ||
4224 | return 0; | ||
4225 | ; return 0; } | ||
4226 | EOF | ||
4227 | -if { (eval echo configure:12467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4228 | +if { (eval echo configure:12488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4229 | rm -rf conftest* | ||
4230 | ac_cv_cpp_partial_specialization=yes | ||
4231 | else | ||
4232 | @@ -12484,12 +12505,12 @@ EOF | ||
4233 | fi | ||
4234 | |||
4235 | echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 | ||
4236 | -echo "configure:12488: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 | ||
4237 | +echo "configure:12509: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 | ||
4238 | if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then | ||
4239 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4240 | else | ||
4241 | cat > conftest.$ac_ext <<EOF | ||
4242 | -#line 12493 "configure" | ||
4243 | +#line 12514 "configure" | ||
4244 | #include "confdefs.h" | ||
4245 | class X { | ||
4246 | public: int go(const X&) {return 3;} | ||
4247 | @@ -12505,7 +12526,7 @@ int main() { | ||
4248 | X x; Y y; y.jo(x); | ||
4249 | ; return 0; } | ||
4250 | EOF | ||
4251 | -if { (eval echo configure:12509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4252 | +if { (eval echo configure:12530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4253 | rm -rf conftest* | ||
4254 | ac_cv_cpp_ambiguity_resolving_using=yes | ||
4255 | else | ||
4256 | @@ -12526,7 +12547,7 @@ EOF | ||
4257 | fi | ||
4258 | |||
4259 | echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 | ||
4260 | -echo "configure:12530: checking for C++ dynamic_cast to void*" >&5 | ||
4261 | +echo "configure:12551: checking for C++ dynamic_cast to void*" >&5 | ||
4262 | if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then | ||
4263 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4264 | else | ||
4265 | @@ -12534,7 +12555,7 @@ else | ||
4266 | ac_cv_cpp_dynamic_cast_void_ptr=no | ||
4267 | else | ||
4268 | cat > conftest.$ac_ext <<EOF | ||
4269 | -#line 12538 "configure" | ||
4270 | +#line 12559 "configure" | ||
4271 | #include "confdefs.h" | ||
4272 | class X { int i; public: virtual ~X() { } }; | ||
4273 | class Y { int j; public: virtual ~Y() { } }; | ||
4274 | @@ -12550,7 +12571,7 @@ class X { int i; public: virtual ~X() { } }; | ||
4275 | ((void*)&mdo == dynamic_cast<void*>(suby)))); | ||
4276 | } | ||
4277 | EOF | ||
4278 | -if { (eval echo configure:12554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
4279 | +if { (eval echo configure:12575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
4280 | then | ||
4281 | ac_cv_cpp_dynamic_cast_void_ptr=yes | ||
4282 | else | ||
4283 | @@ -12574,19 +12595,19 @@ fi | ||
4284 | |||
4285 | |||
4286 | echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 | ||
4287 | -echo "configure:12578: checking whether C++ requires implementation of unused virtual methods" >&5 | ||
4288 | +echo "configure:12599: checking whether C++ requires implementation of unused virtual methods" >&5 | ||
4289 | if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then | ||
4290 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4291 | else | ||
4292 | cat > conftest.$ac_ext <<EOF | ||
4293 | -#line 12583 "configure" | ||
4294 | +#line 12604 "configure" | ||
4295 | #include "confdefs.h" | ||
4296 | class X {private: virtual void never_called();}; | ||
4297 | int main() { | ||
4298 | X x; | ||
4299 | ; return 0; } | ||
4300 | EOF | ||
4301 | -if { (eval echo configure:12590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4302 | +if { (eval echo configure:12611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4303 | rm -rf conftest* | ||
4304 | ac_cv_cpp_unused_required=no | ||
4305 | else | ||
4306 | @@ -12609,12 +12630,12 @@ fi | ||
4307 | |||
4308 | |||
4309 | echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 | ||
4310 | -echo "configure:12613: checking for trouble comparing to zero near std::operator!=()" >&5 | ||
4311 | +echo "configure:12634: checking for trouble comparing to zero near std::operator!=()" >&5 | ||
4312 | if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then | ||
4313 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4314 | else | ||
4315 | cat > conftest.$ac_ext <<EOF | ||
4316 | -#line 12618 "configure" | ||
4317 | +#line 12639 "configure" | ||
4318 | #include "confdefs.h" | ||
4319 | #include <algorithm> | ||
4320 | template <class T> class Foo {}; | ||
4321 | @@ -12625,7 +12646,7 @@ int main() { | ||
4322 | Foo<int> f; return (0 != f); | ||
4323 | ; return 0; } | ||
4324 | EOF | ||
4325 | -if { (eval echo configure:12629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4326 | +if { (eval echo configure:12650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4327 | rm -rf conftest* | ||
4328 | ac_cv_trouble_comparing_to_zero=no | ||
4329 | else | ||
4330 | @@ -12652,19 +12673,19 @@ fi | ||
4331 | _SAVE_LDFLAGS=$LDFLAGS | ||
4332 | LDFLAGS="$LDFLAGS $DSO_PIC_CFLAGS $DSO_LDOPTS $MOZ_OPTIMIZE_LDFLAGS" | ||
4333 | echo $ac_n "checking for __thread keyword for TLS variables""... $ac_c" 1>&6 | ||
4334 | -echo "configure:12656: checking for __thread keyword for TLS variables" >&5 | ||
4335 | +echo "configure:12677: checking for __thread keyword for TLS variables" >&5 | ||
4336 | if eval "test \"`echo '$''{'ac_cv_thread_keyword'+set}'`\" = set"; then | ||
4337 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4338 | else | ||
4339 | cat > conftest.$ac_ext <<EOF | ||
4340 | -#line 12661 "configure" | ||
4341 | +#line 12682 "configure" | ||
4342 | #include "confdefs.h" | ||
4343 | __thread bool tlsIsMainThread = false; | ||
4344 | int main() { | ||
4345 | return tlsIsMainThread; | ||
4346 | ; return 0; } | ||
4347 | EOF | ||
4348 | -if { (eval echo configure:12668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4349 | +if { (eval echo configure:12689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4350 | rm -rf conftest* | ||
4351 | ac_cv_thread_keyword=yes | ||
4352 | else | ||
4353 | @@ -12701,19 +12722,19 @@ fi | ||
4354 | MALLOC_H= | ||
4355 | ac_safe=`echo "malloc.h" | sed 'y%./+-%__p_%'` | ||
4356 | echo $ac_n "checking for malloc.h""... $ac_c" 1>&6 | ||
4357 | -echo "configure:12705: checking for malloc.h" >&5 | ||
4358 | +echo "configure:12726: checking for malloc.h" >&5 | ||
4359 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
4360 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4361 | else | ||
4362 | cat > conftest.$ac_ext <<EOF | ||
4363 | -#line 12710 "configure" | ||
4364 | +#line 12731 "configure" | ||
4365 | #include "confdefs.h" | ||
4366 | #include <malloc.h> | ||
4367 | int main() { | ||
4368 | |||
4369 | ; return 0; } | ||
4370 | EOF | ||
4371 | -if { (eval echo configure:12717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4372 | +if { (eval echo configure:12738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4373 | rm -rf conftest* | ||
4374 | eval "ac_cv_header_$ac_safe=yes" | ||
4375 | else | ||
4376 | @@ -12736,19 +12757,19 @@ fi | ||
4377 | if test "$MALLOC_H" = ""; then | ||
4378 | ac_safe=`echo "malloc/malloc.h" | sed 'y%./+-%__p_%'` | ||
4379 | echo $ac_n "checking for malloc/malloc.h""... $ac_c" 1>&6 | ||
4380 | -echo "configure:12740: checking for malloc/malloc.h" >&5 | ||
4381 | +echo "configure:12761: checking for malloc/malloc.h" >&5 | ||
4382 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
4383 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4384 | else | ||
4385 | cat > conftest.$ac_ext <<EOF | ||
4386 | -#line 12745 "configure" | ||
4387 | +#line 12766 "configure" | ||
4388 | #include "confdefs.h" | ||
4389 | #include <malloc/malloc.h> | ||
4390 | int main() { | ||
4391 | |||
4392 | ; return 0; } | ||
4393 | EOF | ||
4394 | -if { (eval echo configure:12752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4395 | +if { (eval echo configure:12773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4396 | rm -rf conftest* | ||
4397 | eval "ac_cv_header_$ac_safe=yes" | ||
4398 | else | ||
4399 | @@ -12771,19 +12792,19 @@ fi | ||
4400 | if test "$MALLOC_H" = ""; then | ||
4401 | ac_safe=`echo "sys/malloc.h" | sed 'y%./+-%__p_%'` | ||
4402 | echo $ac_n "checking for sys/malloc.h""... $ac_c" 1>&6 | ||
4403 | -echo "configure:12775: checking for sys/malloc.h" >&5 | ||
4404 | +echo "configure:12796: checking for sys/malloc.h" >&5 | ||
4405 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
4406 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4407 | else | ||
4408 | cat > conftest.$ac_ext <<EOF | ||
4409 | -#line 12780 "configure" | ||
4410 | +#line 12801 "configure" | ||
4411 | #include "confdefs.h" | ||
4412 | #include <sys/malloc.h> | ||
4413 | int main() { | ||
4414 | |||
4415 | ; return 0; } | ||
4416 | EOF | ||
4417 | -if { (eval echo configure:12787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4418 | +if { (eval echo configure:12808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4419 | rm -rf conftest* | ||
4420 | eval "ac_cv_header_$ac_safe=yes" | ||
4421 | else | ||
4422 | @@ -12816,12 +12837,12 @@ MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" | ||
4423 | for ac_func in strndup posix_memalign memalign valloc | ||
4424 | do | ||
4425 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
4426 | -echo "configure:12820: checking for $ac_func" >&5 | ||
4427 | +echo "configure:12841: checking for $ac_func" >&5 | ||
4428 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
4429 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4430 | else | ||
4431 | cat > conftest.$ac_ext <<EOF | ||
4432 | -#line 12825 "configure" | ||
4433 | +#line 12846 "configure" | ||
4434 | #include "confdefs.h" | ||
4435 | /* System header to define __stub macros and hopefully few prototypes, | ||
4436 | which can conflict with char $ac_func(); below. */ | ||
4437 | @@ -12847,7 +12868,7 @@ $ac_func(); | ||
4438 | |||
4439 | ; return 0; } | ||
4440 | EOF | ||
4441 | -if { (eval echo configure:12851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4442 | +if { (eval echo configure:12872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4443 | rm -rf conftest* | ||
4444 | eval "ac_cv_func_$ac_func=yes" | ||
4445 | else | ||
4446 | @@ -12874,19 +12895,19 @@ done | ||
4447 | |||
4448 | |||
4449 | echo $ac_n "checking for __attribute__((always_inline))""... $ac_c" 1>&6 | ||
4450 | -echo "configure:12878: checking for __attribute__((always_inline))" >&5 | ||
4451 | +echo "configure:12899: checking for __attribute__((always_inline))" >&5 | ||
4452 | if eval "test \"`echo '$''{'ac_cv_attribute_always_inline'+set}'`\" = set"; then | ||
4453 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4454 | else | ||
4455 | cat > conftest.$ac_ext <<EOF | ||
4456 | -#line 12883 "configure" | ||
4457 | +#line 12904 "configure" | ||
4458 | #include "confdefs.h" | ||
4459 | inline void f(void) __attribute__((always_inline)); | ||
4460 | int main() { | ||
4461 | |||
4462 | ; return 0; } | ||
4463 | EOF | ||
4464 | -if { (eval echo configure:12890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4465 | +if { (eval echo configure:12911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4466 | rm -rf conftest* | ||
4467 | ac_cv_attribute_always_inline=yes | ||
4468 | else | ||
4469 | @@ -12901,19 +12922,19 @@ fi | ||
4470 | echo "$ac_t""$ac_cv_attribute_always_inline" 1>&6 | ||
4471 | |||
4472 | echo $ac_n "checking for __attribute__((malloc))""... $ac_c" 1>&6 | ||
4473 | -echo "configure:12905: checking for __attribute__((malloc))" >&5 | ||
4474 | +echo "configure:12926: checking for __attribute__((malloc))" >&5 | ||
4475 | if eval "test \"`echo '$''{'ac_cv_attribute_malloc'+set}'`\" = set"; then | ||
4476 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4477 | else | ||
4478 | cat > conftest.$ac_ext <<EOF | ||
4479 | -#line 12910 "configure" | ||
4480 | +#line 12931 "configure" | ||
4481 | #include "confdefs.h" | ||
4482 | void* f(int) __attribute__((malloc)); | ||
4483 | int main() { | ||
4484 | |||
4485 | ; return 0; } | ||
4486 | EOF | ||
4487 | -if { (eval echo configure:12917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4488 | +if { (eval echo configure:12938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4489 | rm -rf conftest* | ||
4490 | ac_cv_attribute_malloc=yes | ||
4491 | else | ||
4492 | @@ -12928,19 +12949,19 @@ fi | ||
4493 | echo "$ac_t""$ac_cv_attribute_malloc" 1>&6 | ||
4494 | |||
4495 | echo $ac_n "checking for __attribute__((warn_unused_result))""... $ac_c" 1>&6 | ||
4496 | -echo "configure:12932: checking for __attribute__((warn_unused_result))" >&5 | ||
4497 | +echo "configure:12953: checking for __attribute__((warn_unused_result))" >&5 | ||
4498 | if eval "test \"`echo '$''{'ac_cv_attribute_warn_unused'+set}'`\" = set"; then | ||
4499 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4500 | else | ||
4501 | cat > conftest.$ac_ext <<EOF | ||
4502 | -#line 12937 "configure" | ||
4503 | +#line 12958 "configure" | ||
4504 | #include "confdefs.h" | ||
4505 | int f(void) __attribute__((warn_unused_result)); | ||
4506 | int main() { | ||
4507 | |||
4508 | ; return 0; } | ||
4509 | EOF | ||
4510 | -if { (eval echo configure:12944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4511 | +if { (eval echo configure:12965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4512 | rm -rf conftest* | ||
4513 | ac_cv_attribute_warn_unused=yes | ||
4514 | else | ||
4515 | @@ -12955,19 +12976,19 @@ fi | ||
4516 | echo "$ac_t""$ac_cv_attribute_warn_unused" 1>&6 | ||
4517 | |||
4518 | echo $ac_n "checking for __attribute__((noreturn))""... $ac_c" 1>&6 | ||
4519 | -echo "configure:12959: checking for __attribute__((noreturn))" >&5 | ||
4520 | +echo "configure:12980: checking for __attribute__((noreturn))" >&5 | ||
4521 | if eval "test \"`echo '$''{'ac_cv_attribute_noreturn'+set}'`\" = set"; then | ||
4522 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4523 | else | ||
4524 | cat > conftest.$ac_ext <<EOF | ||
4525 | -#line 12964 "configure" | ||
4526 | +#line 12985 "configure" | ||
4527 | #include "confdefs.h" | ||
4528 | void f(void) __attribute__((noreturn)); | ||
4529 | int main() { | ||
4530 | |||
4531 | ; return 0; } | ||
4532 | EOF | ||
4533 | -if { (eval echo configure:12971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4534 | +if { (eval echo configure:12992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4535 | rm -rf conftest* | ||
4536 | ac_cv_attribute_noreturn=yes | ||
4537 | else | ||
4538 | @@ -12991,19 +13012,19 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
4539 | |||
4540 | |||
4541 | echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 | ||
4542 | -echo "configure:12995: checking for LC_MESSAGES" >&5 | ||
4543 | +echo "configure:13016: checking for LC_MESSAGES" >&5 | ||
4544 | if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then | ||
4545 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4546 | else | ||
4547 | cat > conftest.$ac_ext <<EOF | ||
4548 | -#line 13000 "configure" | ||
4549 | +#line 13021 "configure" | ||
4550 | #include "confdefs.h" | ||
4551 | #include <locale.h> | ||
4552 | int main() { | ||
4553 | int category = LC_MESSAGES; | ||
4554 | ; return 0; } | ||
4555 | EOF | ||
4556 | -if { (eval echo configure:13007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4557 | +if { (eval echo configure:13028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4558 | rm -rf conftest* | ||
4559 | ac_cv_i18n_lc_messages=yes | ||
4560 | else | ||
4561 | @@ -13026,12 +13047,12 @@ fi | ||
4562 | for ac_func in localeconv | ||
4563 | do | ||
4564 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
4565 | -echo "configure:13030: checking for $ac_func" >&5 | ||
4566 | +echo "configure:13051: checking for $ac_func" >&5 | ||
4567 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
4568 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4569 | else | ||
4570 | cat > conftest.$ac_ext <<EOF | ||
4571 | -#line 13035 "configure" | ||
4572 | +#line 13056 "configure" | ||
4573 | #include "confdefs.h" | ||
4574 | /* System header to define __stub macros and hopefully few prototypes, | ||
4575 | which can conflict with char $ac_func(); below. */ | ||
4576 | @@ -13054,7 +13075,7 @@ $ac_func(); | ||
4577 | |||
4578 | ; return 0; } | ||
4579 | EOF | ||
4580 | -if { (eval echo configure:13058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4581 | +if { (eval echo configure:13079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4582 | rm -rf conftest* | ||
4583 | eval "ac_cv_func_$ac_func=yes" | ||
4584 | else | ||
4585 | @@ -13173,6 +13194,7 @@ fi | ||
4586 | |||
4587 | if test -n "$LIBXUL_SDK"; then | ||
4588 | LIBXUL_DIST="$LIBXUL_SDK" | ||
4589 | + SKIP_LIBRARY_CHECKS=1 | ||
4590 | else | ||
4591 | LIBXUL_DIST="$MOZ_BUILD_ROOT/dist" | ||
4592 | fi | ||
4593 | @@ -13243,7 +13265,7 @@ fi | ||
4594 | # Extract the first word of "nspr-config", so it can be a program name with args. | ||
4595 | set dummy nspr-config; ac_word=$2 | ||
4596 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
4597 | -echo "configure:13247: checking for $ac_word" >&5 | ||
4598 | +echo "configure:13269: checking for $ac_word" >&5 | ||
4599 | if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then | ||
4600 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4601 | else | ||
4602 | @@ -13278,7 +13300,7 @@ fi | ||
4603 | |||
4604 | min_nspr_version=4.8.8 | ||
4605 | echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6 | ||
4606 | -echo "configure:13282: checking for NSPR - version >= $min_nspr_version" >&5 | ||
4607 | +echo "configure:13304: checking for NSPR - version >= $min_nspr_version" >&5 | ||
4608 | |||
4609 | no_nspr="" | ||
4610 | if test "$NSPR_CONFIG" != "no"; then | ||
4611 | @@ -13337,7 +13359,7 @@ if test -n "$MOZ_NATIVE_NSPR"; then | ||
4612 | _SAVE_CFLAGS=$CFLAGS | ||
4613 | CFLAGS="$CFLAGS $NSPR_CFLAGS" | ||
4614 | cat > conftest.$ac_ext <<EOF | ||
4615 | -#line 13341 "configure" | ||
4616 | +#line 13363 "configure" | ||
4617 | #include "confdefs.h" | ||
4618 | #include "prtypes.h" | ||
4619 | int main() { | ||
4620 | @@ -13346,7 +13368,7 @@ int main() { | ||
4621 | #endif | ||
4622 | ; return 0; } | ||
4623 | EOF | ||
4624 | -if { (eval echo configure:13350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4625 | +if { (eval echo configure:13372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4626 | rm -rf conftest* | ||
4627 | MOZ_NATIVE_NSPR=1 | ||
4628 | else | ||
4629 | @@ -13358,6 +13380,10 @@ fi | ||
4630 | rm -f conftest* | ||
4631 | CFLAGS=$_SAVE_CFLAGS | ||
4632 | else | ||
4633 | + if test -n "$LIBXUL_SDK"; then | ||
4634 | + NSPR_CFLAGS="-I$LIBXUL_SDK_DIR/sdk/include" | ||
4635 | + NSPR_LIBS="-L$LIBXUL_SDK_DIR/sdk/lib -lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION" | ||
4636 | + else | ||
4637 | if test "$OS_ARCH" = "WINNT"; then | ||
4638 | NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr" | ||
4639 | if test -n "$GNU_CC"; then | ||
4640 | @@ -13369,6 +13395,7 @@ else | ||
4641 | NSPR_CFLAGS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --includedir='${LIBXUL_DIST}'/include/nspr --cflags`' | ||
4642 | NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' | ||
4643 | fi | ||
4644 | + fi | ||
4645 | fi | ||
4646 | |||
4647 | # Check whether --with-system-libevent or --without-system-libevent was given. | ||
4648 | @@ -13391,19 +13418,19 @@ else | ||
4649 | LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" | ||
4650 | ac_safe=`echo "event.h" | sed 'y%./+-%__p_%'` | ||
4651 | echo $ac_n "checking for event.h""... $ac_c" 1>&6 | ||
4652 | -echo "configure:13395: checking for event.h" >&5 | ||
4653 | +echo "configure:13422: checking for event.h" >&5 | ||
4654 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
4655 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4656 | else | ||
4657 | cat > conftest.$ac_ext <<EOF | ||
4658 | -#line 13400 "configure" | ||
4659 | +#line 13427 "configure" | ||
4660 | #include "confdefs.h" | ||
4661 | #include <event.h> | ||
4662 | int main() { | ||
4663 | |||
4664 | ; return 0; } | ||
4665 | EOF | ||
4666 | -if { (eval echo configure:13407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4667 | +if { (eval echo configure:13434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4668 | rm -rf conftest* | ||
4669 | eval "ac_cv_header_$ac_safe=yes" | ||
4670 | else | ||
4671 | @@ -13426,7 +13453,7 @@ fi | ||
4672 | fi | ||
4673 | |||
4674 | echo $ac_n "checking for event_init in -levent""... $ac_c" 1>&6 | ||
4675 | -echo "configure:13430: checking for event_init in -levent" >&5 | ||
4676 | +echo "configure:13457: checking for event_init in -levent" >&5 | ||
4677 | ac_lib_var=`echo event'_'event_init | sed 'y%./+-%__p_%'` | ||
4678 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
4679 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4680 | @@ -13434,7 +13461,7 @@ else | ||
4681 | ac_save_LIBS="$LIBS" | ||
4682 | LIBS="-levent $LIBS" | ||
4683 | cat > conftest.$ac_ext <<EOF | ||
4684 | -#line 13438 "configure" | ||
4685 | +#line 13465 "configure" | ||
4686 | #include "confdefs.h" | ||
4687 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
4688 | /* We use char because int might match the return type of a gcc2 | ||
4689 | @@ -13445,7 +13472,7 @@ int main() { | ||
4690 | event_init() | ||
4691 | ; return 0; } | ||
4692 | EOF | ||
4693 | -if { (eval echo configure:13449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4694 | +if { (eval echo configure:13476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4695 | rm -rf conftest* | ||
4696 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
4697 | else | ||
4698 | @@ -13528,7 +13555,7 @@ fi | ||
4699 | # Extract the first word of "nss-config", so it can be a program name with args. | ||
4700 | set dummy nss-config; ac_word=$2 | ||
4701 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
4702 | -echo "configure:13532: checking for $ac_word" >&5 | ||
4703 | +echo "configure:13559: checking for $ac_word" >&5 | ||
4704 | if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then | ||
4705 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4706 | else | ||
4707 | @@ -13563,7 +13590,7 @@ fi | ||
4708 | |||
4709 | min_nss_version=3.13.1 | ||
4710 | echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6 | ||
4711 | -echo "configure:13567: checking for NSS - version >= $min_nss_version" >&5 | ||
4712 | +echo "configure:13594: checking for NSS - version >= $min_nss_version" >&5 | ||
4713 | |||
4714 | no_nss="" | ||
4715 | if test "$NSS_CONFIG" = "no"; then | ||
4716 | @@ -13636,13 +13663,13 @@ fi | ||
4717 | |||
4718 | |||
4719 | echo $ac_n "checking for YASM assembler""... $ac_c" 1>&6 | ||
4720 | -echo "configure:13640: checking for YASM assembler" >&5 | ||
4721 | +echo "configure:13667: checking for YASM assembler" >&5 | ||
4722 | for ac_prog in yasm | ||
4723 | do | ||
4724 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
4725 | set dummy $ac_prog; ac_word=$2 | ||
4726 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
4727 | -echo "configure:13646: checking for $ac_word" >&5 | ||
4728 | +echo "configure:13673: checking for $ac_word" >&5 | ||
4729 | if eval "test \"`echo '$''{'ac_cv_prog_YASM'+set}'`\" = set"; then | ||
4730 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4731 | else | ||
4732 | @@ -13704,7 +13731,7 @@ if test -z "$JPEG_DIR" -o "$JPEG_DIR" = no; then | ||
4733 | SYSTEM_JPEG= | ||
4734 | else | ||
4735 | echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 | ||
4736 | -echo "configure:13708: checking for jpeg_destroy_compress in -ljpeg" >&5 | ||
4737 | +echo "configure:13735: checking for jpeg_destroy_compress in -ljpeg" >&5 | ||
4738 | ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` | ||
4739 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
4740 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4741 | @@ -13712,7 +13739,7 @@ else | ||
4742 | ac_save_LIBS="$LIBS" | ||
4743 | LIBS="-ljpeg $JPEG_LIBS $LIBS" | ||
4744 | cat > conftest.$ac_ext <<EOF | ||
4745 | -#line 13716 "configure" | ||
4746 | +#line 13743 "configure" | ||
4747 | #include "confdefs.h" | ||
4748 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
4749 | /* We use char because int might match the return type of a gcc2 | ||
4750 | @@ -13723,7 +13750,7 @@ int main() { | ||
4751 | jpeg_destroy_compress() | ||
4752 | ; return 0; } | ||
4753 | EOF | ||
4754 | -if { (eval echo configure:13727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4755 | +if { (eval echo configure:13754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4756 | rm -rf conftest* | ||
4757 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
4758 | else | ||
4759 | @@ -13746,10 +13773,10 @@ fi | ||
4760 | |||
4761 | fi | ||
4762 | |||
4763 | -if test "$SYSTEM_JPEG" = 1; then | ||
4764 | +if test "$SYSTEM_JPEG" = 0; then | ||
4765 | LIBS="$JPEG_LIBS $LIBS" | ||
4766 | cat > conftest.$ac_ext <<EOF | ||
4767 | -#line 13753 "configure" | ||
4768 | +#line 13780 "configure" | ||
4769 | #include "confdefs.h" | ||
4770 | #include <stdio.h> | ||
4771 | #include <sys/types.h> | ||
4772 | @@ -13760,7 +13787,7 @@ int main() { | ||
4773 | #endif | ||
4774 | ; return 0; } | ||
4775 | EOF | ||
4776 | -if { (eval echo configure:13764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4777 | +if { (eval echo configure:13791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4778 | rm -rf conftest* | ||
4779 | SYSTEM_JPEG=1 | ||
4780 | else | ||
4781 | @@ -13798,7 +13825,7 @@ if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then | ||
4782 | SYSTEM_ZLIB= | ||
4783 | else | ||
4784 | echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 | ||
4785 | -echo "configure:13802: checking for gzread in -lz" >&5 | ||
4786 | +echo "configure:13829: checking for gzread in -lz" >&5 | ||
4787 | ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` | ||
4788 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
4789 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4790 | @@ -13806,7 +13833,7 @@ else | ||
4791 | ac_save_LIBS="$LIBS" | ||
4792 | LIBS="-lz $ZLIB_LIBS $LIBS" | ||
4793 | cat > conftest.$ac_ext <<EOF | ||
4794 | -#line 13810 "configure" | ||
4795 | +#line 13837 "configure" | ||
4796 | #include "confdefs.h" | ||
4797 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
4798 | /* We use char because int might match the return type of a gcc2 | ||
4799 | @@ -13817,7 +13844,7 @@ int main() { | ||
4800 | gzread() | ||
4801 | ; return 0; } | ||
4802 | EOF | ||
4803 | -if { (eval echo configure:13821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4804 | +if { (eval echo configure:13848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4805 | rm -rf conftest* | ||
4806 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
4807 | else | ||
4808 | @@ -13839,10 +13866,10 @@ SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS= | ||
4809 | fi | ||
4810 | |||
4811 | fi | ||
4812 | -if test "$SYSTEM_ZLIB" = 1; then | ||
4813 | +if test "$SYSTEM_ZLIB" = 0; then | ||
4814 | LIBS="$ZLIB_LIBS $LIBS" | ||
4815 | cat > conftest.$ac_ext <<EOF | ||
4816 | -#line 13846 "configure" | ||
4817 | +#line 13873 "configure" | ||
4818 | #include "confdefs.h" | ||
4819 | #include <stdio.h> | ||
4820 | #include <string.h> | ||
4821 | @@ -13853,7 +13880,7 @@ int main() { | ||
4822 | #endif | ||
4823 | ; return 0; } | ||
4824 | EOF | ||
4825 | -if { (eval echo configure:13857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4826 | +if { (eval echo configure:13884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4827 | rm -rf conftest* | ||
4828 | SYSTEM_ZLIB=1 | ||
4829 | else | ||
4830 | @@ -13891,7 +13918,7 @@ if test -z "$BZ2_DIR" -o "$BZ2_DIR" = no; then | ||
4831 | SYSTEM_BZ2= | ||
4832 | else | ||
4833 | echo $ac_n "checking for BZ2_bzread in -lbz2""... $ac_c" 1>&6 | ||
4834 | -echo "configure:13895: checking for BZ2_bzread in -lbz2" >&5 | ||
4835 | +echo "configure:13922: checking for BZ2_bzread in -lbz2" >&5 | ||
4836 | ac_lib_var=`echo bz2'_'BZ2_bzread | sed 'y%./+-%__p_%'` | ||
4837 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
4838 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4839 | @@ -13899,7 +13926,7 @@ else | ||
4840 | ac_save_LIBS="$LIBS" | ||
4841 | LIBS="-lbz2 $LIBS" | ||
4842 | cat > conftest.$ac_ext <<EOF | ||
4843 | -#line 13903 "configure" | ||
4844 | +#line 13930 "configure" | ||
4845 | #include "confdefs.h" | ||
4846 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
4847 | /* We use char because int might match the return type of a gcc2 | ||
4848 | @@ -13910,7 +13937,7 @@ int main() { | ||
4849 | BZ2_bzread() | ||
4850 | ; return 0; } | ||
4851 | EOF | ||
4852 | -if { (eval echo configure:13914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4853 | +if { (eval echo configure:13941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4854 | rm -rf conftest* | ||
4855 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
4856 | else | ||
4857 | @@ -13962,7 +13989,7 @@ if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then | ||
4858 | else | ||
4859 | _SAVE_PNG_LIBS=$PNG_LIBS | ||
4860 | echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 | ||
4861 | -echo "configure:13966: checking for png_get_valid in -lpng" >&5 | ||
4862 | +echo "configure:13993: checking for png_get_valid in -lpng" >&5 | ||
4863 | ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` | ||
4864 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
4865 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4866 | @@ -13970,7 +13997,7 @@ else | ||
4867 | ac_save_LIBS="$LIBS" | ||
4868 | LIBS="-lpng $PNG_LIBS $LIBS" | ||
4869 | cat > conftest.$ac_ext <<EOF | ||
4870 | -#line 13974 "configure" | ||
4871 | +#line 14001 "configure" | ||
4872 | #include "confdefs.h" | ||
4873 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
4874 | /* We use char because int might match the return type of a gcc2 | ||
4875 | @@ -13981,7 +14008,7 @@ int main() { | ||
4876 | png_get_valid() | ||
4877 | ; return 0; } | ||
4878 | EOF | ||
4879 | -if { (eval echo configure:13985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4880 | +if { (eval echo configure:14012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4881 | rm -rf conftest* | ||
4882 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
4883 | else | ||
4884 | @@ -14003,7 +14030,7 @@ else | ||
4885 | fi | ||
4886 | |||
4887 | echo $ac_n "checking for png_get_acTL in -lpng""... $ac_c" 1>&6 | ||
4888 | -echo "configure:14007: checking for png_get_acTL in -lpng" >&5 | ||
4889 | +echo "configure:14034: checking for png_get_acTL in -lpng" >&5 | ||
4890 | ac_lib_var=`echo png'_'png_get_acTL | sed 'y%./+-%__p_%'` | ||
4891 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
4892 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4893 | @@ -14011,7 +14038,7 @@ else | ||
4894 | ac_save_LIBS="$LIBS" | ||
4895 | LIBS="-lpng $_SAVE_PNG_LIBS $LIBS" | ||
4896 | cat > conftest.$ac_ext <<EOF | ||
4897 | -#line 14015 "configure" | ||
4898 | +#line 14042 "configure" | ||
4899 | #include "confdefs.h" | ||
4900 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
4901 | /* We use char because int might match the return type of a gcc2 | ||
4902 | @@ -14022,7 +14049,7 @@ int main() { | ||
4903 | png_get_acTL() | ||
4904 | ; return 0; } | ||
4905 | EOF | ||
4906 | -if { (eval echo configure:14026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4907 | +if { (eval echo configure:14053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
4908 | rm -rf conftest* | ||
4909 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
4910 | else | ||
4911 | @@ -14051,10 +14078,10 @@ else | ||
4912 | fi | ||
4913 | |||
4914 | fi | ||
4915 | -if test "$SYSTEM_PNG" = 1; then | ||
4916 | +if test "$SYSTEM_PNG" = 0; then | ||
4917 | LIBS="$PNG_LIBS $LIBS" | ||
4918 | cat > conftest.$ac_ext <<EOF | ||
4919 | -#line 14058 "configure" | ||
4920 | +#line 14085 "configure" | ||
4921 | #include "confdefs.h" | ||
4922 | #include <stdio.h> | ||
4923 | #include <sys/types.h> | ||
4924 | @@ -14068,7 +14095,7 @@ int main() { | ||
4925 | #endif | ||
4926 | ; return 0; } | ||
4927 | EOF | ||
4928 | -if { (eval echo configure:14072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4929 | +if { (eval echo configure:14099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
4930 | rm -rf conftest* | ||
4931 | SYSTEM_PNG=1 | ||
4932 | else | ||
4933 | @@ -14110,7 +14137,7 @@ if test -n "$SYSTEM_HUNSPELL"; then | ||
4934 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
4935 | set dummy pkg-config; ac_word=$2 | ||
4936 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
4937 | -echo "configure:14114: checking for $ac_word" >&5 | ||
4938 | +echo "configure:14141: checking for $ac_word" >&5 | ||
4939 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
4940 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4941 | else | ||
4942 | @@ -14154,19 +14181,19 @@ fi | ||
4943 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
4944 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
4945 | echo $ac_n "checking for hunspell""... $ac_c" 1>&6 | ||
4946 | -echo "configure:14158: checking for hunspell" >&5 | ||
4947 | +echo "configure:14185: checking for hunspell" >&5 | ||
4948 | |||
4949 | if $PKG_CONFIG --exists "hunspell" ; then | ||
4950 | echo "$ac_t""yes" 1>&6 | ||
4951 | succeeded=yes | ||
4952 | |||
4953 | echo $ac_n "checking MOZ_HUNSPELL_CFLAGS""... $ac_c" 1>&6 | ||
4954 | -echo "configure:14165: checking MOZ_HUNSPELL_CFLAGS" >&5 | ||
4955 | +echo "configure:14192: checking MOZ_HUNSPELL_CFLAGS" >&5 | ||
4956 | MOZ_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` | ||
4957 | echo "$ac_t""$MOZ_HUNSPELL_CFLAGS" 1>&6 | ||
4958 | |||
4959 | echo $ac_n "checking MOZ_HUNSPELL_LIBS""... $ac_c" 1>&6 | ||
4960 | -echo "configure:14170: checking MOZ_HUNSPELL_LIBS" >&5 | ||
4961 | +echo "configure:14197: checking MOZ_HUNSPELL_LIBS" >&5 | ||
4962 | ## Remove evil flags like -Wl,--export-dynamic | ||
4963 | MOZ_HUNSPELL_LIBS="`$PKG_CONFIG --libs \"hunspell\" |sed s/-Wl,--export-dynamic//g`" | ||
4964 | echo "$ac_t""$MOZ_HUNSPELL_LIBS" 1>&6 | ||
4965 | @@ -14222,7 +14249,7 @@ if test -n "$MOZ_NATIVE_FFI"; then | ||
4966 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
4967 | set dummy pkg-config; ac_word=$2 | ||
4968 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
4969 | -echo "configure:14226: checking for $ac_word" >&5 | ||
4970 | +echo "configure:14253: checking for $ac_word" >&5 | ||
4971 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
4972 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
4973 | else | ||
4974 | @@ -14266,19 +14293,19 @@ fi | ||
4975 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
4976 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
4977 | echo $ac_n "checking for libffi > 3.0.9""... $ac_c" 1>&6 | ||
4978 | -echo "configure:14270: checking for libffi > 3.0.9" >&5 | ||
4979 | +echo "configure:14297: checking for libffi > 3.0.9" >&5 | ||
4980 | |||
4981 | if $PKG_CONFIG --exists "libffi > 3.0.9" ; then | ||
4982 | echo "$ac_t""yes" 1>&6 | ||
4983 | succeeded=yes | ||
4984 | |||
4985 | echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 | ||
4986 | -echo "configure:14277: checking MOZ_FFI_CFLAGS" >&5 | ||
4987 | +echo "configure:14304: checking MOZ_FFI_CFLAGS" >&5 | ||
4988 | MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi > 3.0.9"` | ||
4989 | echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 | ||
4990 | |||
4991 | echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 | ||
4992 | -echo "configure:14282: checking MOZ_FFI_LIBS" >&5 | ||
4993 | +echo "configure:14309: checking MOZ_FFI_LIBS" >&5 | ||
4994 | ## Remove evil flags like -Wl,--export-dynamic | ||
4995 | MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi > 3.0.9\" |sed s/-Wl,--export-dynamic//g`" | ||
4996 | echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 | ||
4997 | @@ -14314,7 +14341,7 @@ echo "configure:14282: checking MOZ_FFI_LIBS" >&5 | ||
4998 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
4999 | set dummy pkg-config; ac_word=$2 | ||
5000 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5001 | -echo "configure:14318: checking for $ac_word" >&5 | ||
5002 | +echo "configure:14345: checking for $ac_word" >&5 | ||
5003 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5004 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5005 | else | ||
5006 | @@ -14358,19 +14385,19 @@ fi | ||
5007 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5008 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5009 | echo $ac_n "checking for libffi >= 3.0.9""... $ac_c" 1>&6 | ||
5010 | -echo "configure:14362: checking for libffi >= 3.0.9" >&5 | ||
5011 | +echo "configure:14389: checking for libffi >= 3.0.9" >&5 | ||
5012 | |||
5013 | if $PKG_CONFIG --exists "libffi >= 3.0.9" ; then | ||
5014 | echo "$ac_t""yes" 1>&6 | ||
5015 | succeeded=yes | ||
5016 | |||
5017 | echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 | ||
5018 | -echo "configure:14369: checking MOZ_FFI_CFLAGS" >&5 | ||
5019 | +echo "configure:14396: checking MOZ_FFI_CFLAGS" >&5 | ||
5020 | MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0.9"` | ||
5021 | echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 | ||
5022 | |||
5023 | echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 | ||
5024 | -echo "configure:14374: checking MOZ_FFI_LIBS" >&5 | ||
5025 | +echo "configure:14401: checking MOZ_FFI_LIBS" >&5 | ||
5026 | ## Remove evil flags like -Wl,--export-dynamic | ||
5027 | MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi >= 3.0.9\" |sed s/-Wl,--export-dynamic//g`" | ||
5028 | echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 | ||
5029 | @@ -14542,7 +14569,7 @@ fi | ||
5030 | |||
5031 | |||
5032 | echo $ac_n "checking for application to build""... $ac_c" 1>&6 | ||
5033 | -echo "configure:14546: checking for application to build" >&5 | ||
5034 | +echo "configure:14573: checking for application to build" >&5 | ||
5035 | if test -z "$MOZ_BUILD_APP"; then | ||
5036 | echo "$ac_t""browser" 1>&6 | ||
5037 | MOZ_BUILD_APP=browser | ||
5038 | @@ -14560,7 +14587,7 @@ fi | ||
5039 | # Allow the application to influence configure with a confvars.sh script. | ||
5040 | |||
5041 | echo $ac_n "checking if app-specific confvars.sh exists""... $ac_c" 1>&6 | ||
5042 | -echo "configure:14564: checking if app-specific confvars.sh exists" >&5 | ||
5043 | +echo "configure:14591: checking if app-specific confvars.sh exists" >&5 | ||
5044 | if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then | ||
5045 | echo "$ac_t""${srcdir}/${MOZ_BUILD_APP}/confvars.sh" 1>&6 | ||
5046 | . "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" | ||
5047 | @@ -14828,7 +14855,7 @@ if test "$COMPILE_ENVIRONMENT"; then | ||
5048 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5049 | set dummy pkg-config; ac_word=$2 | ||
5050 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5051 | -echo "configure:14832: checking for $ac_word" >&5 | ||
5052 | +echo "configure:14859: checking for $ac_word" >&5 | ||
5053 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5054 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5055 | else | ||
5056 | @@ -14872,19 +14899,19 @@ fi | ||
5057 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5058 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5059 | echo $ac_n "checking for directfb >= 1.1.0""... $ac_c" 1>&6 | ||
5060 | -echo "configure:14876: checking for directfb >= 1.1.0" >&5 | ||
5061 | +echo "configure:14903: checking for directfb >= 1.1.0" >&5 | ||
5062 | |||
5063 | if $PKG_CONFIG --exists "directfb >= 1.1.0" ; then | ||
5064 | echo "$ac_t""yes" 1>&6 | ||
5065 | succeeded=yes | ||
5066 | |||
5067 | echo $ac_n "checking MOZ_DFB_CFLAGS""... $ac_c" 1>&6 | ||
5068 | -echo "configure:14883: checking MOZ_DFB_CFLAGS" >&5 | ||
5069 | +echo "configure:14910: checking MOZ_DFB_CFLAGS" >&5 | ||
5070 | MOZ_DFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= 1.1.0"` | ||
5071 | echo "$ac_t""$MOZ_DFB_CFLAGS" 1>&6 | ||
5072 | |||
5073 | echo $ac_n "checking MOZ_DFB_LIBS""... $ac_c" 1>&6 | ||
5074 | -echo "configure:14888: checking MOZ_DFB_LIBS" >&5 | ||
5075 | +echo "configure:14915: checking MOZ_DFB_LIBS" >&5 | ||
5076 | ## Remove evil flags like -Wl,--export-dynamic | ||
5077 | MOZ_DFB_LIBS="`$PKG_CONFIG --libs \"directfb >= 1.1.0\" |sed s/-Wl,--export-dynamic//g`" | ||
5078 | echo "$ac_t""$MOZ_DFB_LIBS" 1>&6 | ||
5079 | @@ -14922,7 +14949,7 @@ echo "configure:14888: checking MOZ_DFB_LIBS" >&5 | ||
5080 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5081 | set dummy pkg-config; ac_word=$2 | ||
5082 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5083 | -echo "configure:14926: checking for $ac_word" >&5 | ||
5084 | +echo "configure:14953: checking for $ac_word" >&5 | ||
5085 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5086 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5087 | else | ||
5088 | @@ -14966,19 +14993,19 @@ fi | ||
5089 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5090 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5091 | echo $ac_n "checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES""... $ac_c" 1>&6 | ||
5092 | -echo "configure:14970: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES" >&5 | ||
5093 | +echo "configure:14997: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES" >&5 | ||
5094 | |||
5095 | if $PKG_CONFIG --exists "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES" ; then | ||
5096 | echo "$ac_t""yes" 1>&6 | ||
5097 | succeeded=yes | ||
5098 | |||
5099 | echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 | ||
5100 | -echo "configure:14977: checking MOZ_GTK2_CFLAGS" >&5 | ||
5101 | +echo "configure:15004: checking MOZ_GTK2_CFLAGS" >&5 | ||
5102 | MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES"` | ||
5103 | echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 | ||
5104 | |||
5105 | echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 | ||
5106 | -echo "configure:14982: checking MOZ_GTK2_LIBS" >&5 | ||
5107 | +echo "configure:15009: checking MOZ_GTK2_LIBS" >&5 | ||
5108 | ## Remove evil flags like -Wl,--export-dynamic | ||
5109 | MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES\" |sed s/-Wl,--export-dynamic//g`" | ||
5110 | echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 | ||
5111 | @@ -15033,6 +15060,7 @@ EOF | ||
5112 | fi | ||
5113 | |||
5114 | |||
5115 | +if test -z "$LIBXUL_SDK"; then | ||
5116 | if test "$MOZ_ENABLE_GTK2" | ||
5117 | then | ||
5118 | MOZ_ENABLE_STARTUP_NOTIFICATION= | ||
5119 | @@ -15057,7 +15085,7 @@ fi | ||
5120 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5121 | set dummy pkg-config; ac_word=$2 | ||
5122 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5123 | -echo "configure:15061: checking for $ac_word" >&5 | ||
5124 | +echo "configure:15089: checking for $ac_word" >&5 | ||
5125 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5126 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5127 | else | ||
5128 | @@ -15101,19 +15129,19 @@ fi | ||
5129 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5130 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5131 | echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6 | ||
5132 | -echo "configure:15105: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 | ||
5133 | +echo "configure:15133: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 | ||
5134 | |||
5135 | if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then | ||
5136 | echo "$ac_t""yes" 1>&6 | ||
5137 | succeeded=yes | ||
5138 | |||
5139 | echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6 | ||
5140 | -echo "configure:15112: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 | ||
5141 | +echo "configure:15140: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 | ||
5142 | MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"` | ||
5143 | echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6 | ||
5144 | |||
5145 | echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6 | ||
5146 | -echo "configure:15117: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 | ||
5147 | +echo "configure:15145: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 | ||
5148 | ## Remove evil flags like -Wl,--export-dynamic | ||
5149 | MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
5150 | echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6 | ||
5151 | @@ -15159,6 +15187,7 @@ EOF | ||
5152 | |||
5153 | TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS" | ||
5154 | fi | ||
5155 | +fi | ||
5156 | |||
5157 | |||
5158 | |||
5159 | @@ -15179,7 +15208,7 @@ fi | ||
5160 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5161 | set dummy pkg-config; ac_word=$2 | ||
5162 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5163 | -echo "configure:15183: checking for $ac_word" >&5 | ||
5164 | +echo "configure:15212: checking for $ac_word" >&5 | ||
5165 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5166 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5167 | else | ||
5168 | @@ -15223,19 +15252,19 @@ fi | ||
5169 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5170 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5171 | echo $ac_n "checking for QtGui QtNetwork QtCore QtOpenGL""... $ac_c" 1>&6 | ||
5172 | -echo "configure:15227: checking for QtGui QtNetwork QtCore QtOpenGL" >&5 | ||
5173 | +echo "configure:15256: checking for QtGui QtNetwork QtCore QtOpenGL" >&5 | ||
5174 | |||
5175 | if $PKG_CONFIG --exists "QtGui QtNetwork QtCore QtOpenGL" ; then | ||
5176 | echo "$ac_t""yes" 1>&6 | ||
5177 | succeeded=yes | ||
5178 | |||
5179 | echo $ac_n "checking MOZ_QT_CFLAGS""... $ac_c" 1>&6 | ||
5180 | -echo "configure:15234: checking MOZ_QT_CFLAGS" >&5 | ||
5181 | +echo "configure:15263: checking MOZ_QT_CFLAGS" >&5 | ||
5182 | MOZ_QT_CFLAGS=`$PKG_CONFIG --cflags "QtGui QtNetwork QtCore QtOpenGL"` | ||
5183 | echo "$ac_t""$MOZ_QT_CFLAGS" 1>&6 | ||
5184 | |||
5185 | echo $ac_n "checking MOZ_QT_LIBS""... $ac_c" 1>&6 | ||
5186 | -echo "configure:15239: checking MOZ_QT_LIBS" >&5 | ||
5187 | +echo "configure:15268: checking MOZ_QT_LIBS" >&5 | ||
5188 | ## Remove evil flags like -Wl,--export-dynamic | ||
5189 | MOZ_QT_LIBS="`$PKG_CONFIG --libs \"QtGui QtNetwork QtCore QtOpenGL\" |sed s/-Wl,--export-dynamic//g`" | ||
5190 | echo "$ac_t""$MOZ_QT_LIBS" 1>&6 | ||
5191 | @@ -15269,7 +15298,7 @@ do | ||
5192 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
5193 | set dummy $ac_prog; ac_word=$2 | ||
5194 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5195 | -echo "configure:15273: checking for $ac_word" >&5 | ||
5196 | +echo "configure:15302: checking for $ac_word" >&5 | ||
5197 | if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then | ||
5198 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5199 | else | ||
5200 | @@ -15324,7 +15353,7 @@ incorrect" 1>&2; exit 1; } | ||
5201 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5202 | set dummy pkg-config; ac_word=$2 | ||
5203 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5204 | -echo "configure:15328: checking for $ac_word" >&5 | ||
5205 | +echo "configure:15357: checking for $ac_word" >&5 | ||
5206 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5207 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5208 | else | ||
5209 | @@ -15368,19 +15397,19 @@ fi | ||
5210 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5211 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5212 | echo $ac_n "checking for qmsystem2""... $ac_c" 1>&6 | ||
5213 | -echo "configure:15372: checking for qmsystem2" >&5 | ||
5214 | +echo "configure:15401: checking for qmsystem2" >&5 | ||
5215 | |||
5216 | if $PKG_CONFIG --exists "qmsystem2" ; then | ||
5217 | echo "$ac_t""yes" 1>&6 | ||
5218 | succeeded=yes | ||
5219 | |||
5220 | echo $ac_n "checking _QMSYSTEM2_CFLAGS""... $ac_c" 1>&6 | ||
5221 | -echo "configure:15379: checking _QMSYSTEM2_CFLAGS" >&5 | ||
5222 | +echo "configure:15408: checking _QMSYSTEM2_CFLAGS" >&5 | ||
5223 | _QMSYSTEM2_CFLAGS=`$PKG_CONFIG --cflags "qmsystem2"` | ||
5224 | echo "$ac_t""$_QMSYSTEM2_CFLAGS" 1>&6 | ||
5225 | |||
5226 | echo $ac_n "checking _QMSYSTEM2_LIBS""... $ac_c" 1>&6 | ||
5227 | -echo "configure:15384: checking _QMSYSTEM2_LIBS" >&5 | ||
5228 | +echo "configure:15413: checking _QMSYSTEM2_LIBS" >&5 | ||
5229 | ## Remove evil flags like -Wl,--export-dynamic | ||
5230 | _QMSYSTEM2_LIBS="`$PKG_CONFIG --libs \"qmsystem2\" |sed s/-Wl,--export-dynamic//g`" | ||
5231 | echo "$ac_t""$_QMSYSTEM2_LIBS" 1>&6 | ||
5232 | @@ -15427,7 +15456,7 @@ EOF | ||
5233 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5234 | set dummy pkg-config; ac_word=$2 | ||
5235 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5236 | -echo "configure:15431: checking for $ac_word" >&5 | ||
5237 | +echo "configure:15460: checking for $ac_word" >&5 | ||
5238 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5239 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5240 | else | ||
5241 | @@ -15471,19 +15500,19 @@ fi | ||
5242 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5243 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5244 | echo $ac_n "checking for QtNetwork >= 4.7""... $ac_c" 1>&6 | ||
5245 | -echo "configure:15475: checking for QtNetwork >= 4.7" >&5 | ||
5246 | +echo "configure:15504: checking for QtNetwork >= 4.7" >&5 | ||
5247 | |||
5248 | if $PKG_CONFIG --exists "QtNetwork >= 4.7" ; then | ||
5249 | echo "$ac_t""yes" 1>&6 | ||
5250 | succeeded=yes | ||
5251 | |||
5252 | echo $ac_n "checking _QTNETWORK_CFLAGS""... $ac_c" 1>&6 | ||
5253 | -echo "configure:15482: checking _QTNETWORK_CFLAGS" >&5 | ||
5254 | +echo "configure:15511: checking _QTNETWORK_CFLAGS" >&5 | ||
5255 | _QTNETWORK_CFLAGS=`$PKG_CONFIG --cflags "QtNetwork >= 4.7"` | ||
5256 | echo "$ac_t""$_QTNETWORK_CFLAGS" 1>&6 | ||
5257 | |||
5258 | echo $ac_n "checking _QTNETWORK_LIBS""... $ac_c" 1>&6 | ||
5259 | -echo "configure:15487: checking _QTNETWORK_LIBS" >&5 | ||
5260 | +echo "configure:15516: checking _QTNETWORK_LIBS" >&5 | ||
5261 | ## Remove evil flags like -Wl,--export-dynamic | ||
5262 | _QTNETWORK_LIBS="`$PKG_CONFIG --libs \"QtNetwork >= 4.7\" |sed s/-Wl,--export-dynamic//g`" | ||
5263 | echo "$ac_t""$_QTNETWORK_LIBS" 1>&6 | ||
5264 | @@ -15528,7 +15557,7 @@ EOF | ||
5265 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5266 | set dummy pkg-config; ac_word=$2 | ||
5267 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5268 | -echo "configure:15532: checking for $ac_word" >&5 | ||
5269 | +echo "configure:15561: checking for $ac_word" >&5 | ||
5270 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5271 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5272 | else | ||
5273 | @@ -15572,19 +15601,19 @@ fi | ||
5274 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5275 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5276 | echo $ac_n "checking for QtSensors QtFeedback QtLocation""... $ac_c" 1>&6 | ||
5277 | -echo "configure:15576: checking for QtSensors QtFeedback QtLocation" >&5 | ||
5278 | +echo "configure:15605: checking for QtSensors QtFeedback QtLocation" >&5 | ||
5279 | |||
5280 | if $PKG_CONFIG --exists "QtSensors QtFeedback QtLocation" ; then | ||
5281 | echo "$ac_t""yes" 1>&6 | ||
5282 | succeeded=yes | ||
5283 | |||
5284 | echo $ac_n "checking _QTMOBILITY_CFLAGS""... $ac_c" 1>&6 | ||
5285 | -echo "configure:15583: checking _QTMOBILITY_CFLAGS" >&5 | ||
5286 | +echo "configure:15612: checking _QTMOBILITY_CFLAGS" >&5 | ||
5287 | _QTMOBILITY_CFLAGS=`$PKG_CONFIG --cflags "QtSensors QtFeedback QtLocation"` | ||
5288 | echo "$ac_t""$_QTMOBILITY_CFLAGS" 1>&6 | ||
5289 | |||
5290 | echo $ac_n "checking _QTMOBILITY_LIBS""... $ac_c" 1>&6 | ||
5291 | -echo "configure:15588: checking _QTMOBILITY_LIBS" >&5 | ||
5292 | +echo "configure:15617: checking _QTMOBILITY_LIBS" >&5 | ||
5293 | ## Remove evil flags like -Wl,--export-dynamic | ||
5294 | _QTMOBILITY_LIBS="`$PKG_CONFIG --libs \"QtSensors QtFeedback QtLocation\" |sed s/-Wl,--export-dynamic//g`" | ||
5295 | echo "$ac_t""$_QTMOBILITY_LIBS" 1>&6 | ||
5296 | @@ -15619,7 +15648,7 @@ echo "configure:15588: checking _QTMOBILITY_LIBS" >&5 | ||
5297 | MOZ_QT_LIBS="$MOZ_QT_LIBS $_QTMOBILITY_LIBS" | ||
5298 | else | ||
5299 | echo $ac_n "checking for main in -lQtSensors""... $ac_c" 1>&6 | ||
5300 | -echo "configure:15623: checking for main in -lQtSensors" >&5 | ||
5301 | +echo "configure:15652: checking for main in -lQtSensors" >&5 | ||
5302 | ac_lib_var=`echo QtSensors'_'main | sed 'y%./+-%__p_%'` | ||
5303 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
5304 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5305 | @@ -15627,14 +15656,14 @@ else | ||
5306 | ac_save_LIBS="$LIBS" | ||
5307 | LIBS="-lQtSensors $LIBS" | ||
5308 | cat > conftest.$ac_ext <<EOF | ||
5309 | -#line 15631 "configure" | ||
5310 | +#line 15660 "configure" | ||
5311 | #include "confdefs.h" | ||
5312 | |||
5313 | int main() { | ||
5314 | main() | ||
5315 | ; return 0; } | ||
5316 | EOF | ||
5317 | -if { (eval echo configure:15638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
5318 | +if { (eval echo configure:15667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
5319 | rm -rf conftest* | ||
5320 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
5321 | else | ||
5322 | @@ -15689,6 +15718,15 @@ fi | ||
5323 | |||
5324 | |||
5325 | |||
5326 | +if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" | ||
5327 | +then | ||
5328 | + cat >> confdefs.h <<\EOF | ||
5329 | +#define MOZ_X11 1 | ||
5330 | +EOF | ||
5331 | + | ||
5332 | + MOZ_X11=1 | ||
5333 | +fi | ||
5334 | + | ||
5335 | |||
5336 | # Components and Features | ||
5337 | |||
5338 | @@ -15778,7 +15816,7 @@ if test "${enable_pango+set}" = set; then | ||
5339 | fi | ||
5340 | |||
5341 | |||
5342 | -if test "$MOZ_ENABLE_GTK2" | ||
5343 | +if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" | ||
5344 | then | ||
5345 | |||
5346 | |||
5347 | @@ -15788,7 +15826,7 @@ then | ||
5348 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5349 | set dummy pkg-config; ac_word=$2 | ||
5350 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5351 | -echo "configure:15792: checking for $ac_word" >&5 | ||
5352 | +echo "configure:15830: checking for $ac_word" >&5 | ||
5353 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5354 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5355 | else | ||
5356 | @@ -15832,19 +15870,19 @@ fi | ||
5357 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5358 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5359 | echo $ac_n "checking for pango >= $PANGO_VERSION""... $ac_c" 1>&6 | ||
5360 | -echo "configure:15836: checking for pango >= $PANGO_VERSION" >&5 | ||
5361 | +echo "configure:15874: checking for pango >= $PANGO_VERSION" >&5 | ||
5362 | |||
5363 | if $PKG_CONFIG --exists "pango >= $PANGO_VERSION" ; then | ||
5364 | echo "$ac_t""yes" 1>&6 | ||
5365 | succeeded=yes | ||
5366 | |||
5367 | echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 | ||
5368 | -echo "configure:15843: checking _PANGOCHK_CFLAGS" >&5 | ||
5369 | +echo "configure:15881: checking _PANGOCHK_CFLAGS" >&5 | ||
5370 | _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION"` | ||
5371 | echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 | ||
5372 | |||
5373 | echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 | ||
5374 | -echo "configure:15848: checking _PANGOCHK_LIBS" >&5 | ||
5375 | +echo "configure:15886: checking _PANGOCHK_LIBS" >&5 | ||
5376 | ## Remove evil flags like -Wl,--export-dynamic | ||
5377 | _PANGOCHK_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
5378 | echo "$ac_t""$_PANGOCHK_LIBS" 1>&6 | ||
5379 | @@ -15880,7 +15918,7 @@ echo "configure:15848: checking _PANGOCHK_LIBS" >&5 | ||
5380 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5381 | set dummy pkg-config; ac_word=$2 | ||
5382 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5383 | -echo "configure:15884: checking for $ac_word" >&5 | ||
5384 | +echo "configure:15922: checking for $ac_word" >&5 | ||
5385 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5386 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5387 | else | ||
5388 | @@ -15924,19 +15962,19 @@ fi | ||
5389 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5390 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5391 | echo $ac_n "checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION""... $ac_c" 1>&6 | ||
5392 | -echo "configure:15928: checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" >&5 | ||
5393 | +echo "configure:15966: checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" >&5 | ||
5394 | |||
5395 | if $PKG_CONFIG --exists "pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" ; then | ||
5396 | echo "$ac_t""yes" 1>&6 | ||
5397 | succeeded=yes | ||
5398 | |||
5399 | echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 | ||
5400 | -echo "configure:15935: checking MOZ_PANGO_CFLAGS" >&5 | ||
5401 | +echo "configure:15973: checking MOZ_PANGO_CFLAGS" >&5 | ||
5402 | MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION"` | ||
5403 | echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 | ||
5404 | |||
5405 | echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 | ||
5406 | -echo "configure:15940: checking MOZ_PANGO_LIBS" >&5 | ||
5407 | +echo "configure:15978: checking MOZ_PANGO_LIBS" >&5 | ||
5408 | ## Remove evil flags like -Wl,--export-dynamic | ||
5409 | MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
5410 | echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 | ||
5411 | @@ -15980,7 +16018,7 @@ EOF | ||
5412 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5413 | set dummy pkg-config; ac_word=$2 | ||
5414 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5415 | -echo "configure:15984: checking for $ac_word" >&5 | ||
5416 | +echo "configure:16022: checking for $ac_word" >&5 | ||
5417 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5418 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5419 | else | ||
5420 | @@ -16024,19 +16062,19 @@ fi | ||
5421 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5422 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5423 | echo $ac_n "checking for freetype2 > 6.1.0 fontconfig""... $ac_c" 1>&6 | ||
5424 | -echo "configure:16028: checking for freetype2 > 6.1.0 fontconfig" >&5 | ||
5425 | +echo "configure:16066: checking for freetype2 > 6.1.0 fontconfig" >&5 | ||
5426 | |||
5427 | if $PKG_CONFIG --exists "freetype2 > 6.1.0 fontconfig" ; then | ||
5428 | echo "$ac_t""yes" 1>&6 | ||
5429 | succeeded=yes | ||
5430 | |||
5431 | echo $ac_n "checking FT2_CFLAGS""... $ac_c" 1>&6 | ||
5432 | -echo "configure:16035: checking FT2_CFLAGS" >&5 | ||
5433 | +echo "configure:16073: checking FT2_CFLAGS" >&5 | ||
5434 | FT2_CFLAGS=`$PKG_CONFIG --cflags "freetype2 > 6.1.0 fontconfig"` | ||
5435 | echo "$ac_t""$FT2_CFLAGS" 1>&6 | ||
5436 | |||
5437 | echo $ac_n "checking FT2_LIBS""... $ac_c" 1>&6 | ||
5438 | -echo "configure:16040: checking FT2_LIBS" >&5 | ||
5439 | +echo "configure:16078: checking FT2_LIBS" >&5 | ||
5440 | ## Remove evil flags like -Wl,--export-dynamic | ||
5441 | FT2_LIBS="`$PKG_CONFIG --libs \"freetype2 > 6.1.0 fontconfig\" |sed s/-Wl,--export-dynamic//g`" | ||
5442 | echo "$ac_t""$FT2_LIBS" 1>&6 | ||
5443 | @@ -16080,7 +16118,7 @@ then | ||
5444 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5445 | set dummy pkg-config; ac_word=$2 | ||
5446 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5447 | -echo "configure:16084: checking for $ac_word" >&5 | ||
5448 | +echo "configure:16122: checking for $ac_word" >&5 | ||
5449 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5450 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5451 | else | ||
5452 | @@ -16124,19 +16162,19 @@ fi | ||
5453 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5454 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5455 | echo $ac_n "checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION""... $ac_c" 1>&6 | ||
5456 | -echo "configure:16128: checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" >&5 | ||
5457 | +echo "configure:16166: checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" >&5 | ||
5458 | |||
5459 | if $PKG_CONFIG --exists "pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" ; then | ||
5460 | echo "$ac_t""yes" 1>&6 | ||
5461 | succeeded=yes | ||
5462 | |||
5463 | echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 | ||
5464 | -echo "configure:16135: checking MOZ_PANGO_CFLAGS" >&5 | ||
5465 | +echo "configure:16173: checking MOZ_PANGO_CFLAGS" >&5 | ||
5466 | MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION"` | ||
5467 | echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 | ||
5468 | |||
5469 | echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 | ||
5470 | -echo "configure:16140: checking MOZ_PANGO_LIBS" >&5 | ||
5471 | +echo "configure:16178: checking MOZ_PANGO_LIBS" >&5 | ||
5472 | ## Remove evil flags like -Wl,--export-dynamic | ||
5473 | MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
5474 | echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 | ||
5475 | @@ -16180,6 +16218,7 @@ EOF | ||
5476 | fi | ||
5477 | |||
5478 | |||
5479 | +if test -z "$LIBXUL_SDK"; then | ||
5480 | if test "$MOZ_X11" | ||
5481 | then | ||
5482 | if test "$MOZ_ENABLE_GTK2" | ||
5483 | @@ -16209,7 +16248,7 @@ fi | ||
5484 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5485 | set dummy pkg-config; ac_word=$2 | ||
5486 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5487 | -echo "configure:16213: checking for $ac_word" >&5 | ||
5488 | +echo "configure:16252: checking for $ac_word" >&5 | ||
5489 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5490 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5491 | else | ||
5492 | @@ -16253,19 +16292,19 @@ fi | ||
5493 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5494 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5495 | echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 | ||
5496 | -echo "configure:16257: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 | ||
5497 | +echo "configure:16296: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 | ||
5498 | |||
5499 | if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then | ||
5500 | echo "$ac_t""yes" 1>&6 | ||
5501 | succeeded=yes | ||
5502 | |||
5503 | echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 | ||
5504 | -echo "configure:16264: checking MOZ_GNOMEVFS_CFLAGS" >&5 | ||
5505 | +echo "configure:16303: checking MOZ_GNOMEVFS_CFLAGS" >&5 | ||
5506 | MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` | ||
5507 | echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 | ||
5508 | |||
5509 | echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 | ||
5510 | -echo "configure:16269: checking MOZ_GNOMEVFS_LIBS" >&5 | ||
5511 | +echo "configure:16308: checking MOZ_GNOMEVFS_LIBS" >&5 | ||
5512 | ## Remove evil flags like -Wl,--export-dynamic | ||
5513 | MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
5514 | echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6 | ||
5515 | @@ -16315,7 +16354,7 @@ EOF | ||
5516 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5517 | set dummy pkg-config; ac_word=$2 | ||
5518 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5519 | -echo "configure:16319: checking for $ac_word" >&5 | ||
5520 | +echo "configure:16358: checking for $ac_word" >&5 | ||
5521 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5522 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5523 | else | ||
5524 | @@ -16359,19 +16398,19 @@ fi | ||
5525 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5526 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5527 | echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 | ||
5528 | -echo "configure:16363: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 | ||
5529 | +echo "configure:16402: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 | ||
5530 | |||
5531 | if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then | ||
5532 | echo "$ac_t""yes" 1>&6 | ||
5533 | succeeded=yes | ||
5534 | |||
5535 | echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 | ||
5536 | -echo "configure:16370: checking MOZ_GNOMEVFS_CFLAGS" >&5 | ||
5537 | +echo "configure:16409: checking MOZ_GNOMEVFS_CFLAGS" >&5 | ||
5538 | MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` | ||
5539 | echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 | ||
5540 | |||
5541 | echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 | ||
5542 | -echo "configure:16375: checking MOZ_GNOMEVFS_LIBS" >&5 | ||
5543 | +echo "configure:16414: checking MOZ_GNOMEVFS_LIBS" >&5 | ||
5544 | ## Remove evil flags like -Wl,--export-dynamic | ||
5545 | MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
5546 | echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6 | ||
5547 | @@ -16430,7 +16469,7 @@ fi | ||
5548 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5549 | set dummy pkg-config; ac_word=$2 | ||
5550 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5551 | -echo "configure:16434: checking for $ac_word" >&5 | ||
5552 | +echo "configure:16473: checking for $ac_word" >&5 | ||
5553 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5554 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5555 | else | ||
5556 | @@ -16474,19 +16513,19 @@ fi | ||
5557 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5558 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5559 | echo $ac_n "checking for gtk+-2.0 >= 2.14""... $ac_c" 1>&6 | ||
5560 | -echo "configure:16478: checking for gtk+-2.0 >= 2.14" >&5 | ||
5561 | +echo "configure:16517: checking for gtk+-2.0 >= 2.14" >&5 | ||
5562 | |||
5563 | if $PKG_CONFIG --exists "gtk+-2.0 >= 2.14" ; then | ||
5564 | echo "$ac_t""yes" 1>&6 | ||
5565 | succeeded=yes | ||
5566 | |||
5567 | echo $ac_n "checking _GTKCHECK_CFLAGS""... $ac_c" 1>&6 | ||
5568 | -echo "configure:16485: checking _GTKCHECK_CFLAGS" >&5 | ||
5569 | +echo "configure:16524: checking _GTKCHECK_CFLAGS" >&5 | ||
5570 | _GTKCHECK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.14"` | ||
5571 | echo "$ac_t""$_GTKCHECK_CFLAGS" 1>&6 | ||
5572 | |||
5573 | echo $ac_n "checking _GTKCHECK_LIBS""... $ac_c" 1>&6 | ||
5574 | -echo "configure:16490: checking _GTKCHECK_LIBS" >&5 | ||
5575 | +echo "configure:16529: checking _GTKCHECK_LIBS" >&5 | ||
5576 | ## Remove evil flags like -Wl,--export-dynamic | ||
5577 | _GTKCHECK_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= 2.14\" |sed s/-Wl,--export-dynamic//g`" | ||
5578 | echo "$ac_t""$_GTKCHECK_LIBS" 1>&6 | ||
5579 | @@ -16521,7 +16560,7 @@ echo "configure:16490: checking _GTKCHECK_LIBS" >&5 | ||
5580 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5581 | set dummy pkg-config; ac_word=$2 | ||
5582 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5583 | -echo "configure:16525: checking for $ac_word" >&5 | ||
5584 | +echo "configure:16564: checking for $ac_word" >&5 | ||
5585 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5586 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5587 | else | ||
5588 | @@ -16565,19 +16604,19 @@ fi | ||
5589 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5590 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5591 | echo $ac_n "checking for gio-2.0 >= $GIO_VERSION""... $ac_c" 1>&6 | ||
5592 | -echo "configure:16569: checking for gio-2.0 >= $GIO_VERSION" >&5 | ||
5593 | +echo "configure:16608: checking for gio-2.0 >= $GIO_VERSION" >&5 | ||
5594 | |||
5595 | if $PKG_CONFIG --exists "gio-2.0 >= $GIO_VERSION" ; then | ||
5596 | echo "$ac_t""yes" 1>&6 | ||
5597 | succeeded=yes | ||
5598 | |||
5599 | echo $ac_n "checking MOZ_GIO_CFLAGS""... $ac_c" 1>&6 | ||
5600 | -echo "configure:16576: checking MOZ_GIO_CFLAGS" >&5 | ||
5601 | +echo "configure:16615: checking MOZ_GIO_CFLAGS" >&5 | ||
5602 | MOZ_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_VERSION"` | ||
5603 | echo "$ac_t""$MOZ_GIO_CFLAGS" 1>&6 | ||
5604 | |||
5605 | echo $ac_n "checking MOZ_GIO_LIBS""... $ac_c" 1>&6 | ||
5606 | -echo "configure:16581: checking MOZ_GIO_LIBS" >&5 | ||
5607 | +echo "configure:16620: checking MOZ_GIO_LIBS" >&5 | ||
5608 | ## Remove evil flags like -Wl,--export-dynamic | ||
5609 | MOZ_GIO_LIBS="`$PKG_CONFIG --libs \"gio-2.0 >= $GIO_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
5610 | echo "$ac_t""$MOZ_GIO_LIBS" 1>&6 | ||
5611 | @@ -16646,7 +16685,7 @@ fi | ||
5612 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5613 | set dummy pkg-config; ac_word=$2 | ||
5614 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5615 | -echo "configure:16650: checking for $ac_word" >&5 | ||
5616 | +echo "configure:16689: checking for $ac_word" >&5 | ||
5617 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5618 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5619 | else | ||
5620 | @@ -16690,19 +16729,19 @@ fi | ||
5621 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5622 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5623 | echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION gobject-2.0 ""... $ac_c" 1>&6 | ||
5624 | -echo "configure:16694: checking for gconf-2.0 >= $GCONF_VERSION gobject-2.0 " >&5 | ||
5625 | +echo "configure:16733: checking for gconf-2.0 >= $GCONF_VERSION gobject-2.0 " >&5 | ||
5626 | |||
5627 | if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION gobject-2.0 " ; then | ||
5628 | echo "$ac_t""yes" 1>&6 | ||
5629 | succeeded=yes | ||
5630 | |||
5631 | echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 | ||
5632 | -echo "configure:16701: checking MOZ_GCONF_CFLAGS" >&5 | ||
5633 | +echo "configure:16740: checking MOZ_GCONF_CFLAGS" >&5 | ||
5634 | MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION gobject-2.0 "` | ||
5635 | echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 | ||
5636 | |||
5637 | echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 | ||
5638 | -echo "configure:16706: checking MOZ_GCONF_LIBS" >&5 | ||
5639 | +echo "configure:16745: checking MOZ_GCONF_LIBS" >&5 | ||
5640 | ## Remove evil flags like -Wl,--export-dynamic | ||
5641 | MOZ_GCONF_LIBS="`$PKG_CONFIG --libs \"gconf-2.0 >= $GCONF_VERSION gobject-2.0 \" |sed s/-Wl,--export-dynamic//g`" | ||
5642 | echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6 | ||
5643 | @@ -16780,7 +16819,7 @@ fi | ||
5644 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5645 | set dummy pkg-config; ac_word=$2 | ||
5646 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5647 | -echo "configure:16784: checking for $ac_word" >&5 | ||
5648 | +echo "configure:16823: checking for $ac_word" >&5 | ||
5649 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5650 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5651 | else | ||
5652 | @@ -16824,19 +16863,19 @@ fi | ||
5653 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5654 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5655 | echo $ac_n "checking for libproxy-1.0""... $ac_c" 1>&6 | ||
5656 | -echo "configure:16828: checking for libproxy-1.0" >&5 | ||
5657 | +echo "configure:16867: checking for libproxy-1.0" >&5 | ||
5658 | |||
5659 | if $PKG_CONFIG --exists "libproxy-1.0" ; then | ||
5660 | echo "$ac_t""yes" 1>&6 | ||
5661 | succeeded=yes | ||
5662 | |||
5663 | echo $ac_n "checking MOZ_LIBPROXY_CFLAGS""... $ac_c" 1>&6 | ||
5664 | -echo "configure:16835: checking MOZ_LIBPROXY_CFLAGS" >&5 | ||
5665 | +echo "configure:16874: checking MOZ_LIBPROXY_CFLAGS" >&5 | ||
5666 | MOZ_LIBPROXY_CFLAGS=`$PKG_CONFIG --cflags "libproxy-1.0"` | ||
5667 | echo "$ac_t""$MOZ_LIBPROXY_CFLAGS" 1>&6 | ||
5668 | |||
5669 | echo $ac_n "checking MOZ_LIBPROXY_LIBS""... $ac_c" 1>&6 | ||
5670 | -echo "configure:16840: checking MOZ_LIBPROXY_LIBS" >&5 | ||
5671 | +echo "configure:16879: checking MOZ_LIBPROXY_LIBS" >&5 | ||
5672 | ## Remove evil flags like -Wl,--export-dynamic | ||
5673 | MOZ_LIBPROXY_LIBS="`$PKG_CONFIG --libs \"libproxy-1.0\" |sed s/-Wl,--export-dynamic//g`" | ||
5674 | echo "$ac_t""$MOZ_LIBPROXY_LIBS" 1>&6 | ||
5675 | @@ -16914,7 +16953,7 @@ then | ||
5676 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5677 | set dummy pkg-config; ac_word=$2 | ||
5678 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5679 | -echo "configure:16918: checking for $ac_word" >&5 | ||
5680 | +echo "configure:16957: checking for $ac_word" >&5 | ||
5681 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5682 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5683 | else | ||
5684 | @@ -16958,19 +16997,19 @@ fi | ||
5685 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5686 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5687 | echo $ac_n "checking for libnotify >= $LIBNOTIFY_VERSION""... $ac_c" 1>&6 | ||
5688 | -echo "configure:16962: checking for libnotify >= $LIBNOTIFY_VERSION" >&5 | ||
5689 | +echo "configure:17001: checking for libnotify >= $LIBNOTIFY_VERSION" >&5 | ||
5690 | |||
5691 | if $PKG_CONFIG --exists "libnotify >= $LIBNOTIFY_VERSION" ; then | ||
5692 | echo "$ac_t""yes" 1>&6 | ||
5693 | succeeded=yes | ||
5694 | |||
5695 | echo $ac_n "checking MOZ_LIBNOTIFY_CFLAGS""... $ac_c" 1>&6 | ||
5696 | -echo "configure:16969: checking MOZ_LIBNOTIFY_CFLAGS" >&5 | ||
5697 | +echo "configure:17008: checking MOZ_LIBNOTIFY_CFLAGS" >&5 | ||
5698 | MOZ_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_VERSION"` | ||
5699 | echo "$ac_t""$MOZ_LIBNOTIFY_CFLAGS" 1>&6 | ||
5700 | |||
5701 | echo $ac_n "checking MOZ_LIBNOTIFY_LIBS""... $ac_c" 1>&6 | ||
5702 | -echo "configure:16974: checking MOZ_LIBNOTIFY_LIBS" >&5 | ||
5703 | +echo "configure:17013: checking MOZ_LIBNOTIFY_LIBS" >&5 | ||
5704 | ## Remove evil flags like -Wl,--export-dynamic | ||
5705 | MOZ_LIBNOTIFY_LIBS="`$PKG_CONFIG --libs \"libnotify >= $LIBNOTIFY_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
5706 | echo "$ac_t""$MOZ_LIBNOTIFY_LIBS" 1>&6 | ||
5707 | @@ -17045,7 +17084,7 @@ fi | ||
5708 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5709 | set dummy pkg-config; ac_word=$2 | ||
5710 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5711 | -echo "configure:17049: checking for $ac_word" >&5 | ||
5712 | +echo "configure:17088: checking for $ac_word" >&5 | ||
5713 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5714 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5715 | else | ||
5716 | @@ -17089,19 +17128,19 @@ fi | ||
5717 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5718 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5719 | echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 | ||
5720 | -echo "configure:17093: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 | ||
5721 | +echo "configure:17132: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 | ||
5722 | |||
5723 | if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then | ||
5724 | echo "$ac_t""yes" 1>&6 | ||
5725 | succeeded=yes | ||
5726 | |||
5727 | echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 | ||
5728 | -echo "configure:17100: checking MOZ_GNOMEUI_CFLAGS" >&5 | ||
5729 | +echo "configure:17139: checking MOZ_GNOMEUI_CFLAGS" >&5 | ||
5730 | MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` | ||
5731 | echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 | ||
5732 | |||
5733 | echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 | ||
5734 | -echo "configure:17105: checking MOZ_GNOMEUI_LIBS" >&5 | ||
5735 | +echo "configure:17144: checking MOZ_GNOMEUI_LIBS" >&5 | ||
5736 | ## Remove evil flags like -Wl,--export-dynamic | ||
5737 | MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs \"libgnomeui-2.0 >= $GNOMEUI_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
5738 | echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6 | ||
5739 | @@ -17179,7 +17218,7 @@ fi | ||
5740 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5741 | set dummy pkg-config; ac_word=$2 | ||
5742 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5743 | -echo "configure:17183: checking for $ac_word" >&5 | ||
5744 | +echo "configure:17222: checking for $ac_word" >&5 | ||
5745 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5746 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5747 | else | ||
5748 | @@ -17223,19 +17262,19 @@ fi | ||
5749 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5750 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5751 | echo $ac_n "checking for dbus-1 >= $DBUS_VERSION""... $ac_c" 1>&6 | ||
5752 | -echo "configure:17227: checking for dbus-1 >= $DBUS_VERSION" >&5 | ||
5753 | +echo "configure:17266: checking for dbus-1 >= $DBUS_VERSION" >&5 | ||
5754 | |||
5755 | if $PKG_CONFIG --exists "dbus-1 >= $DBUS_VERSION" ; then | ||
5756 | echo "$ac_t""yes" 1>&6 | ||
5757 | succeeded=yes | ||
5758 | |||
5759 | echo $ac_n "checking MOZ_DBUS_CFLAGS""... $ac_c" 1>&6 | ||
5760 | -echo "configure:17234: checking MOZ_DBUS_CFLAGS" >&5 | ||
5761 | +echo "configure:17273: checking MOZ_DBUS_CFLAGS" >&5 | ||
5762 | MOZ_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= $DBUS_VERSION"` | ||
5763 | echo "$ac_t""$MOZ_DBUS_CFLAGS" 1>&6 | ||
5764 | |||
5765 | echo $ac_n "checking MOZ_DBUS_LIBS""... $ac_c" 1>&6 | ||
5766 | -echo "configure:17239: checking MOZ_DBUS_LIBS" >&5 | ||
5767 | +echo "configure:17278: checking MOZ_DBUS_LIBS" >&5 | ||
5768 | ## Remove evil flags like -Wl,--export-dynamic | ||
5769 | MOZ_DBUS_LIBS="`$PKG_CONFIG --libs \"dbus-1 >= $DBUS_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
5770 | echo "$ac_t""$MOZ_DBUS_LIBS" 1>&6 | ||
5771 | @@ -17270,7 +17309,7 @@ echo "configure:17239: checking MOZ_DBUS_LIBS" >&5 | ||
5772 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5773 | set dummy pkg-config; ac_word=$2 | ||
5774 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5775 | -echo "configure:17274: checking for $ac_word" >&5 | ||
5776 | +echo "configure:17313: checking for $ac_word" >&5 | ||
5777 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5778 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5779 | else | ||
5780 | @@ -17314,19 +17353,19 @@ fi | ||
5781 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5782 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5783 | echo $ac_n "checking for dbus-glib-1 >= $DBUS_VERSION""... $ac_c" 1>&6 | ||
5784 | -echo "configure:17318: checking for dbus-glib-1 >= $DBUS_VERSION" >&5 | ||
5785 | +echo "configure:17357: checking for dbus-glib-1 >= $DBUS_VERSION" >&5 | ||
5786 | |||
5787 | if $PKG_CONFIG --exists "dbus-glib-1 >= $DBUS_VERSION" ; then | ||
5788 | echo "$ac_t""yes" 1>&6 | ||
5789 | succeeded=yes | ||
5790 | |||
5791 | echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6 | ||
5792 | -echo "configure:17325: checking MOZ_DBUS_GLIB_CFLAGS" >&5 | ||
5793 | +echo "configure:17364: checking MOZ_DBUS_GLIB_CFLAGS" >&5 | ||
5794 | MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_VERSION"` | ||
5795 | echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6 | ||
5796 | |||
5797 | echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6 | ||
5798 | -echo "configure:17330: checking MOZ_DBUS_GLIB_LIBS" >&5 | ||
5799 | +echo "configure:17369: checking MOZ_DBUS_GLIB_LIBS" >&5 | ||
5800 | ## Remove evil flags like -Wl,--export-dynamic | ||
5801 | MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs \"dbus-glib-1 >= $DBUS_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
5802 | echo "$ac_t""$MOZ_DBUS_GLIB_LIBS" 1>&6 | ||
5803 | @@ -17367,6 +17406,9 @@ fi | ||
5804 | |||
5805 | |||
5806 | |||
5807 | +fi # LIBXUL_SDK | ||
5808 | + | ||
5809 | + | ||
5810 | # Check whether --enable-crypto or --disable-crypto was given. | ||
5811 | if test "${enable_crypto+set}" = set; then | ||
5812 | enableval="$enable_crypto" | ||
5813 | @@ -17556,7 +17598,7 @@ EOF | ||
5814 | esac | ||
5815 | |||
5816 | echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6 | ||
5817 | -echo "configure:17560: checking __attribute__ ((aligned ())) support" >&5 | ||
5818 | +echo "configure:17602: checking __attribute__ ((aligned ())) support" >&5 | ||
5819 | if eval "test \"`echo '$''{'ac_cv_c_attribute_aligned'+set}'`\" = set"; then | ||
5820 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5821 | else | ||
5822 | @@ -17566,14 +17608,14 @@ else | ||
5823 | for ac_cv_c_attr_align_try in 64 32 16 8; do | ||
5824 | echo "trying $ac_cv_c_attr_align_try" | ||
5825 | cat > conftest.$ac_ext <<EOF | ||
5826 | -#line 17570 "configure" | ||
5827 | +#line 17612 "configure" | ||
5828 | #include "confdefs.h" | ||
5829 | |||
5830 | int main() { | ||
5831 | static char c __attribute__ ((aligned(${ac_cv_c_attr_align_try}))) = 0; return c; | ||
5832 | ; return 0; } | ||
5833 | EOF | ||
5834 | -if { (eval echo configure:17577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
5835 | +if { (eval echo configure:17619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
5836 | rm -rf conftest* | ||
5837 | ac_cv_c_attribute_aligned="${ac_cv_c_attr_align_try}" | ||
5838 | else | ||
5839 | @@ -17651,19 +17693,19 @@ EOF | ||
5840 | MOZ_NATIVE_LIBVPX_DEC_TEST= | ||
5841 | ac_safe=`echo "vpx/vpx_decoder.h" | sed 'y%./+-%__p_%'` | ||
5842 | echo $ac_n "checking for vpx/vpx_decoder.h""... $ac_c" 1>&6 | ||
5843 | -echo "configure:17655: checking for vpx/vpx_decoder.h" >&5 | ||
5844 | +echo "configure:17697: checking for vpx/vpx_decoder.h" >&5 | ||
5845 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
5846 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5847 | else | ||
5848 | cat > conftest.$ac_ext <<EOF | ||
5849 | -#line 17660 "configure" | ||
5850 | +#line 17702 "configure" | ||
5851 | #include "confdefs.h" | ||
5852 | #include <vpx/vpx_decoder.h> | ||
5853 | int main() { | ||
5854 | |||
5855 | ; return 0; } | ||
5856 | EOF | ||
5857 | -if { (eval echo configure:17667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
5858 | +if { (eval echo configure:17709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
5859 | rm -rf conftest* | ||
5860 | eval "ac_cv_header_$ac_safe=yes" | ||
5861 | else | ||
5862 | @@ -17686,7 +17728,7 @@ fi | ||
5863 | fi | ||
5864 | |||
5865 | echo $ac_n "checking for vpx_codec_dec_init_ver in -lvpx""... $ac_c" 1>&6 | ||
5866 | -echo "configure:17690: checking for vpx_codec_dec_init_ver in -lvpx" >&5 | ||
5867 | +echo "configure:17732: checking for vpx_codec_dec_init_ver in -lvpx" >&5 | ||
5868 | ac_lib_var=`echo vpx'_'vpx_codec_dec_init_ver | sed 'y%./+-%__p_%'` | ||
5869 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
5870 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5871 | @@ -17694,7 +17736,7 @@ else | ||
5872 | ac_save_LIBS="$LIBS" | ||
5873 | LIBS="-lvpx $LIBS" | ||
5874 | cat > conftest.$ac_ext <<EOF | ||
5875 | -#line 17698 "configure" | ||
5876 | +#line 17740 "configure" | ||
5877 | #include "confdefs.h" | ||
5878 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
5879 | /* We use char because int might match the return type of a gcc2 | ||
5880 | @@ -17705,7 +17747,7 @@ int main() { | ||
5881 | vpx_codec_dec_init_ver() | ||
5882 | ; return 0; } | ||
5883 | EOF | ||
5884 | -if { (eval echo configure:17709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
5885 | +if { (eval echo configure:17751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
5886 | rm -rf conftest* | ||
5887 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
5888 | else | ||
5889 | @@ -17727,14 +17769,14 @@ else | ||
5890 | fi | ||
5891 | |||
5892 | if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then | ||
5893 | - echo $ac_n "checking for libvpx version >= v0.9.7""... $ac_c" 1>&6 | ||
5894 | -echo "configure:17732: checking for libvpx version >= v0.9.7" >&5 | ||
5895 | + echo $ac_n "checking for libvpx version >= v1.0.0""... $ac_c" 1>&6 | ||
5896 | +echo "configure:17774: checking for libvpx version >= v1.0.0" >&5 | ||
5897 | cat > conftest.$ac_ext <<EOF | ||
5898 | -#line 17734 "configure" | ||
5899 | +#line 17776 "configure" | ||
5900 | #include "confdefs.h" | ||
5901 | |||
5902 | #include <vpx/vpx_decoder.h> | ||
5903 | - #if !defined(VPX_CODEC_USE_INPUT_PARTITION) | ||
5904 | + #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) | ||
5905 | #error "test failed." | ||
5906 | #endif | ||
5907 | |||
5908 | @@ -17742,7 +17784,7 @@ int main() { | ||
5909 | return 0; | ||
5910 | ; return 0; } | ||
5911 | EOF | ||
5912 | -if { (eval echo configure:17746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
5913 | +if { (eval echo configure:17788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
5914 | rm -rf conftest* | ||
5915 | echo "$ac_t""yes" 1>&6 | ||
5916 | MOZ_NATIVE_LIBVPX=1 | ||
5917 | @@ -17753,7 +17795,7 @@ else | ||
5918 | cat conftest.$ac_ext >&5 | ||
5919 | rm -rf conftest* | ||
5920 | echo "$ac_t""no" 1>&6 | ||
5921 | - { echo "configure: error: --with-system-libvpx requested but it is not v0.9.7 or later" 1>&2; exit 1; } | ||
5922 | + { echo "configure: error: --with-system-libvpx requested but it is not v1.0.0 or later" 1>&2; exit 1; } | ||
5923 | fi | ||
5924 | rm -f conftest* | ||
5925 | fi | ||
5926 | @@ -17918,6 +17960,7 @@ EOF | ||
5927 | fi | ||
5928 | |||
5929 | |||
5930 | +if test -z "$LIBXUL_SDK"; then | ||
5931 | if test -n "$MOZ_SYDNEYAUDIO"; then | ||
5932 | case "$target_os" in | ||
5933 | linux*) | ||
5934 | @@ -17927,7 +17970,7 @@ linux*) | ||
5935 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
5936 | set dummy pkg-config; ac_word=$2 | ||
5937 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5938 | -echo "configure:17931: checking for $ac_word" >&5 | ||
5939 | +echo "configure:17974: checking for $ac_word" >&5 | ||
5940 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
5941 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5942 | else | ||
5943 | @@ -17971,19 +18014,19 @@ fi | ||
5944 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
5945 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
5946 | echo $ac_n "checking for alsa""... $ac_c" 1>&6 | ||
5947 | -echo "configure:17975: checking for alsa" >&5 | ||
5948 | +echo "configure:18018: checking for alsa" >&5 | ||
5949 | |||
5950 | if $PKG_CONFIG --exists "alsa" ; then | ||
5951 | echo "$ac_t""yes" 1>&6 | ||
5952 | succeeded=yes | ||
5953 | |||
5954 | echo $ac_n "checking MOZ_ALSA_CFLAGS""... $ac_c" 1>&6 | ||
5955 | -echo "configure:17982: checking MOZ_ALSA_CFLAGS" >&5 | ||
5956 | +echo "configure:18025: checking MOZ_ALSA_CFLAGS" >&5 | ||
5957 | MOZ_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa"` | ||
5958 | echo "$ac_t""$MOZ_ALSA_CFLAGS" 1>&6 | ||
5959 | |||
5960 | echo $ac_n "checking MOZ_ALSA_LIBS""... $ac_c" 1>&6 | ||
5961 | -echo "configure:17987: checking MOZ_ALSA_LIBS" >&5 | ||
5962 | +echo "configure:18030: checking MOZ_ALSA_LIBS" >&5 | ||
5963 | ## Remove evil flags like -Wl,--export-dynamic | ||
5964 | MOZ_ALSA_LIBS="`$PKG_CONFIG --libs \"alsa\" |sed s/-Wl,--export-dynamic//g`" | ||
5965 | echo "$ac_t""$MOZ_ALSA_LIBS" 1>&6 | ||
5966 | @@ -18016,6 +18059,7 @@ echo "configure:17987: checking MOZ_ALSA_LIBS" >&5 | ||
5967 | ;; | ||
5968 | esac | ||
5969 | fi | ||
5970 | +fi | ||
5971 | |||
5972 | # Check whether --enable-permissions or --disable-permissions was given. | ||
5973 | if test "${enable_permissions+set}" = set; then | ||
5974 | @@ -18117,7 +18161,7 @@ fi | ||
5975 | # Extract the first word of "java", so it can be a program name with args. | ||
5976 | set dummy java; ac_word=$2 | ||
5977 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5978 | -echo "configure:18121: checking for $ac_word" >&5 | ||
5979 | +echo "configure:18165: checking for $ac_word" >&5 | ||
5980 | if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then | ||
5981 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5982 | else | ||
5983 | @@ -18166,7 +18210,7 @@ fi | ||
5984 | # Extract the first word of "javac", so it can be a program name with args. | ||
5985 | set dummy javac; ac_word=$2 | ||
5986 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5987 | -echo "configure:18170: checking for $ac_word" >&5 | ||
5988 | +echo "configure:18214: checking for $ac_word" >&5 | ||
5989 | if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then | ||
5990 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
5991 | else | ||
5992 | @@ -18215,7 +18259,7 @@ fi | ||
5993 | # Extract the first word of "jar", so it can be a program name with args. | ||
5994 | set dummy jar; ac_word=$2 | ||
5995 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
5996 | -echo "configure:18219: checking for $ac_word" >&5 | ||
5997 | +echo "configure:18263: checking for $ac_word" >&5 | ||
5998 | if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then | ||
5999 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6000 | else | ||
6001 | @@ -18405,7 +18449,7 @@ EOF | ||
6002 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
6003 | set dummy pkg-config; ac_word=$2 | ||
6004 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6005 | -echo "configure:18409: checking for $ac_word" >&5 | ||
6006 | +echo "configure:18453: checking for $ac_word" >&5 | ||
6007 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
6008 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6009 | else | ||
6010 | @@ -18449,19 +18493,19 @@ fi | ||
6011 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
6012 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
6013 | echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6 | ||
6014 | -echo "configure:18453: checking for gthread-2.0" >&5 | ||
6015 | +echo "configure:18497: checking for gthread-2.0" >&5 | ||
6016 | |||
6017 | if $PKG_CONFIG --exists "gthread-2.0" ; then | ||
6018 | echo "$ac_t""yes" 1>&6 | ||
6019 | succeeded=yes | ||
6020 | |||
6021 | echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6 | ||
6022 | -echo "configure:18460: checking MOZ_GTHREAD_CFLAGS" >&5 | ||
6023 | +echo "configure:18504: checking MOZ_GTHREAD_CFLAGS" >&5 | ||
6024 | MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"` | ||
6025 | echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6 | ||
6026 | |||
6027 | echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6 | ||
6028 | -echo "configure:18465: checking MOZ_GTHREAD_LIBS" >&5 | ||
6029 | +echo "configure:18509: checking MOZ_GTHREAD_LIBS" >&5 | ||
6030 | ## Remove evil flags like -Wl,--export-dynamic | ||
6031 | MOZ_GTHREAD_LIBS="`$PKG_CONFIG --libs \"gthread-2.0\" |sed s/-Wl,--export-dynamic//g`" | ||
6032 | echo "$ac_t""$MOZ_GTHREAD_LIBS" 1>&6 | ||
6033 | @@ -18497,19 +18541,19 @@ echo "configure:18465: checking MOZ_GTHREAD_LIBS" >&5 | ||
6034 | do | ||
6035 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
6036 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
6037 | -echo "configure:18501: checking for $ac_hdr" >&5 | ||
6038 | +echo "configure:18545: checking for $ac_hdr" >&5 | ||
6039 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
6040 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6041 | else | ||
6042 | cat > conftest.$ac_ext <<EOF | ||
6043 | -#line 18506 "configure" | ||
6044 | +#line 18550 "configure" | ||
6045 | #include "confdefs.h" | ||
6046 | #include <$ac_hdr> | ||
6047 | int main() { | ||
6048 | |||
6049 | ; return 0; } | ||
6050 | EOF | ||
6051 | -if { (eval echo configure:18513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6052 | +if { (eval echo configure:18557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6053 | rm -rf conftest* | ||
6054 | eval "ac_cv_header_$ac_safe=yes" | ||
6055 | else | ||
6056 | @@ -18622,13 +18666,13 @@ fi | ||
6057 | |||
6058 | if test -n "$LIBJPEG_TURBO_X86_ASM" -o -n "$LIBJPEG_TURBO_X64_ASM" ; then | ||
6059 | echo $ac_n "checking for YASM assembler""... $ac_c" 1>&6 | ||
6060 | -echo "configure:18626: checking for YASM assembler" >&5 | ||
6061 | +echo "configure:18670: checking for YASM assembler" >&5 | ||
6062 | for ac_prog in yasm | ||
6063 | do | ||
6064 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
6065 | set dummy $ac_prog; ac_word=$2 | ||
6066 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6067 | -echo "configure:18632: checking for $ac_word" >&5 | ||
6068 | +echo "configure:18676: checking for $ac_word" >&5 | ||
6069 | if eval "test \"`echo '$''{'ac_cv_prog_LIBJPEG_TURBO_AS'+set}'`\" = set"; then | ||
6070 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6071 | else | ||
6072 | @@ -18832,7 +18876,7 @@ do | ||
6073 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
6074 | set dummy $ac_prog; ac_word=$2 | ||
6075 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6076 | -echo "configure:18836: checking for $ac_word" >&5 | ||
6077 | +echo "configure:18880: checking for $ac_word" >&5 | ||
6078 | if eval "test \"`echo '$''{'ac_cv_path_MAKENSISU'+set}'`\" = set"; then | ||
6079 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6080 | else | ||
6081 | @@ -18891,7 +18935,7 @@ done | ||
6082 | MAKENSISU_MINOR_VER=`echo $MAKENSISU_VER | $AWK -F\. '{ print $2 }'` | ||
6083 | fi | ||
6084 | echo $ac_n "checking for Unicode NSIS with major version == $REQ_NSIS_MAJOR_VER and minor version >= $MIN_NSIS_MINOR_VER""... $ac_c" 1>&6 | ||
6085 | -echo "configure:18895: checking for Unicode NSIS with major version == $REQ_NSIS_MAJOR_VER and minor version >= $MIN_NSIS_MINOR_VER" >&5 | ||
6086 | +echo "configure:18939: checking for Unicode NSIS with major version == $REQ_NSIS_MAJOR_VER and minor version >= $MIN_NSIS_MINOR_VER" >&5 | ||
6087 | if test "$MAKENSISU_VER" = "" || | ||
6088 | test ! "$MAKENSISU_MAJOR_VER" = "$REQ_NSIS_MAJOR_VER" -o \ | ||
6089 | ! "$MAKENSISU_MINOR_VER" -ge $MIN_NSIS_MINOR_VER; then | ||
6090 | @@ -18904,13 +18948,13 @@ fi | ||
6091 | |||
6092 | |||
6093 | echo $ac_n "checking for tar archiver""... $ac_c" 1>&6 | ||
6094 | -echo "configure:18908: checking for tar archiver" >&5 | ||
6095 | +echo "configure:18952: checking for tar archiver" >&5 | ||
6096 | for ac_prog in gnutar gtar tar | ||
6097 | do | ||
6098 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
6099 | set dummy $ac_prog; ac_word=$2 | ||
6100 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6101 | -echo "configure:18914: checking for $ac_word" >&5 | ||
6102 | +echo "configure:18958: checking for $ac_word" >&5 | ||
6103 | if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then | ||
6104 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6105 | else | ||
6106 | @@ -18947,13 +18991,13 @@ echo "$ac_t""$TAR" 1>&6 | ||
6107 | |||
6108 | |||
6109 | echo $ac_n "checking for wget""... $ac_c" 1>&6 | ||
6110 | -echo "configure:18951: checking for wget" >&5 | ||
6111 | +echo "configure:18995: checking for wget" >&5 | ||
6112 | for ac_prog in wget | ||
6113 | do | ||
6114 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
6115 | set dummy $ac_prog; ac_word=$2 | ||
6116 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6117 | -echo "configure:18957: checking for $ac_word" >&5 | ||
6118 | +echo "configure:19001: checking for $ac_word" >&5 | ||
6119 | if eval "test \"`echo '$''{'ac_cv_prog_WGET'+set}'`\" = set"; then | ||
6120 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6121 | else | ||
6122 | @@ -19145,7 +19189,7 @@ else | ||
6123 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
6124 | set dummy pkg-config; ac_word=$2 | ||
6125 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6126 | -echo "configure:19149: checking for $ac_word" >&5 | ||
6127 | +echo "configure:19193: checking for $ac_word" >&5 | ||
6128 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
6129 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6130 | else | ||
6131 | @@ -19189,19 +19233,19 @@ fi | ||
6132 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
6133 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
6134 | echo $ac_n "checking for sqlite3 >= $SQLITE_VERSION""... $ac_c" 1>&6 | ||
6135 | -echo "configure:19193: checking for sqlite3 >= $SQLITE_VERSION" >&5 | ||
6136 | +echo "configure:19237: checking for sqlite3 >= $SQLITE_VERSION" >&5 | ||
6137 | |||
6138 | if $PKG_CONFIG --exists "sqlite3 >= $SQLITE_VERSION" ; then | ||
6139 | echo "$ac_t""yes" 1>&6 | ||
6140 | succeeded=yes | ||
6141 | |||
6142 | echo $ac_n "checking SQLITE_CFLAGS""... $ac_c" 1>&6 | ||
6143 | -echo "configure:19200: checking SQLITE_CFLAGS" >&5 | ||
6144 | +echo "configure:19244: checking SQLITE_CFLAGS" >&5 | ||
6145 | SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= $SQLITE_VERSION"` | ||
6146 | echo "$ac_t""$SQLITE_CFLAGS" 1>&6 | ||
6147 | |||
6148 | echo $ac_n "checking SQLITE_LIBS""... $ac_c" 1>&6 | ||
6149 | -echo "configure:19205: checking SQLITE_LIBS" >&5 | ||
6150 | +echo "configure:19249: checking SQLITE_LIBS" >&5 | ||
6151 | ## Remove evil flags like -Wl,--export-dynamic | ||
6152 | SQLITE_LIBS="`$PKG_CONFIG --libs \"sqlite3 >= $SQLITE_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
6153 | echo "$ac_t""$SQLITE_LIBS" 1>&6 | ||
6154 | @@ -19232,7 +19276,7 @@ echo "configure:19205: checking SQLITE_LIBS" >&5 | ||
6155 | |||
6156 | |||
6157 | echo $ac_n "checking for SQLITE_SECURE_DELETE support in system SQLite""... $ac_c" 1>&6 | ||
6158 | -echo "configure:19236: checking for SQLITE_SECURE_DELETE support in system SQLite" >&5 | ||
6159 | +echo "configure:19280: checking for SQLITE_SECURE_DELETE support in system SQLite" >&5 | ||
6160 | _SAVE_CFLAGS="$CFLAGS" | ||
6161 | CFLAGS="$CFLAGS $SQLITE_CFLAGS" | ||
6162 | _SAVE_LIBS="$LIBS" | ||
6163 | @@ -19246,7 +19290,7 @@ else | ||
6164 | |||
6165 | else | ||
6166 | cat > conftest.$ac_ext <<EOF | ||
6167 | -#line 19250 "configure" | ||
6168 | +#line 19294 "configure" | ||
6169 | #include "confdefs.h" | ||
6170 | |||
6171 | #include "sqlite3.h" | ||
6172 | @@ -19255,7 +19299,7 @@ else | ||
6173 | return !sqlite3_compileoption_used("SQLITE_SECURE_DELETE"); | ||
6174 | } | ||
6175 | EOF | ||
6176 | -if { (eval echo configure:19259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
6177 | +if { (eval echo configure:19303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
6178 | then | ||
6179 | ac_cv_sqlite_secure_delete=yes | ||
6180 | else | ||
6181 | @@ -19278,7 +19322,7 @@ fi | ||
6182 | fi | ||
6183 | |||
6184 | echo $ac_n "checking for SQLITE_THREADSAFE support in system SQLite""... $ac_c" 1>&6 | ||
6185 | -echo "configure:19282: checking for SQLITE_THREADSAFE support in system SQLite" >&5 | ||
6186 | +echo "configure:19326: checking for SQLITE_THREADSAFE support in system SQLite" >&5 | ||
6187 | _SAVE_CFLAGS="$CFLAGS" | ||
6188 | CFLAGS="$CFLAGS $SQLITE_CFLAGS" | ||
6189 | _SAVE_LIBS="$LIBS" | ||
6190 | @@ -19292,7 +19336,7 @@ else | ||
6191 | |||
6192 | else | ||
6193 | cat > conftest.$ac_ext <<EOF | ||
6194 | -#line 19296 "configure" | ||
6195 | +#line 19340 "configure" | ||
6196 | #include "confdefs.h" | ||
6197 | |||
6198 | #include "sqlite3.h" | ||
6199 | @@ -19301,7 +19345,7 @@ else | ||
6200 | return !sqlite3_compileoption_used("SQLITE_THREADSAFE=1"); | ||
6201 | } | ||
6202 | EOF | ||
6203 | -if { (eval echo configure:19305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
6204 | +if { (eval echo configure:19349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
6205 | then | ||
6206 | ac_cv_sqlite_threadsafe=yes | ||
6207 | else | ||
6208 | @@ -19324,7 +19368,7 @@ fi | ||
6209 | fi | ||
6210 | |||
6211 | echo $ac_n "checking for SQLITE_ENABLE_FTS3 support in system SQLite""... $ac_c" 1>&6 | ||
6212 | -echo "configure:19328: checking for SQLITE_ENABLE_FTS3 support in system SQLite" >&5 | ||
6213 | +echo "configure:19372: checking for SQLITE_ENABLE_FTS3 support in system SQLite" >&5 | ||
6214 | _SAVE_CFLAGS="$CFLAGS" | ||
6215 | CFLAGS="$CFLAGS $SQLITE_CFLAGS" | ||
6216 | _SAVE_LIBS="$LIBS" | ||
6217 | @@ -19338,7 +19382,7 @@ else | ||
6218 | |||
6219 | else | ||
6220 | cat > conftest.$ac_ext <<EOF | ||
6221 | -#line 19342 "configure" | ||
6222 | +#line 19386 "configure" | ||
6223 | #include "confdefs.h" | ||
6224 | |||
6225 | #include "sqlite3.h" | ||
6226 | @@ -19347,7 +19391,7 @@ else | ||
6227 | return !sqlite3_compileoption_used("SQLITE_ENABLE_FTS3"); | ||
6228 | } | ||
6229 | EOF | ||
6230 | -if { (eval echo configure:19351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
6231 | +if { (eval echo configure:19395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
6232 | then | ||
6233 | ac_cv_sqlite_enable_fts3=yes | ||
6234 | else | ||
6235 | @@ -19370,7 +19414,7 @@ fi | ||
6236 | fi | ||
6237 | |||
6238 | echo $ac_n "checking for SQLITE_ENABLE_UNLOCK_NOTIFY support in system SQLite""... $ac_c" 1>&6 | ||
6239 | -echo "configure:19374: checking for SQLITE_ENABLE_UNLOCK_NOTIFY support in system SQLite" >&5 | ||
6240 | +echo "configure:19418: checking for SQLITE_ENABLE_UNLOCK_NOTIFY support in system SQLite" >&5 | ||
6241 | _SAVE_CFLAGS="$CFLAGS" | ||
6242 | CFLAGS="$CFLAGS $SQLITE_CFLAGS" | ||
6243 | _SAVE_LIBS="$LIBS" | ||
6244 | @@ -19384,7 +19428,7 @@ else | ||
6245 | |||
6246 | else | ||
6247 | cat > conftest.$ac_ext <<EOF | ||
6248 | -#line 19388 "configure" | ||
6249 | +#line 19432 "configure" | ||
6250 | #include "confdefs.h" | ||
6251 | |||
6252 | #include "sqlite3.h" | ||
6253 | @@ -19393,7 +19437,7 @@ else | ||
6254 | return !sqlite3_compileoption_used("SQLITE_ENABLE_UNLOCK_NOTIFY"); | ||
6255 | } | ||
6256 | EOF | ||
6257 | -if { (eval echo configure:19397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
6258 | +if { (eval echo configure:19441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
6259 | then | ||
6260 | ac_cv_sqlite_enable_unlock_notify=yes | ||
6261 | else | ||
6262 | @@ -19516,7 +19560,7 @@ if test -n "$MOZ_ENABLE_LIBCONIC"; then | ||
6263 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
6264 | set dummy pkg-config; ac_word=$2 | ||
6265 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6266 | -echo "configure:19520: checking for $ac_word" >&5 | ||
6267 | +echo "configure:19564: checking for $ac_word" >&5 | ||
6268 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
6269 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6270 | else | ||
6271 | @@ -19560,19 +19604,19 @@ fi | ||
6272 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
6273 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
6274 | echo $ac_n "checking for conic""... $ac_c" 1>&6 | ||
6275 | -echo "configure:19564: checking for conic" >&5 | ||
6276 | +echo "configure:19608: checking for conic" >&5 | ||
6277 | |||
6278 | if $PKG_CONFIG --exists "conic" ; then | ||
6279 | echo "$ac_t""yes" 1>&6 | ||
6280 | succeeded=yes | ||
6281 | |||
6282 | echo $ac_n "checking LIBCONIC_CFLAGS""... $ac_c" 1>&6 | ||
6283 | -echo "configure:19571: checking LIBCONIC_CFLAGS" >&5 | ||
6284 | +echo "configure:19615: checking LIBCONIC_CFLAGS" >&5 | ||
6285 | LIBCONIC_CFLAGS=`$PKG_CONFIG --cflags "conic"` | ||
6286 | echo "$ac_t""$LIBCONIC_CFLAGS" 1>&6 | ||
6287 | |||
6288 | echo $ac_n "checking LIBCONIC_LIBS""... $ac_c" 1>&6 | ||
6289 | -echo "configure:19576: checking LIBCONIC_LIBS" >&5 | ||
6290 | +echo "configure:19620: checking LIBCONIC_LIBS" >&5 | ||
6291 | ## Remove evil flags like -Wl,--export-dynamic | ||
6292 | LIBCONIC_LIBS="`$PKG_CONFIG --libs \"conic\" |sed s/-Wl,--export-dynamic//g`" | ||
6293 | echo "$ac_t""$LIBCONIC_LIBS" 1>&6 | ||
6294 | @@ -19658,19 +19702,19 @@ EOF | ||
6295 | do | ||
6296 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
6297 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
6298 | -echo "configure:19662: checking for $ac_hdr" >&5 | ||
6299 | +echo "configure:19706: checking for $ac_hdr" >&5 | ||
6300 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
6301 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6302 | else | ||
6303 | cat > conftest.$ac_ext <<EOF | ||
6304 | -#line 19667 "configure" | ||
6305 | +#line 19711 "configure" | ||
6306 | #include "confdefs.h" | ||
6307 | #include <$ac_hdr> | ||
6308 | int main() { | ||
6309 | |||
6310 | ; return 0; } | ||
6311 | EOF | ||
6312 | -if { (eval echo configure:19674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6313 | +if { (eval echo configure:19718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6314 | rm -rf conftest* | ||
6315 | eval "ac_cv_header_$ac_safe=yes" | ||
6316 | else | ||
6317 | @@ -19697,7 +19741,7 @@ EOF | ||
6318 | done | ||
6319 | |||
6320 | echo $ac_n "checking for XCompositeRedirectWindow in -lXcomposite""... $ac_c" 1>&6 | ||
6321 | -echo "configure:19701: checking for XCompositeRedirectWindow in -lXcomposite" >&5 | ||
6322 | +echo "configure:19745: checking for XCompositeRedirectWindow in -lXcomposite" >&5 | ||
6323 | ac_lib_var=`echo Xcomposite'_'XCompositeRedirectWindow | sed 'y%./+-%__p_%'` | ||
6324 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
6325 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6326 | @@ -19705,7 +19749,7 @@ else | ||
6327 | ac_save_LIBS="$LIBS" | ||
6328 | LIBS="-lXcomposite $XLIBS $LIBS" | ||
6329 | cat > conftest.$ac_ext <<EOF | ||
6330 | -#line 19709 "configure" | ||
6331 | +#line 19753 "configure" | ||
6332 | #include "confdefs.h" | ||
6333 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
6334 | /* We use char because int might match the return type of a gcc2 | ||
6335 | @@ -19716,7 +19760,7 @@ int main() { | ||
6336 | XCompositeRedirectWindow() | ||
6337 | ; return 0; } | ||
6338 | EOF | ||
6339 | -if { (eval echo configure:19720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
6340 | +if { (eval echo configure:19764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
6341 | rm -rf conftest* | ||
6342 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
6343 | else | ||
6344 | @@ -19746,7 +19790,7 @@ fi | ||
6345 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
6346 | set dummy pkg-config; ac_word=$2 | ||
6347 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6348 | -echo "configure:19750: checking for $ac_word" >&5 | ||
6349 | +echo "configure:19794: checking for $ac_word" >&5 | ||
6350 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
6351 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6352 | else | ||
6353 | @@ -19790,19 +19834,19 @@ fi | ||
6354 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
6355 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
6356 | echo $ac_n "checking for libhildonmime""... $ac_c" 1>&6 | ||
6357 | -echo "configure:19794: checking for libhildonmime" >&5 | ||
6358 | +echo "configure:19838: checking for libhildonmime" >&5 | ||
6359 | |||
6360 | if $PKG_CONFIG --exists "libhildonmime" ; then | ||
6361 | echo "$ac_t""yes" 1>&6 | ||
6362 | succeeded=yes | ||
6363 | |||
6364 | echo $ac_n "checking LIBHILDONMIME_CFLAGS""... $ac_c" 1>&6 | ||
6365 | -echo "configure:19801: checking LIBHILDONMIME_CFLAGS" >&5 | ||
6366 | +echo "configure:19845: checking LIBHILDONMIME_CFLAGS" >&5 | ||
6367 | LIBHILDONMIME_CFLAGS=`$PKG_CONFIG --cflags "libhildonmime"` | ||
6368 | echo "$ac_t""$LIBHILDONMIME_CFLAGS" 1>&6 | ||
6369 | |||
6370 | echo $ac_n "checking LIBHILDONMIME_LIBS""... $ac_c" 1>&6 | ||
6371 | -echo "configure:19806: checking LIBHILDONMIME_LIBS" >&5 | ||
6372 | +echo "configure:19850: checking LIBHILDONMIME_LIBS" >&5 | ||
6373 | ## Remove evil flags like -Wl,--export-dynamic | ||
6374 | LIBHILDONMIME_LIBS="`$PKG_CONFIG --libs \"libhildonmime\" |sed s/-Wl,--export-dynamic//g`" | ||
6375 | echo "$ac_t""$LIBHILDONMIME_LIBS" 1>&6 | ||
6376 | @@ -19844,7 +19888,7 @@ echo "configure:19806: checking LIBHILDONMIME_LIBS" >&5 | ||
6377 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
6378 | set dummy pkg-config; ac_word=$2 | ||
6379 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6380 | -echo "configure:19848: checking for $ac_word" >&5 | ||
6381 | +echo "configure:19892: checking for $ac_word" >&5 | ||
6382 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
6383 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6384 | else | ||
6385 | @@ -19888,19 +19932,19 @@ fi | ||
6386 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
6387 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
6388 | echo $ac_n "checking for libosso""... $ac_c" 1>&6 | ||
6389 | -echo "configure:19892: checking for libosso" >&5 | ||
6390 | +echo "configure:19936: checking for libosso" >&5 | ||
6391 | |||
6392 | if $PKG_CONFIG --exists "libosso" ; then | ||
6393 | echo "$ac_t""yes" 1>&6 | ||
6394 | succeeded=yes | ||
6395 | |||
6396 | echo $ac_n "checking LIBOSSO_CFLAGS""... $ac_c" 1>&6 | ||
6397 | -echo "configure:19899: checking LIBOSSO_CFLAGS" >&5 | ||
6398 | +echo "configure:19943: checking LIBOSSO_CFLAGS" >&5 | ||
6399 | LIBOSSO_CFLAGS=`$PKG_CONFIG --cflags "libosso"` | ||
6400 | echo "$ac_t""$LIBOSSO_CFLAGS" 1>&6 | ||
6401 | |||
6402 | echo $ac_n "checking LIBOSSO_LIBS""... $ac_c" 1>&6 | ||
6403 | -echo "configure:19904: checking LIBOSSO_LIBS" >&5 | ||
6404 | +echo "configure:19948: checking LIBOSSO_LIBS" >&5 | ||
6405 | ## Remove evil flags like -Wl,--export-dynamic | ||
6406 | LIBOSSO_LIBS="`$PKG_CONFIG --libs \"libosso\" |sed s/-Wl,--export-dynamic//g`" | ||
6407 | echo "$ac_t""$LIBOSSO_LIBS" 1>&6 | ||
6408 | @@ -19941,7 +19985,7 @@ echo "configure:19904: checking LIBOSSO_LIBS" >&5 | ||
6409 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
6410 | set dummy pkg-config; ac_word=$2 | ||
6411 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6412 | -echo "configure:19945: checking for $ac_word" >&5 | ||
6413 | +echo "configure:19989: checking for $ac_word" >&5 | ||
6414 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
6415 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6416 | else | ||
6417 | @@ -19985,19 +20029,19 @@ fi | ||
6418 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
6419 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
6420 | echo $ac_n "checking for hildon-fm-2""... $ac_c" 1>&6 | ||
6421 | -echo "configure:19989: checking for hildon-fm-2" >&5 | ||
6422 | +echo "configure:20033: checking for hildon-fm-2" >&5 | ||
6423 | |||
6424 | if $PKG_CONFIG --exists "hildon-fm-2" ; then | ||
6425 | echo "$ac_t""yes" 1>&6 | ||
6426 | succeeded=yes | ||
6427 | |||
6428 | echo $ac_n "checking LIBHILDONFM_CFLAGS""... $ac_c" 1>&6 | ||
6429 | -echo "configure:19996: checking LIBHILDONFM_CFLAGS" >&5 | ||
6430 | +echo "configure:20040: checking LIBHILDONFM_CFLAGS" >&5 | ||
6431 | LIBHILDONFM_CFLAGS=`$PKG_CONFIG --cflags "hildon-fm-2"` | ||
6432 | echo "$ac_t""$LIBHILDONFM_CFLAGS" 1>&6 | ||
6433 | |||
6434 | echo $ac_n "checking LIBHILDONFM_LIBS""... $ac_c" 1>&6 | ||
6435 | -echo "configure:20001: checking LIBHILDONFM_LIBS" >&5 | ||
6436 | +echo "configure:20045: checking LIBHILDONFM_LIBS" >&5 | ||
6437 | ## Remove evil flags like -Wl,--export-dynamic | ||
6438 | LIBHILDONFM_LIBS="`$PKG_CONFIG --libs \"hildon-fm-2\" |sed s/-Wl,--export-dynamic//g`" | ||
6439 | echo "$ac_t""$LIBHILDONFM_LIBS" 1>&6 | ||
6440 | @@ -20041,7 +20085,7 @@ echo "configure:20001: checking LIBHILDONFM_LIBS" >&5 | ||
6441 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
6442 | set dummy pkg-config; ac_word=$2 | ||
6443 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6444 | -echo "configure:20045: checking for $ac_word" >&5 | ||
6445 | +echo "configure:20089: checking for $ac_word" >&5 | ||
6446 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
6447 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6448 | else | ||
6449 | @@ -20085,19 +20129,19 @@ fi | ||
6450 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
6451 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
6452 | echo $ac_n "checking for ContentManager QtSparql""... $ac_c" 1>&6 | ||
6453 | -echo "configure:20089: checking for ContentManager QtSparql" >&5 | ||
6454 | +echo "configure:20133: checking for ContentManager QtSparql" >&5 | ||
6455 | |||
6456 | if $PKG_CONFIG --exists "ContentManager QtSparql" ; then | ||
6457 | echo "$ac_t""yes" 1>&6 | ||
6458 | succeeded=yes | ||
6459 | |||
6460 | echo $ac_n "checking LIBCONTENTMANAGER_CFLAGS""... $ac_c" 1>&6 | ||
6461 | -echo "configure:20096: checking LIBCONTENTMANAGER_CFLAGS" >&5 | ||
6462 | +echo "configure:20140: checking LIBCONTENTMANAGER_CFLAGS" >&5 | ||
6463 | LIBCONTENTMANAGER_CFLAGS=`$PKG_CONFIG --cflags "ContentManager QtSparql"` | ||
6464 | echo "$ac_t""$LIBCONTENTMANAGER_CFLAGS" 1>&6 | ||
6465 | |||
6466 | echo $ac_n "checking LIBCONTENTMANAGER_LIBS""... $ac_c" 1>&6 | ||
6467 | -echo "configure:20101: checking LIBCONTENTMANAGER_LIBS" >&5 | ||
6468 | +echo "configure:20145: checking LIBCONTENTMANAGER_LIBS" >&5 | ||
6469 | ## Remove evil flags like -Wl,--export-dynamic | ||
6470 | LIBCONTENTMANAGER_LIBS="`$PKG_CONFIG --libs \"ContentManager QtSparql\" |sed s/-Wl,--export-dynamic//g`" | ||
6471 | echo "$ac_t""$LIBCONTENTMANAGER_LIBS" 1>&6 | ||
6472 | @@ -20160,7 +20204,7 @@ fi | ||
6473 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
6474 | set dummy pkg-config; ac_word=$2 | ||
6475 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6476 | -echo "configure:20164: checking for $ac_word" >&5 | ||
6477 | +echo "configure:20208: checking for $ac_word" >&5 | ||
6478 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
6479 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6480 | else | ||
6481 | @@ -20204,19 +20248,19 @@ fi | ||
6482 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
6483 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
6484 | echo $ac_n "checking for contentaction-0.1""... $ac_c" 1>&6 | ||
6485 | -echo "configure:20208: checking for contentaction-0.1" >&5 | ||
6486 | +echo "configure:20252: checking for contentaction-0.1" >&5 | ||
6487 | |||
6488 | if $PKG_CONFIG --exists "contentaction-0.1" ; then | ||
6489 | echo "$ac_t""yes" 1>&6 | ||
6490 | succeeded=yes | ||
6491 | |||
6492 | echo $ac_n "checking LIBCONTENTACTION_CFLAGS""... $ac_c" 1>&6 | ||
6493 | -echo "configure:20215: checking LIBCONTENTACTION_CFLAGS" >&5 | ||
6494 | +echo "configure:20259: checking LIBCONTENTACTION_CFLAGS" >&5 | ||
6495 | LIBCONTENTACTION_CFLAGS=`$PKG_CONFIG --cflags "contentaction-0.1"` | ||
6496 | echo "$ac_t""$LIBCONTENTACTION_CFLAGS" 1>&6 | ||
6497 | |||
6498 | echo $ac_n "checking LIBCONTENTACTION_LIBS""... $ac_c" 1>&6 | ||
6499 | -echo "configure:20220: checking LIBCONTENTACTION_LIBS" >&5 | ||
6500 | +echo "configure:20264: checking LIBCONTENTACTION_LIBS" >&5 | ||
6501 | ## Remove evil flags like -Wl,--export-dynamic | ||
6502 | LIBCONTENTACTION_LIBS="`$PKG_CONFIG --libs \"contentaction-0.1\" |sed s/-Wl,--export-dynamic//g`" | ||
6503 | echo "$ac_t""$LIBCONTENTACTION_LIBS" 1>&6 | ||
6504 | @@ -20277,7 +20321,7 @@ fi | ||
6505 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
6506 | set dummy pkg-config; ac_word=$2 | ||
6507 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6508 | -echo "configure:20281: checking for $ac_word" >&5 | ||
6509 | +echo "configure:20325: checking for $ac_word" >&5 | ||
6510 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
6511 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6512 | else | ||
6513 | @@ -20321,19 +20365,19 @@ fi | ||
6514 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
6515 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
6516 | echo $ac_n "checking for meegotouchcore""... $ac_c" 1>&6 | ||
6517 | -echo "configure:20325: checking for meegotouchcore" >&5 | ||
6518 | +echo "configure:20369: checking for meegotouchcore" >&5 | ||
6519 | |||
6520 | if $PKG_CONFIG --exists "meegotouchcore" ; then | ||
6521 | echo "$ac_t""yes" 1>&6 | ||
6522 | succeeded=yes | ||
6523 | |||
6524 | echo $ac_n "checking MOZ_MEEGOTOUCH_CFLAGS""... $ac_c" 1>&6 | ||
6525 | -echo "configure:20332: checking MOZ_MEEGOTOUCH_CFLAGS" >&5 | ||
6526 | +echo "configure:20376: checking MOZ_MEEGOTOUCH_CFLAGS" >&5 | ||
6527 | MOZ_MEEGOTOUCH_CFLAGS=`$PKG_CONFIG --cflags "meegotouchcore"` | ||
6528 | echo "$ac_t""$MOZ_MEEGOTOUCH_CFLAGS" 1>&6 | ||
6529 | |||
6530 | echo $ac_n "checking MOZ_MEEGOTOUCH_LIBS""... $ac_c" 1>&6 | ||
6531 | -echo "configure:20337: checking MOZ_MEEGOTOUCH_LIBS" >&5 | ||
6532 | +echo "configure:20381: checking MOZ_MEEGOTOUCH_LIBS" >&5 | ||
6533 | ## Remove evil flags like -Wl,--export-dynamic | ||
6534 | MOZ_MEEGOTOUCH_LIBS="`$PKG_CONFIG --libs \"meegotouchcore\" |sed s/-Wl,--export-dynamic//g`" | ||
6535 | echo "$ac_t""$MOZ_MEEGOTOUCH_LIBS" 1>&6 | ||
6536 | @@ -20381,7 +20425,7 @@ EOF | ||
6537 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
6538 | set dummy pkg-config; ac_word=$2 | ||
6539 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6540 | -echo "configure:20385: checking for $ac_word" >&5 | ||
6541 | +echo "configure:20429: checking for $ac_word" >&5 | ||
6542 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
6543 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6544 | else | ||
6545 | @@ -20425,19 +20469,19 @@ fi | ||
6546 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
6547 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
6548 | echo $ac_n "checking for liblocation""... $ac_c" 1>&6 | ||
6549 | -echo "configure:20429: checking for liblocation" >&5 | ||
6550 | +echo "configure:20473: checking for liblocation" >&5 | ||
6551 | |||
6552 | if $PKG_CONFIG --exists "liblocation" ; then | ||
6553 | echo "$ac_t""yes" 1>&6 | ||
6554 | succeeded=yes | ||
6555 | |||
6556 | echo $ac_n "checking LIBLOCATION_CFLAGS""... $ac_c" 1>&6 | ||
6557 | -echo "configure:20436: checking LIBLOCATION_CFLAGS" >&5 | ||
6558 | +echo "configure:20480: checking LIBLOCATION_CFLAGS" >&5 | ||
6559 | LIBLOCATION_CFLAGS=`$PKG_CONFIG --cflags "liblocation"` | ||
6560 | echo "$ac_t""$LIBLOCATION_CFLAGS" 1>&6 | ||
6561 | |||
6562 | echo $ac_n "checking LIBLOCATION_LIBS""... $ac_c" 1>&6 | ||
6563 | -echo "configure:20441: checking LIBLOCATION_LIBS" >&5 | ||
6564 | +echo "configure:20485: checking LIBLOCATION_LIBS" >&5 | ||
6565 | ## Remove evil flags like -Wl,--export-dynamic | ||
6566 | LIBLOCATION_LIBS="`$PKG_CONFIG --libs \"liblocation\" |sed s/-Wl,--export-dynamic//g`" | ||
6567 | echo "$ac_t""$LIBLOCATION_LIBS" 1>&6 | ||
6568 | @@ -20485,7 +20529,7 @@ EOF | ||
6569 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
6570 | set dummy pkg-config; ac_word=$2 | ||
6571 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6572 | -echo "configure:20489: checking for $ac_word" >&5 | ||
6573 | +echo "configure:20533: checking for $ac_word" >&5 | ||
6574 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
6575 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6576 | else | ||
6577 | @@ -20529,19 +20573,19 @@ fi | ||
6578 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
6579 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
6580 | echo $ac_n "checking for ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri""... $ac_c" 1>&6 | ||
6581 | -echo "configure:20533: checking for ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri" >&5 | ||
6582 | +echo "configure:20577: checking for ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri" >&5 | ||
6583 | |||
6584 | if $PKG_CONFIG --exists "ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri" ; then | ||
6585 | echo "$ac_t""yes" 1>&6 | ||
6586 | succeeded=yes | ||
6587 | |||
6588 | echo $ac_n "checking LIBMEEGOTOUCHSHARE_CFLAGS""... $ac_c" 1>&6 | ||
6589 | -echo "configure:20540: checking LIBMEEGOTOUCHSHARE_CFLAGS" >&5 | ||
6590 | +echo "configure:20584: checking LIBMEEGOTOUCHSHARE_CFLAGS" >&5 | ||
6591 | LIBMEEGOTOUCHSHARE_CFLAGS=`$PKG_CONFIG --cflags "ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri"` | ||
6592 | echo "$ac_t""$LIBMEEGOTOUCHSHARE_CFLAGS" 1>&6 | ||
6593 | |||
6594 | echo $ac_n "checking LIBMEEGOTOUCHSHARE_LIBS""... $ac_c" 1>&6 | ||
6595 | -echo "configure:20545: checking LIBMEEGOTOUCHSHARE_LIBS" >&5 | ||
6596 | +echo "configure:20589: checking LIBMEEGOTOUCHSHARE_LIBS" >&5 | ||
6597 | ## Remove evil flags like -Wl,--export-dynamic | ||
6598 | LIBMEEGOTOUCHSHARE_LIBS="`$PKG_CONFIG --libs \"ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri\" |sed s/-Wl,--export-dynamic//g`" | ||
6599 | echo "$ac_t""$LIBMEEGOTOUCHSHARE_LIBS" 1>&6 | ||
6600 | @@ -20661,18 +20705,18 @@ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED" | ||
6601 | |||
6602 | if test -n "$MOZ_DEBUG"; then | ||
6603 | echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 | ||
6604 | -echo "configure:20665: checking for valid debug flags" >&5 | ||
6605 | +echo "configure:20709: checking for valid debug flags" >&5 | ||
6606 | _SAVE_CFLAGS=$CFLAGS | ||
6607 | CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" | ||
6608 | cat > conftest.$ac_ext <<EOF | ||
6609 | -#line 20669 "configure" | ||
6610 | +#line 20713 "configure" | ||
6611 | #include "confdefs.h" | ||
6612 | #include <stdio.h> | ||
6613 | int main() { | ||
6614 | printf("Hello World\n"); | ||
6615 | ; return 0; } | ||
6616 | EOF | ||
6617 | -if { (eval echo configure:20676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6618 | +if { (eval echo configure:20720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6619 | rm -rf conftest* | ||
6620 | _results=yes | ||
6621 | else | ||
6622 | @@ -20757,18 +20801,18 @@ fi | ||
6623 | if test "$COMPILE_ENVIRONMENT"; then | ||
6624 | if test -n "$MOZ_OPTIMIZE"; then | ||
6625 | echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 | ||
6626 | -echo "configure:20761: checking for valid optimization flags" >&5 | ||
6627 | +echo "configure:20805: checking for valid optimization flags" >&5 | ||
6628 | _SAVE_CFLAGS=$CFLAGS | ||
6629 | CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" | ||
6630 | cat > conftest.$ac_ext <<EOF | ||
6631 | -#line 20765 "configure" | ||
6632 | +#line 20809 "configure" | ||
6633 | #include "confdefs.h" | ||
6634 | #include <stdio.h> | ||
6635 | int main() { | ||
6636 | printf("Hello World\n"); | ||
6637 | ; return 0; } | ||
6638 | EOF | ||
6639 | -if { (eval echo configure:20772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6640 | +if { (eval echo configure:20816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6641 | rm -rf conftest* | ||
6642 | _results=yes | ||
6643 | else | ||
6644 | @@ -20837,7 +20881,7 @@ fi | ||
6645 | |||
6646 | if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$MOZ_DISABLE_ICF"; then | ||
6647 | echo $ac_n "checking whether the linker supports Identical Code Folding""... $ac_c" 1>&6 | ||
6648 | -echo "configure:20841: checking whether the linker supports Identical Code Folding" >&5 | ||
6649 | +echo "configure:20885: checking whether the linker supports Identical Code Folding" >&5 | ||
6650 | if eval "test \"`echo '$''{'LD_SUPPORTS_ICF'+set}'`\" = set"; then | ||
6651 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6652 | else | ||
6653 | @@ -20846,7 +20890,7 @@ else | ||
6654 | 'int main() {return foo() - bar();}' > conftest.${ac_ext} | ||
6655 | # If the linker supports ICF, foo and bar symbols will have | ||
6656 | # the same address | ||
6657 | - if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:20850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
6658 | + if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:20894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
6659 | test -s conftest${ac_exeext} && | ||
6660 | objdump -t conftest${ac_exeext} | awk '{a[$6] = $1} END {if (a["foo"] && (a["foo"] != a["bar"])) { exit 1 }}'; then | ||
6661 | LD_SUPPORTS_ICF=yes | ||
6662 | @@ -20867,15 +20911,15 @@ fi | ||
6663 | |||
6664 | if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -n "$MOZ_DEBUG_FLAGS"; then | ||
6665 | echo $ac_n "checking whether removing dead symbols breaks debugging""... $ac_c" 1>&6 | ||
6666 | -echo "configure:20871: checking whether removing dead symbols breaks debugging" >&5 | ||
6667 | +echo "configure:20915: checking whether removing dead symbols breaks debugging" >&5 | ||
6668 | if eval "test \"`echo '$''{'GC_SECTIONS_BREAKS_DEBUG_RANGES'+set}'`\" = set"; then | ||
6669 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6670 | else | ||
6671 | echo 'int foo() {return 42;}' \ | ||
6672 | 'int bar() {return 1;}' \ | ||
6673 | 'int main() {return foo();}' > conftest.${ac_ext} | ||
6674 | - if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -ffunction-sections -c conftest.${ac_ext} 1>&2'; { (eval echo configure:20878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
6675 | - { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:20879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
6676 | + if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -ffunction-sections -c conftest.${ac_ext} 1>&2'; { (eval echo configure:20922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
6677 | + { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:20923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
6678 | test -s conftest${ac_exeext} -a -s conftest.${ac_objext}; then | ||
6679 | if test "`$PYTHON "$_topsrcdir"/build/unix/check_debug_ranges.py conftest.${ac_objext} conftest.${ac_ext}`" = \ | ||
6680 | "`$PYTHON "$_topsrcdir"/build/unix/check_debug_ranges.py conftest${ac_exeext} conftest.${ac_ext}`"; then | ||
6681 | @@ -21007,7 +21051,7 @@ if test "${enable_jemalloc+set}" = set; then | ||
6682 | fi | ||
6683 | |||
6684 | |||
6685 | -if test "$NS_TRACE_MALLOC"; then | ||
6686 | +if test "$NS_TRACE_MALLOC" || test "$LIBXUL_SDK"; then | ||
6687 | MOZ_MEMORY= | ||
6688 | fi | ||
6689 | |||
6690 | @@ -21045,7 +21089,7 @@ EOF | ||
6691 | fi | ||
6692 | else | ||
6693 | echo $ac_n "checking size of int *""... $ac_c" 1>&6 | ||
6694 | -echo "configure:21049: checking size of int *" >&5 | ||
6695 | +echo "configure:21093: checking size of int *" >&5 | ||
6696 | if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then | ||
6697 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6698 | else | ||
6699 | @@ -21053,7 +21097,7 @@ else | ||
6700 | ac_cv_sizeof_int_p=4 | ||
6701 | else | ||
6702 | cat > conftest.$ac_ext <<EOF | ||
6703 | -#line 21057 "configure" | ||
6704 | +#line 21101 "configure" | ||
6705 | #include "confdefs.h" | ||
6706 | #include <stdio.h> | ||
6707 | int main() | ||
6708 | @@ -21064,7 +21108,7 @@ int main() | ||
6709 | return(0); | ||
6710 | } | ||
6711 | EOF | ||
6712 | -if { (eval echo configure:21068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
6713 | +if { (eval echo configure:21112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
6714 | then | ||
6715 | ac_cv_sizeof_int_p=`cat conftestval` | ||
6716 | else | ||
6717 | @@ -21365,7 +21409,7 @@ do | ||
6718 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
6719 | set dummy $ac_prog; ac_word=$2 | ||
6720 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6721 | -echo "configure:21369: checking for $ac_word" >&5 | ||
6722 | +echo "configure:21413: checking for $ac_word" >&5 | ||
6723 | if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then | ||
6724 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6725 | else | ||
6726 | @@ -21519,12 +21563,12 @@ fi | ||
6727 | |||
6728 | if test "$USE_ELF_HACK" = 1; then | ||
6729 | echo $ac_n "checking whether linker creates PT_GNU_RELRO segments""... $ac_c" 1>&6 | ||
6730 | -echo "configure:21523: checking whether linker creates PT_GNU_RELRO segments" >&5 | ||
6731 | +echo "configure:21567: checking whether linker creates PT_GNU_RELRO segments" >&5 | ||
6732 | if eval "test \"`echo '$''{'LINK_WITH_PT_GNU_RELRO'+set}'`\" = set"; then | ||
6733 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6734 | else | ||
6735 | echo "int main() {return 0;}" > conftest.${ac_ext} | ||
6736 | - if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:21528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
6737 | + if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:21572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
6738 | test -s conftest${ac_exeext}; then | ||
6739 | if readelf -l conftest${ac_exeext} | grep GNU_RELRO > /dev/null; then | ||
6740 | LINK_WITH_PT_GNU_RELRO=yes | ||
6741 | @@ -21652,12 +21696,12 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
6742 | for ac_func in __cxa_demangle | ||
6743 | do | ||
6744 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
6745 | -echo "configure:21656: checking for $ac_func" >&5 | ||
6746 | +echo "configure:21700: checking for $ac_func" >&5 | ||
6747 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
6748 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6749 | else | ||
6750 | cat > conftest.$ac_ext <<EOF | ||
6751 | -#line 21661 "configure" | ||
6752 | +#line 21705 "configure" | ||
6753 | #include "confdefs.h" | ||
6754 | /* System header to define __stub macros and hopefully few prototypes, | ||
6755 | which can conflict with char $ac_func(); below. */ | ||
6756 | @@ -21683,7 +21727,7 @@ $ac_func(); | ||
6757 | |||
6758 | ; return 0; } | ||
6759 | EOF | ||
6760 | -if { (eval echo configure:21687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
6761 | +if { (eval echo configure:21731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
6762 | rm -rf conftest* | ||
6763 | eval "ac_cv_func_$ac_func=yes" | ||
6764 | else | ||
6765 | @@ -21731,19 +21775,19 @@ fi | ||
6766 | if test -z "$SKIP_LIBRARY_CHECKS"; then | ||
6767 | ac_safe=`echo "unwind.h" | sed 'y%./+-%__p_%'` | ||
6768 | echo $ac_n "checking for unwind.h""... $ac_c" 1>&6 | ||
6769 | -echo "configure:21735: checking for unwind.h" >&5 | ||
6770 | +echo "configure:21779: checking for unwind.h" >&5 | ||
6771 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
6772 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6773 | else | ||
6774 | cat > conftest.$ac_ext <<EOF | ||
6775 | -#line 21740 "configure" | ||
6776 | +#line 21784 "configure" | ||
6777 | #include "confdefs.h" | ||
6778 | #include <unwind.h> | ||
6779 | int main() { | ||
6780 | |||
6781 | ; return 0; } | ||
6782 | EOF | ||
6783 | -if { (eval echo configure:21747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6784 | +if { (eval echo configure:21791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6785 | rm -rf conftest* | ||
6786 | eval "ac_cv_header_$ac_safe=yes" | ||
6787 | else | ||
6788 | @@ -21760,12 +21804,12 @@ fi | ||
6789 | for ac_func in _Unwind_Backtrace | ||
6790 | do | ||
6791 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
6792 | -echo "configure:21764: checking for $ac_func" >&5 | ||
6793 | +echo "configure:21808: checking for $ac_func" >&5 | ||
6794 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
6795 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6796 | else | ||
6797 | cat > conftest.$ac_ext <<EOF | ||
6798 | -#line 21769 "configure" | ||
6799 | +#line 21813 "configure" | ||
6800 | #include "confdefs.h" | ||
6801 | /* System header to define __stub macros and hopefully few prototypes, | ||
6802 | which can conflict with char $ac_func(); below. */ | ||
6803 | @@ -21788,7 +21832,7 @@ $ac_func(); | ||
6804 | |||
6805 | ; return 0; } | ||
6806 | EOF | ||
6807 | -if { (eval echo configure:21792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
6808 | +if { (eval echo configure:21836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
6809 | rm -rf conftest* | ||
6810 | eval "ac_cv_func_$ac_func=yes" | ||
6811 | else | ||
6812 | @@ -21949,7 +21993,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then | ||
6813 | # Compiler Options | ||
6814 | |||
6815 | echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 | ||
6816 | -echo "configure:21953: checking for gcc -pipe support" >&5 | ||
6817 | +echo "configure:21997: checking for gcc -pipe support" >&5 | ||
6818 | if test -n "$GNU_CC" -a -n "$GNU_CXX" -a -n "$GNU_AS"; then | ||
6819 | echo '#include <stdio.h>' > dummy-hello.c | ||
6820 | echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c | ||
6821 | @@ -21964,14 +22008,14 @@ if test -n "$GNU_CC" -a -n "$GNU_CXX" -a -n "$GNU_AS"; then | ||
6822 | _SAVE_CFLAGS=$CFLAGS | ||
6823 | CFLAGS="$CFLAGS -pipe" | ||
6824 | cat > conftest.$ac_ext <<EOF | ||
6825 | -#line 21968 "configure" | ||
6826 | +#line 22012 "configure" | ||
6827 | #include "confdefs.h" | ||
6828 | #include <stdio.h> | ||
6829 | int main() { | ||
6830 | printf("Hello World\n"); | ||
6831 | ; return 0; } | ||
6832 | EOF | ||
6833 | -if { (eval echo configure:21975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6834 | +if { (eval echo configure:22019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6835 | rm -rf conftest* | ||
6836 | _res_gcc_pipe="yes" | ||
6837 | else | ||
6838 | @@ -22001,16 +22045,16 @@ _SAVE_CFLAGS="$CFLAGS" | ||
6839 | CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction" | ||
6840 | |||
6841 | echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 | ||
6842 | -echo "configure:22005: checking whether C compiler supports -fprofile-generate" >&5 | ||
6843 | +echo "configure:22049: checking whether C compiler supports -fprofile-generate" >&5 | ||
6844 | cat > conftest.$ac_ext <<EOF | ||
6845 | -#line 22007 "configure" | ||
6846 | +#line 22051 "configure" | ||
6847 | #include "confdefs.h" | ||
6848 | |||
6849 | int main() { | ||
6850 | return 0; | ||
6851 | ; return 0; } | ||
6852 | EOF | ||
6853 | -if { (eval echo configure:22014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6854 | +if { (eval echo configure:22058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6855 | rm -rf conftest* | ||
6856 | PROFILE_GEN_CFLAGS="-fprofile-generate" | ||
6857 | result="yes" | ||
6858 | @@ -22074,16 +22118,16 @@ if test "$_PEDANTIC"; then | ||
6859 | _SAVE_CXXFLAGS=$CXXFLAGS | ||
6860 | CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic ${_COMPILER_PREFIX}-Wno-long-long" | ||
6861 | echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 | ||
6862 | -echo "configure:22078: checking whether C++ compiler has -pedantic long long bug" >&5 | ||
6863 | +echo "configure:22122: checking whether C++ compiler has -pedantic long long bug" >&5 | ||
6864 | cat > conftest.$ac_ext <<EOF | ||
6865 | -#line 22080 "configure" | ||
6866 | +#line 22124 "configure" | ||
6867 | #include "confdefs.h" | ||
6868 | $configure_static_assert_macros | ||
6869 | int main() { | ||
6870 | CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8) | ||
6871 | ; return 0; } | ||
6872 | EOF | ||
6873 | -if { (eval echo configure:22087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6874 | +if { (eval echo configure:22131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6875 | rm -rf conftest* | ||
6876 | result="no" | ||
6877 | else | ||
6878 | @@ -22110,12 +22154,12 @@ fi | ||
6879 | _SAVE_CXXFLAGS=$CXXFLAGS | ||
6880 | CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" | ||
6881 | echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 | ||
6882 | -echo "configure:22114: checking for correct overload resolution with const and templates" >&5 | ||
6883 | +echo "configure:22158: checking for correct overload resolution with const and templates" >&5 | ||
6884 | if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then | ||
6885 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6886 | else | ||
6887 | cat > conftest.$ac_ext <<EOF | ||
6888 | -#line 22119 "configure" | ||
6889 | +#line 22163 "configure" | ||
6890 | #include "confdefs.h" | ||
6891 | |||
6892 | template <class T> | ||
6893 | @@ -22145,7 +22189,7 @@ int main() { | ||
6894 | |||
6895 | ; return 0; } | ||
6896 | EOF | ||
6897 | -if { (eval echo configure:22149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6898 | +if { (eval echo configure:22193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
6899 | rm -rf conftest* | ||
6900 | ac_nscap_nonconst_opeq_bug="no" | ||
6901 | else | ||
6902 | @@ -22182,18 +22226,18 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
6903 | |||
6904 | |||
6905 | echo $ac_n "checking what kind of list files are supported by the linker""... $ac_c" 1>&6 | ||
6906 | -echo "configure:22186: checking what kind of list files are supported by the linker" >&5 | ||
6907 | +echo "configure:22230: checking what kind of list files are supported by the linker" >&5 | ||
6908 | if eval "test \"`echo '$''{'EXPAND_LIBS_LIST_STYLE'+set}'`\" = set"; then | ||
6909 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6910 | else | ||
6911 | echo "int main() {return 0;}" > conftest.${ac_ext} | ||
6912 | - if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&2'; { (eval echo configure:22191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then | ||
6913 | + if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&2'; { (eval echo configure:22235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then | ||
6914 | echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list | ||
6915 | - if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&2'; { (eval echo configure:22193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then | ||
6916 | + if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&2'; { (eval echo configure:22237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then | ||
6917 | EXPAND_LIBS_LIST_STYLE=linkerscript | ||
6918 | else | ||
6919 | echo "conftest.${OBJ_SUFFIX}" > conftest.list | ||
6920 | - if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&2'; { (eval echo configure:22197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then | ||
6921 | + if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&2'; { (eval echo configure:22241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then | ||
6922 | EXPAND_LIBS_LIST_STYLE=list | ||
6923 | else | ||
6924 | EXPAND_LIBS_LIST_STYLE=none | ||
6925 | @@ -22323,7 +22367,7 @@ XPCOM_LIBS="$LIBXUL_LIBS" | ||
6926 | # Standalone module options (Not for building Mozilla) | ||
6927 | |||
6928 | |||
6929 | -if test -z "$SKIP_PATH_CHECKS"; then | ||
6930 | +if test -z "$SKIP_PATH_CHECKS" && test -z "$LIBXUL_SDK"; then | ||
6931 | if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then | ||
6932 | if test "$MOZ_ENABLE_GTK2" -o "$USE_ELF_DYNSTR_GC" ; then | ||
6933 | succeeded=no | ||
6934 | @@ -22332,7 +22376,7 @@ if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then | ||
6935 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
6936 | set dummy pkg-config; ac_word=$2 | ||
6937 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6938 | -echo "configure:22336: checking for $ac_word" >&5 | ||
6939 | +echo "configure:22380: checking for $ac_word" >&5 | ||
6940 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
6941 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6942 | else | ||
6943 | @@ -22376,19 +22420,19 @@ fi | ||
6944 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
6945 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
6946 | echo $ac_n "checking for glib-2.0 >= 1.3.7 gobject-2.0""... $ac_c" 1>&6 | ||
6947 | -echo "configure:22380: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 | ||
6948 | +echo "configure:22424: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 | ||
6949 | |||
6950 | if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7 gobject-2.0" ; then | ||
6951 | echo "$ac_t""yes" 1>&6 | ||
6952 | succeeded=yes | ||
6953 | |||
6954 | echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 | ||
6955 | -echo "configure:22387: checking GLIB_CFLAGS" >&5 | ||
6956 | +echo "configure:22431: checking GLIB_CFLAGS" >&5 | ||
6957 | GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7 gobject-2.0"` | ||
6958 | echo "$ac_t""$GLIB_CFLAGS" 1>&6 | ||
6959 | |||
6960 | echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 | ||
6961 | -echo "configure:22392: checking GLIB_LIBS" >&5 | ||
6962 | +echo "configure:22436: checking GLIB_LIBS" >&5 | ||
6963 | ## Remove evil flags like -Wl,--export-dynamic | ||
6964 | GLIB_LIBS="`$PKG_CONFIG --libs \"glib-2.0 >= 1.3.7 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" | ||
6965 | echo "$ac_t""$GLIB_LIBS" 1>&6 | ||
6966 | @@ -22473,7 +22517,7 @@ fi | ||
6967 | # Extract the first word of "glib-config", so it can be a program name with args. | ||
6968 | set dummy glib-config; ac_word=$2 | ||
6969 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
6970 | -echo "configure:22477: checking for $ac_word" >&5 | ||
6971 | +echo "configure:22521: checking for $ac_word" >&5 | ||
6972 | if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then | ||
6973 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
6974 | else | ||
6975 | @@ -22508,7 +22552,7 @@ fi | ||
6976 | |||
6977 | min_glib_version=${GLIB_VERSION} | ||
6978 | echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 | ||
6979 | -echo "configure:22512: checking for GLIB - version >= $min_glib_version" >&5 | ||
6980 | +echo "configure:22556: checking for GLIB - version >= $min_glib_version" >&5 | ||
6981 | no_glib="" | ||
6982 | if test "$GLIB_CONFIG" = "no" ; then | ||
6983 | no_glib=yes | ||
6984 | @@ -22531,7 +22575,7 @@ echo "configure:22512: checking for GLIB - version >= $min_glib_version" >&5 | ||
6985 | echo $ac_n "cross compiling; assumed OK... $ac_c" | ||
6986 | else | ||
6987 | cat > conftest.$ac_ext <<EOF | ||
6988 | -#line 22535 "configure" | ||
6989 | +#line 22579 "configure" | ||
6990 | #include "confdefs.h" | ||
6991 | |||
6992 | #include <glib.h> | ||
6993 | @@ -22607,7 +22651,7 @@ main () | ||
6994 | } | ||
6995 | |||
6996 | EOF | ||
6997 | -if { (eval echo configure:22611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
6998 | +if { (eval echo configure:22655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
6999 | then | ||
7000 | : | ||
7001 | else | ||
7002 | @@ -22641,7 +22685,7 @@ fi | ||
7003 | CFLAGS="$CFLAGS $GLIB_CFLAGS" | ||
7004 | LIBS="$LIBS $GLIB_LIBS" | ||
7005 | cat > conftest.$ac_ext <<EOF | ||
7006 | -#line 22645 "configure" | ||
7007 | +#line 22689 "configure" | ||
7008 | #include "confdefs.h" | ||
7009 | |||
7010 | #include <glib.h> | ||
7011 | @@ -22651,7 +22695,7 @@ int main() { | ||
7012 | return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); | ||
7013 | ; return 0; } | ||
7014 | EOF | ||
7015 | -if { (eval echo configure:22655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
7016 | +if { (eval echo configure:22699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
7017 | rm -rf conftest* | ||
7018 | echo "*** The test program compiled, but did not run. This usually means" | ||
7019 | echo "*** that the run-time linker is not finding GLIB or finding the wrong" | ||
7020 | @@ -22739,19 +22783,19 @@ fi | ||
7021 | do | ||
7022 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
7023 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
7024 | -echo "configure:22743: checking for $ac_hdr" >&5 | ||
7025 | +echo "configure:22787: checking for $ac_hdr" >&5 | ||
7026 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
7027 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
7028 | else | ||
7029 | cat > conftest.$ac_ext <<EOF | ||
7030 | -#line 22748 "configure" | ||
7031 | +#line 22792 "configure" | ||
7032 | #include "confdefs.h" | ||
7033 | #include <$ac_hdr> | ||
7034 | int main() { | ||
7035 | |||
7036 | ; return 0; } | ||
7037 | EOF | ||
7038 | -if { (eval echo configure:22755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
7039 | +if { (eval echo configure:22799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
7040 | rm -rf conftest* | ||
7041 | eval "ac_cv_header_$ac_safe=yes" | ||
7042 | else | ||
7043 | @@ -22825,19 +22869,19 @@ EOF | ||
7044 | |||
7045 | ac_safe=`echo "d3d9.h" | sed 'y%./+-%__p_%'` | ||
7046 | echo $ac_n "checking for d3d9.h""... $ac_c" 1>&6 | ||
7047 | -echo "configure:22829: checking for d3d9.h" >&5 | ||
7048 | +echo "configure:22873: checking for d3d9.h" >&5 | ||
7049 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
7050 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
7051 | else | ||
7052 | cat > conftest.$ac_ext <<EOF | ||
7053 | -#line 22834 "configure" | ||
7054 | +#line 22878 "configure" | ||
7055 | #include "confdefs.h" | ||
7056 | #include <d3d9.h> | ||
7057 | int main() { | ||
7058 | |||
7059 | ; return 0; } | ||
7060 | EOF | ||
7061 | -if { (eval echo configure:22841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
7062 | +if { (eval echo configure:22885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
7063 | rm -rf conftest* | ||
7064 | eval "ac_cv_header_$ac_safe=yes" | ||
7065 | else | ||
7066 | @@ -22861,19 +22905,19 @@ fi | ||
7067 | if test -n "$WIN32_D2D_SURFACE_FEATURE"; then | ||
7068 | ac_safe=`echo "d3d10.h" | sed 'y%./+-%__p_%'` | ||
7069 | echo $ac_n "checking for d3d10.h""... $ac_c" 1>&6 | ||
7070 | -echo "configure:22865: checking for d3d10.h" >&5 | ||
7071 | +echo "configure:22909: checking for d3d10.h" >&5 | ||
7072 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
7073 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
7074 | else | ||
7075 | cat > conftest.$ac_ext <<EOF | ||
7076 | -#line 22870 "configure" | ||
7077 | +#line 22914 "configure" | ||
7078 | #include "confdefs.h" | ||
7079 | #include <d3d10.h> | ||
7080 | int main() { | ||
7081 | |||
7082 | ; return 0; } | ||
7083 | EOF | ||
7084 | -if { (eval echo configure:22877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
7085 | +if { (eval echo configure:22921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
7086 | rm -rf conftest* | ||
7087 | eval "ac_cv_header_$ac_safe=yes" | ||
7088 | else | ||
7089 | @@ -22957,7 +23001,7 @@ EOF | ||
7090 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
7091 | set dummy pkg-config; ac_word=$2 | ||
7092 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
7093 | -echo "configure:22961: checking for $ac_word" >&5 | ||
7094 | +echo "configure:23005: checking for $ac_word" >&5 | ||
7095 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
7096 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
7097 | else | ||
7098 | @@ -23001,19 +23045,19 @@ fi | ||
7099 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
7100 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
7101 | echo $ac_n "checking for pixman-1 >= 0.19.2""... $ac_c" 1>&6 | ||
7102 | -echo "configure:23005: checking for pixman-1 >= 0.19.2" >&5 | ||
7103 | +echo "configure:23049: checking for pixman-1 >= 0.19.2" >&5 | ||
7104 | |||
7105 | if $PKG_CONFIG --exists "pixman-1 >= 0.19.2" ; then | ||
7106 | echo "$ac_t""yes" 1>&6 | ||
7107 | succeeded=yes | ||
7108 | |||
7109 | echo $ac_n "checking PIXMAN_CFLAGS""... $ac_c" 1>&6 | ||
7110 | -echo "configure:23012: checking PIXMAN_CFLAGS" >&5 | ||
7111 | +echo "configure:23056: checking PIXMAN_CFLAGS" >&5 | ||
7112 | PIXMAN_CFLAGS=`$PKG_CONFIG --cflags "pixman-1 >= 0.19.2"` | ||
7113 | echo "$ac_t""$PIXMAN_CFLAGS" 1>&6 | ||
7114 | |||
7115 | echo $ac_n "checking PIXMAN_LIBS""... $ac_c" 1>&6 | ||
7116 | -echo "configure:23017: checking PIXMAN_LIBS" >&5 | ||
7117 | +echo "configure:23061: checking PIXMAN_LIBS" >&5 | ||
7118 | ## Remove evil flags like -Wl,--export-dynamic | ||
7119 | PIXMAN_LIBS="`$PKG_CONFIG --libs \"pixman-1 >= 0.19.2\" |sed s/-Wl,--export-dynamic//g`" | ||
7120 | echo "$ac_t""$PIXMAN_LIBS" 1>&6 | ||
7121 | @@ -23060,7 +23104,7 @@ else | ||
7122 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
7123 | set dummy pkg-config; ac_word=$2 | ||
7124 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
7125 | -echo "configure:23064: checking for $ac_word" >&5 | ||
7126 | +echo "configure:23108: checking for $ac_word" >&5 | ||
7127 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
7128 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
7129 | else | ||
7130 | @@ -23104,19 +23148,19 @@ fi | ||
7131 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
7132 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
7133 | echo $ac_n "checking for cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig""... $ac_c" 1>&6 | ||
7134 | -echo "configure:23108: checking for cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig" >&5 | ||
7135 | +echo "configure:23152: checking for cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig" >&5 | ||
7136 | |||
7137 | if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig" ; then | ||
7138 | echo "$ac_t""yes" 1>&6 | ||
7139 | succeeded=yes | ||
7140 | |||
7141 | echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 | ||
7142 | -echo "configure:23115: checking CAIRO_CFLAGS" >&5 | ||
7143 | +echo "configure:23159: checking CAIRO_CFLAGS" >&5 | ||
7144 | CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig"` | ||
7145 | echo "$ac_t""$CAIRO_CFLAGS" 1>&6 | ||
7146 | |||
7147 | echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 | ||
7148 | -echo "configure:23120: checking CAIRO_LIBS" >&5 | ||
7149 | +echo "configure:23164: checking CAIRO_LIBS" >&5 | ||
7150 | ## Remove evil flags like -Wl,--export-dynamic | ||
7151 | CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig\" |sed s/-Wl,--export-dynamic//g`" | ||
7152 | echo "$ac_t""$CAIRO_LIBS" 1>&6 | ||
7153 | @@ -23153,7 +23197,7 @@ echo "configure:23120: checking CAIRO_LIBS" >&5 | ||
7154 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
7155 | set dummy pkg-config; ac_word=$2 | ||
7156 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
7157 | -echo "configure:23157: checking for $ac_word" >&5 | ||
7158 | +echo "configure:23201: checking for $ac_word" >&5 | ||
7159 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
7160 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
7161 | else | ||
7162 | @@ -23197,19 +23241,19 @@ fi | ||
7163 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
7164 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
7165 | echo $ac_n "checking for cairo-tee >= $CAIRO_VERSION""... $ac_c" 1>&6 | ||
7166 | -echo "configure:23201: checking for cairo-tee >= $CAIRO_VERSION" >&5 | ||
7167 | +echo "configure:23245: checking for cairo-tee >= $CAIRO_VERSION" >&5 | ||
7168 | |||
7169 | if $PKG_CONFIG --exists "cairo-tee >= $CAIRO_VERSION" ; then | ||
7170 | echo "$ac_t""yes" 1>&6 | ||
7171 | succeeded=yes | ||
7172 | |||
7173 | echo $ac_n "checking CAIRO_TEE_CFLAGS""... $ac_c" 1>&6 | ||
7174 | -echo "configure:23208: checking CAIRO_TEE_CFLAGS" >&5 | ||
7175 | +echo "configure:23252: checking CAIRO_TEE_CFLAGS" >&5 | ||
7176 | CAIRO_TEE_CFLAGS=`$PKG_CONFIG --cflags "cairo-tee >= $CAIRO_VERSION"` | ||
7177 | echo "$ac_t""$CAIRO_TEE_CFLAGS" 1>&6 | ||
7178 | |||
7179 | echo $ac_n "checking CAIRO_TEE_LIBS""... $ac_c" 1>&6 | ||
7180 | -echo "configure:23213: checking CAIRO_TEE_LIBS" >&5 | ||
7181 | +echo "configure:23257: checking CAIRO_TEE_LIBS" >&5 | ||
7182 | ## Remove evil flags like -Wl,--export-dynamic | ||
7183 | CAIRO_TEE_LIBS="`$PKG_CONFIG --libs \"cairo-tee >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
7184 | echo "$ac_t""$CAIRO_TEE_LIBS" 1>&6 | ||
7185 | @@ -23245,7 +23289,7 @@ echo "configure:23213: checking CAIRO_TEE_LIBS" >&5 | ||
7186 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
7187 | set dummy pkg-config; ac_word=$2 | ||
7188 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
7189 | -echo "configure:23249: checking for $ac_word" >&5 | ||
7190 | +echo "configure:23293: checking for $ac_word" >&5 | ||
7191 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
7192 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
7193 | else | ||
7194 | @@ -23289,19 +23333,19 @@ fi | ||
7195 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
7196 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
7197 | echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6 | ||
7198 | -echo "configure:23293: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 | ||
7199 | +echo "configure:23337: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 | ||
7200 | |||
7201 | if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then | ||
7202 | echo "$ac_t""yes" 1>&6 | ||
7203 | succeeded=yes | ||
7204 | |||
7205 | echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6 | ||
7206 | -echo "configure:23300: checking CAIRO_XRENDER_CFLAGS" >&5 | ||
7207 | +echo "configure:23344: checking CAIRO_XRENDER_CFLAGS" >&5 | ||
7208 | CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"` | ||
7209 | echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6 | ||
7210 | |||
7211 | echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6 | ||
7212 | -echo "configure:23305: checking CAIRO_XRENDER_LIBS" >&5 | ||
7213 | +echo "configure:23349: checking CAIRO_XRENDER_LIBS" >&5 | ||
7214 | ## Remove evil flags like -Wl,--export-dynamic | ||
7215 | CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs \"cairo-xlib-xrender >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`" | ||
7216 | echo "$ac_t""$CAIRO_XRENDER_LIBS" 1>&6 | ||
7217 | @@ -23454,19 +23498,19 @@ if test -z "$SKIP_LIBRARY_CHECKS" -a "$NECKO_WIFI" -a "$OS_ARCH" = "Linux" | ||
7218 | then | ||
7219 | ac_safe=`echo "iwlib.h" | sed 'y%./+-%__p_%'` | ||
7220 | echo $ac_n "checking for iwlib.h""... $ac_c" 1>&6 | ||
7221 | -echo "configure:23458: checking for iwlib.h" >&5 | ||
7222 | +echo "configure:23502: checking for iwlib.h" >&5 | ||
7223 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
7224 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
7225 | else | ||
7226 | cat > conftest.$ac_ext <<EOF | ||
7227 | -#line 23463 "configure" | ||
7228 | +#line 23507 "configure" | ||
7229 | #include "confdefs.h" | ||
7230 | #include <iwlib.h> | ||
7231 | int main() { | ||
7232 | |||
7233 | ; return 0; } | ||
7234 | EOF | ||
7235 | -if { (eval echo configure:23470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
7236 | +if { (eval echo configure:23514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
7237 | rm -rf conftest* | ||
7238 | eval "ac_cv_header_$ac_safe=yes" | ||
7239 | else | ||
7240 | @@ -23924,9 +23968,9 @@ EOF | ||
7241 | |||
7242 | |||
7243 | echo $ac_n "checking for posix_fallocate""... $ac_c" 1>&6 | ||
7244 | -echo "configure:23928: checking for posix_fallocate" >&5 | ||
7245 | +echo "configure:23972: checking for posix_fallocate" >&5 | ||
7246 | cat > conftest.$ac_ext <<EOF | ||
7247 | -#line 23930 "configure" | ||
7248 | +#line 23974 "configure" | ||
7249 | #include "confdefs.h" | ||
7250 | #define _XOPEN_SOURCE 600 | ||
7251 | #include <fcntl.h> | ||
7252 | @@ -23934,7 +23978,7 @@ int main() { | ||
7253 | posix_fallocate(0, 0, 0); | ||
7254 | ; return 0; } | ||
7255 | EOF | ||
7256 | -if { (eval echo configure:23938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
7257 | +if { (eval echo configure:23982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
7258 | rm -rf conftest* | ||
7259 | ac_cv___posix_fallocate=true | ||
7260 | else | ||
7261 | @@ -23955,12 +23999,12 @@ else | ||
7262 | echo "$ac_t""no" 1>&6 | ||
7263 | fi | ||
7264 | |||
7265 | -if test "$COMPILE_ENVIRONMENT"; then | ||
7266 | +if test "$COMPILE_ENVIRONMENT" && test -z "$LIBXUL_SDK"; then | ||
7267 | if test "$MOZ_X11"; then | ||
7268 | _SAVE_CFLAGS=$CFLAGS | ||
7269 | CFLAGS="$CFLAGS $XCFLAGS" | ||
7270 | cat > conftest.$ac_ext <<EOF | ||
7271 | -#line 23964 "configure" | ||
7272 | +#line 24008 "configure" | ||
7273 | #include "confdefs.h" | ||
7274 | |||
7275 | #include <stdio.h> | ||
7276 | @@ -23979,7 +24023,7 @@ int main() { | ||
7277 | |||
7278 | ; return 0; } | ||
7279 | EOF | ||
7280 | -if { (eval echo configure:23983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
7281 | +if { (eval echo configure:24027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
7282 | : | ||
7283 | else | ||
7284 | echo "configure: failed program was:" >&5 | ||
7285 | @@ -23999,19 +24043,19 @@ fi # MOZ_X11 | ||
7286 | if test -n "$MOZ_WEBGL_GLX"; then | ||
7287 | ac_safe=`echo "GL/glx.h" | sed 'y%./+-%__p_%'` | ||
7288 | echo $ac_n "checking for GL/glx.h""... $ac_c" 1>&6 | ||
7289 | -echo "configure:24003: checking for GL/glx.h" >&5 | ||
7290 | +echo "configure:24047: checking for GL/glx.h" >&5 | ||
7291 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
7292 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
7293 | else | ||
7294 | cat > conftest.$ac_ext <<EOF | ||
7295 | -#line 24008 "configure" | ||
7296 | +#line 24052 "configure" | ||
7297 | #include "confdefs.h" | ||
7298 | #include <GL/glx.h> | ||
7299 | int main() { | ||
7300 | |||
7301 | ; return 0; } | ||
7302 | EOF | ||
7303 | -if { (eval echo configure:24015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
7304 | +if { (eval echo configure:24059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
7305 | rm -rf conftest* | ||
7306 | eval "ac_cv_header_$ac_safe=yes" | ||
7307 | else | ||
7308 | @@ -24037,7 +24081,7 @@ fi | ||
7309 | fi # MOZ_WEBGL_GLX | ||
7310 | fi # COMPILE_ENVIRONMENT | ||
7311 | |||
7312 | -if test "$USE_FC_FREETYPE"; then | ||
7313 | +if test "$USE_FC_FREETYPE" && test -z "$LIBXUL_SDK"; then | ||
7314 | if test "$COMPILE_ENVIRONMENT"; then | ||
7315 | _SAVE_CPPFLAGS="$CPPFLAGS" | ||
7316 | CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS" | ||
7317 | @@ -24045,17 +24089,17 @@ if test "$USE_FC_FREETYPE"; then | ||
7318 | do | ||
7319 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
7320 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
7321 | -echo "configure:24049: checking for $ac_hdr" >&5 | ||
7322 | +echo "configure:24093: checking for $ac_hdr" >&5 | ||
7323 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
7324 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
7325 | else | ||
7326 | cat > conftest.$ac_ext <<EOF | ||
7327 | -#line 24054 "configure" | ||
7328 | +#line 24098 "configure" | ||
7329 | #include "confdefs.h" | ||
7330 | #include <$ac_hdr> | ||
7331 | EOF | ||
7332 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
7333 | -{ (eval echo configure:24059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
7334 | +{ (eval echo configure:24103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
7335 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
7336 | if test -z "$ac_err"; then | ||
7337 | rm -rf conftest* | ||
7338 | @@ -24509,6 +24553,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g | ||
7339 | s%@INSTALL_DATA@%$INSTALL_DATA%g | ||
7340 | s%@LN_S@%$LN_S%g | ||
7341 | s%@PYTHON@%$PYTHON%g | ||
7342 | +s%@MOZ_SYSTEM_PLY@%$MOZ_SYSTEM_PLY%g | ||
7343 | s%@NSINSTALL_BIN@%$NSINSTALL_BIN%g | ||
7344 | s%@DOXYGEN@%$DOXYGEN%g | ||
7345 | s%@AUTOCONF@%$AUTOCONF%g | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch new file mode 100644 index 0000000..84a45df --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Mon, 27 Dec 2010 10:44:28 +0100 | ||
3 | Subject: Add a 2 minutes timeout on xpcshell tests | ||
4 | |||
5 | --- | ||
6 | testing/xpcshell/runxpcshelltests.py | 18 ++++++++++++++++-- | ||
7 | 1 file changed, 16 insertions(+), 2 deletions(-) | ||
8 | |||
9 | diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py | ||
10 | index ea15466..e1babbb 100644 | ||
11 | --- a/testing/xpcshell/runxpcshelltests.py | ||
12 | +++ b/testing/xpcshell/runxpcshelltests.py | ||
13 | @@ -38,7 +38,7 @@ | ||
14 | # | ||
15 | # ***** END LICENSE BLOCK ***** */ | ||
16 | |||
17 | -import re, sys, os, os.path, logging, shutil, signal, math, time | ||
18 | +import re, sys, os, os.path, logging, shutil, signal, math, time, select | ||
19 | from glob import glob | ||
20 | from optparse import OptionParser | ||
21 | from subprocess import Popen, PIPE, STDOUT | ||
22 | @@ -510,7 +510,21 @@ class XPCShellTests(object): | ||
23 | # - don't move this line above launchProcess, or child will inherit the SIG_IGN | ||
24 | signal.signal(signal.SIGINT, markGotSIGINT) | ||
25 | # |stderr == None| as |pStderr| was either |None| or redirected to |stdout|. | ||
26 | - stdout, stderr = self.communicate(proc) | ||
27 | + if pStdout == PIPE: | ||
28 | + stdout = "" | ||
29 | + while True: | ||
30 | + (r, w, e) = select.select([proc.stdout], [], [], 120) | ||
31 | + if len(r) == 0: | ||
32 | + stdout += "TEST-UNEXPECTED-FAIL | %s | application timed out after 120 seconds with no output" % (test) | ||
33 | + proc.kill() | ||
34 | + break | ||
35 | + line = proc.stdout.read(1) | ||
36 | + if line == "": | ||
37 | + break | ||
38 | + stdout += line | ||
39 | + proc.wait() | ||
40 | + else: | ||
41 | + stdout, stderr = self.communicate(proc) | ||
42 | signal.signal(signal.SIGINT, signal.SIG_DFL) | ||
43 | |||
44 | if interactive: | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-another-preferences-directory-for-applications-p.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-another-preferences-directory-for-applications-p.patch new file mode 100644 index 0000000..799b0e5 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-another-preferences-directory-for-applications-p.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Sat, 21 Jun 2008 03:09:21 +0200 | ||
3 | Subject: Add another preferences directory for applications: | ||
4 | preferences/syspref | ||
5 | |||
6 | It was existing in previous versions of iceweasel as a symlink to | ||
7 | /etc/iceweasel/pref. | ||
8 | |||
9 | This has the side effect to make these preferences there work again, and | ||
10 | to disable the "set as default browser" dialog. | ||
11 | --- | ||
12 | toolkit/xre/nsXREDirProvider.cpp | 2 ++ | ||
13 | 1 file changed, 2 insertions(+) | ||
14 | |||
15 | diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp | ||
16 | index 45bdfb1..da71bdd 100644 | ||
17 | --- a/toolkit/xre/nsXREDirProvider.cpp | ||
18 | +++ b/toolkit/xre/nsXREDirProvider.cpp | ||
19 | @@ -603,6 +603,7 @@ nsXREDirProvider::LoadAppBundleDirs() | ||
20 | } | ||
21 | |||
22 | static const char *const kAppendPrefDir[] = { "defaults", "preferences", nsnull }; | ||
23 | +static const char *const kAppendSysPrefDir[] = { "defaults", "syspref", nsnull }; | ||
24 | |||
25 | #ifdef DEBUG_bsmedberg | ||
26 | static void | ||
27 | @@ -644,6 +645,7 @@ nsXREDirProvider::GetFilesInternal(const char* aProperty, | ||
28 | LoadAppDirIntoArray(mXULAppDir, kAppendPrefDir, directories); | ||
29 | LoadDirsIntoArray(mAppBundleDirectories, | ||
30 | kAppendPrefDir, directories); | ||
31 | + LoadAppDirIntoArray(mXULAppDir, kAppendSysPrefDir, directories); | ||
32 | |||
33 | rv = NS_NewArrayEnumerator(aResult, directories); | ||
34 | } | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-soname-to-appropriate-libraries.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-soname-to-appropriate-libraries.patch new file mode 100644 index 0000000..430585e --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Add-soname-to-appropriate-libraries.patch | |||
@@ -0,0 +1,168 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Thu, 13 Mar 2008 08:22:05 +0100 | ||
3 | Subject: Add soname to appropriate libraries. | ||
4 | |||
5 | This is a stripped down version, compared to the dpatch version, because we | ||
6 | actually are never going to use minor and micro version numbers. Also, we | ||
7 | now don't set a SO version on libxul and libxpcom because they will now | ||
8 | be dlloaded() by the standalone xpcomglue. | ||
9 | --- | ||
10 | config/makefiles/target_libs.mk | 4 +++- | ||
11 | config/rules.mk | 16 +++++++++++++++- | ||
12 | js/src/Makefile.in | 4 ++++ | ||
13 | js/src/config/makefiles/target_libs.mk | 4 +++- | ||
14 | js/src/config/rules.mk | 16 +++++++++++++++- | ||
15 | 5 files changed, 40 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/config/makefiles/target_libs.mk b/config/makefiles/target_libs.mk | ||
18 | index 707fdd1..254e2d3 100644 | ||
19 | --- a/config/makefiles/target_libs.mk | ||
20 | +++ b/config/makefiles/target_libs.mk | ||
21 | @@ -80,7 +80,7 @@ GARBAGE += $(foreach lib,$(LIBRARY),$(EXPORT_LIBRARY)/$(lib)) | ||
22 | endif | ||
23 | endif # EXPORT_LIBRARY | ||
24 | |||
25 | -libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY) | ||
26 | +libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(UNVERSIONED_LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY) | ||
27 | ifndef NO_DIST_INSTALL | ||
28 | ifdef LIBRARY | ||
29 | ifdef EXPORT_LIBRARY # Stage libs that will be linked into a static build | ||
30 | @@ -109,8 +109,10 @@ ifndef NO_INSTALL_IMPORT_LIBRARY | ||
31 | endif | ||
32 | else | ||
33 | $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib | ||
34 | + $(call MKSHLINKS,$(DIST)/lib) | ||
35 | endif | ||
36 | $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET) | ||
37 | + $(call MKSHLINKS,$(FINAL_TARGET)) | ||
38 | endif # IS_COMPONENT | ||
39 | endif # SHARED_LIBRARY | ||
40 | ifdef PROGRAM | ||
41 | diff --git a/config/rules.mk b/config/rules.mk | ||
42 | index d1b969b..c64b4d5 100644 | ||
43 | --- a/config/rules.mk | ||
44 | +++ b/config/rules.mk | ||
45 | @@ -290,6 +290,18 @@ else | ||
46 | SHARED_LIBRARY := $(DLL_PREFIX)$(SHARED_LIBRARY_NAME)$(DLL_SUFFIX) | ||
47 | endif | ||
48 | |||
49 | +ifdef SO_VERSION | ||
50 | +UNVERSIONED_LIBRARY := $(notdir $(SHARED_LIBRARY)) | ||
51 | + | ||
52 | +ifeq ($(strip $(SHARED_LIBRARY)),$(strip $(SDK_LIBRARY))) | ||
53 | +SDK_LIBRARY := $(SHARED_LIBRARY) | ||
54 | +endif | ||
55 | + | ||
56 | +SHARED_LIBRARY := $(SHARED_LIBRARY).$(SO_VERSION) | ||
57 | + | ||
58 | +MKSHLINKS = rm -f $(1)/$(UNVERSIONED_LIBRARY); ln -s $(SHARED_LIBRARY) $(1)/$(UNVERSIONED_LIBRARY) | ||
59 | +endif | ||
60 | + | ||
61 | ifeq ($(OS_ARCH),OS2) | ||
62 | DEF_FILE := $(SHARED_LIBRARY:.dll=.def) | ||
63 | endif | ||
64 | @@ -380,7 +392,7 @@ SIMPLE_PROGRAMS := | ||
65 | endif | ||
66 | |||
67 | ifndef TARGETS | ||
68 | -TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY) | ||
69 | +TARGETS = $(LIBRARY) $(UNVERSIONED_LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY) | ||
70 | endif | ||
71 | |||
72 | ifndef OBJS | ||
73 | @@ -1059,6 +1071,8 @@ endif | ||
74 | # so instead of deleting .o files after repacking them into a dylib, we make | ||
75 | # symlinks back to the originals. The symlinks are a no-op for stabs debugging, | ||
76 | # so no need to conditionalize on OS version or debugging format. | ||
77 | +$(UNVERSIONED_LIBRARY): $(SHARED_LIBRARY) | ||
78 | + $(call MKSHLINKS,.) | ||
79 | |||
80 | $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS_DEPS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS) | ||
81 | ifndef INCREMENTAL_LINKER | ||
82 | diff --git a/js/src/Makefile.in b/js/src/Makefile.in | ||
83 | index fc48cbd..1200ae6 100644 | ||
84 | --- a/js/src/Makefile.in | ||
85 | +++ b/js/src/Makefile.in | ||
86 | @@ -74,6 +74,7 @@ MODULE = js | ||
87 | LIBRARY_NAME = mozjs | ||
88 | STATIC_LIBRARY_NAME = js_static | ||
89 | GRE_MODULE = 1 | ||
90 | +SO_VERSION = $(JS_SO_VERSION) | ||
91 | |||
92 | LIBS = $(NSPR_LIBS) | ||
93 | |||
94 | @@ -922,6 +923,9 @@ ifneq (,$(LIBRARY)) | ||
95 | endif | ||
96 | ifneq (,$(SHARED_LIBRARY)) | ||
97 | $(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir) | ||
98 | +ifneq (,$(UNVERSIONED_LIBRARY)) | ||
99 | + ln -s $(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(UNVERSIONED_LIBRARY) | ||
100 | +endif | ||
101 | endif | ||
102 | ifneq (,$(IMPORT_LIBRARY)) | ||
103 | $(SYSINSTALL) $(IMPORT_LIBRARY) $(DESTDIR)$(libdir) | ||
104 | diff --git a/js/src/config/makefiles/target_libs.mk b/js/src/config/makefiles/target_libs.mk | ||
105 | index 707fdd1..254e2d3 100644 | ||
106 | --- a/js/src/config/makefiles/target_libs.mk | ||
107 | +++ b/js/src/config/makefiles/target_libs.mk | ||
108 | @@ -80,7 +80,7 @@ GARBAGE += $(foreach lib,$(LIBRARY),$(EXPORT_LIBRARY)/$(lib)) | ||
109 | endif | ||
110 | endif # EXPORT_LIBRARY | ||
111 | |||
112 | -libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY) | ||
113 | +libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(UNVERSIONED_LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY) | ||
114 | ifndef NO_DIST_INSTALL | ||
115 | ifdef LIBRARY | ||
116 | ifdef EXPORT_LIBRARY # Stage libs that will be linked into a static build | ||
117 | @@ -109,8 +109,10 @@ ifndef NO_INSTALL_IMPORT_LIBRARY | ||
118 | endif | ||
119 | else | ||
120 | $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib | ||
121 | + $(call MKSHLINKS,$(DIST)/lib) | ||
122 | endif | ||
123 | $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET) | ||
124 | + $(call MKSHLINKS,$(FINAL_TARGET)) | ||
125 | endif # IS_COMPONENT | ||
126 | endif # SHARED_LIBRARY | ||
127 | ifdef PROGRAM | ||
128 | diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk | ||
129 | index d1b969b..c64b4d5 100644 | ||
130 | --- a/js/src/config/rules.mk | ||
131 | +++ b/js/src/config/rules.mk | ||
132 | @@ -290,6 +290,18 @@ else | ||
133 | SHARED_LIBRARY := $(DLL_PREFIX)$(SHARED_LIBRARY_NAME)$(DLL_SUFFIX) | ||
134 | endif | ||
135 | |||
136 | +ifdef SO_VERSION | ||
137 | +UNVERSIONED_LIBRARY := $(notdir $(SHARED_LIBRARY)) | ||
138 | + | ||
139 | +ifeq ($(strip $(SHARED_LIBRARY)),$(strip $(SDK_LIBRARY))) | ||
140 | +SDK_LIBRARY := $(SHARED_LIBRARY) | ||
141 | +endif | ||
142 | + | ||
143 | +SHARED_LIBRARY := $(SHARED_LIBRARY).$(SO_VERSION) | ||
144 | + | ||
145 | +MKSHLINKS = rm -f $(1)/$(UNVERSIONED_LIBRARY); ln -s $(SHARED_LIBRARY) $(1)/$(UNVERSIONED_LIBRARY) | ||
146 | +endif | ||
147 | + | ||
148 | ifeq ($(OS_ARCH),OS2) | ||
149 | DEF_FILE := $(SHARED_LIBRARY:.dll=.def) | ||
150 | endif | ||
151 | @@ -380,7 +392,7 @@ SIMPLE_PROGRAMS := | ||
152 | endif | ||
153 | |||
154 | ifndef TARGETS | ||
155 | -TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY) | ||
156 | +TARGETS = $(LIBRARY) $(UNVERSIONED_LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $(HOST_PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(JAVA_LIBRARY) | ||
157 | endif | ||
158 | |||
159 | ifndef OBJS | ||
160 | @@ -1059,6 +1071,8 @@ endif | ||
161 | # so instead of deleting .o files after repacking them into a dylib, we make | ||
162 | # symlinks back to the originals. The symlinks are a no-op for stabs debugging, | ||
163 | # so no need to conditionalize on OS version or debugging format. | ||
164 | +$(UNVERSIONED_LIBRARY): $(SHARED_LIBRARY) | ||
165 | + $(call MKSHLINKS,.) | ||
166 | |||
167 | $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS_DEPS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS) | ||
168 | ifndef INCREMENTAL_LINKER | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Avoid-libxpcom-being-excluded-from-linked-libraries-.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Avoid-libxpcom-being-excluded-from-linked-libraries-.patch new file mode 100644 index 0000000..09cf8bf --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Avoid-libxpcom-being-excluded-from-linked-libraries-.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Wed, 12 Mar 2008 23:18:23 +0100 | ||
3 | Subject: Avoid libxpcom being excluded from linked libraries by | ||
4 | -Wl,--as-needed | ||
5 | |||
6 | Force libxpcom to be linked to xulrunner-bin and xpcshell so that it is | ||
7 | loaded in most cases. | ||
8 | --- | ||
9 | xulrunner/app/Makefile.in | 2 ++ | ||
10 | 1 file changed, 2 insertions(+) | ||
11 | |||
12 | diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in | ||
13 | index d6efcbb..eae02da 100644 | ||
14 | --- a/xulrunner/app/Makefile.in | ||
15 | +++ b/xulrunner/app/Makefile.in | ||
16 | @@ -83,7 +83,9 @@ endif | ||
17 | LIBS += \ | ||
18 | $(EXTRA_DSO_LIBS) \ | ||
19 | $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \ | ||
20 | + -Wl,--no-as-needed \ | ||
21 | $(XPCOM_LIBS) \ | ||
22 | + -Wl,--as-needed \ | ||
23 | $(NSPR_LIBS) \ | ||
24 | $(NULL) | ||
25 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch new file mode 100644 index 0000000..0084e99 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Thu, 12 Nov 2009 17:18:31 +0100 | ||
3 | Subject: Avoid wrong sessionstore data to keep windows out of user sight | ||
4 | |||
5 | It happens that sessionstore can keep wrong information for the window | ||
6 | position or minimized state. Workaround this until the real bug is found | ||
7 | and fixed (probably in xulrunner). | ||
8 | |||
9 | Closes: #552426, #553453 | ||
10 | --- | ||
11 | browser/components/sessionstore/src/nsSessionStore.js | 4 +--- | ||
12 | 1 file changed, 1 insertion(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js | ||
15 | index a62821b..0878209 100644 | ||
16 | --- a/browser/components/sessionstore/src/nsSessionStore.js | ||
17 | +++ b/browser/components/sessionstore/src/nsSessionStore.js | ||
18 | @@ -3460,7 +3460,7 @@ SessionStoreService.prototype = { | ||
19 | aWindow.resizeTo(aWidth, aHeight); | ||
20 | } | ||
21 | if (!isNaN(aLeft) && !isNaN(aTop) && (aLeft != win_("screenX") || aTop != win_("screenY"))) { | ||
22 | - aWindow.moveTo(aLeft, aTop); | ||
23 | + aWindow.moveTo((aLeft < -aWidth) ? 0 : aLeft, (aTop < -aHeight) ? 0 : aTop); | ||
24 | } | ||
25 | if (aSizeMode && win_("sizemode") != aSizeMode) | ||
26 | { | ||
27 | @@ -3470,8 +3470,6 @@ SessionStoreService.prototype = { | ||
28 | aWindow.maximize(); | ||
29 | break; | ||
30 | case "minimized": | ||
31 | - aWindow.minimize(); | ||
32 | - break; | ||
33 | case "normal": | ||
34 | aWindow.restore(); | ||
35 | break; | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Bug-508942-Use-Preprocessor.py-filters-in-defines-an.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Bug-508942-Use-Preprocessor.py-filters-in-defines-an.patch new file mode 100644 index 0000000..b20704a --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Bug-508942-Use-Preprocessor.py-filters-in-defines-an.patch | |||
@@ -0,0 +1,117 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Sat, 21 Apr 2012 12:11:40 +0200 | ||
3 | Subject: Bug 508942 - Use Preprocessor.py filters in #defines and #includes | ||
4 | |||
5 | Original patch by Markus Stange. | ||
6 | --- | ||
7 | config/Preprocessor.py | 11 ++++++++--- | ||
8 | config/tests/unit-Preprocessor.py | 9 +++++++++ | ||
9 | js/src/config/Preprocessor.py | 11 ++++++++--- | ||
10 | 3 files changed, 25 insertions(+), 6 deletions(-) | ||
11 | |||
12 | diff --git a/config/Preprocessor.py b/config/Preprocessor.py | ||
13 | index 752e83f..f238111 100644 | ||
14 | --- a/config/Preprocessor.py | ||
15 | +++ b/config/Preprocessor.py | ||
16 | @@ -134,6 +134,11 @@ class Preprocessor: | ||
17 | rv.out = self.out | ||
18 | return rv | ||
19 | |||
20 | + def applyFilters(self, aLine): | ||
21 | + for f in self.filters: | ||
22 | + aLine = f[1](aLine) | ||
23 | + return aLine | ||
24 | + | ||
25 | def write(self, aLine): | ||
26 | """ | ||
27 | Internal method for handling output. | ||
28 | @@ -146,8 +151,7 @@ class Preprocessor: | ||
29 | 'file': self.context['FILE'], | ||
30 | 'le': self.LE}) | ||
31 | self.writtenLines = ln | ||
32 | - for f in self.filters: | ||
33 | - aLine = f[1](aLine) | ||
34 | + aLine = self.applyFilters(aLine) | ||
35 | # ensure our line ending. Only need to handle \n, as we're reading | ||
36 | # with universal line ending support, at least for files. | ||
37 | aLine = re.sub('\n', self.LE, aLine) | ||
38 | @@ -242,7 +246,7 @@ class Preprocessor: | ||
39 | raise Preprocessor.Error(self, 'SYNTAX_DEF', args) | ||
40 | val = 1 | ||
41 | if m.group('value'): | ||
42 | - val = m.group('value') | ||
43 | + val = self.applyFilters(m.group('value')) | ||
44 | try: | ||
45 | val = int(val) | ||
46 | except: | ||
47 | @@ -423,6 +427,7 @@ class Preprocessor: | ||
48 | if isName: | ||
49 | try: | ||
50 | args = str(args) | ||
51 | + args = self.applyFilters(args) | ||
52 | if not os.path.isabs(args): | ||
53 | args = os.path.join(self.context['DIRECTORY'], args) | ||
54 | args = open(args, 'rU') | ||
55 | diff --git a/config/tests/unit-Preprocessor.py b/config/tests/unit-Preprocessor.py | ||
56 | index d2f95f0..0ae2f88 100644 | ||
57 | --- a/config/tests/unit-Preprocessor.py | ||
58 | +++ b/config/tests/unit-Preprocessor.py | ||
59 | @@ -404,6 +404,15 @@ FAIL | ||
60 | self.pp.do_include(f) | ||
61 | self.assertEqual(self.pp.out.getvalue(), "first\rsecond\r") | ||
62 | |||
63 | + def test_filterDefine(self): | ||
64 | + f = NamedIO('filterDefine.in', '''#filter substitution | ||
65 | +#define VAR AS | ||
66 | +#define VAR2 P@VAR@ | ||
67 | +@VAR2@S | ||
68 | +''') | ||
69 | + self.pp.do_include(f) | ||
70 | + self.assertEqual(self.pp.out.getvalue(), "PASS\n") | ||
71 | + | ||
72 | def test_number_value_equals(self): | ||
73 | f = NamedIO("number_value_equals.in", """#define FOO 1000 | ||
74 | #if FOO == 1000 | ||
75 | diff --git a/js/src/config/Preprocessor.py b/js/src/config/Preprocessor.py | ||
76 | index 752e83f..f238111 100644 | ||
77 | --- a/js/src/config/Preprocessor.py | ||
78 | +++ b/js/src/config/Preprocessor.py | ||
79 | @@ -134,6 +134,11 @@ class Preprocessor: | ||
80 | rv.out = self.out | ||
81 | return rv | ||
82 | |||
83 | + def applyFilters(self, aLine): | ||
84 | + for f in self.filters: | ||
85 | + aLine = f[1](aLine) | ||
86 | + return aLine | ||
87 | + | ||
88 | def write(self, aLine): | ||
89 | """ | ||
90 | Internal method for handling output. | ||
91 | @@ -146,8 +151,7 @@ class Preprocessor: | ||
92 | 'file': self.context['FILE'], | ||
93 | 'le': self.LE}) | ||
94 | self.writtenLines = ln | ||
95 | - for f in self.filters: | ||
96 | - aLine = f[1](aLine) | ||
97 | + aLine = self.applyFilters(aLine) | ||
98 | # ensure our line ending. Only need to handle \n, as we're reading | ||
99 | # with universal line ending support, at least for files. | ||
100 | aLine = re.sub('\n', self.LE, aLine) | ||
101 | @@ -242,7 +246,7 @@ class Preprocessor: | ||
102 | raise Preprocessor.Error(self, 'SYNTAX_DEF', args) | ||
103 | val = 1 | ||
104 | if m.group('value'): | ||
105 | - val = m.group('value') | ||
106 | + val = self.applyFilters(m.group('value')) | ||
107 | try: | ||
108 | val = int(val) | ||
109 | except: | ||
110 | @@ -423,6 +427,7 @@ class Preprocessor: | ||
111 | if isName: | ||
112 | try: | ||
113 | args = str(args) | ||
114 | + args = self.applyFilters(args) | ||
115 | if not os.path.isabs(args): | ||
116 | args = os.path.join(self.context['DIRECTORY'], args) | ||
117 | args = open(args, 'rU') | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Check-less-things-during-configure-when-using-libxul.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Check-less-things-during-configure-when-using-libxul.patch new file mode 100644 index 0000000..5952ac6 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Check-less-things-during-configure-when-using-libxul.patch | |||
@@ -0,0 +1,149 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Sat, 19 Apr 2008 23:01:20 +0200 | ||
3 | Subject: Check less things during configure when using libxul-sdk | ||
4 | |||
5 | We don't need to check e.g. cairo or pango when using libxul-sdk, since | ||
6 | we won't be building most of the toolkit. | ||
7 | --- | ||
8 | configure.in | 30 +++++++++++++++++++++++++----- | ||
9 | 1 file changed, 25 insertions(+), 5 deletions(-) | ||
10 | |||
11 | diff --git a/configure.in b/configure.in | ||
12 | index 6b155e0..18872c4 100644 | ||
13 | --- a/configure.in | ||
14 | +++ b/configure.in | ||
15 | @@ -4190,6 +4190,7 @@ AC_SUBST(LIBXUL_SDK) | ||
16 | |||
17 | if test -n "$LIBXUL_SDK"; then | ||
18 | LIBXUL_DIST="$LIBXUL_SDK" | ||
19 | + SKIP_LIBRARY_CHECKS=1 | ||
20 | else | ||
21 | LIBXUL_DIST="$MOZ_BUILD_ROOT/dist" | ||
22 | fi | ||
23 | @@ -4224,6 +4225,10 @@ if test -n "$MOZ_NATIVE_NSPR"; then | ||
24 | AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT or including prtypes.h does not provide it])) | ||
25 | CFLAGS=$_SAVE_CFLAGS | ||
26 | else | ||
27 | + if test -n "$LIBXUL_SDK"; then | ||
28 | + NSPR_CFLAGS="-I$LIBXUL_SDK_DIR/sdk/include" | ||
29 | + NSPR_LIBS="-L$LIBXUL_SDK_DIR/sdk/lib -lnspr$NSPR_VERSION -lplc$NSPR_VERSION -lplds$NSPR_VERSION" | ||
30 | + else | ||
31 | if test "$OS_ARCH" = "WINNT"; then | ||
32 | NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr" | ||
33 | if test -n "$GNU_CC"; then | ||
34 | @@ -4235,6 +4240,7 @@ else | ||
35 | NSPR_CFLAGS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --includedir='${LIBXUL_DIST}'/include/nspr --cflags`' | ||
36 | NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' | ||
37 | fi | ||
38 | + fi | ||
39 | fi | ||
40 | |||
41 | dnl system libevent Support | ||
42 | @@ -4935,6 +4941,7 @@ dnl ======================================================== | ||
43 | dnl = startup-notification support module | ||
44 | dnl ======================================================== | ||
45 | |||
46 | +if test -z "$LIBXUL_SDK"; then | ||
47 | if test "$MOZ_ENABLE_GTK2" | ||
48 | then | ||
49 | MOZ_ENABLE_STARTUP_NOTIFICATION= | ||
50 | @@ -4963,6 +4970,7 @@ then | ||
51 | |||
52 | TK_LIBS="$TK_LIBS $MOZ_STARTUP_NOTIFICATION_LIBS" | ||
53 | fi | ||
54 | +fi | ||
55 | AC_SUBST(MOZ_ENABLE_STARTUP_NOTIFICATION) | ||
56 | AC_SUBST(MOZ_STARTUP_NOTIFICATION_CFLAGS) | ||
57 | AC_SUBST(MOZ_STARTUP_NOTIFICATION_LIBS) | ||
58 | @@ -5060,6 +5068,12 @@ AC_SUBST(MOZ_QT_LIBS) | ||
59 | AC_SUBST(MOC) | ||
60 | |||
61 | AC_SUBST(MOZ_DFB) | ||
62 | + | ||
63 | +if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" | ||
64 | +then | ||
65 | + AC_DEFINE(MOZ_X11) | ||
66 | + MOZ_X11=1 | ||
67 | +fi | ||
68 | AC_SUBST(MOZ_X11) | ||
69 | |||
70 | dnl ======================================================== | ||
71 | @@ -5145,7 +5159,7 @@ MOZ_ARG_DISABLE_BOOL(pango, | ||
72 | dnl ======================================================== | ||
73 | dnl = Pango | ||
74 | dnl ======================================================== | ||
75 | -if test "$MOZ_ENABLE_GTK2" | ||
76 | +if test "$MOZ_ENABLE_GTK2" && test -z "$LIBXUL_SDK" | ||
77 | then | ||
78 | AC_SUBST(MOZ_PANGO) | ||
79 | |||
80 | @@ -5186,6 +5200,7 @@ dnl ======================================================== | ||
81 | dnl = GnomeVFS, GIO and GConf support module | ||
82 | dnl ======================================================== | ||
83 | |||
84 | +if test -z "$LIBXUL_SDK"; then | ||
85 | if test "$MOZ_X11" | ||
86 | then | ||
87 | dnl build the gnomevfs extension by default only when the | ||
88 | @@ -5424,6 +5439,9 @@ AC_SUBST(MOZ_DBUS_LIBS) | ||
89 | AC_SUBST(MOZ_DBUS_GLIB_CFLAGS) | ||
90 | AC_SUBST(MOZ_DBUS_GLIB_LIBS) | ||
91 | |||
92 | +fi # LIBXUL_SDK | ||
93 | + | ||
94 | + | ||
95 | dnl ======================================================== | ||
96 | dnl = Build Personal Security Manager | ||
97 | dnl ======================================================== | ||
98 | @@ -5796,6 +5814,7 @@ dnl = Check alsa availability on Linux if using sydneyaudio | ||
99 | dnl ======================================================== | ||
100 | |||
101 | dnl If using sydneyaudio with Linux, ensure that the alsa library is available | ||
102 | +if test -z "$LIBXUL_SDK"; then | ||
103 | if test -n "$MOZ_SYDNEYAUDIO"; then | ||
104 | case "$target_os" in | ||
105 | linux*) | ||
106 | @@ -5805,6 +5824,7 @@ linux*) | ||
107 | ;; | ||
108 | esac | ||
109 | fi | ||
110 | +fi | ||
111 | |||
112 | dnl ======================================================== | ||
113 | dnl Permissions System | ||
114 | @@ -7045,7 +7065,7 @@ MOZ_ARG_ENABLE_BOOL(jemalloc, | ||
115 | MOZ_MEMORY=1, | ||
116 | MOZ_MEMORY=) | ||
117 | |||
118 | -if test "$NS_TRACE_MALLOC"; then | ||
119 | +if test "$NS_TRACE_MALLOC" || test "$LIBXUL_SDK"; then | ||
120 | MOZ_MEMORY= | ||
121 | fi | ||
122 | |||
123 | @@ -7920,7 +7940,7 @@ MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla)) | ||
124 | dnl Check for GLib. | ||
125 | dnl ======================================================== | ||
126 | |||
127 | -if test -z "$SKIP_PATH_CHECKS"; then | ||
128 | +if test -z "$SKIP_PATH_CHECKS" && test -z "$LIBXUL_SDK"; then | ||
129 | if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then | ||
130 | if test "$MOZ_ENABLE_GTK2" -o "$USE_ELF_DYNSTR_GC" ; then | ||
131 | PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0) | ||
132 | @@ -8610,7 +8630,7 @@ else | ||
133 | fi | ||
134 | |||
135 | dnl Check for missing components | ||
136 | -if test "$COMPILE_ENVIRONMENT"; then | ||
137 | +if test "$COMPILE_ENVIRONMENT" && test -z "$LIBXUL_SDK"; then | ||
138 | if test "$MOZ_X11"; then | ||
139 | dnl ==================================================== | ||
140 | dnl = Check if X headers exist | ||
141 | @@ -8649,7 +8669,7 @@ if test -n "$MOZ_WEBGL_GLX"; then | ||
142 | fi # MOZ_WEBGL_GLX | ||
143 | fi # COMPILE_ENVIRONMENT | ||
144 | |||
145 | -if test "$USE_FC_FREETYPE"; then | ||
146 | +if test "$USE_FC_FREETYPE" && test -z "$LIBXUL_SDK"; then | ||
147 | if test "$COMPILE_ENVIRONMENT"; then | ||
148 | _SAVE_CPPFLAGS="$CPPFLAGS" | ||
149 | CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Do-build-time-detection-of-2-bytes-wchar_t-and-char1.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Do-build-time-detection-of-2-bytes-wchar_t-and-char1.patch new file mode 100644 index 0000000..99408b4 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Do-build-time-detection-of-2-bytes-wchar_t-and-char1.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Wed, 14 Apr 2010 08:59:59 +0200 | ||
3 | Subject: Do build time detection of 2-bytes wchar_t and char16_t support | ||
4 | |||
5 | https://bugzilla.mozilla.org/show_bug.cgi?id=559278 | ||
6 | Closes: #577677 | ||
7 | --- | ||
8 | xpcom/base/nscore.h | 22 ++++++++++++++++++++++ | ||
9 | xpcom/glue/nsStringAPI.h | 1 + | ||
10 | xpcom/string/public/nsLiteralString.h | 1 + | ||
11 | 3 files changed, 24 insertions(+) | ||
12 | |||
13 | diff --git a/xpcom/base/nscore.h b/xpcom/base/nscore.h | ||
14 | index 9cde77d..40d3aaa 100644 | ||
15 | --- a/xpcom/base/nscore.h | ||
16 | +++ b/xpcom/base/nscore.h | ||
17 | @@ -391,6 +391,28 @@ typedef PRUint32 nsrefcnt; | ||
18 | #define HAVE_CPP_2BYTE_WCHAR_T | ||
19 | #endif | ||
20 | |||
21 | +#ifdef __GNUC__ | ||
22 | +/* char16_t is only available in gcc 4.4+ with experimental c++0x support | ||
23 | + * (-std=c++0x or -std=gnu++0x) */ | ||
24 | +#if defined(HAVE_CPP_CHAR16_T) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4) || !defined(__GXX_EXPERIMENTAL_CXX0X__)) | ||
25 | +#warning libxul SDK was configured with char16_t support, but now building without | ||
26 | +#undef HAVE_CPP_CHAR16_T | ||
27 | +#elif ! defined(HAVE_CPP_CHAR16_T) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && defined(__GXX_EXPERIMENTAL_CXX0X__) | ||
28 | +#warning libxul SDK was configured without char16_t support, but now building with | ||
29 | +#define HAVE_CPP_CHAR16_T | ||
30 | +#endif | ||
31 | + | ||
32 | +/* When gcc is not given -fshort-wchar, wchar_t is not 2-bytes wide */ | ||
33 | +#if defined(HAVE_CPP_2BYTE_WCHAR_T) && (__SIZEOF_WCHAR_T__ != 2) | ||
34 | +#warning libxul SDK was configured with 2-byte wchar_t, but now building without | ||
35 | +#undef HAVE_CPP_2BYTE_WCHAR_T | ||
36 | +#elif ! defined(HAVE_CPP_2BYTE_WCHAR_T) && (__SIZEOF_WCHAR_T__ == 2) | ||
37 | +#warning libxul SDK was configured without 2-byte wchar_t, but now building with | ||
38 | +#define HAVE_CPP_2BYTE_WCHAR_T | ||
39 | +#endif | ||
40 | + | ||
41 | +#endif | ||
42 | + | ||
43 | #ifndef __PRUNICHAR__ | ||
44 | #define __PRUNICHAR__ | ||
45 | /* For now, don't use wchar_t on Unix because it breaks the Netscape | ||
46 | diff --git a/xpcom/glue/nsStringAPI.h b/xpcom/glue/nsStringAPI.h | ||
47 | index 272c9eb..0590fc5 100644 | ||
48 | --- a/xpcom/glue/nsStringAPI.h | ||
49 | +++ b/xpcom/glue/nsStringAPI.h | ||
50 | @@ -1109,6 +1109,7 @@ private: | ||
51 | #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s) const nsDependentString n(reinterpret_cast<const nsAString::char_type*>(s), PRUint32((sizeof(s)/2)-1)) | ||
52 | typedef nsDependentString nsLiteralString; | ||
53 | #else | ||
54 | + #warning Using conversions for literal strings. Please consider using 2-bytes wchar_t or char16_t instead | ||
55 | #define NS_LL(s) s | ||
56 | #define NS_MULTILINE_LITERAL_STRING(s) NS_ConvertASCIItoUTF16(s, PRUint32(sizeof(s)-1)) | ||
57 | #define NS_MULTILINE_LITERAL_STRING_INIT(n,s) n(s, PRUint32(sizeof(s)-1)) | ||
58 | diff --git a/xpcom/string/public/nsLiteralString.h b/xpcom/string/public/nsLiteralString.h | ||
59 | index 7808f24..2cf1f7b 100644 | ||
60 | --- a/xpcom/string/public/nsLiteralString.h | ||
61 | +++ b/xpcom/string/public/nsLiteralString.h | ||
62 | @@ -91,6 +91,7 @@ literal_string( const nsACString::char_type* aPtr, PRUint32 aLength ) | ||
63 | #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s) const nsDependentString n(reinterpret_cast<const nsAString::char_type*>(s), PRUint32((sizeof(s)/2)-1)) | ||
64 | typedef nsDependentString nsLiteralString; | ||
65 | #else | ||
66 | + #warning Using conversions for literal strings. Please consider using 2-bytes wchar_t or char16_t instead | ||
67 | #define NS_LL(s) s | ||
68 | #define NS_MULTILINE_LITERAL_STRING(s) NS_ConvertASCIItoUTF16(s, PRUint32(sizeof(s)-1)) | ||
69 | #define NS_MULTILINE_LITERAL_STRING_INIT(n,s) n(s, PRUint32(sizeof(s)-1)) | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Don-t-build-example-component.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Don-t-build-example-component.patch new file mode 100644 index 0000000..daadb5f --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Don-t-build-example-component.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Wed, 12 Mar 2008 23:20:52 +0100 | ||
3 | Subject: Don't build example component | ||
4 | |||
5 | --- | ||
6 | xulrunner/Makefile.in | 1 - | ||
7 | 1 file changed, 1 deletion(-) | ||
8 | |||
9 | diff --git a/xulrunner/Makefile.in b/xulrunner/Makefile.in | ||
10 | index 0af55ea..176ace0 100644 | ||
11 | --- a/xulrunner/Makefile.in | ||
12 | +++ b/xulrunner/Makefile.in | ||
13 | @@ -47,7 +47,6 @@ PARALLEL_DIRS = \ | ||
14 | app \ | ||
15 | setup \ | ||
16 | stub \ | ||
17 | - examples \ | ||
18 | $(NULL) | ||
19 | |||
20 | ifeq ($(OS_ARCH),WINNT) | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Don-t-error-out-when-run-time-libsqlite-is-older-tha.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Don-t-error-out-when-run-time-libsqlite-is-older-tha.patch new file mode 100644 index 0000000..dd5661f --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Don-t-error-out-when-run-time-libsqlite-is-older-tha.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Mon, 22 Mar 2010 11:45:42 +0100 | ||
3 | Subject: Don't error-out when run-time libsqlite is older than build-time | ||
4 | libsqlite | ||
5 | |||
6 | In Debian, we have shlibs to handle this. | ||
7 | --- | ||
8 | storage/src/mozStorageService.cpp | 2 ++ | ||
9 | 1 file changed, 2 insertions(+) | ||
10 | |||
11 | diff --git a/storage/src/mozStorageService.cpp b/storage/src/mozStorageService.cpp | ||
12 | index 7c0a7a0..0121765 100644 | ||
13 | --- a/storage/src/mozStorageService.cpp | ||
14 | +++ b/storage/src/mozStorageService.cpp | ||
15 | @@ -222,6 +222,7 @@ Service::getSingleton() | ||
16 | return gService; | ||
17 | } | ||
18 | |||
19 | +#if 0 | ||
20 | // Ensure that we are using the same version of SQLite that we compiled with | ||
21 | // or newer. Our configure check ensures we are using a new enough version | ||
22 | // at compile time. | ||
23 | @@ -237,6 +238,7 @@ Service::getSingleton() | ||
24 | } | ||
25 | ::PR_Abort(); | ||
26 | } | ||
27 | +#endif | ||
28 | |||
29 | gService = new Service(); | ||
30 | if (gService) { | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Don-t-install-system-profile.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Don-t-install-system-profile.patch new file mode 100644 index 0000000..5be5f5a --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Don-t-install-system-profile.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Wed, 12 Mar 2008 23:25:15 +0100 | ||
3 | Subject: Don't install system profile | ||
4 | |||
5 | --- | ||
6 | xulrunner/app/Makefile.in | 2 -- | ||
7 | 1 file changed, 2 deletions(-) | ||
8 | |||
9 | diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in | ||
10 | index eae02da..2d5b8f4 100644 | ||
11 | --- a/xulrunner/app/Makefile.in | ||
12 | +++ b/xulrunner/app/Makefile.in | ||
13 | @@ -48,8 +48,6 @@ VPATH = @srcdir@ | ||
14 | |||
15 | include $(DEPTH)/config/autoconf.mk | ||
16 | |||
17 | -DIRS = profile | ||
18 | - | ||
19 | PREF_JS_EXPORTS = $(srcdir)/xulrunner.js | ||
20 | GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js) | ||
21 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Don-t-register-plugins-if-the-MOZILLA_DISABLE_PLUGIN.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Don-t-register-plugins-if-the-MOZILLA_DISABLE_PLUGIN.patch new file mode 100644 index 0000000..2b13be9 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Don-t-register-plugins-if-the-MOZILLA_DISABLE_PLUGIN.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Sat, 27 Sep 2008 17:17:39 +0200 | ||
3 | Subject: Don't register plugins if the MOZILLA_DISABLE_PLUGINS environment | ||
4 | variable is set | ||
5 | |||
6 | --- | ||
7 | dom/plugins/base/nsPluginHost.cpp | 4 ++++ | ||
8 | 1 file changed, 4 insertions(+) | ||
9 | |||
10 | diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp | ||
11 | index 992bcd4..18081a2 100644 | ||
12 | --- a/dom/plugins/base/nsPluginHost.cpp | ||
13 | +++ b/dom/plugins/base/nsPluginHost.cpp | ||
14 | @@ -407,6 +407,10 @@ nsPluginHost::nsPluginHost() | ||
15 | } | ||
16 | } | ||
17 | |||
18 | + const char *env = PR_GetEnv("MOZILLA_DISABLE_PLUGINS"); | ||
19 | + if (env && env[0]) | ||
20 | + mPluginsDisabled = PR_TRUE; | ||
21 | + | ||
22 | nsCOMPtr<nsIObserverService> obsService = | ||
23 | mozilla::services::GetObserverService(); | ||
24 | if (obsService) { | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Fix-tracejit-to-build-against-nanojit-headers-in-dis.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Fix-tracejit-to-build-against-nanojit-headers-in-dis.patch new file mode 100644 index 0000000..1a13d45 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Fix-tracejit-to-build-against-nanojit-headers-in-dis.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Wed, 10 Nov 2010 08:41:03 +0100 | ||
3 | Subject: Fix tracejit to build against nanojit headers in | ||
4 | dist/include/nanojit | ||
5 | |||
6 | --- | ||
7 | js/src/tracejit/Writer.cpp | 2 +- | ||
8 | js/src/tracejit/Writer.h | 2 +- | ||
9 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/js/src/tracejit/Writer.cpp b/js/src/tracejit/Writer.cpp | ||
12 | index 8f6476e..df0c8e2 100644 | ||
13 | --- a/js/src/tracejit/Writer.cpp | ||
14 | +++ b/js/src/tracejit/Writer.cpp | ||
15 | @@ -42,7 +42,7 @@ | ||
16 | #include "jscompartment.h" | ||
17 | #include "jsiter.h" | ||
18 | #include "Writer.h" | ||
19 | -#include "nanojit.h" | ||
20 | +#include "nanojit/nanojit.h" | ||
21 | #include "jsobjinlines.h" | ||
22 | |||
23 | #include "vm/ArgumentsObject.h" | ||
24 | diff --git a/js/src/tracejit/Writer.h b/js/src/tracejit/Writer.h | ||
25 | index ab96acc..56d2641 100644 | ||
26 | --- a/js/src/tracejit/Writer.h | ||
27 | +++ b/js/src/tracejit/Writer.h | ||
28 | @@ -42,7 +42,7 @@ | ||
29 | |||
30 | #include "jsstr.h" | ||
31 | #include "jstypedarray.h" | ||
32 | -#include "nanojit.h" | ||
33 | +#include "nanojit/nanojit.h" | ||
34 | |||
35 | namespace js { | ||
36 | namespace tjit { | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Gross-workaround-to-avoid-installing-test-idl-and-in.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Gross-workaround-to-avoid-installing-test-idl-and-in.patch new file mode 100644 index 0000000..cb6fdde --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Gross-workaround-to-avoid-installing-test-idl-and-in.patch | |||
@@ -0,0 +1,71 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Wed, 27 Jan 2010 17:47:57 +0100 | ||
3 | Subject: Gross workaround to avoid installing test idl and include files in | ||
4 | the SDK | ||
5 | |||
6 | https://bugzilla.mozilla.org/show_bug.cgi?id=542749 | ||
7 | --- | ||
8 | config/rules.mk | 12 +++++++++++- | ||
9 | js/src/config/rules.mk | 12 +++++++++++- | ||
10 | 2 files changed, 22 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/config/rules.mk b/config/rules.mk | ||
13 | index c64b4d5..1b8bfc0 100644 | ||
14 | --- a/config/rules.mk | ||
15 | +++ b/config/rules.mk | ||
16 | @@ -64,6 +64,16 @@ ifdef SDK_HEADERS | ||
17 | EXPORTS += $(SDK_HEADERS) | ||
18 | endif | ||
19 | |||
20 | +ifneq (,$(findstring sample,$(MODULE))$(findstring test,$(MODULE))$(findstring Test,$(MODULE))) | ||
21 | +INCLUDE_DIR := $(DIST)/include/testing | ||
22 | +IDL_DIR := $(DIST)/tests/idl | ||
23 | +LOCAL_INCLUDES += -I$(XPIDL_GEN_DIR) -I$(INCLUDE_DIR) | ||
24 | +override MOZ_JAVAXPCOM := | ||
25 | +XPIDL_FLAGS += -I$(DIST)/idl | ||
26 | +else | ||
27 | +INCLUDE_DIR := $(DIST)/include | ||
28 | +endif | ||
29 | + | ||
30 | REPORT_BUILD = @echo $(notdir $<) | ||
31 | |||
32 | ifeq ($(OS_ARCH),OS2) | ||
33 | @@ -1525,7 +1535,7 @@ ifndef NO_DIST_INSTALL | ||
34 | export:: $(XPIDLSRCS) $(IDL_DIR) | ||
35 | $(INSTALL) $(IFLAGS1) $^ | ||
36 | |||
37 | -export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(DIST)/include | ||
38 | +export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(INCLUDE_DIR) | ||
39 | $(INSTALL) $(IFLAGS1) $^ | ||
40 | endif # NO_DIST_INSTALL | ||
41 | |||
42 | diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk | ||
43 | index c64b4d5..1b8bfc0 100644 | ||
44 | --- a/js/src/config/rules.mk | ||
45 | +++ b/js/src/config/rules.mk | ||
46 | @@ -64,6 +64,16 @@ ifdef SDK_HEADERS | ||
47 | EXPORTS += $(SDK_HEADERS) | ||
48 | endif | ||
49 | |||
50 | +ifneq (,$(findstring sample,$(MODULE))$(findstring test,$(MODULE))$(findstring Test,$(MODULE))) | ||
51 | +INCLUDE_DIR := $(DIST)/include/testing | ||
52 | +IDL_DIR := $(DIST)/tests/idl | ||
53 | +LOCAL_INCLUDES += -I$(XPIDL_GEN_DIR) -I$(INCLUDE_DIR) | ||
54 | +override MOZ_JAVAXPCOM := | ||
55 | +XPIDL_FLAGS += -I$(DIST)/idl | ||
56 | +else | ||
57 | +INCLUDE_DIR := $(DIST)/include | ||
58 | +endif | ||
59 | + | ||
60 | REPORT_BUILD = @echo $(notdir $<) | ||
61 | |||
62 | ifeq ($(OS_ARCH),OS2) | ||
63 | @@ -1525,7 +1535,7 @@ ifndef NO_DIST_INSTALL | ||
64 | export:: $(XPIDLSRCS) $(IDL_DIR) | ||
65 | $(INSTALL) $(IFLAGS1) $^ | ||
66 | |||
67 | -export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(DIST)/include | ||
68 | +export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(INCLUDE_DIR) | ||
69 | $(INSTALL) $(IFLAGS1) $^ | ||
70 | endif # NO_DIST_INSTALL | ||
71 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Handle-transition-to-etc-appname-searchplugins-more-.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Handle-transition-to-etc-appname-searchplugins-more-.patch new file mode 100644 index 0000000..7259c97 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Handle-transition-to-etc-appname-searchplugins-more-.patch | |||
@@ -0,0 +1,73 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Sun, 15 Apr 2012 11:38:32 +0200 | ||
3 | Subject: Handle transition to /etc/<appname>/searchplugins more gracefully | ||
4 | |||
5 | Closes: #666675. | ||
6 | --- | ||
7 | toolkit/components/search/nsSearchService.js | 32 ++++++++++++++++++++++++-- | ||
8 | 1 file changed, 30 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js | ||
11 | index 2807835..8fa31ca 100644 | ||
12 | --- a/toolkit/components/search/nsSearchService.js | ||
13 | +++ b/toolkit/components/search/nsSearchService.js | ||
14 | @@ -710,6 +710,7 @@ function getMozParamPref(prefName) | ||
15 | * | ||
16 | * @see nsIBrowserSearchService.idl | ||
17 | */ | ||
18 | +let gForceCacheInvalidation = false; | ||
19 | let gEnginesLoaded = false; | ||
20 | function notifyAction(aEngine, aVerb) { | ||
21 | if (gEnginesLoaded) { | ||
22 | @@ -2012,6 +2013,20 @@ Engine.prototype = { | ||
23 | **/ | ||
24 | _initWithJSON: function SRCH_ENG__initWithJSON(aJson) { | ||
25 | this.__id = aJson._id; | ||
26 | + try { | ||
27 | + let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile); | ||
28 | + file.initWithPath(this.__id); | ||
29 | + let loadDirs = []; | ||
30 | + let locations = getDir(NS_APP_SEARCH_DIR_LIST, Ci.nsISimpleEnumerator); | ||
31 | + while (locations.hasMoreElements()) { | ||
32 | + let dir = locations.getNext().QueryInterface(Ci.nsIFile); | ||
33 | + loadDirs.push(dir); | ||
34 | + } | ||
35 | + if (loadDirs.some(function (element) element.equals(file.parent))) { | ||
36 | + this.__id = "[app]/" + file.leafName; | ||
37 | + gForceCacheInvalidation = true; | ||
38 | + } | ||
39 | + } catch (e) { } | ||
40 | this._name = aJson._name; | ||
41 | this._description = aJson.description; | ||
42 | if (aJson._hasPreferredIcon == undefined) | ||
43 | @@ -2306,8 +2321,19 @@ Engine.prototype = { | ||
44 | this.__installLocation = SEARCH_APP_DIR; | ||
45 | else if (this._file.parent.equals(getDir(NS_APP_USER_SEARCH_DIR))) | ||
46 | this.__installLocation = SEARCH_PROFILE_DIR; | ||
47 | - else | ||
48 | - this.__installLocation = SEARCH_IN_EXTENSION; | ||
49 | + else { | ||
50 | + let loadDirs = []; | ||
51 | + let locations = getDir(NS_APP_SEARCH_DIR_LIST, Ci.nsISimpleEnumerator); | ||
52 | + while (locations.hasMoreElements()) { | ||
53 | + let dir = locations.getNext().QueryInterface(Ci.nsIFile); | ||
54 | + loadDirs.push(dir); | ||
55 | + } | ||
56 | + let parent = this._file.parent; | ||
57 | + if (loadDirs.some(function (element) !element.equals(parent))) | ||
58 | + this.__installLocation = SEARCH_APP_DIR; | ||
59 | + else | ||
60 | + this.__installLocation = SEARCH_IN_EXTENSION; | ||
61 | + } | ||
62 | } | ||
63 | |||
64 | return this.__installLocation; | ||
65 | @@ -2471,6 +2497,8 @@ function SearchService() { | ||
66 | } | ||
67 | gEnginesLoaded = true; | ||
68 | this._addObservers(); | ||
69 | + if (gForceCacheInvalidation) | ||
70 | + this._batchCacheInvalidation(); | ||
71 | } | ||
72 | SearchService.prototype = { | ||
73 | classID: Components.ID("{7319788a-fe93-4db3-9f39-818cf08f4256}"), | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Ignore-system-libjpeg-libpng-and-zlib-version-checki.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Ignore-system-libjpeg-libpng-and-zlib-version-checki.patch new file mode 100644 index 0000000..76368cb --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Ignore-system-libjpeg-libpng-and-zlib-version-checki.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Thu, 13 Mar 2008 07:33:42 +0100 | ||
3 | Subject: Ignore system libjpeg, libpng and zlib version checking | ||
4 | |||
5 | Make sure we won't be bitten by upstream changing libjpeg, libpng or zlib | ||
6 | internal version, which makes system library not used even though | ||
7 | --with-system-* argument is given to configure. | ||
8 | --- | ||
9 | configure.in | 6 +++--- | ||
10 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
11 | |||
12 | diff --git a/configure.in b/configure.in | ||
13 | index 18872c4..5c20d46 100644 | ||
14 | --- a/configure.in | ||
15 | +++ b/configure.in | ||
16 | @@ -4357,7 +4357,7 @@ else | ||
17 | AC_CHECK_LIB(jpeg, jpeg_destroy_compress, [SYSTEM_JPEG=1 JPEG_LIBS="-ljpeg $JPEG_LIBS"], SYSTEM_JPEG=, $JPEG_LIBS) | ||
18 | fi | ||
19 | |||
20 | -if test "$SYSTEM_JPEG" = 1; then | ||
21 | +if test "$SYSTEM_JPEG" = 0; then | ||
22 | LIBS="$JPEG_LIBS $LIBS" | ||
23 | AC_TRY_COMPILE([ #include <stdio.h> | ||
24 | #include <sys/types.h> | ||
25 | @@ -4397,7 +4397,7 @@ else | ||
26 | AC_CHECK_LIB(z, gzread, [SYSTEM_ZLIB=1 ZLIB_LIBS="-lz $ZLIB_LIBS"], | ||
27 | [SYSTEM_ZLIB= ZLIB_CFLAGS= ZLIB_LIBS=], $ZLIB_LIBS) | ||
28 | fi | ||
29 | -if test "$SYSTEM_ZLIB" = 1; then | ||
30 | +if test "$SYSTEM_ZLIB" = 0; then | ||
31 | LIBS="$ZLIB_LIBS $LIBS" | ||
32 | AC_TRY_COMPILE([ #include <stdio.h> | ||
33 | #include <string.h> | ||
34 | @@ -4473,7 +4473,7 @@ else | ||
35 | AC_MSG_ERROR([--with-system-png won't work because the system's libpng doesn't have APNG support]), | ||
36 | $_SAVE_PNG_LIBS) | ||
37 | fi | ||
38 | -if test "$SYSTEM_PNG" = 1; then | ||
39 | +if test "$SYSTEM_PNG" = 0; then | ||
40 | LIBS="$PNG_LIBS $LIBS" | ||
41 | AC_TRY_COMPILE([ #include <stdio.h> | ||
42 | #include <sys/types.h> | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Install-js-shell-when-running-make-install-from-js-s.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Install-js-shell-when-running-make-install-from-js-s.patch new file mode 100644 index 0000000..92052f2 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Install-js-shell-when-running-make-install-from-js-s.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Fri, 26 Feb 2010 16:25:15 +0100 | ||
3 | Subject: Install js shell when running make install from js/src | ||
4 | |||
5 | --- | ||
6 | js/src/Makefile.in | 1 + | ||
7 | js/src/shell/Makefile.in | 3 +++ | ||
8 | 2 files changed, 4 insertions(+) | ||
9 | |||
10 | diff --git a/js/src/Makefile.in b/js/src/Makefile.in | ||
11 | index 0f83fd6..d61492d 100644 | ||
12 | --- a/js/src/Makefile.in | ||
13 | +++ b/js/src/Makefile.in | ||
14 | @@ -940,6 +940,7 @@ endif | ||
15 | ifneq (,$(IMPORT_LIBRARY)) | ||
16 | $(SYSINSTALL) $(IMPORT_LIBRARY) $(DESTDIR)$(libdir) | ||
17 | endif | ||
18 | + $(MAKE) -C shell install | ||
19 | |||
20 | # Extra dependancies and rules for auto-generated headers | ||
21 | host_jskwgen.$(OBJ_SUFFIX): jsversion.h jskeyword.tbl | ||
22 | diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in | ||
23 | index 4df10ed..504e259 100644 | ||
24 | --- a/js/src/shell/Makefile.in | ||
25 | +++ b/js/src/shell/Makefile.in | ||
26 | @@ -78,3 +78,6 @@ endif | ||
27 | # People expect the js shell to wind up in the top-level JS dir. | ||
28 | libs:: | ||
29 | $(INSTALL) $(IFLAGS2) $(PROGRAM) $(DEPTH) | ||
30 | + | ||
31 | +install:: $(PROGRAM) | ||
32 | + $(SYSINSTALL) $^ $(DESTDIR)$(bindir) | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Install-missing-nanojit-and-.tbl-headers-from-js-src.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Install-missing-nanojit-and-.tbl-headers-from-js-src.patch new file mode 100644 index 0000000..6dc7737 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Install-missing-nanojit-and-.tbl-headers-from-js-src.patch | |||
@@ -0,0 +1,85 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Thu, 28 Jan 2010 18:08:38 +0100 | ||
3 | Subject: Install missing nanojit and .tbl headers from js/src | ||
4 | |||
5 | https://bugzilla.mozilla.org/show_bug.cgi?id=542789 | ||
6 | --- | ||
7 | js/src/Makefile.in | 44 +++++++++++++++++++++++++++----------------- | ||
8 | 1 file changed, 27 insertions(+), 17 deletions(-) | ||
9 | |||
10 | diff --git a/js/src/Makefile.in b/js/src/Makefile.in | ||
11 | index 1200ae6..0f83fd6 100644 | ||
12 | --- a/js/src/Makefile.in | ||
13 | +++ b/js/src/Makefile.in | ||
14 | @@ -230,6 +230,7 @@ INSTALLED_HEADERS = \ | ||
15 | jsxdrapi.h \ | ||
16 | jsval.h \ | ||
17 | prmjtime.h \ | ||
18 | + jskeyword.tbl \ | ||
19 | $(NULL) | ||
20 | |||
21 | ###################################################### | ||
22 | @@ -296,21 +297,21 @@ VPATH += \ | ||
23 | |||
24 | INSTALLED_HEADERS += \ | ||
25 | jsbuiltins.h \ | ||
26 | - Assembler.h \ | ||
27 | - Allocator.h \ | ||
28 | - CodeAlloc.h \ | ||
29 | - Containers.h \ | ||
30 | - LIR.h \ | ||
31 | - LIRopcode.tbl \ | ||
32 | - avmplus.h \ | ||
33 | - Fragmento.h \ | ||
34 | - Native.h \ | ||
35 | - NativeCommon.h \ | ||
36 | - Native$(NANOJIT_ARCH).h \ | ||
37 | - njconfig.h \ | ||
38 | - njcpudetect.h \ | ||
39 | - RegAlloc.h \ | ||
40 | - nanojit.h \ | ||
41 | + nanojit/Assembler.h \ | ||
42 | + nanojit/Allocator.h \ | ||
43 | + nanojit/CodeAlloc.h \ | ||
44 | + nanojit/Containers.h \ | ||
45 | + nanojit/LIR.h \ | ||
46 | + nanojit/LIRopcode.tbl \ | ||
47 | + nanojit/avmplus.h \ | ||
48 | + nanojit/Fragmento.h \ | ||
49 | + nanojit/Native.h \ | ||
50 | + nanojit/NativeCommon.h \ | ||
51 | + nanojit/Native$(NANOJIT_ARCH).h \ | ||
52 | + nanojit/njconfig.h \ | ||
53 | + nanojit/njcpudetect.h \ | ||
54 | + nanojit/RegAlloc.h \ | ||
55 | + nanojit/nanojit.h \ | ||
56 | VMPI.h \ | ||
57 | Writer.h \ | ||
58 | $(NULL) | ||
59 | @@ -545,7 +546,11 @@ else | ||
60 | CPPSRCS += pm_stub.cpp | ||
61 | endif | ||
62 | |||
63 | -EXPORTS = $(INSTALLED_HEADERS) | ||
64 | +EXPORTS = $(filter-out nanojit/%,$(INSTALLED_HEADERS)) | ||
65 | +ifdef ENABLE_TRACEJIT | ||
66 | +EXPORTS_NAMESPACES += nanojit | ||
67 | +EXPORTS_nanojit = $(filter nanojit/%,$(INSTALLED_HEADERS)) | ||
68 | +endif # ENABLE_TRACEJIT | ||
69 | |||
70 | DASH_R = -r | ||
71 | |||
72 | @@ -911,7 +916,12 @@ js-config: js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config | ||
73 | SCRIPTS = js-config | ||
74 | SDK_BINARY = js-config | ||
75 | |||
76 | -install:: $(INSTALLED_HEADERS) | ||
77 | +ifdef ENABLE_TRACEJIT | ||
78 | +install:: $(filter nanojit/%,$(INSTALLED_HEADERS)) | ||
79 | + $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)/nanojit | ||
80 | +endif | ||
81 | + | ||
82 | +install:: $(filter-out nanojit/%,$(INSTALLED_HEADERS)) | ||
83 | $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE) | ||
84 | |||
85 | install:: $(SCRIPTS) | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Load-distribution-search-plugins-from-etc-appname-se.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Load-distribution-search-plugins-from-etc-appname-se.patch new file mode 100644 index 0000000..940eac7 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Load-distribution-search-plugins-from-etc-appname-se.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Fri, 30 Mar 2012 15:44:54 +0200 | ||
3 | Subject: Load distribution search plugins from /etc/<appname>/searchplugins | ||
4 | |||
5 | --- | ||
6 | .../components/dirprovider/DirectoryProvider.cpp | 22 ++++++++++++++------ | ||
7 | 1 file changed, 16 insertions(+), 6 deletions(-) | ||
8 | |||
9 | diff --git a/browser/components/dirprovider/DirectoryProvider.cpp b/browser/components/dirprovider/DirectoryProvider.cpp | ||
10 | index 1373adc..cde4587 100644 | ||
11 | --- a/browser/components/dirprovider/DirectoryProvider.cpp | ||
12 | +++ b/browser/components/dirprovider/DirectoryProvider.cpp | ||
13 | @@ -38,7 +38,8 @@ | ||
14 | #include "nsIDirectoryService.h" | ||
15 | #include "DirectoryProvider.h" | ||
16 | |||
17 | -#include "nsIFile.h" | ||
18 | +#include "nsIXULAppInfo.h" | ||
19 | +#include "nsILocalFile.h" | ||
20 | #include "nsISimpleEnumerator.h" | ||
21 | #include "nsIPrefService.h" | ||
22 | #include "nsIPrefBranch.h" | ||
23 | @@ -166,13 +167,22 @@ AppendFileKey(const char *key, nsIProperties* aDirSvc, | ||
24 | static void | ||
25 | AppendDistroSearchDirs(nsIProperties* aDirSvc, nsCOMArray<nsIFile> &array) | ||
26 | { | ||
27 | - nsCOMPtr<nsIFile> searchPlugins; | ||
28 | - nsresult rv = aDirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, | ||
29 | - NS_GET_IID(nsIFile), | ||
30 | - getter_AddRefs(searchPlugins)); | ||
31 | + nsCOMPtr<nsILocalFile> searchPlugins; | ||
32 | + nsresult rv = NS_NewLocalFile(NS_LITERAL_STRING("/etc"), false, | ||
33 | + getter_AddRefs(searchPlugins)); | ||
34 | if (NS_FAILED(rv)) | ||
35 | return; | ||
36 | - searchPlugins->AppendNative(NS_LITERAL_CSTRING("distribution")); | ||
37 | + nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1"); | ||
38 | + if (!appInfo) | ||
39 | + return; | ||
40 | + | ||
41 | + nsCAutoString name; | ||
42 | + rv = appInfo->GetName(name); | ||
43 | + if (NS_FAILED(rv)) | ||
44 | + return; | ||
45 | + ToLowerCase(name); | ||
46 | + | ||
47 | + searchPlugins->AppendNative(name); | ||
48 | searchPlugins->AppendNative(NS_LITERAL_CSTRING("searchplugins")); | ||
49 | |||
50 | bool exists; | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Use-a-variable-for-xulrunner-base-version-in-various.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Use-a-variable-for-xulrunner-base-version-in-various.patch new file mode 100644 index 0000000..d35c478 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/Use-a-variable-for-xulrunner-base-version-in-various.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Mon, 14 Jul 2008 15:20:46 +0200 | ||
3 | Subject: Use a variable for xulrunner base version in various places | ||
4 | |||
5 | --- | ||
6 | config/autoconf.mk.in | 9 +++++---- | ||
7 | 1 file changed, 5 insertions(+), 4 deletions(-) | ||
8 | |||
9 | diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in | ||
10 | index fccb1a9..ca251cb 100644 | ||
11 | --- a/config/autoconf.mk.in | ||
12 | +++ b/config/autoconf.mk.in | ||
13 | @@ -55,6 +55,7 @@ MOZ_APP_PROFILE = @MOZ_APP_PROFILE@ | ||
14 | MOZ_APP_UA_NAME = @MOZ_APP_UA_NAME@ | ||
15 | MOZ_APP_VERSION = @MOZ_APP_VERSION@ | ||
16 | MOZ_APP_MAXVERSION = @MOZ_APP_MAXVERSION@ | ||
17 | +MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION))) | ||
18 | MOZ_UA_BUILDID = @MOZ_UA_BUILDID@ | ||
19 | MOZ_MACBUNDLE_NAME = @MOZ_MACBUNDLE_NAME@ | ||
20 | |||
21 | @@ -63,14 +64,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ | ||
22 | prefix = @prefix@ | ||
23 | exec_prefix = @exec_prefix@ | ||
24 | bindir = @bindir@ | ||
25 | -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) | ||
26 | +includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) | ||
27 | libdir = @libdir@ | ||
28 | datadir = @datadir@ | ||
29 | mandir = @mandir@ | ||
30 | -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) | ||
31 | +idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) | ||
32 | |||
33 | -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) | ||
34 | -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) | ||
35 | +installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) | ||
36 | +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION) | ||
37 | |||
38 | DIST = $(DEPTH)/dist | ||
39 | LIBXUL_SDK = @LIBXUL_SDK@ | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/pkg-config-files-don-t-need-to-require-the-version-o.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/pkg-config-files-don-t-need-to-require-the-version-o.patch new file mode 100644 index 0000000..a90e53b --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/debian-hacks/pkg-config-files-don-t-need-to-require-the-version-o.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Tue, 7 Sep 2010 08:52:43 +0200 | ||
3 | Subject: pkg-config files don't need to require the version of nspr xulrunner | ||
4 | was built against | ||
5 | |||
6 | --- | ||
7 | xulrunner/installer/libxul.pc.in | 2 +- | ||
8 | xulrunner/installer/mozilla-js.pc.in | 2 +- | ||
9 | xulrunner/installer/mozilla-nss.pc.in | 2 +- | ||
10 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
11 | |||
12 | diff --git a/xulrunner/installer/libxul.pc.in b/xulrunner/installer/libxul.pc.in | ||
13 | index ccce9aa..631382d 100644 | ||
14 | --- a/xulrunner/installer/libxul.pc.in | ||
15 | +++ b/xulrunner/installer/libxul.pc.in | ||
16 | @@ -6,6 +6,6 @@ idldir=%idldir% | ||
17 | Name: libxul | ||
18 | Description: The Mozilla Runtime and Embedding Engine | ||
19 | Version: %MOZILLA_VERSION% | ||
20 | -Requires: %NSPR_NAME% >= %NSPR_VERSION% | ||
21 | +Requires: %NSPR_NAME% | ||
22 | Libs: -L${sdkdir}/lib %MOZ_XUL_LINK% | ||
23 | Cflags: -I${includedir} %WCHAR_CFLAGS% | ||
24 | diff --git a/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in | ||
25 | index c1428f1..9eb0a79 100644 | ||
26 | --- a/xulrunner/installer/mozilla-js.pc.in | ||
27 | +++ b/xulrunner/installer/mozilla-js.pc.in | ||
28 | @@ -5,6 +5,6 @@ includedir=%includedir% | ||
29 | Name: JavaScript | ||
30 | Description: The Mozilla JavaScript Library | ||
31 | Version: %MOZILLA_VERSION% | ||
32 | -Requires: %NSPR_NAME% >= %NSPR_VERSION% | ||
33 | +Requires: %NSPR_NAME% | ||
34 | Libs: -L${sdkdir}/lib %MOZ_JS_LINK% | ||
35 | Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE | ||
36 | diff --git a/xulrunner/installer/mozilla-nss.pc.in b/xulrunner/installer/mozilla-nss.pc.in | ||
37 | index 088832a..927305f 100644 | ||
38 | --- a/xulrunner/installer/mozilla-nss.pc.in | ||
39 | +++ b/xulrunner/installer/mozilla-nss.pc.in | ||
40 | @@ -5,6 +5,6 @@ includedir=%includedir% | ||
41 | Name: NSS | ||
42 | Description: Mozilla Network Security Services | ||
43 | Version: %MOZILLA_VERSION% | ||
44 | -Requires: %NSPR_NAME% >= %NSPR_VERSION% | ||
45 | +Requires: %NSPR_NAME% | ||
46 | Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3 | ||
47 | Cflags: -I${includedir} | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Allow-.js-preference-files-to-set-locked-prefs-with-.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Allow-.js-preference-files-to-set-locked-prefs-with-.patch new file mode 100644 index 0000000..78190c4 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Allow-.js-preference-files-to-set-locked-prefs-with-.patch | |||
@@ -0,0 +1,115 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Sat, 21 Jun 2008 02:48:46 +0200 | ||
3 | Subject: Allow .js preference files to set locked prefs with lockPref() | ||
4 | |||
5 | --- | ||
6 | modules/libpref/src/prefapi.cpp | 5 ++++- | ||
7 | modules/libpref/src/prefapi.h | 3 ++- | ||
8 | modules/libpref/src/prefread.cpp | 11 ++++++++--- | ||
9 | modules/libpref/src/prefread.h | 6 ++++-- | ||
10 | 4 files changed, 18 insertions(+), 7 deletions(-) | ||
11 | |||
12 | diff --git a/modules/libpref/src/prefapi.cpp b/modules/libpref/src/prefapi.cpp | ||
13 | index 5ecc914..885bdf4 100644 | ||
14 | --- a/modules/libpref/src/prefapi.cpp | ||
15 | +++ b/modules/libpref/src/prefapi.cpp | ||
16 | @@ -976,7 +976,10 @@ void PREF_ReaderCallback(void *closure, | ||
17 | const char *pref, | ||
18 | PrefValue value, | ||
19 | PrefType type, | ||
20 | - bool isDefault) | ||
21 | + bool isDefault, | ||
22 | + bool isLocked) | ||
23 | { | ||
24 | pref_HashPref(pref, value, type, isDefault); | ||
25 | + if (isLocked) | ||
26 | + PREF_LockPref(pref, true); | ||
27 | } | ||
28 | diff --git a/modules/libpref/src/prefapi.h b/modules/libpref/src/prefapi.h | ||
29 | index 22a88d3..2b20c4e 100644 | ||
30 | --- a/modules/libpref/src/prefapi.h | ||
31 | +++ b/modules/libpref/src/prefapi.h | ||
32 | @@ -208,7 +208,8 @@ void PREF_ReaderCallback( void *closure, | ||
33 | const char *pref, | ||
34 | PrefValue value, | ||
35 | PrefType type, | ||
36 | - bool isDefault); | ||
37 | + bool isDefault, | ||
38 | + bool isLocked); | ||
39 | |||
40 | PR_END_EXTERN_C | ||
41 | #endif | ||
42 | diff --git a/modules/libpref/src/prefread.cpp b/modules/libpref/src/prefread.cpp | ||
43 | index 893d256..d4ef51a 100644 | ||
44 | --- a/modules/libpref/src/prefread.cpp | ||
45 | +++ b/modules/libpref/src/prefread.cpp | ||
46 | @@ -75,6 +75,7 @@ enum { | ||
47 | #define BITS_PER_HEX_DIGIT 4 | ||
48 | |||
49 | static const char kUserPref[] = "user_pref"; | ||
50 | +static const char kLockPref[] = "lockPref"; | ||
51 | static const char kPref[] = "pref"; | ||
52 | static const char kTrue[] = "true"; | ||
53 | static const char kFalse[] = "false"; | ||
54 | @@ -161,7 +162,7 @@ pref_DoCallback(PrefParseState *ps) | ||
55 | default: | ||
56 | break; | ||
57 | } | ||
58 | - (*ps->reader)(ps->closure, ps->lb, value, ps->vtype, ps->fdefault); | ||
59 | + (*ps->reader)(ps->closure, ps->lb, value, ps->vtype, ps->fdefault, ps->flock); | ||
60 | return true; | ||
61 | } | ||
62 | |||
63 | @@ -220,6 +221,7 @@ PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen) | ||
64 | ps->vb = NULL; | ||
65 | ps->vtype = PREF_INVALID; | ||
66 | ps->fdefault = false; | ||
67 | + ps->flock = false; | ||
68 | } | ||
69 | switch (c) { | ||
70 | case '/': /* begin comment block or line? */ | ||
71 | @@ -230,7 +232,9 @@ PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen) | ||
72 | break; | ||
73 | case 'u': /* indicating user_pref */ | ||
74 | case 'p': /* indicating pref */ | ||
75 | - ps->smatch = (c == 'u' ? kUserPref : kPref); | ||
76 | + case 'l': /* indicating lockPref */ | ||
77 | + ps->smatch = (c == 'u' ? kUserPref : | ||
78 | + (c == 'p' ? kPref : kLockPref)); | ||
79 | ps->sindex = 1; | ||
80 | ps->nextstate = PREF_PARSE_UNTIL_OPEN_PAREN; | ||
81 | state = PREF_PARSE_MATCH_STRING; | ||
82 | @@ -274,7 +278,8 @@ PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen) | ||
83 | /* name parsing */ | ||
84 | case PREF_PARSE_UNTIL_NAME: | ||
85 | if (c == '\"' || c == '\'') { | ||
86 | - ps->fdefault = (ps->smatch == kPref); | ||
87 | + ps->fdefault = (ps->smatch != kUserPref); | ||
88 | + ps->flock = (ps->smatch == kLockPref); | ||
89 | ps->quotechar = c; | ||
90 | ps->nextstate = PREF_PARSE_UNTIL_COMMA; /* return here when done */ | ||
91 | state = PREF_PARSE_QUOTED_STRING; | ||
92 | diff --git a/modules/libpref/src/prefread.h b/modules/libpref/src/prefread.h | ||
93 | index 50f4d54..93a1702 100644 | ||
94 | --- a/modules/libpref/src/prefread.h | ||
95 | +++ b/modules/libpref/src/prefread.h | ||
96 | @@ -62,7 +62,8 @@ typedef void (*PrefReader)(void *closure, | ||
97 | const char *pref, | ||
98 | PrefValue val, | ||
99 | PrefType type, | ||
100 | - bool defPref); | ||
101 | + bool defPref, | ||
102 | + bool lockPref); | ||
103 | |||
104 | /* structure fields are private */ | ||
105 | typedef struct PrefParseState { | ||
106 | @@ -82,7 +83,8 @@ typedef struct PrefParseState { | ||
107 | char *lbend; /* line buffer end */ | ||
108 | char *vb; /* value buffer (ptr into lb) */ | ||
109 | PrefType vtype; /* PREF_STRING,INT,BOOL */ | ||
110 | - bool fdefault; /* true if (default) pref */ | ||
111 | + bool fdefault; /* true if (default) pref */ | ||
112 | + bool flock; /* true if pref to be locked */ | ||
113 | } PrefParseState; | ||
114 | |||
115 | /** | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Allow-webGL-with-mesa-assuming-users-will-have-updat.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Allow-webGL-with-mesa-assuming-users-will-have-updat.patch new file mode 100644 index 0000000..54ec57d --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Allow-webGL-with-mesa-assuming-users-will-have-updat.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Fri, 31 Aug 2012 09:01:08 +0200 | ||
3 | Subject: Allow webGL with mesa, assuming users will have updated to 8.0.4-2 | ||
4 | on wheezy | ||
5 | |||
6 | The version in squeeze-backports is not affected by CVE-2012-2864, and the | ||
7 | version in squeeze is blacklisted. | ||
8 | --- | ||
9 | widget/src/xpwidgets/GfxInfoX11.cpp | 4 ---- | ||
10 | 1 file changed, 4 deletions(-) | ||
11 | |||
12 | diff --git a/widget/src/xpwidgets/GfxInfoX11.cpp b/widget/src/xpwidgets/GfxInfoX11.cpp | ||
13 | index a2d5e0b..27a0fd0 100644 | ||
14 | --- a/widget/src/xpwidgets/GfxInfoX11.cpp | ||
15 | +++ b/widget/src/xpwidgets/GfxInfoX11.cpp | ||
16 | @@ -310,10 +310,6 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, | ||
17 | } | ||
18 | |||
19 | if (mIsMesa) { | ||
20 | - if (aFeature == nsIGfxInfo::FEATURE_WEBGL_OPENGL) { | ||
21 | - *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION; | ||
22 | - aSuggestedDriverVersion.AssignLiteral("Not Mesa"); | ||
23 | - } | ||
24 | if (mIsNouveau && version(mMajorVersion, mMinorVersion) < version(8,0)) { | ||
25 | *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION; | ||
26 | aSuggestedDriverVersion.AssignLiteral("Mesa 8.0"); | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Avoid-spurious-Run-items-in-application-handlers-con.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Avoid-spurious-Run-items-in-application-handlers-con.patch new file mode 100644 index 0000000..6225dad --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Avoid-spurious-Run-items-in-application-handlers-con.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Thu, 10 Jul 2008 21:40:08 +0200 | ||
3 | Subject: Avoid spurious "Run" items in application handlers configuration | ||
4 | pane | ||
5 | |||
6 | --- | ||
7 | browser/components/preferences/applications.js | 1 + | ||
8 | uriloader/exthandler/nsHandlerService.js | 11 +++++------ | ||
9 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
10 | |||
11 | diff --git a/browser/components/preferences/applications.js b/browser/components/preferences/applications.js | ||
12 | index abfec20..40cd81a 100644 | ||
13 | --- a/browser/components/preferences/applications.js | ||
14 | +++ b/browser/components/preferences/applications.js | ||
15 | @@ -1345,6 +1345,7 @@ var gApplicationsPane = { | ||
16 | return aExecutable && | ||
17 | aExecutable.exists() && | ||
18 | aExecutable.isExecutable() && | ||
19 | + aExecutable.isFile() && | ||
20 | // XXXben - we need to compare this with the running instance executable | ||
21 | // just don't know how to do that via script... | ||
22 | // XXXmano TBD: can probably add this to nsIShellService | ||
23 | diff --git a/uriloader/exthandler/nsHandlerService.js b/uriloader/exthandler/nsHandlerService.js | ||
24 | index c4e62f6..589ba31 100644 | ||
25 | --- a/uriloader/exthandler/nsHandlerService.js | ||
26 | +++ b/uriloader/exthandler/nsHandlerService.js | ||
27 | @@ -658,25 +658,24 @@ HandlerService.prototype = { | ||
28 | |||
29 | try { | ||
30 | file.initWithPath(aPath); | ||
31 | - | ||
32 | - if (file.exists()) | ||
33 | - return file; | ||
34 | } | ||
35 | catch(ex) { | ||
36 | // Note: for historical reasons, we don't actually check to see | ||
37 | // if the exception is NS_ERROR_FILE_UNRECOGNIZED_PATH, which is what | ||
38 | // nsILocalFile::initWithPath throws when a path is relative. | ||
39 | - | ||
40 | file = this._dirSvc.get("XCurProcD", Ci.nsIFile); | ||
41 | |||
42 | try { | ||
43 | file.append(aPath); | ||
44 | - if (file.exists()) | ||
45 | - return file; | ||
46 | } | ||
47 | catch(ex) {} | ||
48 | } | ||
49 | |||
50 | + if (file && file.exists() && | ||
51 | + file.isExecutable() && | ||
52 | + file.isFile()) | ||
53 | + return file; | ||
54 | + | ||
55 | return null; | ||
56 | }, | ||
57 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-515232-Try-getting-general.useragent.locale-as-a.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-515232-Try-getting-general.useragent.locale-as-a.patch new file mode 100644 index 0000000..87cf894 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-515232-Try-getting-general.useragent.locale-as-a.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Sun, 26 Feb 2012 09:20:44 +0100 | ||
3 | Subject: Bug 515232 - Try getting general.useragent.locale as a complex value | ||
4 | first in DirectoryProvider.cpp | ||
5 | |||
6 | --- | ||
7 | browser/components/dirprovider/DirectoryProvider.cpp | 14 +++++++++++++- | ||
8 | 1 file changed, 13 insertions(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/browser/components/dirprovider/DirectoryProvider.cpp b/browser/components/dirprovider/DirectoryProvider.cpp | ||
11 | index 1373adc..5df1419 100644 | ||
12 | --- a/browser/components/dirprovider/DirectoryProvider.cpp | ||
13 | +++ b/browser/components/dirprovider/DirectoryProvider.cpp | ||
14 | @@ -56,6 +56,7 @@ | ||
15 | #include "nsServiceManagerUtils.h" | ||
16 | #include "nsStringAPI.h" | ||
17 | #include "nsXULAppAPI.h" | ||
18 | +#include "nsIPrefLocalizedString.h" | ||
19 | |||
20 | namespace mozilla { | ||
21 | namespace browser { | ||
22 | @@ -200,7 +201,18 @@ AppendDistroSearchDirs(nsIProperties* aDirSvc, nsCOMArray<nsIFile> &array) | ||
23 | localePlugins->AppendNative(NS_LITERAL_CSTRING("locale")); | ||
24 | |||
25 | nsCString locale; | ||
26 | - rv = prefs->GetCharPref("general.useragent.locale", getter_Copies(locale)); | ||
27 | + nsCOMPtr<nsIPrefLocalizedString> prefString; | ||
28 | + rv = prefs->GetComplexValue("general.useragent.locale", | ||
29 | + NS_GET_IID(nsIPrefLocalizedString), | ||
30 | + getter_AddRefs(prefString)); | ||
31 | + if (NS_SUCCEEDED(rv)) { | ||
32 | + nsAutoString wLocale; | ||
33 | + prefString->GetData(getter_Copies(wLocale)); | ||
34 | + CopyUTF16toUTF8(wLocale, locale); | ||
35 | + } else { | ||
36 | + rv = prefs->GetCharPref("general.useragent.locale", getter_Copies(locale)); | ||
37 | + } | ||
38 | + | ||
39 | if (NS_SUCCEEDED(rv)) { | ||
40 | |||
41 | nsCOMPtr<nsIFile> curLocalePlugins; | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-691898-Use-YARR-interpreter-instead-of-PCRE-on-p.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-691898-Use-YARR-interpreter-instead-of-PCRE-on-p.patch new file mode 100644 index 0000000..dab2016 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-691898-Use-YARR-interpreter-instead-of-PCRE-on-p.patch | |||
@@ -0,0 +1,285 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Sat, 24 Dec 2011 09:56:58 +0100 | ||
3 | Subject: Bug 691898 - Use YARR interpreter instead of PCRE on platforms where | ||
4 | YARR JIT is not supported | ||
5 | |||
6 | --- | ||
7 | js/src/Makefile.in | 21 +++++++++++++-------- | ||
8 | js/src/vm/RegExpObject-inl.h | 28 ++++++---------------------- | ||
9 | js/src/vm/RegExpObject.cpp | 36 ------------------------------------ | ||
10 | js/src/vm/RegExpObject.h | 27 ++++++--------------------- | ||
11 | js/src/yarr/wtfbridge.h | 2 -- | ||
12 | 5 files changed, 25 insertions(+), 89 deletions(-) | ||
13 | |||
14 | diff --git a/js/src/Makefile.in b/js/src/Makefile.in | ||
15 | index fc48cbd..49f0bdc 100644 | ||
16 | --- a/js/src/Makefile.in | ||
17 | +++ b/js/src/Makefile.in | ||
18 | @@ -416,15 +416,20 @@ CPPSRCS += checks.cc \ | ||
19 | |||
20 | ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU))) | ||
21 | |||
22 | -VPATH += $(srcdir)/yarr/pcre \ | ||
23 | +VPATH += $(srcdir)/assembler \ | ||
24 | + $(srcdir)/assembler/wtf \ | ||
25 | + $(srcdir)/yarr \ | ||
26 | $(NULL) | ||
27 | |||
28 | CPPSRCS += \ | ||
29 | - pcre_compile.cpp \ | ||
30 | - pcre_exec.cpp \ | ||
31 | - pcre_tables.cpp \ | ||
32 | - pcre_xclass.cpp \ | ||
33 | - pcre_ucp_searchfuncs.cpp \ | ||
34 | + Assertions.cpp \ | ||
35 | + OSAllocatorOS2.cpp \ | ||
36 | + OSAllocatorPosix.cpp \ | ||
37 | + OSAllocatorWin.cpp \ | ||
38 | + PageBlock.cpp \ | ||
39 | + YarrInterpreter.cpp \ | ||
40 | + YarrPattern.cpp \ | ||
41 | + YarrSyntaxChecker.cpp \ | ||
42 | $(NULL) | ||
43 | else | ||
44 | |||
45 | @@ -1015,10 +1020,10 @@ endif | ||
46 | # Needed to "configure" it correctly. Unfortunately these | ||
47 | # flags wind up being applied to all code in js/src, not just | ||
48 | # the code in js/src/assembler. | ||
49 | -CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 | ||
50 | +CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 | ||
51 | |||
52 | ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT)) | ||
53 | -CXXFLAGS += -DENABLE_JIT=1 | ||
54 | +CXXFLAGS += -DENABLE_JIT=1 -DENABLE_ASSEMBLER=1 | ||
55 | endif | ||
56 | |||
57 | INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr | ||
58 | diff --git a/js/src/vm/RegExpObject-inl.h b/js/src/vm/RegExpObject-inl.h | ||
59 | index 5f7817d..91108a7 100644 | ||
60 | --- a/js/src/vm/RegExpObject-inl.h | ||
61 | +++ b/js/src/vm/RegExpObject-inl.h | ||
62 | @@ -327,6 +327,7 @@ RegExpPrivate::create(JSContext *cx, JSString *source, RegExpFlag flags, TokenSt | ||
63 | return RetType(self); | ||
64 | } | ||
65 | |||
66 | +#if ENABLE_YARR_JIT | ||
67 | /* This function should be deleted once bad Android platforms phase out. See bug 604774. */ | ||
68 | inline bool | ||
69 | RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx) | ||
70 | @@ -337,12 +338,12 @@ RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx) | ||
71 | return true; | ||
72 | #endif | ||
73 | } | ||
74 | +#endif | ||
75 | |||
76 | inline bool | ||
77 | RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, | ||
78 | uintN *parenCount, RegExpFlag flags) | ||
79 | { | ||
80 | -#if ENABLE_YARR_JIT | ||
81 | /* Parse the pattern. */ | ||
82 | ErrorCode yarrError; | ||
83 | YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag), | ||
84 | @@ -359,7 +360,7 @@ RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream * | ||
85 | * case we have to bytecode compile it. | ||
86 | */ | ||
87 | |||
88 | -#ifdef JS_METHODJIT | ||
89 | +#if ENABLE_YARR_JIT && defined(JS_METHODJIT) | ||
90 | if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) { | ||
91 | if (!cx->compartment->ensureJaegerCompartmentExists(cx)) | ||
92 | return false; | ||
93 | @@ -371,21 +372,11 @@ RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream * | ||
94 | } | ||
95 | #endif | ||
96 | |||
97 | +#if ENABLE_YARR_JIT | ||
98 | codeBlock.setFallBack(true); | ||
99 | +#endif | ||
100 | byteCode = byteCompile(yarrPattern, cx->compartment->regExpAllocator).get(); | ||
101 | return true; | ||
102 | -#else /* !defined(ENABLE_YARR_JIT) */ | ||
103 | - int error = 0; | ||
104 | - compiled = jsRegExpCompile(pattern.chars(), pattern.length(), | ||
105 | - ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase, | ||
106 | - multiline() ? JSRegExpMultiline : JSRegExpSingleLine, | ||
107 | - parenCount, &error); | ||
108 | - if (error) { | ||
109 | - reportPCREError(cx, error); | ||
110 | - return false; | ||
111 | - } | ||
112 | - return true; | ||
113 | -#endif | ||
114 | } | ||
115 | |||
116 | inline bool | ||
117 | @@ -431,19 +422,12 @@ RegExpPrivateCode::execute(JSContext *cx, const jschar *chars, size_t start, siz | ||
118 | else | ||
119 | result = JSC::Yarr::execute(codeBlock, chars, start, length, output); | ||
120 | #else | ||
121 | - result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount); | ||
122 | + result = JSC::Yarr::interpret(byteCode, chars, start, length, output); | ||
123 | #endif | ||
124 | |||
125 | if (result == -1) | ||
126 | return Success_NotFound; | ||
127 | |||
128 | -#if !ENABLE_YARR_JIT | ||
129 | - if (result < 0) { | ||
130 | - reportPCREError(cx, result); | ||
131 | - return Error; | ||
132 | - } | ||
133 | -#endif | ||
134 | - | ||
135 | JS_ASSERT(result >= 0); | ||
136 | return Success; | ||
137 | } | ||
138 | diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp | ||
139 | index f75c6a5..7631dd5 100644 | ||
140 | --- a/js/src/vm/RegExpObject.cpp | ||
141 | +++ b/js/src/vm/RegExpObject.cpp | ||
142 | @@ -251,7 +251,6 @@ Class js::RegExpClass = { | ||
143 | NULL /* trace */ | ||
144 | }; | ||
145 | |||
146 | -#if ENABLE_YARR_JIT | ||
147 | void | ||
148 | RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error) | ||
149 | { | ||
150 | @@ -283,41 +282,6 @@ RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode err | ||
151 | } | ||
152 | } | ||
153 | |||
154 | -#else /* !ENABLE_YARR_JIT */ | ||
155 | - | ||
156 | -void | ||
157 | -RegExpPrivateCode::reportPCREError(JSContext *cx, int error) | ||
158 | -{ | ||
159 | -#define REPORT(msg_) \ | ||
160 | - JS_ReportErrorFlagsAndNumberUC(cx, JSREPORT_ERROR, js_GetErrorMessage, NULL, msg_); \ | ||
161 | - return | ||
162 | - switch (error) { | ||
163 | - case -2: REPORT(JSMSG_REGEXP_TOO_COMPLEX); | ||
164 | - case 0: JS_NOT_REACHED("Precondition violation: an error must have occurred."); | ||
165 | - case 1: REPORT(JSMSG_TRAILING_SLASH); | ||
166 | - case 2: REPORT(JSMSG_TRAILING_SLASH); | ||
167 | - case 3: REPORT(JSMSG_REGEXP_TOO_COMPLEX); | ||
168 | - case 4: REPORT(JSMSG_BAD_QUANTIFIER); | ||
169 | - case 5: REPORT(JSMSG_BAD_QUANTIFIER); | ||
170 | - case 6: REPORT(JSMSG_BAD_CLASS_RANGE); | ||
171 | - case 7: REPORT(JSMSG_REGEXP_TOO_COMPLEX); | ||
172 | - case 8: REPORT(JSMSG_BAD_CLASS_RANGE); | ||
173 | - case 9: REPORT(JSMSG_BAD_QUANTIFIER); | ||
174 | - case 10: REPORT(JSMSG_UNMATCHED_RIGHT_PAREN); | ||
175 | - case 11: REPORT(JSMSG_REGEXP_TOO_COMPLEX); | ||
176 | - case 12: REPORT(JSMSG_UNMATCHED_RIGHT_PAREN); | ||
177 | - case 13: REPORT(JSMSG_REGEXP_TOO_COMPLEX); | ||
178 | - case 14: REPORT(JSMSG_MISSING_PAREN); | ||
179 | - case 15: REPORT(JSMSG_BAD_BACKREF); | ||
180 | - case 16: REPORT(JSMSG_REGEXP_TOO_COMPLEX); | ||
181 | - case 17: REPORT(JSMSG_REGEXP_TOO_COMPLEX); | ||
182 | - default: | ||
183 | - JS_NOT_REACHED("Precondition violation: unknown PCRE error code."); | ||
184 | - } | ||
185 | -#undef REPORT | ||
186 | -} | ||
187 | -#endif /* ENABLE_YARR_JIT */ | ||
188 | - | ||
189 | bool | ||
190 | js::ParseRegExpFlags(JSContext *cx, JSString *flagStr, RegExpFlag *flagsOut) | ||
191 | { | ||
192 | diff --git a/js/src/vm/RegExpObject.h b/js/src/vm/RegExpObject.h | ||
193 | index 1449d56..279f3c0 100644 | ||
194 | --- a/js/src/vm/RegExpObject.h | ||
195 | +++ b/js/src/vm/RegExpObject.h | ||
196 | @@ -49,8 +49,6 @@ | ||
197 | #include "yarr/Yarr.h" | ||
198 | #if ENABLE_YARR_JIT | ||
199 | #include "yarr/YarrJIT.h" | ||
200 | -#else | ||
201 | -#include "yarr/pcre/pcre.h" | ||
202 | #endif | ||
203 | |||
204 | namespace js { | ||
205 | @@ -153,48 +151,39 @@ ResetRegExpObject(JSContext *cx, AlreadyIncRefed<RegExpPrivate> rep); | ||
206 | /* Abstracts away the gross |RegExpPrivate| backend details. */ | ||
207 | class RegExpPrivateCode | ||
208 | { | ||
209 | -#if ENABLE_YARR_JIT | ||
210 | typedef JSC::Yarr::BytecodePattern BytecodePattern; | ||
211 | typedef JSC::Yarr::ErrorCode ErrorCode; | ||
212 | + typedef JSC::Yarr::YarrPattern YarrPattern; | ||
213 | +#if ENABLE_YARR_JIT | ||
214 | typedef JSC::Yarr::JSGlobalData JSGlobalData; | ||
215 | typedef JSC::Yarr::YarrCodeBlock YarrCodeBlock; | ||
216 | - typedef JSC::Yarr::YarrPattern YarrPattern; | ||
217 | |||
218 | /* Note: Native code is valid only if |codeBlock.isFallBack() == false|. */ | ||
219 | YarrCodeBlock codeBlock; | ||
220 | - BytecodePattern *byteCode; | ||
221 | -#else | ||
222 | - JSRegExp *compiled; | ||
223 | #endif | ||
224 | + BytecodePattern *byteCode; | ||
225 | |||
226 | public: | ||
227 | RegExpPrivateCode() | ||
228 | : | ||
229 | #if ENABLE_YARR_JIT | ||
230 | codeBlock(), | ||
231 | - byteCode(NULL) | ||
232 | -#else | ||
233 | - compiled(NULL) | ||
234 | #endif | ||
235 | + byteCode(NULL) | ||
236 | { } | ||
237 | |||
238 | ~RegExpPrivateCode() { | ||
239 | #if ENABLE_YARR_JIT | ||
240 | codeBlock.release(); | ||
241 | +#endif | ||
242 | if (byteCode) | ||
243 | Foreground::delete_<BytecodePattern>(byteCode); | ||
244 | -#else | ||
245 | - if (compiled) | ||
246 | - jsRegExpFree(compiled); | ||
247 | -#endif | ||
248 | } | ||
249 | |||
250 | #if ENABLE_YARR_JIT | ||
251 | static inline bool isJITRuntimeEnabled(JSContext *cx); | ||
252 | - void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error); | ||
253 | -#else | ||
254 | - void reportPCREError(JSContext *cx, int error); | ||
255 | #endif | ||
256 | + void reportYarrError(JSContext *cx, TokenStream *ts, JSC::Yarr::ErrorCode error); | ||
257 | |||
258 | inline bool compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts, uintN *parenCount, | ||
259 | RegExpFlag flags); | ||
260 | @@ -205,11 +194,7 @@ class RegExpPrivateCode | ||
261 | int *output, size_t outputCount); | ||
262 | |||
263 | static size_t getOutputSize(size_t pairCount) { | ||
264 | -#if ENABLE_YARR_JIT | ||
265 | return pairCount * 2; | ||
266 | -#else | ||
267 | - return pairCount * 3; /* Should be x2, but PCRE has... needs. */ | ||
268 | -#endif | ||
269 | } | ||
270 | }; | ||
271 | |||
272 | diff --git a/js/src/yarr/wtfbridge.h b/js/src/yarr/wtfbridge.h | ||
273 | index ac41d08..fb8eb86 100644 | ||
274 | --- a/js/src/yarr/wtfbridge.h | ||
275 | +++ b/js/src/yarr/wtfbridge.h | ||
276 | @@ -49,9 +49,7 @@ | ||
277 | #include "jsprvtd.h" | ||
278 | #include "vm/String.h" | ||
279 | #include "assembler/wtf/Platform.h" | ||
280 | -#if ENABLE_YARR_JIT | ||
281 | #include "assembler/jit/ExecutableAllocator.h" | ||
282 | -#endif | ||
283 | |||
284 | namespace JSC { namespace Yarr { | ||
285 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-696636-Block-OpenGL-1-drivers-explicitly-to-stee.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-696636-Block-OpenGL-1-drivers-explicitly-to-stee.patch new file mode 100644 index 0000000..4f0ffc9 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-696636-Block-OpenGL-1-drivers-explicitly-to-stee.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From: Benoit Jacob <bjacob@mozilla.com> | ||
2 | Date: Thu, 23 Feb 2012 17:21:30 -0500 | ||
3 | Subject: Bug 696636 - Block OpenGL 1 drivers explicitly to steer clear of | ||
4 | crashes - r=mattwoodrow | ||
5 | |||
6 | --- | ||
7 | widget/src/xpwidgets/GfxInfoX11.cpp | 14 +++++++++++++- | ||
8 | widget/src/xpwidgets/GfxInfoX11.h | 2 +- | ||
9 | 2 files changed, 14 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/widget/src/xpwidgets/GfxInfoX11.cpp b/widget/src/xpwidgets/GfxInfoX11.cpp | ||
12 | index 018b8fa..4974c5f 100644 | ||
13 | --- a/widget/src/xpwidgets/GfxInfoX11.cpp | ||
14 | +++ b/widget/src/xpwidgets/GfxInfoX11.cpp | ||
15 | @@ -61,6 +61,7 @@ pid_t glxtest_pid = 0; | ||
16 | nsresult | ||
17 | GfxInfo::Init() | ||
18 | { | ||
19 | + mGLMajorVersion = 0; | ||
20 | mMajorVersion = 0; | ||
21 | mMinorVersion = 0; | ||
22 | mRevisionVersion = 0; | ||
23 | @@ -195,6 +196,9 @@ GfxInfo::GetData() | ||
24 | CrashReporter::AppendAppNotesToCrashReport(note); | ||
25 | #endif | ||
26 | |||
27 | + // determine the major OpenGL version. That's the first integer in the version string. | ||
28 | + mGLMajorVersion = strtol(mVersion.get(), 0, 10); | ||
29 | + | ||
30 | // determine driver type (vendor) and where in the version string | ||
31 | // the actual driver version numbers should be expected to be found (whereToReadVersionNumbers) | ||
32 | const char *whereToReadVersionNumbers = nsnull; | ||
33 | @@ -219,7 +223,7 @@ GfxInfo::GetData() | ||
34 | whereToReadVersionNumbers = mVersion.get(); | ||
35 | } | ||
36 | |||
37 | - // read major.minor version numbers | ||
38 | + // read major.minor version numbers of the driver (not to be confused with the OpenGL version) | ||
39 | if (whereToReadVersionNumbers) { | ||
40 | // copy into writable buffer, for tokenization | ||
41 | strncpy(buf, whereToReadVersionNumbers, buf_size); | ||
42 | @@ -275,6 +279,14 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, | ||
43 | |||
44 | OperatingSystem os = DRIVER_OS_LINUX; | ||
45 | |||
46 | + if (mGLMajorVersion == 1) { | ||
47 | + // We're on OpenGL 1. In most cases that indicates really old hardware. | ||
48 | + // We better block them, rather than rely on them to fail gracefully, because they don't! | ||
49 | + // see bug 696636 | ||
50 | + *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE; | ||
51 | + return NS_OK; | ||
52 | + } | ||
53 | + | ||
54 | // Disable OpenGL layers when we don't have texture_from_pixmap because it regresses performance. | ||
55 | if (aFeature == nsIGfxInfo::FEATURE_OPENGL_LAYERS && !mHasTextureFromPixmap) { | ||
56 | *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION; | ||
57 | diff --git a/widget/src/xpwidgets/GfxInfoX11.h b/widget/src/xpwidgets/GfxInfoX11.h | ||
58 | index 2525db0..03878ff 100644 | ||
59 | --- a/widget/src/xpwidgets/GfxInfoX11.h | ||
60 | +++ b/widget/src/xpwidgets/GfxInfoX11.h | ||
61 | @@ -95,7 +95,7 @@ private: | ||
62 | nsCString mAdapterDescription; | ||
63 | bool mIsMesa, mIsNVIDIA, mIsFGLRX; | ||
64 | bool mHasTextureFromPixmap; | ||
65 | - int mMajorVersion, mMinorVersion, mRevisionVersion; | ||
66 | + int mGLMajorVersion, mMajorVersion, mMinorVersion, mRevisionVersion; | ||
67 | |||
68 | void AddCrashReportAnnotations(); | ||
69 | }; | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-706724-Fix-for-error-ftruncate-was-not-declared-.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-706724-Fix-for-error-ftruncate-was-not-declared-.patch new file mode 100644 index 0000000..0d3bd9f --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-706724-Fix-for-error-ftruncate-was-not-declared-.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From: aceman <acelists@atlas.sk> | ||
2 | Date: Wed, 11 Jan 2012 10:46:54 +0100 | ||
3 | Subject: =?UTF-8?q?Bug=20706724=20-=20Fix=20for=20error:=20=E2=80=98ftruncat?= | ||
4 | =?UTF-8?q?e=E2=80=99=20was=20not=20declared=20in=20this=20scope.=20r=3Dbenj?= | ||
5 | =?UTF-8?q?amin?= | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | --- | ||
11 | ipc/chromium/src/base/file_util.cc | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/ipc/chromium/src/base/file_util.cc b/ipc/chromium/src/base/file_util.cc | ||
15 | index 1154fed..6067a4a 100644 | ||
16 | --- a/ipc/chromium/src/base/file_util.cc | ||
17 | +++ b/ipc/chromium/src/base/file_util.cc | ||
18 | @@ -8,7 +8,7 @@ | ||
19 | #include <io.h> | ||
20 | #endif | ||
21 | #include <stdio.h> | ||
22 | -#if defined(ANDROID) | ||
23 | +#if defined(ANDROID) || defined(OS_POSIX) | ||
24 | #include <unistd.h> | ||
25 | #endif | ||
26 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-709259-Try-creating-a-named-cursor-before-a-bitm.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-709259-Try-creating-a-named-cursor-before-a-bitm.patch new file mode 100644 index 0000000..23c90a2 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-709259-Try-creating-a-named-cursor-before-a-bitm.patch | |||
@@ -0,0 +1,85 @@ | |||
1 | From: Chris Coulson <chrisccoulson@ubuntu.com> | ||
2 | Date: Wed, 14 Dec 2011 11:34:31 +0100 | ||
3 | Subject: Bug 709259 - Try creating a named cursor before a bitmap cursor. | ||
4 | r=karlt | ||
5 | |||
6 | --- | ||
7 | widget/src/gtk2/nsGtkCursors.h | 31 +++++++++++++++++-------------- | ||
8 | widget/src/gtk2/nsWindow.cpp | 14 +++++++++++--- | ||
9 | 2 files changed, 28 insertions(+), 17 deletions(-) | ||
10 | |||
11 | diff --git a/widget/src/gtk2/nsGtkCursors.h b/widget/src/gtk2/nsGtkCursors.h | ||
12 | index b8065eb..eff43ba 100644 | ||
13 | --- a/widget/src/gtk2/nsGtkCursors.h | ||
14 | +++ b/widget/src/gtk2/nsGtkCursors.h | ||
15 | @@ -46,6 +46,7 @@ typedef struct { | ||
16 | const unsigned char *mask_bits; | ||
17 | int hot_x; | ||
18 | int hot_y; | ||
19 | + const char *hash; | ||
20 | } nsGtkCursor; | ||
21 | |||
22 | /* MOZ_CURSOR_HAND_GRAB */ | ||
23 | @@ -415,21 +416,23 @@ enum { | ||
24 | MOZ_CURSOR_NONE | ||
25 | }; | ||
26 | |||
27 | -// create custom pixmap cursor | ||
28 | +// create custom pixmap cursor. The hash values must stay in sync with the | ||
29 | +// bitmap data above. To see the hash function, have a look at XcursorImageHash | ||
30 | +// in libXcursor | ||
31 | static const nsGtkCursor GtkCursors[] = { | ||
32 | - { moz_hand_grab_bits, moz_hand_grab_mask_bits, 10, 10 }, | ||
33 | - { moz_hand_grabbing_bits, moz_hand_grabbing_mask_bits, 10, 10 }, | ||
34 | - { moz_copy_bits, moz_copy_mask_bits, 2, 2 }, | ||
35 | - { moz_alias_bits, moz_alias_mask_bits, 2, 2 }, | ||
36 | - { moz_menu_bits, moz_menu_mask_bits, 2, 2 }, | ||
37 | - { moz_spinning_bits, moz_spinning_mask_bits, 2, 2 }, | ||
38 | - { moz_zoom_in_bits, moz_zoom_in_mask_bits, 6, 6 }, | ||
39 | - { moz_zoom_out_bits, moz_zoom_out_mask_bits, 6, 6 }, | ||
40 | - { moz_not_allowed_bits, moz_not_allowed_mask_bits, 9, 9 }, | ||
41 | - { moz_vertical_text_bits, moz_vertical_text_mask_bits, 8, 4 }, | ||
42 | - { moz_nesw_resize_bits, moz_nesw_resize_mask_bits, 8, 8 }, | ||
43 | - { moz_nwse_resize_bits, moz_nwse_resize_mask_bits, 8, 8 }, | ||
44 | - { moz_none_bits, moz_none_mask_bits, 0, 0 } | ||
45 | + { moz_hand_grab_bits, moz_hand_grab_mask_bits, 10, 10, "5aca4d189052212118709018842178c0" }, | ||
46 | + { moz_hand_grabbing_bits, moz_hand_grabbing_mask_bits, 10, 10, "208530c400c041818281048008011002" }, | ||
47 | + { moz_copy_bits, moz_copy_mask_bits, 2, 2, "08ffe1cb5fe6fc01f906f1c063814ccf" }, | ||
48 | + { moz_alias_bits, moz_alias_mask_bits, 2, 2, "0876e1c15ff2fc01f906f1c363074c0f" }, | ||
49 | + { moz_menu_bits, moz_menu_mask_bits, 2, 2, "08ffe1e65f80fcfdf9fff11263e74c48" }, | ||
50 | + { moz_spinning_bits, moz_spinning_mask_bits, 2, 2, "08e8e1c95fe2fc01f976f1e063a24ccd" }, | ||
51 | + { moz_zoom_in_bits, moz_zoom_in_mask_bits, 6, 6, "f41c0e382c94c0958e07017e42b00462" }, | ||
52 | + { moz_zoom_out_bits, moz_zoom_out_mask_bits, 6, 6, "f41c0e382c97c0938e07017e42800402" }, | ||
53 | + { moz_not_allowed_bits, moz_not_allowed_mask_bits, 9, 9, "03b6e0fcb3499374a867d041f52298f0" }, | ||
54 | + { moz_vertical_text_bits, moz_vertical_text_mask_bits, 8, 4, "048008013003cff3c00c801001200000" }, | ||
55 | + { moz_nesw_resize_bits, moz_nesw_resize_mask_bits, 8, 8, "50585d75b494802d0151028115016902" }, | ||
56 | + { moz_nwse_resize_bits, moz_nwse_resize_mask_bits, 8, 8, "38c5dff7c7b8962045400281044508d2" }, | ||
57 | + { moz_none_bits, moz_none_mask_bits, 0, 0, NULL } | ||
58 | }; | ||
59 | |||
60 | #endif /* nsGtkCursors_h__ */ | ||
61 | diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp | ||
62 | index 2fd6f64..25f1c2a 100644 | ||
63 | --- a/widget/src/gtk2/nsWindow.cpp | ||
64 | +++ b/widget/src/gtk2/nsWindow.cpp | ||
65 | @@ -5602,9 +5602,17 @@ get_gtk_cursor(nsCursor aCursor) | ||
66 | break; | ||
67 | } | ||
68 | |||
69 | - // if by now we don't have a xcursor, this means we have to make a | ||
70 | - // custom one | ||
71 | - if (newType != 0xff) { | ||
72 | + // If by now we don't have a xcursor, this means we have to make a custom | ||
73 | + // one. First, we try creating a named cursor based on the hash of our | ||
74 | + // custom bitmap, as libXcursor has some magic to convert bitmapped cursors | ||
75 | + // to themed cursors | ||
76 | + if (newType != 0xFF && GtkCursors[newType].hash) { | ||
77 | + gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), | ||
78 | + GtkCursors[newType].hash); | ||
79 | + } | ||
80 | + | ||
81 | + // If we still don't have a xcursor, we now really create a bitmap cursor | ||
82 | + if (newType != 0xff && !gdkcursor) { | ||
83 | GdkPixbuf * cursor_pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 32, 32); | ||
84 | if (!cursor_pixbuf) | ||
85 | return NULL; | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-720682-Don-t-crash-an-app-using-libxul-because-o.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-720682-Don-t-crash-an-app-using-libxul-because-o.patch new file mode 100644 index 0000000..7bc22a6 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-720682-Don-t-crash-an-app-using-libxul-because-o.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Sat, 25 Feb 2012 10:34:52 +0100 | ||
3 | Subject: Bug 720682 - Don't crash an app using libxul because of the lack of | ||
4 | je_malloc_usable_size_in_advance | ||
5 | |||
6 | --- | ||
7 | storage/src/mozStorageService.cpp | 3 ++- | ||
8 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/storage/src/mozStorageService.cpp b/storage/src/mozStorageService.cpp | ||
11 | index 7c0a7a0..8a1aa65 100644 | ||
12 | --- a/storage/src/mozStorageService.cpp | ||
13 | +++ b/storage/src/mozStorageService.cpp | ||
14 | @@ -367,7 +367,8 @@ static int sqliteMemSize(void* p) | ||
15 | |||
16 | static int sqliteMemRoundup(int n) | ||
17 | { | ||
18 | - n = je_malloc_usable_size_in_advance(n); | ||
19 | + if (je_malloc_usable_size_in_advance) | ||
20 | + n = je_malloc_usable_size_in_advance(n); | ||
21 | |||
22 | // jemalloc can return blocks of size 2 and 4, but SQLite requires that all | ||
23 | // allocations be 8-aligned. So we round up sub-8 requests to 8. This | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-722127-Bump-required-libvpx-version-to-1.0.0.-r-.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-722127-Bump-required-libvpx-version-to-1.0.0.-r-.patch new file mode 100644 index 0000000..cef3817 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-722127-Bump-required-libvpx-version-to-1.0.0.-r-.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From: ojab <ojab@ojab.ru> | ||
2 | Date: Mon, 30 Jan 2012 15:53:21 +0100 | ||
3 | Subject: Bug 722127 - Bump required libvpx version to 1.0.0. r=tterribe | ||
4 | |||
5 | --- | ||
6 | configure.in | 12 ++++++------ | ||
7 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
8 | |||
9 | diff --git a/configure.in b/configure.in | ||
10 | index 6b155e0..d83926e 100644 | ||
11 | --- a/configure.in | ||
12 | +++ b/configure.in | ||
13 | @@ -5616,20 +5616,20 @@ if test -n "$MOZ_WEBM"; then | ||
14 | [MOZ_NATIVE_LIBVPX_DEC_TEST=1], | ||
15 | ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) | ||
16 | if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then | ||
17 | - AC_MSG_CHECKING([for libvpx version >= v0.9.7]) | ||
18 | + AC_MSG_CHECKING([for libvpx version >= v1.0.0]) | ||
19 | dnl We need at least v0.9.7 to fix several crash bugs (for which we | ||
20 | - dnl had local patches prior to v0.9.7). | ||
21 | + dnl had local patches prior to v1.0.0). | ||
22 | dnl | ||
23 | dnl This is a terrible test for the library version, but we don't | ||
24 | dnl have a good one. There is no version number in a public header, | ||
25 | dnl and testing the headers still doesn't guarantee we link against | ||
26 | dnl the right version. While we could call vpx_codec_version() at | ||
27 | dnl run-time, that would break cross-compiling. There are no | ||
28 | - dnl additional exported symbols between the v0.9.7 release and the | ||
29 | - dnl v0.9.6 one to check for. | ||
30 | + dnl additional exported decoder symbols between the v1.0.0 release | ||
31 | + dnl and the v0.9.7 one to check for. | ||
32 | AC_TRY_COMPILE([ | ||
33 | #include <vpx/vpx_decoder.h> | ||
34 | - #if !defined(VPX_CODEC_USE_INPUT_PARTITION) | ||
35 | + #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) | ||
36 | #error "test failed." | ||
37 | #endif | ||
38 | ], | ||
39 | @@ -5639,7 +5639,7 @@ if test -n "$MOZ_WEBM"; then | ||
40 | MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" | ||
41 | MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], | ||
42 | [AC_MSG_RESULT([no]) | ||
43 | - AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])]) | ||
44 | + AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])]) | ||
45 | fi | ||
46 | CFLAGS=$_SAVE_CFLAGS | ||
47 | LDFLAGS=$_SAVE_LDFLAGS | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-725655-gcc-4.7-build-failures-missing-headers-.-.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-725655-gcc-4.7-build-failures-missing-headers-.-.patch new file mode 100644 index 0000000..1db1a28 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-725655-gcc-4.7-build-failures-missing-headers-.-.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From: =?UTF-8?q?Martin=20Str=C3=A1nsk=C3=BD?= <stransky@redhat.com> | ||
2 | Date: Fri, 10 Feb 2012 16:07:41 +0100 | ||
3 | Subject: Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin | ||
4 | |||
5 | --- | ||
6 | ipc/chromium/src/base/file_util_linux.cc | 3 +++ | ||
7 | ipc/chromium/src/base/message_pump_libevent.cc | 3 +++ | ||
8 | ipc/chromium/src/base/time_posix.cc | 3 +++ | ||
9 | 3 files changed, 9 insertions(+) | ||
10 | |||
11 | diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc | ||
12 | index cca706f..171e44f 100644 | ||
13 | --- a/ipc/chromium/src/base/file_util_linux.cc | ||
14 | +++ b/ipc/chromium/src/base/file_util_linux.cc | ||
15 | @@ -5,6 +5,9 @@ | ||
16 | #include "base/file_util.h" | ||
17 | |||
18 | #include <fcntl.h> | ||
19 | +#if defined(ANDROID) || defined(OS_POSIX) | ||
20 | +#include <unistd.h> | ||
21 | +#endif | ||
22 | |||
23 | #include <string> | ||
24 | #include <vector> | ||
25 | diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc | ||
26 | index 6194f79..9f31dbb 100644 | ||
27 | --- a/ipc/chromium/src/base/message_pump_libevent.cc | ||
28 | +++ b/ipc/chromium/src/base/message_pump_libevent.cc | ||
29 | @@ -6,6 +6,9 @@ | ||
30 | |||
31 | #include <errno.h> | ||
32 | #include <fcntl.h> | ||
33 | +#if defined(ANDROID) || defined(OS_POSIX) | ||
34 | +#include <unistd.h> | ||
35 | +#endif | ||
36 | |||
37 | #include "eintr_wrapper.h" | ||
38 | #include "base/logging.h" | ||
39 | diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc | ||
40 | index 8d1a1d5..abf2a56 100644 | ||
41 | --- a/ipc/chromium/src/base/time_posix.cc | ||
42 | +++ b/ipc/chromium/src/base/time_posix.cc | ||
43 | @@ -13,6 +13,9 @@ | ||
44 | #else | ||
45 | #include <time.h> | ||
46 | #endif | ||
47 | +#if defined(ANDROID) || defined(OS_POSIX) | ||
48 | +#include <unistd.h> | ||
49 | +#endif | ||
50 | |||
51 | #include <limits> | ||
52 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-728229-Allow-to-build-with-system-python-ply-lib.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-728229-Allow-to-build-with-system-python-ply-lib.patch new file mode 100644 index 0000000..b3e4c52 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-728229-Allow-to-build-with-system-python-ply-lib.patch | |||
@@ -0,0 +1,82 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Fri, 17 Feb 2012 16:53:34 +0100 | ||
3 | Subject: Bug 728229 - Allow to build with system python ply library | ||
4 | |||
5 | --- | ||
6 | config/autoconf.mk.in | 2 ++ | ||
7 | configure.in | 10 ++++++++++ | ||
8 | xpcom/idl-parser/Makefile.in | 2 ++ | ||
9 | xpcom/typelib/xpidl/Makefile.in | 2 ++ | ||
10 | 4 files changed, 16 insertions(+) | ||
11 | |||
12 | diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in | ||
13 | index fccb1a9..e13dce4 100644 | ||
14 | --- a/config/autoconf.mk.in | ||
15 | +++ b/config/autoconf.mk.in | ||
16 | @@ -685,6 +685,8 @@ JS_SHARED_LIBRARY = @JS_SHARED_LIBRARY@ | ||
17 | |||
18 | MOZ_INSTRUMENT_EVENT_LOOP = @MOZ_INSTRUMENT_EVENT_LOOP@ | ||
19 | |||
20 | +MOZ_SYSTEM_PLY = @MOZ_SYSTEM_PLY@ | ||
21 | + | ||
22 | # We only want to do the pymake sanity on Windows, other os's can cope | ||
23 | ifeq ($(HOST_OS_ARCH),WINNT) | ||
24 | # Ensure invariants between GNU Make and pymake | ||
25 | diff --git a/configure.in b/configure.in | ||
26 | index d83926e..3c32ae8 100644 | ||
27 | --- a/configure.in | ||
28 | +++ b/configure.in | ||
29 | @@ -1021,6 +1021,16 @@ if test -z "$PYTHON"; then | ||
30 | AC_MSG_ERROR([python was not found in \$PATH]) | ||
31 | fi | ||
32 | |||
33 | +MOZ_ARG_WITH_BOOL(system-ply, | ||
34 | +[ --with-system-ply Use system installed python ply library], | ||
35 | + [if $PYTHON -c 'import ply' 2>&5; then | ||
36 | + MOZ_SYSTEM_PLY=1 | ||
37 | + else | ||
38 | + AC_MSG_ERROR([python ply library is not found but --with-system-ply was requested]) | ||
39 | + fi]) | ||
40 | + | ||
41 | +AC_SUBST(MOZ_SYSTEM_PLY) | ||
42 | + | ||
43 | if test -z "$COMPILE_ENVIRONMENT"; then | ||
44 | NSINSTALL_BIN='$(PYTHON) $(topsrcdir)/config/nsinstall.py' | ||
45 | fi | ||
46 | diff --git a/xpcom/idl-parser/Makefile.in b/xpcom/idl-parser/Makefile.in | ||
47 | index 20ca148..f5ff178 100644 | ||
48 | --- a/xpcom/idl-parser/Makefile.in | ||
49 | +++ b/xpcom/idl-parser/Makefile.in | ||
50 | @@ -47,10 +47,12 @@ PARSER_SRCS = \ | ||
51 | xpidl.py \ | ||
52 | $(NULL) | ||
53 | |||
54 | +ifndef MOZ_SYSTEM_PLY | ||
55 | PLY_PROGS = \ | ||
56 | $(topsrcdir)/other-licenses/ply/ply/lex.py \ | ||
57 | $(topsrcdir)/other-licenses/ply/ply/yacc.py \ | ||
58 | $(NULL) | ||
59 | +endif | ||
60 | |||
61 | include $(topsrcdir)/config/rules.mk | ||
62 | |||
63 | diff --git a/xpcom/typelib/xpidl/Makefile.in b/xpcom/typelib/xpidl/Makefile.in | ||
64 | index 30f1a66..bcae13a 100644 | ||
65 | --- a/xpcom/typelib/xpidl/Makefile.in | ||
66 | +++ b/xpcom/typelib/xpidl/Makefile.in | ||
67 | @@ -52,6 +52,7 @@ SDK_BINARY = \ | ||
68 | $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \ | ||
69 | $(NULL) | ||
70 | |||
71 | +ifndef MOZ_SYSTEM_PLY | ||
72 | $(SDK_BIN_DIR)/ply:: | ||
73 | $(NSINSTALL) -D $@ | ||
74 | |||
75 | @@ -63,6 +64,7 @@ PLY_SRCS = \ | ||
76 | |||
77 | export:: $(PLY_SRCS) $(SDK_BIN_DIR)/ply | ||
78 | $(INSTALL) $(IFLAGS2) $^ | ||
79 | +endif | ||
80 | |||
81 | include $(topsrcdir)/config/rules.mk | ||
82 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-729817-Allow-the-Nouveau-driver-with-Mesa-8.0.1-.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-729817-Allow-the-Nouveau-driver-with-Mesa-8.0.1-.patch new file mode 100644 index 0000000..40b010d --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-729817-Allow-the-Nouveau-driver-with-Mesa-8.0.1-.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From: Zack Weinberg <zackw@panix.com> | ||
2 | Date: Fri, 9 Mar 2012 11:07:16 +0100 | ||
3 | Subject: Bug 729817 - Allow the Nouveau driver with Mesa >= 8.0.1 - r=bjacob | ||
4 | |||
5 | --- | ||
6 | widget/src/xpwidgets/GfxInfoX11.cpp | 4 ++-- | ||
7 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
8 | |||
9 | diff --git a/widget/src/xpwidgets/GfxInfoX11.cpp b/widget/src/xpwidgets/GfxInfoX11.cpp | ||
10 | index c6b2ad3..a2d5e0b 100644 | ||
11 | --- a/widget/src/xpwidgets/GfxInfoX11.cpp | ||
12 | +++ b/widget/src/xpwidgets/GfxInfoX11.cpp | ||
13 | @@ -314,9 +314,9 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, | ||
14 | *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION; | ||
15 | aSuggestedDriverVersion.AssignLiteral("Not Mesa"); | ||
16 | } | ||
17 | - if (mIsNouveau) { | ||
18 | + if (mIsNouveau && version(mMajorVersion, mMinorVersion) < version(8,0)) { | ||
19 | *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION; | ||
20 | - aSuggestedDriverVersion.AssignLiteral("<Not the Nouveau driver>"); | ||
21 | + aSuggestedDriverVersion.AssignLiteral("Mesa 8.0"); | ||
22 | } else if (version(mMajorVersion, mMinorVersion, mRevisionVersion) < version(7,10,3)) { | ||
23 | *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION; | ||
24 | aSuggestedDriverVersion.AssignLiteral("Mesa 7.10.3"); | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-729817-Block-the-Nouveau-3D-driver-as-it-s-insta.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-729817-Block-the-Nouveau-3D-driver-as-it-s-insta.patch new file mode 100644 index 0000000..7e2f3a6 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-729817-Block-the-Nouveau-3D-driver-as-it-s-insta.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From: Benoit Jacob <bjacob@mozilla.com> | ||
2 | Date: Thu, 23 Feb 2012 17:23:29 -0500 | ||
3 | Subject: Bug 729817 - Block the Nouveau 3D driver as it's installed by | ||
4 | default on OpenSuse 12.1 and crashes - r=mattwoodrow | ||
5 | |||
6 | --- | ||
7 | widget/src/xpwidgets/GfxInfoX11.cpp | 8 +++++++- | ||
8 | widget/src/xpwidgets/GfxInfoX11.h | 2 +- | ||
9 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/widget/src/xpwidgets/GfxInfoX11.cpp b/widget/src/xpwidgets/GfxInfoX11.cpp | ||
12 | index 4974c5f..c6b2ad3 100644 | ||
13 | --- a/widget/src/xpwidgets/GfxInfoX11.cpp | ||
14 | +++ b/widget/src/xpwidgets/GfxInfoX11.cpp | ||
15 | @@ -68,6 +68,7 @@ GfxInfo::Init() | ||
16 | mIsMesa = false; | ||
17 | mIsNVIDIA = false; | ||
18 | mIsFGLRX = false; | ||
19 | + mIsNouveau = false; | ||
20 | mHasTextureFromPixmap = false; | ||
21 | return GfxInfoBase::Init(); | ||
22 | } | ||
23 | @@ -208,6 +209,8 @@ GfxInfo::GetData() | ||
24 | // with Mesa, the version string contains "Mesa major.minor" and that's all the version information we get: | ||
25 | // there is no actual driver version info. | ||
26 | whereToReadVersionNumbers = Mesa_in_version_string + strlen("Mesa"); | ||
27 | + if (strcasestr(mVendor.get(), "nouveau")) | ||
28 | + mIsNouveau = true; | ||
29 | } else if (strstr(mVendor.get(), "NVIDIA Corporation")) { | ||
30 | mIsNVIDIA = true; | ||
31 | // with the NVIDIA driver, the version string contains "NVIDIA major.minor" | ||
32 | @@ -311,7 +314,10 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, | ||
33 | *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION; | ||
34 | aSuggestedDriverVersion.AssignLiteral("Not Mesa"); | ||
35 | } | ||
36 | - if (version(mMajorVersion, mMinorVersion, mRevisionVersion) < version(7,10,3)) { | ||
37 | + if (mIsNouveau) { | ||
38 | + *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION; | ||
39 | + aSuggestedDriverVersion.AssignLiteral("<Not the Nouveau driver>"); | ||
40 | + } else if (version(mMajorVersion, mMinorVersion, mRevisionVersion) < version(7,10,3)) { | ||
41 | *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION; | ||
42 | aSuggestedDriverVersion.AssignLiteral("Mesa 7.10.3"); | ||
43 | } | ||
44 | diff --git a/widget/src/xpwidgets/GfxInfoX11.h b/widget/src/xpwidgets/GfxInfoX11.h | ||
45 | index 03878ff..68bf976 100644 | ||
46 | --- a/widget/src/xpwidgets/GfxInfoX11.h | ||
47 | +++ b/widget/src/xpwidgets/GfxInfoX11.h | ||
48 | @@ -93,7 +93,7 @@ private: | ||
49 | nsCString mRenderer; | ||
50 | nsCString mVersion; | ||
51 | nsCString mAdapterDescription; | ||
52 | - bool mIsMesa, mIsNVIDIA, mIsFGLRX; | ||
53 | + bool mIsMesa, mIsNVIDIA, mIsFGLRX, mIsNouveau; | ||
54 | bool mHasTextureFromPixmap; | ||
55 | int mGLMajorVersion, mMajorVersion, mMinorVersion, mRevisionVersion; | ||
56 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-734490-fix-build-failures-with-Clang-and-GCC-4.7.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-734490-fix-build-failures-with-Clang-and-GCC-4.7.patch new file mode 100644 index 0000000..a2ee22e --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-734490-fix-build-failures-with-Clang-and-GCC-4.7.patch | |||
@@ -0,0 +1,76 @@ | |||
1 | From: Stefan <kdevel@vogtner.de> | ||
2 | Date: Thu, 15 Mar 2012 11:01:08 -0700 | ||
3 | Subject: Bug 734490: fix build failures with Clang and GCC 4.7 in | ||
4 | TestPoisonArea.cpp. r=zwol | ||
5 | |||
6 | --- | ||
7 | layout/base/tests/TestPoisonArea.cpp | 14 +++++++------- | ||
8 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
9 | |||
10 | diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp | ||
11 | index f81ce1b..6cf4afd 100644 | ||
12 | --- a/layout/base/tests/TestPoisonArea.cpp | ||
13 | +++ b/layout/base/tests/TestPoisonArea.cpp | ||
14 | @@ -397,7 +397,7 @@ ReservePoisonArea() | ||
15 | uintptr_t result = (((uintptr_t(0x7FFFFFFFu) << 31) << 1 | | ||
16 | uintptr_t(0xF0DEAFFFu)) & | ||
17 | ~uintptr_t(PAGESIZE-1)); | ||
18 | - printf("INFO | poison area assumed at 0x%.*"PRIxPTR"\n", SIZxPTR, result); | ||
19 | + printf("INFO | poison area assumed at 0x%.*" PRIxPTR "\n", SIZxPTR, result); | ||
20 | return result; | ||
21 | } else { | ||
22 | // First see if we can allocate the preferred poison address from the OS. | ||
23 | @@ -405,7 +405,7 @@ ReservePoisonArea() | ||
24 | void *result = ReserveRegion(candidate, false); | ||
25 | if (result == (void *)candidate) { | ||
26 | // success - inaccessible page allocated | ||
27 | - printf("INFO | poison area allocated at 0x%.*"PRIxPTR | ||
28 | + printf("INFO | poison area allocated at 0x%.*" PRIxPTR | ||
29 | " (preferred addr)\n", SIZxPTR, (uintptr_t)result); | ||
30 | return candidate; | ||
31 | } | ||
32 | @@ -416,7 +416,7 @@ ReservePoisonArea() | ||
33 | // success - selected page cannot be usable memory | ||
34 | if (result != MAP_FAILED) | ||
35 | ReleaseRegion(result); | ||
36 | - printf("INFO | poison area assumed at 0x%.*"PRIxPTR | ||
37 | + printf("INFO | poison area assumed at 0x%.*" PRIxPTR | ||
38 | " (preferred addr)\n", SIZxPTR, candidate); | ||
39 | return candidate; | ||
40 | } | ||
41 | @@ -424,7 +424,7 @@ ReservePoisonArea() | ||
42 | // The preferred address is already in use. Did the OS give us a | ||
43 | // consolation prize? | ||
44 | if (result != MAP_FAILED) { | ||
45 | - printf("INFO | poison area allocated at 0x%.*"PRIxPTR | ||
46 | + printf("INFO | poison area allocated at 0x%.*" PRIxPTR | ||
47 | " (consolation prize)\n", SIZxPTR, (uintptr_t)result); | ||
48 | return (uintptr_t)result; | ||
49 | } | ||
50 | @@ -433,7 +433,7 @@ ReservePoisonArea() | ||
51 | // the address. | ||
52 | result = ReserveRegion(0, false); | ||
53 | if (result != MAP_FAILED) { | ||
54 | - printf("INFO | poison area allocated at 0x%.*"PRIxPTR | ||
55 | + printf("INFO | poison area allocated at 0x%.*" PRIxPTR | ||
56 | " (fallback)\n", SIZxPTR, (uintptr_t)result); | ||
57 | return (uintptr_t)result; | ||
58 | } | ||
59 | @@ -455,7 +455,7 @@ ReservePositiveControl() | ||
60 | printf("ERROR | allocating positive control | %s\n", LastErrMsg()); | ||
61 | return 0; | ||
62 | } | ||
63 | - printf("INFO | positive control allocated at 0x%.*"PRIxPTR"\n", | ||
64 | + printf("INFO | positive control allocated at 0x%.*" PRIxPTR "\n", | ||
65 | SIZxPTR, (uintptr_t)result); | ||
66 | return (uintptr_t)result; | ||
67 | } | ||
68 | @@ -486,7 +486,7 @@ ReserveNegativeControl() | ||
69 | return 0; | ||
70 | } | ||
71 | |||
72 | - printf("INFO | negative control allocated at 0x%.*"PRIxPTR"\n", | ||
73 | + printf("INFO | negative control allocated at 0x%.*" PRIxPTR "\n", | ||
74 | SIZxPTR, (uintptr_t)result); | ||
75 | return (uintptr_t)result; | ||
76 | } | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-747322-Fix-jemalloc-mmap-wrapper-for-s390x.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-747322-Fix-jemalloc-mmap-wrapper-for-s390x.patch new file mode 100644 index 0000000..17b6678 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-747322-Fix-jemalloc-mmap-wrapper-for-s390x.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Fri, 20 Apr 2012 11:26:22 +0200 | ||
3 | Subject: Bug 747322 - Fix jemalloc mmap wrapper for s390x | ||
4 | |||
5 | --- | ||
6 | memory/jemalloc/jemalloc.c | 6 +++--- | ||
7 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
8 | |||
9 | diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c | ||
10 | index d792728..147e18f 100644 | ||
11 | --- a/memory/jemalloc/jemalloc.c | ||
12 | +++ b/memory/jemalloc/jemalloc.c | ||
13 | @@ -403,9 +403,9 @@ void *_mmap(void *addr, size_t length, int prot, int flags, | ||
14 | struct { | ||
15 | void *addr; | ||
16 | size_t length; | ||
17 | - int prot; | ||
18 | - int flags; | ||
19 | - int fd; | ||
20 | + long prot; | ||
21 | + long flags; | ||
22 | + long fd; | ||
23 | off_t offset; | ||
24 | } args = { addr, length, prot, flags, fd, offset }; | ||
25 | return (void *) syscall(SYS_mmap, &args); | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-761082-Only-export-TabMessageUtils.h-in-mozilla-.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-761082-Only-export-TabMessageUtils.h-in-mozilla-.patch new file mode 100644 index 0000000..ac855b2 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Bug-761082-Only-export-TabMessageUtils.h-in-mozilla-.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From: Mike Hommey <mh+mozilla@glandium.org> | ||
2 | Date: Thu, 7 Jun 2012 10:41:59 +0200 | ||
3 | Subject: Bug 761082 - Only export TabMessageUtils.h in mozilla/dom. r=cjones | ||
4 | |||
5 | --- | ||
6 | dom/ipc/Makefile.in | 2 +- | ||
7 | dom/ipc/PBrowser.ipdl | 2 +- | ||
8 | dom/ipc/TabMessageUtils.cpp | 2 +- | ||
9 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
10 | |||
11 | diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in | ||
12 | index 8d02e8b..ea37fad 100644 | ||
13 | --- a/dom/ipc/Makefile.in | ||
14 | +++ b/dom/ipc/Makefile.in | ||
15 | @@ -53,7 +53,7 @@ DIRS += tests | ||
16 | endif | ||
17 | endif | ||
18 | |||
19 | -EXPORTS = TabMessageUtils.h PCOMContentPermissionRequestChild.h | ||
20 | +EXPORTS = PCOMContentPermissionRequestChild.h | ||
21 | |||
22 | EXPORTS_NAMESPACES = mozilla/dom | ||
23 | |||
24 | diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl | ||
25 | index f9a25fc..10a8592 100644 | ||
26 | --- a/dom/ipc/PBrowser.ipdl | ||
27 | +++ b/dom/ipc/PBrowser.ipdl | ||
28 | @@ -44,7 +44,7 @@ include protocol PContentPermissionRequest; | ||
29 | include protocol PRenderFrame; | ||
30 | include protocol POfflineCacheUpdate; | ||
31 | |||
32 | -include "TabMessageUtils.h"; | ||
33 | +include "mozilla/dom/TabMessageUtils.h"; | ||
34 | include "gfxMatrix.h"; | ||
35 | include "mozilla/net/NeckoMessageUtils.h"; | ||
36 | include "IPC/nsGUIEventIPC.h"; | ||
37 | diff --git a/dom/ipc/TabMessageUtils.cpp b/dom/ipc/TabMessageUtils.cpp | ||
38 | index 201d7d4..44b7e44 100644 | ||
39 | --- a/dom/ipc/TabMessageUtils.cpp | ||
40 | +++ b/dom/ipc/TabMessageUtils.cpp | ||
41 | @@ -36,7 +36,7 @@ | ||
42 | * | ||
43 | * ***** END LICENSE BLOCK ***** */ | ||
44 | |||
45 | -#include "TabMessageUtils.h" | ||
46 | +#include "mozilla/dom/TabMessageUtils.h" | ||
47 | #include "nsCOMPtr.h" | ||
48 | #include "nsIDOMEvent.h" | ||
49 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Fix-some-tests-using-CurProcD-where-GreD-should-be-u.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Fix-some-tests-using-CurProcD-where-GreD-should-be-u.patch new file mode 100644 index 0000000..c1002a9 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Fix-some-tests-using-CurProcD-where-GreD-should-be-u.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Thu, 14 Jul 2011 17:18:56 +0200 | ||
3 | Subject: Fix some tests using CurProcD where GreD should be used | ||
4 | |||
5 | --- | ||
6 | dom/plugins/test/unit/head_plugins.js | 2 +- | ||
7 | netwerk/test/unit/test_socks.js | 2 +- | ||
8 | toolkit/mozapps/extensions/test/xpcshell/test_plugins.js | 2 +- | ||
9 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
10 | |||
11 | diff --git a/dom/plugins/test/unit/head_plugins.js b/dom/plugins/test/unit/head_plugins.js | ||
12 | index ddb78f5..ca32106 100644 | ||
13 | --- a/dom/plugins/test/unit/head_plugins.js | ||
14 | +++ b/dom/plugins/test/unit/head_plugins.js | ||
15 | @@ -38,7 +38,7 @@ | ||
16 | |||
17 | // Finds the test plugin library | ||
18 | function get_test_plugin() { | ||
19 | - var plugins = gDirSvc.get("CurProcD", Ci.nsILocalFile); | ||
20 | + var plugins = gDirSvc.get("GreD", Ci.nsILocalFile); | ||
21 | plugins.append("plugins"); | ||
22 | do_check_true(plugins.exists()); | ||
23 | var plugin = plugins.clone(); | ||
24 | diff --git a/netwerk/test/unit/test_socks.js b/netwerk/test/unit/test_socks.js | ||
25 | index bbaeffa..f692d97 100644 | ||
26 | --- a/netwerk/test/unit/test_socks.js | ||
27 | +++ b/netwerk/test/unit/test_socks.js | ||
28 | @@ -36,7 +36,7 @@ function runScriptSubprocess(script, args) | ||
29 | { | ||
30 | // logic copied from ted's crashreporter unit test | ||
31 | var ds = new DirectoryService(); | ||
32 | - var bin = ds.get("CurProcD", Ci.nsILocalFile); | ||
33 | + var bin = ds.get("GreD", Ci.nsILocalFile); | ||
34 | |||
35 | bin.append("xpcshell"); | ||
36 | if (!bin.exists()) { | ||
37 | diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js b/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js | ||
38 | index 71e9ac1..0bde3e2 100644 | ||
39 | --- a/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js | ||
40 | +++ b/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js | ||
41 | @@ -18,7 +18,7 @@ function run_test() { | ||
42 | |||
43 | // Finds the test plugin library | ||
44 | function get_test_plugin() { | ||
45 | - var plugins = Services.dirsvc.get("CurProcD", AM_Ci.nsILocalFile); | ||
46 | + var plugins = Services.dirsvc.get("GreD", AM_Ci.nsILocalFile); | ||
47 | plugins.append("plugins"); | ||
48 | do_check_true(plugins.exists()); | ||
49 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Load-dependent-libraries-with-their-real-path-to-avo.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Load-dependent-libraries-with-their-real-path-to-avo.patch new file mode 100644 index 0000000..216792f --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Load-dependent-libraries-with-their-real-path-to-avo.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Sat, 25 Feb 2012 12:03:56 +0100 | ||
3 | Subject: Load dependent libraries with their real path to avoid confusing gdb | ||
4 | when they are symlinks | ||
5 | |||
6 | --- | ||
7 | xpcom/glue/standalone/nsGlueLinkingDlopen.cpp | 3 +++ | ||
8 | 1 file changed, 3 insertions(+) | ||
9 | |||
10 | diff --git a/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp b/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp | ||
11 | index 959bd69..61b18f8 100644 | ||
12 | --- a/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp | ||
13 | +++ b/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp | ||
14 | @@ -206,6 +206,9 @@ preload(const char *file) | ||
15 | static void | ||
16 | ReadDependentCB(const char *aDependentLib, bool do_preload) | ||
17 | { | ||
18 | + char lib[MAXPATHLEN]; | ||
19 | + if (realpath(aDependentLib, lib)) | ||
20 | + aDependentLib = lib; | ||
21 | #if defined(LINUX) && !defined(ANDROID) | ||
22 | if (do_preload) | ||
23 | preload(aDependentLib); | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Properly-launch-applications-set-in-HOME-.mailcap.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Properly-launch-applications-set-in-HOME-.mailcap.patch new file mode 100644 index 0000000..8ed4881 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/Properly-launch-applications-set-in-HOME-.mailcap.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Sat, 22 Nov 2008 09:35:23 +0100 | ||
3 | Subject: Properly launch applications set in $HOME/.mailcap | ||
4 | |||
5 | Replaces the previous patch in a much simpler way. | ||
6 | --- | ||
7 | uriloader/exthandler/unix/nsMIMEInfoUnix.cpp | 15 +++++++++++++-- | ||
8 | 1 file changed, 13 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp | ||
11 | index 5d7f758..81b8efb 100644 | ||
12 | --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp | ||
13 | +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp | ||
14 | @@ -99,6 +99,12 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI) | ||
15 | NS_IMETHODIMP | ||
16 | nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval) | ||
17 | { | ||
18 | + // if mDefaultApplication is set, it means the application has been set from | ||
19 | + // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to | ||
20 | + // give the GNOME answer. | ||
21 | + if (mDefaultApplication) | ||
22 | + return nsMIMEInfoImpl::GetHasDefaultHandler(_retval); | ||
23 | + | ||
24 | *_retval = false; | ||
25 | nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType); | ||
26 | if (!mimeInfo) { | ||
27 | @@ -132,13 +138,18 @@ nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval) | ||
28 | } | ||
29 | #endif | ||
30 | |||
31 | - // If we didn't find a VFS handler, fallback. | ||
32 | - return nsMIMEInfoImpl::GetHasDefaultHandler(_retval); | ||
33 | + return NS_OK; | ||
34 | } | ||
35 | |||
36 | nsresult | ||
37 | nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile *aFile) | ||
38 | { | ||
39 | + // if mDefaultApplication is set, it means the application has been set from | ||
40 | + // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to | ||
41 | + // give the GNOME answer. | ||
42 | + if (mDefaultApplication) | ||
43 | + return nsMIMEInfoImpl::LaunchDefaultWithFile(aFile); | ||
44 | + | ||
45 | nsCAutoString nativePath; | ||
46 | aFile->GetNativePath(nativePath); | ||
47 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/bug-693343-a11y-disabled-in-Gnome-3-when-GNOME_ACCES.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/bug-693343-a11y-disabled-in-Gnome-3-when-GNOME_ACCES.patch new file mode 100644 index 0000000..2fdc6ae --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/fixes/bug-693343-a11y-disabled-in-Gnome-3-when-GNOME_ACCES.patch | |||
@@ -0,0 +1,351 @@ | |||
1 | From: Trevor Saunders <trev.saunders@gmail.com> | ||
2 | Date: Wed, 4 Jan 2012 20:54:17 -0500 | ||
3 | Subject: bug 693343 - a11y disabled in Gnome 3 when GNOME_ACCESSIBILITY is | ||
4 | unset patch=mgorse, tbsaunde r=tbsaunde, karlt | ||
5 | |||
6 | --- | ||
7 | accessible/src/atk/Makefile.in | 4 + | ||
8 | accessible/src/atk/nsApplicationAccessibleWrap.cpp | 156 ++++++++++++++++---- | ||
9 | accessible/src/base/nsAccessibilityService.h | 15 ++ | ||
10 | widget/src/gtk2/nsWindow.cpp | 48 +----- | ||
11 | widget/src/gtk2/nsWindow.h | 3 - | ||
12 | 5 files changed, 157 insertions(+), 69 deletions(-) | ||
13 | |||
14 | diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in | ||
15 | index 4934fd1..9fe1f48 100644 | ||
16 | --- a/accessible/src/atk/Makefile.in | ||
17 | +++ b/accessible/src/atk/Makefile.in | ||
18 | @@ -92,6 +92,10 @@ include $(topsrcdir)/config/rules.mk | ||
19 | CFLAGS += $(MOZ_GTK2_CFLAGS) | ||
20 | CXXFLAGS += $(MOZ_GTK2_CFLAGS) | ||
21 | |||
22 | +ifdef MOZ_ENABLE_DBUS | ||
23 | +CXXFLAGS += $(MOZ_DBUS_CFLAGS) | ||
24 | +endif | ||
25 | + | ||
26 | LOCAL_INCLUDES += \ | ||
27 | -I$(srcdir) \ | ||
28 | -I$(srcdir)/../base \ | ||
29 | diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src/atk/nsApplicationAccessibleWrap.cpp | ||
30 | index c8ee40c..5937883 100644 | ||
31 | --- a/accessible/src/atk/nsApplicationAccessibleWrap.cpp | ||
32 | +++ b/accessible/src/atk/nsApplicationAccessibleWrap.cpp | ||
33 | @@ -44,7 +44,7 @@ | ||
34 | #include "nsMai.h" | ||
35 | #include "prlink.h" | ||
36 | #include "prenv.h" | ||
37 | -#include "nsIPrefBranch.h" | ||
38 | +#include "nsIGConfService.h" | ||
39 | #include "nsIServiceManager.h" | ||
40 | #include "nsAutoPtr.h" | ||
41 | #include "nsAccessibilityService.h" | ||
42 | @@ -52,6 +52,11 @@ | ||
43 | |||
44 | #include <gtk/gtk.h> | ||
45 | #include <atk/atk.h> | ||
46 | +#ifdef MOZ_ENABLE_DBUS | ||
47 | +#include <dbus/dbus.h> | ||
48 | +#endif | ||
49 | + | ||
50 | +using namespace mozilla::a11y; | ||
51 | |||
52 | typedef GType (* AtkGetTypeType) (void); | ||
53 | GType g_atk_hyperlink_impl_type = G_TYPE_INVALID; | ||
54 | @@ -60,11 +65,6 @@ static PRLibrary *sATKLib = nsnull; | ||
55 | static const char sATKLibName[] = "libatk-1.0.so.0"; | ||
56 | static const char sATKHyperlinkImplGetTypeSymbol[] = | ||
57 | "atk_hyperlink_impl_get_type"; | ||
58 | -static const char sAccEnv [] = "GNOME_ACCESSIBILITY"; | ||
59 | -static const char sSysPrefService [] = | ||
60 | - "@mozilla.org/system-preference-service;1"; | ||
61 | -static const char sAccessibilityKey [] = | ||
62 | - "config.use_system_prefs.accessibility"; | ||
63 | |||
64 | /* gail function pointer */ | ||
65 | static guint (* gail_add_global_event_listener) (GSignalEmissionHook listener, | ||
66 | @@ -614,26 +614,7 @@ toplevel_event_watcher(GSignalInvocationHint* ihint, | ||
67 | bool | ||
68 | nsApplicationAccessibleWrap::Init() | ||
69 | { | ||
70 | - // XXX following code is copied from widget/src/gtk2/nsWindow.cpp | ||
71 | - // we should put it to somewhere that can be used from both modules | ||
72 | - // see bug 390761 | ||
73 | - | ||
74 | - // check if accessibility enabled/disabled by environment variable | ||
75 | - bool isGnomeATEnabled = false; | ||
76 | - const char *envValue = PR_GetEnv(sAccEnv); | ||
77 | - if (envValue) { | ||
78 | - isGnomeATEnabled = !!atoi(envValue); | ||
79 | - } else { | ||
80 | - //check gconf-2 setting | ||
81 | - nsresult rv; | ||
82 | - nsCOMPtr<nsIPrefBranch> sysPrefService = | ||
83 | - do_GetService(sSysPrefService, &rv); | ||
84 | - if (NS_SUCCEEDED(rv) && sysPrefService) { | ||
85 | - sysPrefService->GetBoolPref(sAccessibilityKey, &isGnomeATEnabled); | ||
86 | - } | ||
87 | - } | ||
88 | - | ||
89 | - if (isGnomeATEnabled) { | ||
90 | + if (ShouldA11yBeEnabled()) { | ||
91 | // load and initialize gail library | ||
92 | nsresult rv = LoadGtkModule(sGail); | ||
93 | if (NS_SUCCEEDED(rv)) { | ||
94 | @@ -882,3 +863,126 @@ LoadGtkModule(GnomeAccessibilityModule& aModule) | ||
95 | } | ||
96 | return NS_OK; | ||
97 | } | ||
98 | + | ||
99 | +namespace mozilla { | ||
100 | +namespace a11y { | ||
101 | + | ||
102 | + static const char sAccEnv [] = "GNOME_ACCESSIBILITY"; | ||
103 | +#ifdef MOZ_ENABLE_DBUS | ||
104 | +static DBusPendingCall *sPendingCall = nsnull; | ||
105 | +#endif | ||
106 | + | ||
107 | +void | ||
108 | +PreInit() | ||
109 | +{ | ||
110 | +#ifdef MOZ_ENABLE_DBUS | ||
111 | + static bool sChecked = FALSE; | ||
112 | + if (sChecked) | ||
113 | + return; | ||
114 | + | ||
115 | + sChecked = TRUE; | ||
116 | + | ||
117 | + // dbus is only checked if GNOME_ACCESSIBILITY is unset | ||
118 | + if (PR_GetEnv(sAccEnv) || !PR_GetEnv("DBUS_SESSION_BUS_ADDRESS")) | ||
119 | + return; | ||
120 | + | ||
121 | + DBusConnection* bus = dbus_bus_get(DBUS_BUS_SESSION, nsnull); | ||
122 | + if (!bus) | ||
123 | + return; | ||
124 | + | ||
125 | + dbus_connection_set_exit_on_disconnect(bus, FALSE); | ||
126 | + | ||
127 | + DBusMessage *message; | ||
128 | + message = dbus_message_new_method_call("org.a11y.Bus", "/org/a11y/bus", | ||
129 | + "org.freedesktop.DBus.Properties", | ||
130 | + "Get"); | ||
131 | + if (!message) | ||
132 | + goto dbus_done; | ||
133 | + | ||
134 | + static const char* iface = "org.a11y.Status"; | ||
135 | + static const char* member = "IsEnabled"; | ||
136 | + dbus_message_append_args(message, DBUS_TYPE_STRING, &iface, | ||
137 | + DBUS_TYPE_STRING, &member, DBUS_TYPE_INVALID); | ||
138 | + dbus_connection_send_with_reply(bus, message, &sPendingCall, 1000); | ||
139 | + dbus_message_unref(message); | ||
140 | + | ||
141 | +dbus_done: | ||
142 | + dbus_connection_unref(bus); | ||
143 | +#endif | ||
144 | +} | ||
145 | + | ||
146 | +bool | ||
147 | +ShouldA11yBeEnabled() | ||
148 | +{ | ||
149 | + static bool sChecked = false, sShouldEnable = false; | ||
150 | + if (sChecked) | ||
151 | + return sShouldEnable; | ||
152 | + | ||
153 | + sChecked = true; | ||
154 | + | ||
155 | + // check if accessibility enabled/disabled by environment variable | ||
156 | + const char* envValue = PR_GetEnv(sAccEnv); | ||
157 | + if (envValue) | ||
158 | + return sShouldEnable = !!atoi(envValue); | ||
159 | + | ||
160 | +#ifdef MOZ_ENABLE_DBUS | ||
161 | + PreInit(); | ||
162 | + bool dbusSuccess = false; | ||
163 | + DBusMessage *reply = nsnull; | ||
164 | + if (!sPendingCall) | ||
165 | + goto dbus_done; | ||
166 | + | ||
167 | + dbus_pending_call_block(sPendingCall); | ||
168 | + reply = dbus_pending_call_steal_reply(sPendingCall); | ||
169 | + dbus_pending_call_unref(sPendingCall); | ||
170 | + sPendingCall = nsnull; | ||
171 | + if (!reply || | ||
172 | + dbus_message_get_type(reply) != DBUS_MESSAGE_TYPE_METHOD_RETURN || | ||
173 | + strcmp(dbus_message_get_signature (reply), DBUS_TYPE_VARIANT_AS_STRING)) | ||
174 | + goto dbus_done; | ||
175 | + | ||
176 | + DBusMessageIter iter, iter_variant, iter_struct; | ||
177 | + dbus_bool_t dResult; | ||
178 | + dbus_message_iter_init(reply, &iter); | ||
179 | + dbus_message_iter_recurse (&iter, &iter_variant); | ||
180 | + switch (dbus_message_iter_get_arg_type(&iter_variant)) { | ||
181 | + case DBUS_TYPE_STRUCT: | ||
182 | + // at-spi2-core 2.2.0-2.2.1 had a bug where it returned a struct | ||
183 | + dbus_message_iter_recurse(&iter_variant, &iter_struct); | ||
184 | + if (dbus_message_iter_get_arg_type(&iter_struct) == DBUS_TYPE_BOOLEAN) { | ||
185 | + dbus_message_iter_get_basic(&iter_struct, &dResult); | ||
186 | + sShouldEnable = dResult; | ||
187 | + dbusSuccess = true; | ||
188 | + } | ||
189 | + | ||
190 | + break; | ||
191 | + case DBUS_TYPE_BOOLEAN: | ||
192 | + dbus_message_iter_get_basic(&iter_variant, &dResult); | ||
193 | + sShouldEnable = dResult; | ||
194 | + dbusSuccess = true; | ||
195 | + break; | ||
196 | + default: | ||
197 | + break; | ||
198 | + } | ||
199 | + | ||
200 | +dbus_done: | ||
201 | + if (reply) | ||
202 | + dbus_message_unref(reply); | ||
203 | + | ||
204 | + if (dbusSuccess) | ||
205 | + return sShouldEnable; | ||
206 | +#endif | ||
207 | + | ||
208 | + //check gconf-2 setting | ||
209 | +static const char sGconfAccessibilityKey[] = | ||
210 | + "/desktop/gnome/interface/accessibility"; | ||
211 | + nsresult rv = NS_OK; | ||
212 | + nsCOMPtr<nsIGConfService> gconf = | ||
213 | + do_GetService(NS_GCONFSERVICE_CONTRACTID, &rv); | ||
214 | + if (NS_SUCCEEDED(rv) && gconf) | ||
215 | + gconf->GetBool(NS_LITERAL_CSTRING(sGconfAccessibilityKey), &sShouldEnable); | ||
216 | + | ||
217 | + return sShouldEnable; | ||
218 | +} | ||
219 | +} // namespace a11y | ||
220 | +} // namespace mozilla | ||
221 | diff --git a/accessible/src/base/nsAccessibilityService.h b/accessible/src/base/nsAccessibilityService.h | ||
222 | index 841814a..4284c80 100644 | ||
223 | --- a/accessible/src/base/nsAccessibilityService.h | ||
224 | +++ b/accessible/src/base/nsAccessibilityService.h | ||
225 | @@ -56,6 +56,21 @@ namespace a11y { | ||
226 | */ | ||
227 | FocusManager* FocusMgr(); | ||
228 | |||
229 | +#ifdef MOZ_ACCESSIBILITY_ATK | ||
230 | +/** | ||
231 | + * Perform initialization that should be done as soon as possible, in order | ||
232 | + * to minimize startup time. | ||
233 | + * XXX: this function and the next defined in nsApplicationAccessibleWrap.cpp | ||
234 | + */ | ||
235 | +void PreInit(); | ||
236 | + | ||
237 | +/** | ||
238 | + * Is platform accessibility enabled. | ||
239 | + * Only used on linux with atk for now. | ||
240 | + */ | ||
241 | +bool ShouldA11yBeEnabled(); | ||
242 | +#endif | ||
243 | + | ||
244 | } // namespace a11y | ||
245 | } // namespace mozilla | ||
246 | |||
247 | diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp | ||
248 | index 25f1c2a..8f8cd40 100644 | ||
249 | --- a/widget/src/gtk2/nsWindow.cpp | ||
250 | +++ b/widget/src/gtk2/nsWindow.cpp | ||
251 | @@ -110,19 +110,10 @@ | ||
252 | #include "nsIPropertyBag2.h" | ||
253 | |||
254 | #ifdef ACCESSIBILITY | ||
255 | -#include "nsIAccessibilityService.h" | ||
256 | +#include "nsAccessibilityService.h" | ||
257 | #include "nsIAccessibleDocument.h" | ||
258 | -#include "prenv.h" | ||
259 | -#include "stdlib.h" | ||
260 | |||
261 | using namespace mozilla; | ||
262 | - | ||
263 | -static bool sAccessibilityChecked = false; | ||
264 | -/* static */ | ||
265 | -bool nsWindow::sAccessibilityEnabled = false; | ||
266 | -static const char sSysPrefService [] = "@mozilla.org/system-preference-service;1"; | ||
267 | -static const char sAccEnv [] = "GNOME_ACCESSIBILITY"; | ||
268 | -static const char sAccessibilityKey [] = "config.use_system_prefs.accessibility"; | ||
269 | #endif | ||
270 | |||
271 | /* For SetIcon */ | ||
272 | @@ -1116,9 +1107,8 @@ nsWindow::Show(bool aState) | ||
273 | } | ||
274 | |||
275 | #ifdef ACCESSIBILITY | ||
276 | - if (aState && sAccessibilityEnabled) { | ||
277 | + if (aState && a11y::ShouldA11yBeEnabled()) | ||
278 | CreateRootAccessible(); | ||
279 | - } | ||
280 | #endif | ||
281 | |||
282 | NativeShow(aState); | ||
283 | @@ -3890,6 +3880,11 @@ nsWindow::Create(nsIWidget *aParent, | ||
284 | |||
285 | NS_ASSERTION(!mWindowGroup, "already have window group (leaking it)"); | ||
286 | |||
287 | +#ifdef ACCESSIBILITY | ||
288 | + // Send a DBus message to check whether a11y is enabled | ||
289 | + a11y::PreInit(); | ||
290 | +#endif | ||
291 | + | ||
292 | // Ensure that the toolkit is created. | ||
293 | nsGTKToolkit::GetToolkit(); | ||
294 | |||
295 | @@ -4283,33 +4278,6 @@ nsWindow::Create(nsIWidget *aParent, | ||
296 | if (!mIsTopLevel) | ||
297 | Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, false); | ||
298 | |||
299 | -#ifdef ACCESSIBILITY | ||
300 | - nsresult rv; | ||
301 | - if (!sAccessibilityChecked) { | ||
302 | - sAccessibilityChecked = true; | ||
303 | - | ||
304 | - //check if accessibility enabled/disabled by environment variable | ||
305 | - const char *envValue = PR_GetEnv(sAccEnv); | ||
306 | - if (envValue) { | ||
307 | - sAccessibilityEnabled = atoi(envValue) != 0; | ||
308 | - LOG(("Accessibility Env %s=%s\n", sAccEnv, envValue)); | ||
309 | - } | ||
310 | - //check gconf-2 setting | ||
311 | - else { | ||
312 | - nsCOMPtr<nsIPrefBranch> sysPrefService = | ||
313 | - do_GetService(sSysPrefService, &rv); | ||
314 | - if (NS_SUCCEEDED(rv) && sysPrefService) { | ||
315 | - | ||
316 | - // do the work to get gconf setting. | ||
317 | - // will be done soon later. | ||
318 | - sysPrefService->GetBoolPref(sAccessibilityKey, | ||
319 | - &sAccessibilityEnabled); | ||
320 | - } | ||
321 | - | ||
322 | - } | ||
323 | - } | ||
324 | -#endif | ||
325 | - | ||
326 | #ifdef MOZ_DFB | ||
327 | if (!mDFB) { | ||
328 | DirectFBCreate( &mDFB ); | ||
329 | @@ -6517,7 +6485,7 @@ nsWindow::DispatchAccessibleEvent() | ||
330 | void | ||
331 | nsWindow::DispatchEventToRootAccessible(PRUint32 aEventType) | ||
332 | { | ||
333 | - if (!sAccessibilityEnabled) { | ||
334 | + if (!a11y::ShouldA11yBeEnabled()) { | ||
335 | return; | ||
336 | } | ||
337 | |||
338 | diff --git a/widget/src/gtk2/nsWindow.h b/widget/src/gtk2/nsWindow.h | ||
339 | index a72eca7..577acbf 100644 | ||
340 | --- a/widget/src/gtk2/nsWindow.h | ||
341 | +++ b/widget/src/gtk2/nsWindow.h | ||
342 | @@ -345,9 +345,6 @@ public: | ||
343 | #endif | ||
344 | NS_IMETHOD ReparentNativeWidget(nsIWidget* aNewParent); | ||
345 | |||
346 | -#ifdef ACCESSIBILITY | ||
347 | - static bool sAccessibilityEnabled; | ||
348 | -#endif | ||
349 | protected: | ||
350 | // Helper for SetParent and ReparentNativeWidget. | ||
351 | void ReparentNativeWidgetInternal(nsIWidget* aNewParent, | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch new file mode 100644 index 0000000..69d01f6 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch | |||
@@ -0,0 +1,74 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Thu, 1 Apr 2010 15:34:59 +0200 | ||
3 | Subject: Determine which phishing shavar to use depending on | ||
4 | MOZ_OFFICIAL_BRANDING | ||
5 | |||
6 | --- | ||
7 | browser/app/Makefile.in | 4 ++++ | ||
8 | browser/app/profile/firefox.js | 4 ++++ | ||
9 | browser/components/safebrowsing/Makefile.in | 4 ++++ | ||
10 | browser/components/safebrowsing/content/application.js | 4 ++++ | ||
11 | 4 files changed, 16 insertions(+) | ||
12 | |||
13 | diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in | ||
14 | index 95055cb..a6066f7 100644 | ||
15 | --- a/browser/app/Makefile.in | ||
16 | +++ b/browser/app/Makefile.in | ||
17 | @@ -191,6 +191,10 @@ ifdef MOZILLA_OFFICIAL | ||
18 | DEFINES += -DMOZILLA_OFFICIAL | ||
19 | endif | ||
20 | |||
21 | +ifdef MOZ_OFFICIAL_BRANDING | ||
22 | +DEFINES += -DMOZ_OFFICIAL_BRANDING | ||
23 | +endif | ||
24 | + | ||
25 | ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) | ||
26 | libs:: | ||
27 | $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons | ||
28 | diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js | ||
29 | index 4f3aac3..7ba75fa 100644 | ||
30 | --- a/browser/app/profile/firefox.js | ||
31 | +++ b/browser/app/profile/firefox.js | ||
32 | @@ -742,7 +742,11 @@ pref("urlclassifier.alternate_error_page", "blocked"); | ||
33 | pref("urlclassifier.gethashnoise", 4); | ||
34 | |||
35 | // The list of tables that use the gethash request to confirm partial results. | ||
36 | +#ifdef MOZ_OFFICIAL_BRANDING | ||
37 | pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar"); | ||
38 | +#else | ||
39 | +pref("urlclassifier.gethashtables", "googpub-phish-shavar,goog-malware-shavar"); | ||
40 | +#endif | ||
41 | |||
42 | // If an urlclassifier table has not been updated in this number of seconds, | ||
43 | // a gethash request will be forced to check that the result is still in | ||
44 | diff --git a/browser/components/safebrowsing/Makefile.in b/browser/components/safebrowsing/Makefile.in | ||
45 | index 2d526c2..3b6ca17 100644 | ||
46 | --- a/browser/components/safebrowsing/Makefile.in | ||
47 | +++ b/browser/components/safebrowsing/Makefile.in | ||
48 | @@ -51,6 +51,10 @@ ifdef MOZILLA_OFFICIAL | ||
49 | DEFINES += -DOFFICIAL_BUILD=1 | ||
50 | endif | ||
51 | |||
52 | +ifdef MOZ_OFFICIAL_BRANDING | ||
53 | +DEFINES += -DMOZ_OFFICIAL_BRANDING | ||
54 | +endif | ||
55 | + | ||
56 | EXTRA_COMPONENTS = \ | ||
57 | src/nsSafebrowsingApplication.manifest \ | ||
58 | $(NULL) | ||
59 | diff --git a/browser/components/safebrowsing/content/application.js b/browser/components/safebrowsing/content/application.js | ||
60 | index d353cbc..ec32c92 100644 | ||
61 | --- a/browser/components/safebrowsing/content/application.js | ||
62 | +++ b/browser/components/safebrowsing/content/application.js | ||
63 | @@ -109,7 +109,11 @@ PROT_Application.prototype.initialize = function() { | ||
64 | this.malwareWarden.maybeToggleUpdateChecking(); | ||
65 | |||
66 | this.phishWarden = new PROT_PhishingWarden(); | ||
67 | +#ifdef MOZ_OFFICIAL_BRANDING | ||
68 | this.phishWarden.registerBlackTable("goog-phish-shavar"); | ||
69 | +#else | ||
70 | + this.phishWarden.registerBlackTable("googpub-phish-shavar"); | ||
71 | +#endif | ||
72 | this.phishWarden.maybeToggleUpdateChecking(); | ||
73 | } | ||
74 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch new file mode 100644 index 0000000..277a35c --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Sat, 19 Feb 2011 11:02:30 +0100 | ||
3 | Subject: Use MOZ_APP_DISPLAYNAME to fill appstrings.properties | ||
4 | |||
5 | --- | ||
6 | browser/locales/Makefile.in | 2 ++ | ||
7 | .../en-US/chrome/overrides/appstrings.properties | 20 ++++++++++---------- | ||
8 | 2 files changed, 12 insertions(+), 10 deletions(-) | ||
9 | |||
10 | diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in | ||
11 | index b30a715..9f7befb 100644 | ||
12 | --- a/browser/locales/Makefile.in | ||
13 | +++ b/browser/locales/Makefile.in | ||
14 | @@ -69,6 +69,8 @@ SUBMAKEFILES += \ | ||
15 | $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \ | ||
16 | $(NULL) | ||
17 | |||
18 | +DEFINES += -DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) | ||
19 | + | ||
20 | # This makefile uses variable overrides from the libs-% target to | ||
21 | # build non-default locales to non-default dist/ locations. Be aware! | ||
22 | |||
23 | diff --git a/browser/locales/en-US/chrome/overrides/appstrings.properties b/browser/locales/en-US/chrome/overrides/appstrings.properties | ||
24 | index 87e9538..ac979f9 100644 | ||
25 | --- a/browser/locales/en-US/chrome/overrides/appstrings.properties | ||
26 | +++ b/browser/locales/en-US/chrome/overrides/appstrings.properties | ||
27 | @@ -35,24 +35,24 @@ | ||
28 | # ***** END LICENSE BLOCK ***** | ||
29 | |||
30 | malformedURI=The URL is not valid and cannot be loaded. | ||
31 | -fileNotFound=Firefox can't find the file at %S. | ||
32 | -dnsNotFound=Firefox can't find the server at %S. | ||
33 | -protocolNotFound=Firefox doesn't know how to open this address, because the protocol (%S) isn't associated with any program. | ||
34 | -connectionFailure=Firefox can't establish a connection to the server at %S. | ||
35 | +#expand fileNotFound=__MOZ_APP_DISPLAYNAME__ can't find the file at %S. | ||
36 | +#expand dnsNotFound=__MOZ_APP_DISPLAYNAME__ can't find the server at %S. | ||
37 | +#expand protocolNotFound=__MOZ_APP_DISPLAYNAME__ doesn't know how to open this address, because the protocol (%S) isn't associated with any program. | ||
38 | +#expand connectionFailure=__MOZ_APP_DISPLAYNAME__ can't establish a connection to the server at %S. | ||
39 | netInterrupt=The connection to %S was interrupted while the page was loading. | ||
40 | netTimeout=The server at %S is taking too long to respond. | ||
41 | -redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete. | ||
42 | +#expand redirectLoop=__MOZ_APP_DISPLAYNAME__ has detected that the server is redirecting the request for this address in a way that will never complete. | ||
43 | ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S" | ||
44 | confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier. | ||
45 | resendButton.label=Resend | ||
46 | -unknownSocketType=Firefox doesn't know how to communicate with the server. | ||
47 | +#expand unknownSocketType=__MOZ_APP_DISPLAYNAME__ doesn't know how to communicate with the server. | ||
48 | netReset=The connection to the server was reset while the page was loading. | ||
49 | notCached=This document is no longer available. | ||
50 | -netOffline=Firefox is currently in offline mode and can't browse the Web. | ||
51 | +#expand netOffline=__MOZ_APP_DISPLAYNAME__ is currently in offline mode and can't browse the Web. | ||
52 | isprinting=The document cannot change while Printing or in Print Preview. | ||
53 | -deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Firefox has canceled the request for your protection. | ||
54 | -proxyResolveFailure=Firefox is configured to use a proxy server that can't be found. | ||
55 | -proxyConnectFailure=Firefox is configured to use a proxy server that is refusing connections. | ||
56 | +#expand deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. __MOZ_APP_DISPLAYNAME__ has canceled the request for your protection. | ||
57 | +#expand proxyResolveFailure=__MOZ_APP_DISPLAYNAME__ is configured to use a proxy server that can't be found. | ||
58 | +#expand proxyConnectFailure=__MOZ_APP_DISPLAYNAME__ is configured to use a proxy server that is refusing connections. | ||
59 | contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. | ||
60 | unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem. | ||
61 | externalProtocolTitle=External Protocol Request | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/mozconfig b/meta-linaro-integration/recipes-overlayed/firefox/firefox/mozconfig new file mode 100644 index 0000000..cc71f48 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/mozconfig | |||
@@ -0,0 +1,60 @@ | |||
1 | . $topsrcdir/browser/config/mozconfig | ||
2 | |||
3 | # From xulrunner.mozconfig | ||
4 | ac_add_options --prefix=@prefix@ | ||
5 | ac_add_options --enable-default-toolkit=cairo-gtk2 | ||
6 | ac_add_options --enable-pango | ||
7 | ac_add_options --enable-system-cairo # MOZ_TREE_CAIRO= | ||
8 | ac_add_options --with-system-jpeg # MOZ_NATIVE_JPEG=1 | ||
9 | ac_add_options --with-system-zlib # MOZ_NATIVE_ZLIB=1 | ||
10 | ac_add_options --with-system-bz2 # MOZ_NATIVE_BZ2=1 | ||
11 | #ac_add_options --with-system-nspr # MOZ_NATIVE_NSPR=1 | ||
12 | #ac_add_options --with-system-nss # MOZ_NATIVE_NSS=1 | ||
13 | ac_add_options --enable-svg | ||
14 | ac_add_options --enable-mathml | ||
15 | ac_add_options --disable-pedantic | ||
16 | ac_add_options --disable-long-long-warning | ||
17 | ac_add_options --disable-gnomevfs | ||
18 | ac_add_options --disable-gconf | ||
19 | #ac_add_options --enable-gio | ||
20 | ac_add_options --disable-gio | ||
21 | #ac_add_options --enable-gnomeui | ||
22 | ac_add_options --disable-gnomeui | ||
23 | ac_add_options --disable-mochitest | ||
24 | ac_add_options --disable-debug | ||
25 | ac_add_options --enable-canvas | ||
26 | ac_add_options --enable-readline | ||
27 | ac_add_options --disable-installer | ||
28 | ac_add_options --disable-javaxpcom | ||
29 | ac_add_options --disable-elf-dynstr-gc | ||
30 | #ac_add_options --enable-system-hunspell # MOZ_NATIVE_HUNSPELL=1 | ||
31 | ac_add_options --disable-system-hunspell # MOZ_NATIVE_HUNSPELL=1 | ||
32 | ac_add_options --disable-crashreporter | ||
33 | #ac_add_options --enable-system-sqlite # MOZ_NATIVE_SQLITE=1 | ||
34 | ac_add_options --disable-strip | ||
35 | ac_add_options --disable-install-strip | ||
36 | ac_add_options --enable-url-classifier | ||
37 | ac_add_options --enable-startup-notification | ||
38 | ac_add_options --enable-system-ffi # MOZ_NATIVE_FFI=1 | ||
39 | ac_add_options --with-system-libevent=@STAGING_DIR_TARGET@@prefix@ # MOZ_NATIVE_LIBEVENT=1 | ||
40 | ac_add_options --with-system-libvpx # MOZ_NATIVE_LIBVPX=1 | ||
41 | #ac_add_options --enable-shared-js | ||
42 | |||
43 | # From iceweasel.mozconfig | ||
44 | ac_add_options --with-user-appdir=.mozilla | ||
45 | ac_add_options --disable-installer | ||
46 | ac_add_options --disable-strip | ||
47 | ac_add_options --disable-install-strip | ||
48 | ac_add_options --disable-tests | ||
49 | ac_add_options --enable-extensions=default | ||
50 | ac_add_options --enable-single-profile | ||
51 | ac_add_options --disable-profilesharing | ||
52 | ac_add_options --disable-updater | ||
53 | ac_add_options --disable-elf-dynstr-gc | ||
54 | #ac_add_options --with-branding=debian/branding | ||
55 | ac_add_options --enable-official-branding | ||
56 | ac_add_options --disable-necko-wifi | ||
57 | ac_add_options --disable-crashreporter | ||
58 | ac_add_options --disable-webm | ||
59 | ac_add_options --enable-chrome-format=jar | ||
60 | ac_add_options --disable-libjpeg-turbo | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/mozilla-firefox.desktop b/meta-linaro-integration/recipes-overlayed/firefox/firefox/mozilla-firefox.desktop new file mode 100644 index 0000000..77420e6 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/mozilla-firefox.desktop | |||
@@ -0,0 +1,11 @@ | |||
1 | [Desktop Entry] | ||
2 | Name=Firefox Browser | ||
3 | Comment=Firefox Web Browser | ||
4 | Exec=firefox | ||
5 | Terminal=false | ||
6 | MultipleArgs=false | ||
7 | Type=Application | ||
8 | Icon=mozilla-firefox.png | ||
9 | Categories=Application;Internet;Network; | ||
10 | SingleInstance=true | ||
11 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/mozilla-firefox.png b/meta-linaro-integration/recipes-overlayed/firefox/firefox/mozilla-firefox.png new file mode 100644 index 0000000..f8b2e21 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/mozilla-firefox.png | |||
Binary files differ | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Add-xptcall-support-for-SH4-processors.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Add-xptcall-support-for-SH4-processors.patch new file mode 100644 index 0000000..9e2f26c --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Add-xptcall-support-for-SH4-processors.patch | |||
@@ -0,0 +1,522 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Fri, 30 Apr 2010 11:03:50 +0200 | ||
3 | Subject: Add xptcall support for SH4 processors | ||
4 | |||
5 | Closes: #553593 | ||
6 | https://bugzilla.mozilla.org/show_bug.cgi?id=382214 | ||
7 | --- | ||
8 | xpcom/reflect/xptcall/src/md/unix/Makefile.in | 11 + | ||
9 | .../xptcall/src/md/unix/xptcinvoke_linux_sh.cpp | 203 +++++++++++++++ | ||
10 | .../xptcall/src/md/unix/xptcstubs_linux_sh.cpp | 271 ++++++++++++++++++++ | ||
11 | 3 files changed, 485 insertions(+) | ||
12 | create mode 100644 xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_sh.cpp | ||
13 | create mode 100644 xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_sh.cpp | ||
14 | |||
15 | diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in | ||
16 | index 6c50821..44d6ab1 100644 | ||
17 | --- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in | ||
18 | +++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in | ||
19 | @@ -430,6 +430,17 @@ CPPSRCS := xptcinvoke_linux_s390x.cpp xptcstubs_linux_s390x.cpp | ||
20 | CXXFLAGS += -fno-strict-aliasing -fno-inline -fomit-frame-pointer -mbackchain | ||
21 | endif | ||
22 | |||
23 | +############ | ||
24 | +# SuperH | ||
25 | +############ | ||
26 | +# | ||
27 | +# | ||
28 | +# Currently, tested on sh4 and sh4a (non sh4al and sh4al-dsp..) | ||
29 | +ifeq ($(OS_ARCH),Linux) | ||
30 | +ifneq (,$(filter sh4 sh4a,$(OS_TEST))) | ||
31 | +CPPSRCS := xptcinvoke_linux_sh.cpp xptcstubs_linux_sh.cpp | ||
32 | +endif | ||
33 | +endif | ||
34 | |||
35 | # we don't want the shared lib, but we want to force the creation of a static lib. | ||
36 | FORCE_STATIC_LIB = 1 | ||
37 | diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_sh.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_sh.cpp | ||
38 | new file mode 100644 | ||
39 | index 0000000..ca4807d | ||
40 | --- /dev/null | ||
41 | +++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_sh.cpp | ||
42 | @@ -0,0 +1,203 @@ | ||
43 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- | ||
44 | + * | ||
45 | + * ***** BEGIN LICENSE BLOCK ***** | ||
46 | + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | ||
47 | + * | ||
48 | + * The contents of this file are subject to the Mozilla Public License Version | ||
49 | + * 1.1 (the "License"); you may not use this file except in compliance with | ||
50 | + * the License. You may obtain a copy of the License at | ||
51 | + * http://www.mozilla.org/MPL/ | ||
52 | + * | ||
53 | + * Software distributed under the License is distributed on an "AS IS" basis, | ||
54 | + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | ||
55 | + * for the specific language governing rights and limitations under the | ||
56 | + * License. | ||
57 | + * | ||
58 | + * The Original Code is mozilla.org code. | ||
59 | + * | ||
60 | + * The Initial Developer of the Original Code is | ||
61 | + * Netscape Communications Corporation. | ||
62 | + * Portions created by the Initial Developer are Copyright (C) 1998 | ||
63 | + * the Initial Developer. All Rights Reserved. | ||
64 | + * | ||
65 | + * Contributor(s): | ||
66 | + * - Copyright (C) 2008-2009 STMicroelectronics | ||
67 | + * | ||
68 | + * Alternatively, the contents of this file may be used under the terms of | ||
69 | + * either of the GNU General Public License Version 2 or later (the "GPL"), | ||
70 | + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), | ||
71 | + * in which case the provisions of the GPL or the LGPL are applicable instead | ||
72 | + * of those above. If you wish to allow use of your version of this file only | ||
73 | + * under the terms of either the GPL or the LGPL, and not to allow others to | ||
74 | + * use your version of this file under the terms of the MPL, indicate your | ||
75 | + * decision by deleting the provisions above and replace them with the notice | ||
76 | + * and other provisions required by the GPL or the LGPL. If you do not delete | ||
77 | + * the provisions above, a recipient may use your version of this file under | ||
78 | + * the terms of any one of the MPL, the GPL or the LGPL. | ||
79 | + * | ||
80 | + * Based on the neutroni port, however that assumed that the compiler was pushing params | ||
81 | + * onto the stack. Change to take this into account. | ||
82 | + * | ||
83 | + * ***** END LICENSE BLOCK ***** */ | ||
84 | + | ||
85 | +#include "xptcprivate.h" | ||
86 | + | ||
87 | +extern "C" { | ||
88 | + | ||
89 | +const int c_int_register_params = 4; | ||
90 | +const int c_float_register_params = 8; | ||
91 | + | ||
92 | +static PRUint32 __attribute__((__used__)) | ||
93 | +copy_to_stack(PRUint32 **that,PRUint32 methodIndex,PRUint32 paramCount, nsXPTCVariant* s,PRUint32* data) | ||
94 | +{ | ||
95 | + int intCount = 1; // Because of that | ||
96 | + int floatCount = 0; | ||
97 | + PRUint32 *intRegParams=data+1 ; | ||
98 | + float *floatRegParams = (float *)(data+4); | ||
99 | + | ||
100 | + /* Push the that register into the right place so it can be restored on exit */ | ||
101 | + *data= (PRUint32)(that); | ||
102 | + data+=12; /* 4 integer registers, and 8 floating point registers */ | ||
103 | + | ||
104 | + for ( PRUint32 i = 0; i < paramCount; ++i, ++s ) | ||
105 | + { | ||
106 | + nsXPTType type = s->IsPtrData() ? nsXPTType::T_I32 : s->type; | ||
107 | + | ||
108 | + switch ( type ) { | ||
109 | + case nsXPTType::T_I64: | ||
110 | + case nsXPTType::T_U64: | ||
111 | + // Space to pass in registers? | ||
112 | + if ( (c_int_register_params - intCount) >= 2 ) { | ||
113 | + *((PRInt64 *) intRegParams) = s->val.i64; | ||
114 | + intRegParams += 2; | ||
115 | + intCount += 2; | ||
116 | + } | ||
117 | + else { | ||
118 | + *((PRInt64*) data) = s->val.i64; | ||
119 | + data += 2; | ||
120 | + } | ||
121 | + break; | ||
122 | + case nsXPTType::T_FLOAT: | ||
123 | + // Space to pass in registers? | ||
124 | + if ( floatCount < c_float_register_params ) { | ||
125 | + *floatRegParams = s->val.f; | ||
126 | + ++floatCount; | ||
127 | + ++floatRegParams; | ||
128 | + } | ||
129 | + else { | ||
130 | + *((float*) data) = s->val.f; | ||
131 | + ++data; | ||
132 | + } | ||
133 | + break; | ||
134 | + case nsXPTType::T_DOUBLE: | ||
135 | + // Space to pass in registers? | ||
136 | + if ( (c_float_register_params - floatCount) >= 2 ) { | ||
137 | + if ( (floatCount & 1) != 0 ) { | ||
138 | + ++floatCount; | ||
139 | + ++floatRegParams; | ||
140 | + } | ||
141 | + *(double *)floatRegParams = s->val.d; | ||
142 | + floatCount += 2; | ||
143 | + floatRegParams += 2; | ||
144 | + } | ||
145 | + else { | ||
146 | + *((double *) data) = s->val.d; | ||
147 | + data += 2; | ||
148 | + } | ||
149 | + break; | ||
150 | + default: // 32 (non-float) value | ||
151 | + PRInt32 value = (PRInt32) (s->IsPtrData() ? s->ptr : s->val.p); | ||
152 | + // Space to pass in registers? | ||
153 | + if ( intCount < c_int_register_params ) { | ||
154 | + *intRegParams = value; | ||
155 | + ++intRegParams; | ||
156 | + ++intCount; | ||
157 | + } | ||
158 | + else { | ||
159 | + *data = value; | ||
160 | + ++data; | ||
161 | + } | ||
162 | + break; | ||
163 | + } | ||
164 | + } | ||
165 | + | ||
166 | + /* Now calculate the return address | ||
167 | + * Dereference that to get vtable pointer | ||
168 | + */ | ||
169 | + return *( (*(that))+(methodIndex) ); | ||
170 | + | ||
171 | +} | ||
172 | + | ||
173 | +} | ||
174 | + | ||
175 | + /* This was originally done as a C function, but the original code was | ||
176 | + * relying on how the compiler laid out the stack. Later versions of | ||
177 | + * gcc do a better job of optimising and never push the parameters on the | ||
178 | + * stack. So it is simpler to just write the whole thing in assembler anyway | ||
179 | + */ | ||
180 | + | ||
181 | + /* Because the SH processor passes the first few parameters in registers | ||
182 | + it is a bit tricky setting things up right. To make things easier, | ||
183 | + all the hard work will be done by copy_to_stack above. We pass to it | ||
184 | + a chunk of memory, the bottom of which will be copied to registers r4 to r7 | ||
185 | + and fr4 to fr11 before calling the target function. | ||
186 | + */ | ||
187 | + | ||
188 | +/* r4= that, r5=methodIndex,r6=paramCount,r7=params */ | ||
189 | + | ||
190 | + __asm__ ( | ||
191 | + | ||
192 | + | ||
193 | + /* Make space for parameters to be passed to the method. Assume worst case | ||
194 | + 8 bytes per parameter. Also leave space for 4 longs and 8 floats that | ||
195 | + will be put into registers. The worst case is all int64 parameters | ||
196 | + and even in this case 8 bytes are passed in registers so we can | ||
197 | + deduct this from our allocation. | ||
198 | + */ | ||
199 | + ".section .text\n" | ||
200 | + ".balign 4\n" | ||
201 | + ".global NS_InvokeByIndex_P\n" | ||
202 | + "NS_InvokeByIndex_P:\n" | ||
203 | + "mov.l r14, @-r15 \n\t" // Push frame | ||
204 | + "sts.l pr, @-r15 \n\t" // Push link | ||
205 | + "mov.l r8, @-r15 \n\t" // Save | ||
206 | + "mov r15, r14\n\t" // Set frame | ||
207 | + "mov #3, r1 \n\t" // Assume worse case, all params are 64bit, hence *8 | ||
208 | + "mov r6, r2\n\t" | ||
209 | + "shld r1, r2 \n\t" | ||
210 | + "mov r2, r8 \n\t" // Save stack drop | ||
211 | + "add #48, r2 \n\t" // Space for 4 longs, 8 floats | ||
212 | + "sub r2, r15 \n\t" // Drop stack | ||
213 | + "mov.l 1f, r1 \n\t" // Get address of copy_to_stack_function | ||
214 | + "jsr @r1 \n\t" | ||
215 | + "mov.l r15, @-r15 \n\t" // Params will be dumped here | ||
216 | + "add #4, r15 \n\t" // Pop stack ptr param. r0 contains method address | ||
217 | + | ||
218 | + /* Now everything is laid out nicely in the stack. We just have to | ||
219 | + load values at the top end of the memory area into registers and | ||
220 | + make the call. We may load more things into registers than needed, | ||
221 | + but nobody will care about that. | ||
222 | + */ | ||
223 | + | ||
224 | + "mov.l @r15+, r4 \n\t" // that | ||
225 | + "mov.l @r15+, r5 \n\t" | ||
226 | + "mov.l @r15+, r6 \n\t" | ||
227 | + "mov.l @r15+, r7 \n\t" | ||
228 | + "fmov.s @r15+, fr5 \n\t" | ||
229 | + "fmov.s @r15+, fr4 \n\t" | ||
230 | + "fmov.s @r15+, fr7 \n\t" | ||
231 | + "fmov.s @r15+, fr6 \n\t" | ||
232 | + "fmov.s @r15+, fr9 \n\t" | ||
233 | + "fmov.s @r15+, fr8 \n\t" | ||
234 | + "fmov.s @r15+, fr11 \n\t" | ||
235 | + "jsr @r0 \n\t" // Invoke method | ||
236 | + "fmov.s @r15+, fr10 \n\t" | ||
237 | + "add r8, r15\n\t" // Pop stack back | ||
238 | + "mov.l @r15+, r8\n\t" // Restore r8 | ||
239 | + "lds.l @r15+, pr\n\t" | ||
240 | + "rts\n\t" | ||
241 | + "mov.l @r15+, r14\n\t" | ||
242 | + ".balign 4\n\t" | ||
243 | + "1: .long copy_to_stack \n\t" | ||
244 | + ); | ||
245 | + | ||
246 | diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_sh.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_sh.cpp | ||
247 | new file mode 100644 | ||
248 | index 0000000..cf9fcea | ||
249 | --- /dev/null | ||
250 | +++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_sh.cpp | ||
251 | @@ -0,0 +1,271 @@ | ||
252 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
253 | +/* ***** BEGIN LICENSE BLOCK ***** | ||
254 | + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | ||
255 | + * | ||
256 | + * The contents of this file are subject to the Mozilla Public License Version | ||
257 | + * 1.1 (the "License"); you may not use this file except in compliance with | ||
258 | + * the License. You may obtain a copy of the License at | ||
259 | + * http://www.mozilla.org/MPL/ | ||
260 | + * | ||
261 | + * Software distributed under the License is distributed on an "AS IS" basis, | ||
262 | + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | ||
263 | + * for the specific language governing rights and limitations under the | ||
264 | + * License. | ||
265 | + * | ||
266 | + * The Original Code is mozilla.org code. | ||
267 | + * | ||
268 | + * The Initial Developer of the Original Code is | ||
269 | + * Netscape Communications Corporation. | ||
270 | + * Portions created by the Initial Developer are Copyright (C) 1999 | ||
271 | + * the Initial Developer. All Rights Reserved. | ||
272 | + * | ||
273 | + * Contributor(s): | ||
274 | + * - Copyright (C) 2008-2009 STMicroelectronics | ||
275 | + * | ||
276 | + * Alternatively, the contents of this file may be used under the terms of | ||
277 | + * either of the GNU General Public License Version 2 or later (the "GPL"), | ||
278 | + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), | ||
279 | + * in which case the provisions of the GPL or the LGPL are applicable instead | ||
280 | + * of those above. If you wish to allow use of your version of this file only | ||
281 | + * under the terms of either the GPL or the LGPL, and not to allow others to | ||
282 | + * use your version of this file under the terms of the MPL, indicate your | ||
283 | + * decision by deleting the provisions above and replace them with the notice | ||
284 | + * and other provisions required by the GPL or the LGPL. If you do not delete | ||
285 | + * the provisions above, a recipient may use your version of this file under | ||
286 | + * the terms of any one of the MPL, the GPL or the LGPL. | ||
287 | + * | ||
288 | + * Based on the neutrino code, with some bug fixes and using the C preprocessor | ||
289 | + * like all the other ports rather than the python script. | ||
290 | + * | ||
291 | + * ***** END LICENSE BLOCK ***** */ | ||
292 | + | ||
293 | +#include "xptcprivate.h" | ||
294 | +#include "xptiprivate.h" | ||
295 | + | ||
296 | +const int c_int_register_params = 3; | ||
297 | +const int c_float_register_params = 8; | ||
298 | + | ||
299 | +/* | ||
300 | + Dispatch function for all stubs. | ||
301 | + | ||
302 | + The parameters to the original function are spread between 'data' which | ||
303 | + is value of the stack pointer when the stub was called, intRegParams which | ||
304 | + points to an area containing the values of r5, r6 and r7 when the stub was | ||
305 | + called and floatRegParams which points to an area containing the values | ||
306 | + of float registers fr4 to fr11 when the stub was called. | ||
307 | + | ||
308 | + */ | ||
309 | +extern "C" nsresult | ||
310 | +PrepareAndDispatch(nsXPTCStubBase* self, int methodIndex, PRUint32* data, | ||
311 | + PRUint32 *intRegParams, float *floatRegParams) | ||
312 | +{ | ||
313 | +#define PARAM_BUFFER_COUNT 16 | ||
314 | + | ||
315 | + nsresult result = NS_ERROR_FAILURE; | ||
316 | + int intCount = 0; | ||
317 | + int floatCount = 0; | ||
318 | + nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; | ||
319 | + nsXPTCMiniVariant* dispatchParams = NULL; | ||
320 | + const nsXPTMethodInfo* info; | ||
321 | + PRUint8 paramCount; | ||
322 | + PRUint8 i; | ||
323 | + | ||
324 | + NS_ASSERTION(self,"no self"); | ||
325 | + | ||
326 | + self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info); | ||
327 | + NS_ASSERTION(info,"no interface info"); | ||
328 | + | ||
329 | + paramCount = info->GetParamCount(); | ||
330 | + | ||
331 | + // setup variant array pointer | ||
332 | + if(paramCount > PARAM_BUFFER_COUNT) | ||
333 | + dispatchParams = new nsXPTCMiniVariant[paramCount]; | ||
334 | + else | ||
335 | + dispatchParams = paramBuffer; | ||
336 | + NS_ASSERTION(dispatchParams,"no place for params"); | ||
337 | + | ||
338 | + for ( i = 0; i < paramCount; ++i ) { | ||
339 | + const nsXPTParamInfo& param = info->GetParam(i); | ||
340 | + nsXPTCMiniVariant* dp = &dispatchParams[i]; | ||
341 | + nsXPTType type = param.IsOut() ? nsXPTType::T_I32 : param.GetType(); | ||
342 | + | ||
343 | + switch ( type ) { | ||
344 | + case nsXPTType::T_I64: | ||
345 | + case nsXPTType::T_U64: | ||
346 | + // Was this passed in a register? | ||
347 | + if ( (c_int_register_params - intCount) >= 2 ) { | ||
348 | + dp->val.i64 = *((PRInt64 *) intRegParams); | ||
349 | + intRegParams += 2; | ||
350 | + intCount += 2; | ||
351 | + } | ||
352 | + else { | ||
353 | + dp->val.i64 = *((PRInt64*) data); | ||
354 | + data += 2; | ||
355 | + } | ||
356 | + break; | ||
357 | + case nsXPTType::T_FLOAT: | ||
358 | + // Was this passed in a register? | ||
359 | + if ( floatCount < c_float_register_params ) { | ||
360 | + dp->val.f = *floatRegParams; | ||
361 | + ++floatCount; | ||
362 | + ++floatRegParams; | ||
363 | + } | ||
364 | + else { | ||
365 | + dp->val.f = *((float*) data); | ||
366 | + ++data; | ||
367 | + } | ||
368 | + break; | ||
369 | + case nsXPTType::T_DOUBLE: | ||
370 | + // Was this passed in a register? | ||
371 | + if ( (c_float_register_params - floatCount) >= 2 ) { | ||
372 | + if ( floatCount & 1 != 0 ) { | ||
373 | + ++floatCount; | ||
374 | + ++floatRegParams; | ||
375 | + } | ||
376 | + dp->val.d = *(double *)floatRegParams; | ||
377 | + floatCount += 2; | ||
378 | + floatRegParams += 2; | ||
379 | + } | ||
380 | + else { | ||
381 | + dp->val.d = *((double *) data); | ||
382 | + data += 2; | ||
383 | + } | ||
384 | + break; | ||
385 | + default: // 32-bit (non-float) value | ||
386 | + // Was this passed in a register? | ||
387 | + if ( intCount < c_int_register_params ) { | ||
388 | + dp->val.i32 = *intRegParams; | ||
389 | + ++intRegParams; | ||
390 | + ++intCount; | ||
391 | + } | ||
392 | + else { | ||
393 | + dp->val.i32 = *data; | ||
394 | + ++data; | ||
395 | + } | ||
396 | + break; | ||
397 | + } | ||
398 | + } | ||
399 | + | ||
400 | + result = self->mOuter->CallMethod((PRUint16)methodIndex, info, dispatchParams); | ||
401 | + | ||
402 | + if(dispatchParams != paramBuffer) | ||
403 | + delete [] dispatchParams; | ||
404 | + | ||
405 | + return result; | ||
406 | +} | ||
407 | + | ||
408 | + | ||
409 | +__asm__ ( | ||
410 | + ".text\n" | ||
411 | + ".little\n" | ||
412 | + ".section .rodata\n" | ||
413 | + | ||
414 | + ".globl SharedStub\n" | ||
415 | + ".type SharedStub, @function\n" | ||
416 | + "SharedStub:\n" | ||
417 | + "mov r15, r1\n" | ||
418 | + "mov.l r14,@-r15\n" | ||
419 | + "sts.l pr,@-r15\n" | ||
420 | + "mov r15, r14\n" | ||
421 | + | ||
422 | + /* Some parameters might have been passed in registers, so push them | ||
423 | + * all onto the stack, PrepareAndDispatch can then work out whats what | ||
424 | + * given method type information. | ||
425 | + */ | ||
426 | + "mov.l r7, @-r15\n" | ||
427 | + "mov.l r6, @-r15\n" | ||
428 | + "mov.l r5, @-r15\n" | ||
429 | + "mov r15, r7\n" /* r7 = PrepareAndDispatch intRegParams param */ | ||
430 | + | ||
431 | + "fmov.s fr10, @-r15\n" | ||
432 | + "fmov.s fr11, @-r15\n" | ||
433 | + "fmov.s fr8, @-r15\n" | ||
434 | + "fmov.s fr9, @-r15\n" | ||
435 | + "fmov.s fr6, @-r15\n" | ||
436 | + "fmov.s fr7, @-r15\n" | ||
437 | + "fmov.s fr4, @-r15\n" | ||
438 | + "fmov.s fr5, @-r15\n" | ||
439 | + "mov.l r15, @-r15\n" /* PrepareAndDispatch floatRegParams param */ | ||
440 | + | ||
441 | + "mov r1, r6\n" /* r6 = PrepareAndDispatch data param */ | ||
442 | + | ||
443 | + "mov.l 1f, r1\n" | ||
444 | + "jsr @r1\n" /* Note, following instruction is executed first*/ | ||
445 | + "mov r2, r5\n" /* r5 = PrepareAndDispatch methodIndex param */ | ||
446 | + | ||
447 | + "mov r14,r15\n" | ||
448 | + "lds.l @r15+,pr\n" | ||
449 | + "mov.l @r15+,r14\n" | ||
450 | + "rts\n" | ||
451 | + "nop\n" | ||
452 | + ".align 2\n" | ||
453 | + "1:\n" | ||
454 | + ".long PrepareAndDispatch\n" | ||
455 | + ); | ||
456 | + | ||
457 | +#define STUB_ENTRY(n) \ | ||
458 | +__asm__( \ | ||
459 | + ".text\n" \ | ||
460 | + ".align 1 \n" \ | ||
461 | + ".if " #n " < 10\n\t" \ | ||
462 | + ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ | ||
463 | + ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n"\ | ||
464 | + "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ | ||
465 | + ".elseif " #n " < 100\n\t" \ | ||
466 | + ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ | ||
467 | + ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n"\ | ||
468 | + "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ | ||
469 | + ".elseif " #n " < 1000\n\t" \ | ||
470 | + ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ | ||
471 | + ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n"\ | ||
472 | + "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ | ||
473 | + ".else\n\t" \ | ||
474 | + ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ | ||
475 | + ".endif\n\t" \ | ||
476 | + "mov.l 1f, r1 \n" \ | ||
477 | + ".if "#n" < 128 \n" \ | ||
478 | + "jmp @r1 \n" \ | ||
479 | + " mov #"#n",r2 \n" \ | ||
480 | + ".elseif "#n" < 256 \n" \ | ||
481 | + "mov #"#n", r2 \n" \ | ||
482 | + "jmp @r1 \n" \ | ||
483 | + " extu.b r2, r2 \n" \ | ||
484 | + ".else \n" \ | ||
485 | + "mov #"#n" & 0xff,r2 \n" \ | ||
486 | + "extu.b r2, r2 \n" \ | ||
487 | + "mov #"#n">>8, r3 \n" \ | ||
488 | + "shll8 r3 \n" \ | ||
489 | + "jmp @r1 \n" \ | ||
490 | + " or r3, r2 \n" \ | ||
491 | + ".endif \n" \ | ||
492 | + ".if "#n" % 20 == 0\n" \ | ||
493 | + ".align 2\n" \ | ||
494 | + "1:\n" \ | ||
495 | + ".long SharedStub\n" \ | ||
496 | + ".endif\n" \ | ||
497 | + ); | ||
498 | + | ||
499 | + | ||
500 | +/* Due to the fact that the SH4 can only load forward labels, we have | ||
501 | + * to use sentinel_entry to output the last label. A better solution | ||
502 | + * would be to introduce a STUB_LAST macro in the defs.in file, but | ||
503 | + * this will do for now | ||
504 | + */ | ||
505 | + | ||
506 | +#define SENTINEL_ENTRY(n) \ | ||
507 | +__asm__( \ | ||
508 | +".if "#n" == 0 \n" \ | ||
509 | + ".text \n" \ | ||
510 | + ".align 2\n" \ | ||
511 | + "1:\n" \ | ||
512 | + ".long SharedStub\n" \ | ||
513 | +".endif\n" \ | ||
514 | +); \ | ||
515 | + \ | ||
516 | +nsresult nsXPTCStubBase::Sentinel##n() \ | ||
517 | +{ \ | ||
518 | + NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ | ||
519 | + return NS_ERROR_NOT_IMPLEMENTED; \ | ||
520 | +} | ||
521 | + | ||
522 | +#include "xptcstubsdef.inc" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Allow-ipc-code-to-build-on-GNU-Hurd.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Allow-ipc-code-to-build-on-GNU-Hurd.patch new file mode 100644 index 0000000..bf73dc0 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Allow-ipc-code-to-build-on-GNU-Hurd.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Fri, 5 Aug 2011 11:24:58 +0200 | ||
3 | Subject: Allow ipc code to build on GNU/Hurd | ||
4 | |||
5 | --- | ||
6 | ipc/chromium/src/base/debug_util_posix.cc | 1 - | ||
7 | ipc/chromium/src/base/third_party/nspr/prcpucfg.h | 2 +- | ||
8 | ipc/chromium/src/build/build_config.h | 2 +- | ||
9 | 3 files changed, 2 insertions(+), 3 deletions(-) | ||
10 | |||
11 | diff --git a/ipc/chromium/src/base/debug_util_posix.cc b/ipc/chromium/src/base/debug_util_posix.cc | ||
12 | index 72a4ebf..5a45ac9 100644 | ||
13 | --- a/ipc/chromium/src/base/debug_util_posix.cc | ||
14 | +++ b/ipc/chromium/src/base/debug_util_posix.cc | ||
15 | @@ -17,7 +17,6 @@ | ||
16 | #include <unistd.h> | ||
17 | #if MOZ_HAVE_EXECINFO_H | ||
18 | #include <execinfo.h> | ||
19 | -#include <sys/sysctl.h> | ||
20 | #endif | ||
21 | |||
22 | #include "base/basictypes.h" | ||
23 | diff --git a/ipc/chromium/src/base/third_party/nspr/prcpucfg.h b/ipc/chromium/src/base/third_party/nspr/prcpucfg.h | ||
24 | index 30fef1b..c7e47ba 100644 | ||
25 | --- a/ipc/chromium/src/base/third_party/nspr/prcpucfg.h | ||
26 | +++ b/ipc/chromium/src/base/third_party/nspr/prcpucfg.h | ||
27 | @@ -34,7 +34,7 @@ | ||
28 | #include "base/third_party/nspr/prcpucfg_win.h" | ||
29 | #elif defined(__APPLE__) | ||
30 | #include "base/third_party/nspr/prcpucfg_mac.h" | ||
31 | -#elif defined(__linux__) || defined(ANDROID) || defined(__GLIBC__) | ||
32 | +#elif defined(__linux__) || defined(ANDROID) || defined(__GLIBC__) || defined(__GNU__) | ||
33 | #include "base/third_party/nspr/prcpucfg_linux.h" | ||
34 | #elif defined(__OpenBSD__) | ||
35 | #include "base/third_party/nspr/prcpucfg_openbsd.h" | ||
36 | diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h | ||
37 | index 4ef0c76..463b3d9 100644 | ||
38 | --- a/ipc/chromium/src/build/build_config.h | ||
39 | +++ b/ipc/chromium/src/build/build_config.h | ||
40 | @@ -17,7 +17,7 @@ | ||
41 | // A set of macros to use for platform detection. | ||
42 | #if defined(__APPLE__) | ||
43 | #define OS_MACOSX 1 | ||
44 | -#elif defined(__linux__) || defined(ANDROID) || defined(__GLIBC__) | ||
45 | +#elif defined(__linux__) || defined(ANDROID) || defined(__GLIBC__) || defined(__GNU__) | ||
46 | #define OS_LINUX 1 | ||
47 | #elif defined(__OpenBSD__) | ||
48 | #define OS_OPENBSD 1 | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Allow-ipc-code-to-build-on-GNU-kfreebsd.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Allow-ipc-code-to-build-on-GNU-kfreebsd.patch new file mode 100644 index 0000000..5c680f6 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Allow-ipc-code-to-build-on-GNU-kfreebsd.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Thu, 30 Jun 2011 18:29:22 +0200 | ||
3 | Subject: Allow ipc code to build on GNU/kfreebsd | ||
4 | |||
5 | --- | ||
6 | ipc/chromium/src/base/platform_thread_posix.cc | 4 ++++ | ||
7 | ipc/chromium/src/base/third_party/nspr/prcpucfg.h | 2 +- | ||
8 | ipc/chromium/src/build/build_config.h | 2 +- | ||
9 | 3 files changed, 6 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/ipc/chromium/src/base/platform_thread_posix.cc b/ipc/chromium/src/base/platform_thread_posix.cc | ||
12 | index e3f49c7..f1d3b2f 100644 | ||
13 | --- a/ipc/chromium/src/base/platform_thread_posix.cc | ||
14 | +++ b/ipc/chromium/src/base/platform_thread_posix.cc | ||
15 | @@ -37,7 +37,11 @@ PlatformThreadId PlatformThread::CurrentId() { | ||
16 | // TODO(BSD): find a better thread ID | ||
17 | return (intptr_t)(pthread_self()); | ||
18 | #elif defined(OS_LINUX) | ||
19 | +#ifdef __NR_gettid | ||
20 | return syscall(__NR_gettid); | ||
21 | +#else | ||
22 | + return getpid(); | ||
23 | +#endif | ||
24 | #endif | ||
25 | } | ||
26 | |||
27 | diff --git a/ipc/chromium/src/base/third_party/nspr/prcpucfg.h b/ipc/chromium/src/base/third_party/nspr/prcpucfg.h | ||
28 | index ef40994..30fef1b 100644 | ||
29 | --- a/ipc/chromium/src/base/third_party/nspr/prcpucfg.h | ||
30 | +++ b/ipc/chromium/src/base/third_party/nspr/prcpucfg.h | ||
31 | @@ -34,7 +34,7 @@ | ||
32 | #include "base/third_party/nspr/prcpucfg_win.h" | ||
33 | #elif defined(__APPLE__) | ||
34 | #include "base/third_party/nspr/prcpucfg_mac.h" | ||
35 | -#elif defined(__linux__) || defined(ANDROID) | ||
36 | +#elif defined(__linux__) || defined(ANDROID) || defined(__GLIBC__) | ||
37 | #include "base/third_party/nspr/prcpucfg_linux.h" | ||
38 | #elif defined(__OpenBSD__) | ||
39 | #include "base/third_party/nspr/prcpucfg_openbsd.h" | ||
40 | diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h | ||
41 | index 0952ab1..4ef0c76 100644 | ||
42 | --- a/ipc/chromium/src/build/build_config.h | ||
43 | +++ b/ipc/chromium/src/build/build_config.h | ||
44 | @@ -17,7 +17,7 @@ | ||
45 | // A set of macros to use for platform detection. | ||
46 | #if defined(__APPLE__) | ||
47 | #define OS_MACOSX 1 | ||
48 | -#elif defined(__linux__) || defined(ANDROID) | ||
49 | +#elif defined(__linux__) || defined(ANDROID) || defined(__GLIBC__) | ||
50 | #define OS_LINUX 1 | ||
51 | #elif defined(__OpenBSD__) | ||
52 | #define OS_OPENBSD 1 | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-698923-Don-t-require-16-bytes-alignment-for-VMFr.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-698923-Don-t-require-16-bytes-alignment-for-VMFr.patch new file mode 100644 index 0000000..83907bf --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-698923-Don-t-require-16-bytes-alignment-for-VMFr.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Fri, 18 Nov 2011 11:27:29 +0100 | ||
3 | Subject: Bug 698923 - Don't require 16 bytes alignment for VMFrame on sparc | ||
4 | |||
5 | --- | ||
6 | js/src/methodjit/MethodJIT.cpp | 2 +- | ||
7 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
8 | |||
9 | diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp | ||
10 | index 4f7f5db..c3d01cb 100644 | ||
11 | --- a/js/src/methodjit/MethodJIT.cpp | ||
12 | +++ b/js/src/methodjit/MethodJIT.cpp | ||
13 | @@ -257,7 +257,7 @@ JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); | ||
14 | #if defined(__GNUC__) && !defined(_WIN64) | ||
15 | |||
16 | /* If this assert fails, you need to realign VMFrame to 16 bytes. */ | ||
17 | -#ifdef JS_CPU_ARM | ||
18 | +#if defined(JS_CPU_ARM) || defined(JS_CPU_SPARC) | ||
19 | JS_STATIC_ASSERT(sizeof(VMFrame) % 8 == 0); | ||
20 | #else | ||
21 | JS_STATIC_ASSERT(sizeof(VMFrame) % 16 == 0); | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-703531-Fix-ARMAssembler-getOp2RegScale-on-ARMv5.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-703531-Fix-ARMAssembler-getOp2RegScale-on-ARMv5.patch new file mode 100644 index 0000000..509b46a --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-703531-Fix-ARMAssembler-getOp2RegScale-on-ARMv5.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Fri, 18 Nov 2011 11:32:09 +0100 | ||
3 | Subject: Bug 703531 - Fix ARMAssembler::getOp2RegScale on < ARMv5 | ||
4 | |||
5 | --- | ||
6 | js/src/assembler/assembler/ARMAssembler.cpp | 4 ++-- | ||
7 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
8 | |||
9 | diff --git a/js/src/assembler/assembler/ARMAssembler.cpp b/js/src/assembler/assembler/ARMAssembler.cpp | ||
10 | index 78b8a7d..0458446 100644 | ||
11 | --- a/js/src/assembler/assembler/ARMAssembler.cpp | ||
12 | +++ b/js/src/assembler/assembler/ARMAssembler.cpp | ||
13 | @@ -112,10 +112,10 @@ ARMWord ARMAssembler::getOp2RegScale(RegisterID reg, ARMWord scale) | ||
14 | : // No clobbers. | ||
15 | ); | ||
16 | #else | ||
17 | - ARMWord lz = 0; // Accumulate leading zeroes. | ||
18 | + lz = 0; // Accumulate leading zeroes. | ||
19 | for (ARMWord s = 16; s > 0; s /= 2) { | ||
20 | ARMWord mask = 0xffffffff << (32-lz-s); | ||
21 | - if ((x & mask) == 0) { | ||
22 | + if ((scale & mask) == 0) { | ||
23 | lz += s; | ||
24 | } | ||
25 | } | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-703534-Fix-build-failure-on-platforms-without-YA.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-703534-Fix-build-failure-on-platforms-without-YA.patch new file mode 100644 index 0000000..981e7a7 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-703534-Fix-build-failure-on-platforms-without-YA.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Fri, 18 Nov 2011 11:55:49 +0100 | ||
3 | Subject: Bug 703534 - Fix build failure on platforms without YARR JIT | ||
4 | |||
5 | --- | ||
6 | js/src/jscompartment.cpp | 1 - | ||
7 | 1 file changed, 1 deletion(-) | ||
8 | |||
9 | diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp | ||
10 | index 721c38e..af5a96e 100644 | ||
11 | --- a/js/src/jscompartment.cpp | ||
12 | +++ b/js/src/jscompartment.cpp | ||
13 | @@ -50,7 +50,6 @@ | ||
14 | #include "jswatchpoint.h" | ||
15 | #include "jswrapper.h" | ||
16 | #include "assembler/wtf/Platform.h" | ||
17 | -#include "assembler/jit/ExecutableAllocator.h" | ||
18 | #include "yarr/BumpPointerAllocator.h" | ||
19 | #include "methodjit/MethodJIT.h" | ||
20 | #include "methodjit/PolyIC.h" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-703833-Avoid-invalid-conversion-from-const-size_.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-703833-Avoid-invalid-conversion-from-const-size_.patch new file mode 100644 index 0000000..e4e339e --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-703833-Avoid-invalid-conversion-from-const-size_.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From: Mike Hommey <mh+mozilla@glandium.org> | ||
2 | Date: Sat, 19 Nov 2011 09:44:10 +0100 | ||
3 | Subject: Bug 703833 - Avoid invalid conversion from 'const size_t*' to 'const | ||
4 | jsuword*' on s390 | ||
5 | |||
6 | --- | ||
7 | js/src/jsgc.cpp | 4 ++-- | ||
8 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp | ||
11 | index e8818d1..f25f0a5 100644 | ||
12 | --- a/js/src/jsgc.cpp | ||
13 | +++ b/js/src/jsgc.cpp | ||
14 | @@ -1052,8 +1052,8 @@ MarkStackRangeConservatively(JSTracer *trc, Value *beginv, Value *endv) | ||
15 | ~AutoSkipChecking() { runtime->gcCheckCompartment = savedCompartment; } | ||
16 | } as(trc->context->runtime); | ||
17 | |||
18 | - const jsuword *begin = beginv->payloadWord(); | ||
19 | - const jsuword *end = endv->payloadWord(); | ||
20 | + const jsuword *begin = (const jsuword *) beginv->payloadWord(); | ||
21 | + const jsuword *end = (const jsuword *) endv->payloadWord();; | ||
22 | #ifdef JS_NUNBOX32 | ||
23 | /* | ||
24 | * With 64-bit jsvals on 32-bit systems, we can optimize a bit by | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-703842-Avoid-R_SPARC_WDISP22-relocation-in-Tramp.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-703842-Avoid-R_SPARC_WDISP22-relocation-in-Tramp.patch new file mode 100644 index 0000000..c687ff4 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-703842-Avoid-R_SPARC_WDISP22-relocation-in-Tramp.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From: Mike Hommey <mh+mozilla@glandium.org> | ||
2 | Date: Sat, 19 Nov 2011 09:37:34 +0100 | ||
3 | Subject: Bug 703842 - Avoid R_SPARC_WDISP22 relocation in TrampolineSparc.s | ||
4 | |||
5 | --- | ||
6 | js/src/methodjit/TrampolineSparc.s | 3 ++- | ||
7 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
8 | |||
9 | diff --git a/js/src/methodjit/TrampolineSparc.s b/js/src/methodjit/TrampolineSparc.s | ||
10 | index 0fa9cfd..1b15369 100644 | ||
11 | --- a/js/src/methodjit/TrampolineSparc.s | ||
12 | +++ b/js/src/methodjit/TrampolineSparc.s | ||
13 | @@ -112,7 +112,7 @@ throwpoline_exit: | ||
14 | JaegerInterpolineScripted: | ||
15 | ld [%l0 + 0x10], %l0 /* Load f->prev_ */ | ||
16 | st %l0, [%fp - 36] /* Update f->regs->fp_ */ | ||
17 | - ba JaegerInterpoline | ||
18 | + ba interpoline_enter | ||
19 | nop | ||
20 | .size JaegerInterpolineScripted, . - JaegerInterpolineScripted | ||
21 | |||
22 | @@ -120,6 +120,7 @@ JaegerInterpolineScripted: | ||
23 | .global JaegerInterpoline | ||
24 | .type JaegerInterpoline, #function | ||
25 | JaegerInterpoline: | ||
26 | +interpoline_enter: | ||
27 | mov %o0,%o2 | ||
28 | mov %l3,%o0 | ||
29 | mov %l2,%o1 | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-706787-Crash-on-s390x-nsXPCComponents-AttachNewC.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-706787-Crash-on-s390x-nsXPCComponents-AttachNewC.patch new file mode 100644 index 0000000..c20e218 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-706787-Crash-on-s390x-nsXPCComponents-AttachNewC.patch | |||
@@ -0,0 +1,78 @@ | |||
1 | From: Martin Stransky <stransky@redhat.com> | ||
2 | Date: Mon, 5 Dec 2011 10:49:56 +0100 | ||
3 | Subject: Bug 706787 - Crash on s390x | ||
4 | (nsXPCComponents::AttachNewComponentsObject() fails). r=glandium | ||
5 | |||
6 | --- | ||
7 | .../xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp | 50 ++++---------------- | ||
8 | 1 file changed, 9 insertions(+), 41 deletions(-) | ||
9 | |||
10 | diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp | ||
11 | index c12482a..ec9dd98 100644 | ||
12 | --- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp | ||
13 | +++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp | ||
14 | @@ -194,55 +194,23 @@ invoke_copy_to_stack(PRUint32 paramCount, nsXPTCVariant* s, PRUint64* d_ov, PRUi | ||
15 | } | ||
16 | } | ||
17 | |||
18 | +typedef nsresult (*vtable_func)(nsISupports *, PRUint64, PRUint64, PRUint64, PRUint64, double, double, double, double); | ||
19 | + | ||
20 | EXPORT_XPCOM_API(nsresult) | ||
21 | NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, | ||
22 | PRUint32 paramCount, nsXPTCVariant* params) | ||
23 | { | ||
24 | - PRUint64 *vtable = *(PRUint64 **)that; | ||
25 | - PRUint64 method = vtable[methodIndex]; | ||
26 | + vtable_func *vtable = *reinterpret_cast<vtable_func **>(that); | ||
27 | + vtable_func method = vtable[methodIndex]; | ||
28 | PRUint64 overflow = invoke_count_words (paramCount, params); | ||
29 | + PRUint64 *stack_space = reinterpret_cast<PRUint64 *>(__builtin_alloca((overflow + 8 /* 4 64-bits gpr + 4 64-bits fpr */) * 8)); | ||
30 | PRUint64 result; | ||
31 | |||
32 | - __asm__ __volatile__ | ||
33 | - ( | ||
34 | - "lgr 7,15\n\t" | ||
35 | - "aghi 7,-64\n\t" | ||
36 | - | ||
37 | - "lgr 3,%3\n\t" | ||
38 | - "sllg 3,3,3\n\t" | ||
39 | - "lcgr 3,3\n\t" | ||
40 | - "lg 2,0(15)\n\t" | ||
41 | - "la 15,0(3,7)\n\t" | ||
42 | - "stg 2,0(15)\n\t" | ||
43 | - | ||
44 | - "lgr 2,%1\n\t" | ||
45 | - "lgr 3,%2\n\t" | ||
46 | - "la 4,160(15)\n\t" | ||
47 | - "lgr 5,%3\n\t" | ||
48 | - "basr 14,%4\n\t" | ||
49 | - | ||
50 | - "lgr 2,%5\n\t" | ||
51 | - "ld 0,192(7)\n\t" | ||
52 | - "ld 2,200(7)\n\t" | ||
53 | - "ld 4,208(7)\n\t" | ||
54 | - "ld 6,216(7)\n\t" | ||
55 | - "lmg 3,6,160(7)\n\t" | ||
56 | - "basr 14,%6\n\t" | ||
57 | + invoke_copy_to_stack(paramCount, params, stack_space, overflow); | ||
58 | |||
59 | - "la 15,64(7)\n\t" | ||
60 | + PRUint64 *d_gpr = stack_space + overflow; | ||
61 | + double *d_fpr = reinterpret_cast<double *>(d_gpr + 4); | ||
62 | |||
63 | - "lgr %0,2\n\t" | ||
64 | - : "=r" (result) | ||
65 | - : "r" ((PRUint64)paramCount), | ||
66 | - "r" (params), | ||
67 | - "r" (overflow), | ||
68 | - "a" (invoke_copy_to_stack), | ||
69 | - "a" (that), | ||
70 | - "a" (method) | ||
71 | - : "2", "3", "4", "5", "6", "7", "14", "cc", "memory", | ||
72 | - "%f0", "%f1", "%f2", "%f3", "%f4", "%f5", "%f6", "%f7" | ||
73 | - ); | ||
74 | - | ||
75 | - return result; | ||
76 | + return method(that, d_gpr[0], d_gpr[1], d_gpr[2], d_gpr[3], d_fpr[0], d_fpr[1], d_fpr[2], d_fpr[3]); | ||
77 | } | ||
78 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-711353-Add-support-for-GNU-kFreeBSD-and-GNU-Hurd.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-711353-Add-support-for-GNU-kFreeBSD-and-GNU-Hurd.patch new file mode 100644 index 0000000..721caf4 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-711353-Add-support-for-GNU-kFreeBSD-and-GNU-Hurd.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | From: Mike Hommey <mh+mozilla@glandium.org> | ||
2 | Date: Fri, 16 Dec 2011 11:29:43 +0100 | ||
3 | Subject: Bug 711353 - Add support for GNU/kFreeBSD and GNU/Hurd to | ||
4 | gfx/angle/src/compiler/osinclude.h | ||
5 | |||
6 | --- | ||
7 | gfx/angle/src/compiler/osinclude.h | 3 ++- | ||
8 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/gfx/angle/src/compiler/osinclude.h b/gfx/angle/src/compiler/osinclude.h | ||
11 | index dacdc22..6e84774 100644 | ||
12 | --- a/gfx/angle/src/compiler/osinclude.h | ||
13 | +++ b/gfx/angle/src/compiler/osinclude.h | ||
14 | @@ -16,7 +16,8 @@ | ||
15 | #define ANGLE_OS_WIN | ||
16 | #elif defined(__APPLE__) || defined(__linux__) || \ | ||
17 | defined(__FreeBSD__) || defined(__OpenBSD__) || \ | ||
18 | - defined(__sun) || defined(ANDROID) | ||
19 | + defined(__sun) || defined(ANDROID) || \ | ||
20 | + defined(__GLIBC__) || defined(__GNU__) | ||
21 | #define ANGLE_OS_POSIX | ||
22 | #else | ||
23 | #error Unsupported platform. | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-747870-Properly-align-XPCLazyCallContext-mData.-.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-747870-Properly-align-XPCLazyCallContext-mData.-.patch new file mode 100644 index 0000000..ea01a1c --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Bug-747870-Properly-align-XPCLazyCallContext-mData.-.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Mon, 23 Apr 2012 12:32:10 +0200 | ||
3 | Subject: Bug 747870 - Properly align XPCLazyCallContext::mData. r=bholley | ||
4 | |||
5 | --- | ||
6 | js/xpconnect/src/xpcprivate.h | 13 +++++++------ | ||
7 | 1 file changed, 7 insertions(+), 6 deletions(-) | ||
8 | |||
9 | diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h | ||
10 | index d57f66e..ca23216 100644 | ||
11 | --- a/js/xpconnect/src/xpcprivate.h | ||
12 | +++ b/js/xpconnect/src/xpcprivate.h | ||
13 | @@ -1328,12 +1328,13 @@ public: | ||
14 | XPCCallContext &GetXPCCallContext() | ||
15 | { | ||
16 | if (!mCcx) { | ||
17 | + XPCCallContext *data = mData.addr(); | ||
18 | mCcxToDestroy = mCcx = | ||
19 | - new (mData) XPCCallContext(mCallerLanguage, mCx, | ||
20 | - mCallBeginRequest == CALL_BEGINREQUEST, | ||
21 | - mObj, | ||
22 | - mFlattenedJSObject, mWrapper, | ||
23 | - mTearOff); | ||
24 | + new (data) XPCCallContext(mCallerLanguage, mCx, | ||
25 | + mCallBeginRequest == CALL_BEGINREQUEST, | ||
26 | + mObj, | ||
27 | + mFlattenedJSObject, mWrapper, | ||
28 | + mTearOff); | ||
29 | if (!mCcx->IsValid()) { | ||
30 | NS_ERROR("This is not supposed to fail!"); | ||
31 | } | ||
32 | @@ -1361,7 +1362,7 @@ private: | ||
33 | JSObject *mFlattenedJSObject; | ||
34 | XPCWrappedNative *mWrapper; | ||
35 | XPCWrappedNativeTearOff *mTearOff; | ||
36 | - char mData[sizeof(XPCCallContext)]; | ||
37 | + mozilla::AlignedStorage2<XPCCallContext> mData; | ||
38 | }; | ||
39 | |||
40 | /*************************************************************************** | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Fix-GNU-non-Linux-failure-to-build-because-of-ipc-ch.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Fix-GNU-non-Linux-failure-to-build-because-of-ipc-ch.patch new file mode 100644 index 0000000..6ef2226 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/porting/Fix-GNU-non-Linux-failure-to-build-because-of-ipc-ch.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Fri, 18 Nov 2011 11:28:30 +0100 | ||
3 | Subject: Fix GNU/non-Linux failure to build because of | ||
4 | ipc/chromium/src/base/dir_reader_posix.h | ||
5 | |||
6 | --- | ||
7 | ipc/chromium/src/base/dir_reader_posix.h | 4 ++-- | ||
8 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git a/ipc/chromium/src/base/dir_reader_posix.h b/ipc/chromium/src/base/dir_reader_posix.h | ||
11 | index f591ae0..4b74a08 100644 | ||
12 | --- a/ipc/chromium/src/base/dir_reader_posix.h | ||
13 | +++ b/ipc/chromium/src/base/dir_reader_posix.h | ||
14 | @@ -18,7 +18,7 @@ | ||
15 | // seems worse than falling back to enumerating all file descriptors so we will | ||
16 | // probably never implement this on the Mac. | ||
17 | |||
18 | -#if defined(OS_LINUX) | ||
19 | +#if defined(OS_LINUX) && defined(__linux__) | ||
20 | #include "base/dir_reader_linux.h" | ||
21 | #else | ||
22 | #include "base/dir_reader_fallback.h" | ||
23 | @@ -26,7 +26,7 @@ | ||
24 | |||
25 | namespace base { | ||
26 | |||
27 | -#if defined(OS_LINUX) | ||
28 | +#if defined(OS_LINUX) && defined(__linux__) | ||
29 | typedef DirReaderLinux DirReaderPosix; | ||
30 | #else | ||
31 | typedef DirReaderFallback DirReaderPosix; | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/powerpc_va_list.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/powerpc_va_list.patch new file mode 100644 index 0000000..e91e09a --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/powerpc_va_list.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | --- mozilla-release.ORIG/xpcom/glue/nsTextFormatter.cpp 2009-07-30 09:30:35.000000000 -0600 | ||
2 | +++ mozilla-release/xpcom/glue/nsTextFormatter.cpp 2010-03-24 15:48:24.000000000 -0600 | ||
3 | @@ -70,7 +70,10 @@ | ||
4 | ** Note: on some platforms va_list is defined as an array, | ||
5 | ** and requires array notation. | ||
6 | */ | ||
7 | - | ||
8 | +#if defined(__powerpc__) | ||
9 | +#define HAVE_VA_LIST_AS_ARRAY | ||
10 | +#endif | ||
11 | + | ||
12 | #ifdef HAVE_VA_COPY | ||
13 | #define VARARGS_ASSIGN(foo, bar) VA_COPY(foo,bar) | ||
14 | #elif defined(HAVE_VA_LIST_AS_ARRAY) | ||
15 | |||
16 | diff -ur mozilla-release.ORIG/js/src/jsapi.cpp mozilla-release/js/src/jsapi.cpp | ||
17 | --- mozilla-release.ORIG/js/src/jsapi.cpp 2012-02-15 23:40:35.000000000 -0700 | ||
18 | +++ mozilla-release/js/src/jsapi.cpp 2012-03-01 17:01:41.716770994 -0700 | ||
19 | @@ -108,6 +108,10 @@ | ||
20 | #include "jsxml.h" | ||
21 | #endif | ||
22 | |||
23 | +#if defined(__powerpc__) | ||
24 | +#define HAVE_VA_LIST_AS_ARRAY | ||
25 | +#endif | ||
26 | + | ||
27 | using namespace js; | ||
28 | using namespace js::gc; | ||
29 | using namespace js::types; | ||
30 | |||
31 | diff -ur mozilla-release.ORIG/js/src/jsprf.cpp mozilla-release/js/src/jsprf.cpp | ||
32 | --- mozilla-release.ORIG/js/src/jsprf.cpp 2012-02-15 23:40:35.000000000 -0700 | ||
33 | +++ mozilla-release/js/src/jsprf.cpp 2012-03-01 17:01:41.348769842 -0700 | ||
34 | @@ -57,6 +57,10 @@ | ||
35 | ** Note: on some platforms va_list is defined as an array, | ||
36 | ** and requires array notation. | ||
37 | */ | ||
38 | +#if defined(__powerpc__) | ||
39 | +#define HAVE_VA_LIST_AS_ARRAY | ||
40 | +#endif | ||
41 | + | ||
42 | #ifdef HAVE_VA_COPY | ||
43 | #define VARARGS_ASSIGN(foo, bar) VA_COPY(foo,bar) | ||
44 | #elif defined(HAVE_VA_LIST_AS_ARRAY) | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Don-t-auto-disable-extensions-in-system-directories.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Don-t-auto-disable-extensions-in-system-directories.patch new file mode 100644 index 0000000..f01ac83 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Don-t-auto-disable-extensions-in-system-directories.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Fri, 17 Feb 2012 17:47:15 +0100 | ||
3 | Subject: Don't auto-disable extensions in system directories | ||
4 | |||
5 | --- | ||
6 | browser/app/profile/firefox.js | 2 +- | ||
7 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
8 | |||
9 | diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js | ||
10 | index 3d979c2..6d72e8d 100644 | ||
11 | --- a/browser/app/profile/firefox.js | ||
12 | +++ b/browser/app/profile/firefox.js | ||
13 | @@ -88,7 +88,7 @@ pref("extensions.hotfix.certs.1.sha1Fingerprint", "CA:C4:7D:BF:63:4D:24:E9:DC:93 | ||
14 | // Disable add-ons installed into the shared user and shared system areas by | ||
15 | // default. This does not include the application directory. See the SCOPE | ||
16 | // constants in AddonManager.jsm for values to use here | ||
17 | -pref("extensions.autoDisableScopes", 15); | ||
18 | +pref("extensions.autoDisableScopes", 3); | ||
19 | |||
20 | // Dictionary download preference | ||
21 | pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Enable-intl.locale.matchOS-and-report-the-locale-cor.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Enable-intl.locale.matchOS-and-report-the-locale-cor.patch new file mode 100644 index 0000000..773b61a --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Enable-intl.locale.matchOS-and-report-the-locale-cor.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Thu, 13 Mar 2008 20:28:02 +0100 | ||
3 | Subject: Enable intl.locale.matchOS, and report the locale correctly | ||
4 | |||
5 | https://bugzilla.mozilla.org/show_bug.cgi?id=331779 | ||
6 | --- | ||
7 | xulrunner/app/xulrunner.js | 3 ++- | ||
8 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/xulrunner/app/xulrunner.js b/xulrunner/app/xulrunner.js | ||
11 | index 880593c..0a0f5a9 100644 | ||
12 | --- a/xulrunner/app/xulrunner.js | ||
13 | +++ b/xulrunner/app/xulrunner.js | ||
14 | @@ -39,7 +39,8 @@ | ||
15 | // We need to override the default values of these preferences since all.js | ||
16 | // assumes these are in the navigator package, which for us is nonexistent. | ||
17 | // XXX(darin): perhaps all.js should not be seamonkey specific | ||
18 | -pref("general.useragent.locale", "@AB_CD@"); | ||
19 | +pref("intl.locale.matchOS", true); | ||
20 | +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); | ||
21 | pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul"); | ||
22 | pref("xpinstall.dialog.progress.chrome", "chrome://mozapps/content/extensions/extensions.xul"); | ||
23 | pref("xpinstall.dialog.progress.skin", "chrome://mozapps/content/extensions/extensions.xul"); | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch new file mode 100644 index 0000000..68034fc --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From: Mike Hommey <mh@glandium.org> | ||
2 | Date: Sat, 18 Oct 2008 14:30:06 +0200 | ||
3 | Subject: Remove general.useragent.locale prefs from firefox*.js | ||
4 | |||
5 | It is better defined in the GRE provided by xulrunner-1.9 | ||
6 | --- | ||
7 | browser/app/profile/firefox.js | 1 - | ||
8 | browser/locales/en-US/firefox-l10n.js | 1 - | ||
9 | 2 files changed, 2 deletions(-) | ||
10 | |||
11 | diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js | ||
12 | index 4f3aac3..3d979c2 100644 | ||
13 | --- a/browser/app/profile/firefox.js | ||
14 | +++ b/browser/app/profile/firefox.js | ||
15 | @@ -229,7 +229,6 @@ pref("keyword.enabled", true); | ||
16 | // "use the search service's default engine" | ||
17 | pref("keyword.URL", ""); | ||
18 | |||
19 | -pref("general.useragent.locale", "@AB_CD@"); | ||
20 | pref("general.skins.selectedSkin", "classic/1.0"); | ||
21 | |||
22 | pref("general.smoothScroll", false); | ||
23 | diff --git a/browser/locales/en-US/firefox-l10n.js b/browser/locales/en-US/firefox-l10n.js | ||
24 | index e9027aa..a683b7f 100644 | ||
25 | --- a/browser/locales/en-US/firefox-l10n.js | ||
26 | +++ b/browser/locales/en-US/firefox-l10n.js | ||
27 | @@ -36,4 +36,3 @@ | ||
28 | |||
29 | #filter substitution | ||
30 | |||
31 | -pref("general.useragent.locale", "@AB_CD@"); | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Set-DPI-to-system-settings.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Set-DPI-to-system-settings.patch new file mode 100644 index 0000000..9058cd4 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Set-DPI-to-system-settings.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Thu, 13 Mar 2008 20:30:19 +0100 | ||
3 | Subject: Set DPI to system settings | ||
4 | |||
5 | --- | ||
6 | modules/libpref/src/init/all.js | 2 +- | ||
7 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
8 | |||
9 | diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js | ||
10 | index 3c0a70c..10b82bb 100644 | ||
11 | --- a/modules/libpref/src/init/all.js | ||
12 | +++ b/modules/libpref/src/init/all.js | ||
13 | @@ -1397,7 +1397,7 @@ pref("layout.css.visited_links_enabled", true); | ||
14 | // A value of 0 means use the system DPI. A positive value is used as the DPI. | ||
15 | // This sets the physical size of a device pixel and thus controls the | ||
16 | // interpretation of physical units such as "pt". | ||
17 | -pref("layout.css.dpi", -1); | ||
18 | +pref("layout.css.dpi", 0); | ||
19 | |||
20 | // Set the number of device pixels per CSS pixel. A value <= 0 means choose | ||
21 | // automatically based on user settings for the platform (e.g., "UI scale factor" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Set-javascript.options.showInConsole.patch b/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Set-javascript.options.showInConsole.patch new file mode 100644 index 0000000..cee79cf --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/prefs/Set-javascript.options.showInConsole.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | From: Mike Hommey <glandium@debian.org> | ||
2 | Date: Sat, 8 Dec 2007 19:24:40 +0100 | ||
3 | Subject: Set javascript.options.showInConsole | ||
4 | |||
5 | --- | ||
6 | modules/libpref/src/init/all.js | 1 + | ||
7 | 1 file changed, 1 insertion(+) | ||
8 | |||
9 | diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js | ||
10 | index e8160c2..3c0a70c 100644 | ||
11 | --- a/modules/libpref/src/init/all.js | ||
12 | +++ b/modules/libpref/src/init/all.js | ||
13 | @@ -627,6 +627,7 @@ pref("javascript.options.strict", false); | ||
14 | pref("javascript.options.strict.debug", true); | ||
15 | #endif | ||
16 | pref("javascript.options.relimit", true); | ||
17 | +pref("javascript.options.showInConsole", true); | ||
18 | pref("javascript.options.tracejit.content", false); | ||
19 | pref("javascript.options.tracejit.chrome", false); | ||
20 | pref("javascript.options.methodjit.content", true); | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox/vendor.js b/meta-linaro-integration/recipes-overlayed/firefox/firefox/vendor.js new file mode 100644 index 0000000..5de0eb8 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox/vendor.js | |||
@@ -0,0 +1,6 @@ | |||
1 | pref("general.useragent.compatMode.firefox", true); | ||
2 | pref("distribution.searchplugins.defaultLocale", "en-US"); | ||
3 | // Forbid application updates | ||
4 | lockPref("app.update.enabled", false); | ||
5 | lockPref("extensions.update.enabled", false); | ||
6 | lockPref("extensions.autoDisableScopes", 10); | ||
diff --git a/meta-linaro-integration/recipes-overlayed/firefox/firefox_10.0.11esr.bb b/meta-linaro-integration/recipes-overlayed/firefox/firefox_10.0.11esr.bb new file mode 100644 index 0000000..98da1a4 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/firefox/firefox_10.0.11esr.bb | |||
@@ -0,0 +1,153 @@ | |||
1 | # Copyright (C) 2009-2013, O.S. Systems Software Ltda. All Rights Reserved | ||
2 | # Released under the MIT license (see packages/COPYING) | ||
3 | |||
4 | DESCRIPTION ?= "Browser made by mozilla" | ||
5 | DEPENDS += "alsa-lib curl startup-notification libevent cairo libnotify libvpx virtual/libgl nss nspr" | ||
6 | |||
7 | LICENSE = "MPLv1 | GPLv2+ | LGPLv2.1+" | ||
8 | LIC_FILES_CHKSUM = "file://toolkit/content/license.html;endline=39;md5=9cb02f27e77e702043b827c9418bfbf8" | ||
9 | |||
10 | SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2;name=archive \ | ||
11 | file://mozilla-${PN}.png \ | ||
12 | file://mozilla-${PN}.desktop \ | ||
13 | file://fixes/Allow-.js-preference-files-to-set-locked-prefs-with-.patch \ | ||
14 | file://fixes/Avoid-spurious-Run-items-in-application-handlers-con.patch \ | ||
15 | file://fixes/Properly-launch-applications-set-in-HOME-.mailcap.patch \ | ||
16 | file://fixes/Fix-some-tests-using-CurProcD-where-GreD-should-be-u.patch \ | ||
17 | file://fixes/Bug-691898-Use-YARR-interpreter-instead-of-PCRE-on-p.patch \ | ||
18 | file://fixes/Bug-722127-Bump-required-libvpx-version-to-1.0.0.-r-.patch \ | ||
19 | file://fixes/Bug-728229-Allow-to-build-with-system-python-ply-lib.patch \ | ||
20 | file://fixes/Bug-720682-Don-t-crash-an-app-using-libxul-because-o.patch \ | ||
21 | file://fixes/Bug-696636-Block-OpenGL-1-drivers-explicitly-to-stee.patch \ | ||
22 | file://fixes/Load-dependent-libraries-with-their-real-path-to-avo.patch \ | ||
23 | file://fixes/Bug-515232-Try-getting-general.useragent.locale-as-a.patch \ | ||
24 | file://fixes/Bug-729817-Block-the-Nouveau-3D-driver-as-it-s-insta.patch \ | ||
25 | file://fixes/Bug-729817-Allow-the-Nouveau-driver-with-Mesa-8.0.1-.patch \ | ||
26 | file://fixes/Bug-747322-Fix-jemalloc-mmap-wrapper-for-s390x.patch \ | ||
27 | file://fixes/Bug-725655-gcc-4.7-build-failures-missing-headers-.-.patch \ | ||
28 | file://fixes/Bug-734490-fix-build-failures-with-Clang-and-GCC-4.7.patch \ | ||
29 | file://fixes/Bug-706724-Fix-for-error-ftruncate-was-not-declared-.patch \ | ||
30 | file://fixes/Bug-709259-Try-creating-a-named-cursor-before-a-bitm.patch \ | ||
31 | file://fixes/Bug-761082-Only-export-TabMessageUtils.h-in-mozilla-.patch \ | ||
32 | file://fixes/bug-693343-a11y-disabled-in-Gnome-3-when-GNOME_ACCES.patch \ | ||
33 | file://fixes/Allow-webGL-with-mesa-assuming-users-will-have-updat.patch \ | ||
34 | file://iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch \ | ||
35 | file://iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch \ | ||
36 | file://porting/Add-xptcall-support-for-SH4-processors.patch \ | ||
37 | file://porting/Allow-ipc-code-to-build-on-GNU-kfreebsd.patch \ | ||
38 | file://porting/Allow-ipc-code-to-build-on-GNU-Hurd.patch \ | ||
39 | file://porting/Bug-698923-Don-t-require-16-bytes-alignment-for-VMFr.patch \ | ||
40 | file://porting/Fix-GNU-non-Linux-failure-to-build-because-of-ipc-ch.patch \ | ||
41 | file://porting/Bug-703531-Fix-ARMAssembler-getOp2RegScale-on-ARMv5.patch \ | ||
42 | file://porting/Bug-703534-Fix-build-failure-on-platforms-without-YA.patch \ | ||
43 | file://porting/Bug-703842-Avoid-R_SPARC_WDISP22-relocation-in-Tramp.patch \ | ||
44 | file://porting/Bug-703833-Avoid-invalid-conversion-from-const-size_.patch \ | ||
45 | file://porting/Bug-711353-Add-support-for-GNU-kFreeBSD-and-GNU-Hurd.patch \ | ||
46 | file://porting/Bug-747870-Properly-align-XPCLazyCallContext-mData.-.patch \ | ||
47 | file://porting/Bug-706787-Crash-on-s390x-nsXPCComponents-AttachNewC.patch \ | ||
48 | file://prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch \ | ||
49 | file://prefs/Enable-intl.locale.matchOS-and-report-the-locale-cor.patch \ | ||
50 | file://prefs/Set-javascript.options.showInConsole.patch \ | ||
51 | file://prefs/Set-DPI-to-system-settings.patch \ | ||
52 | file://prefs/Don-t-auto-disable-extensions-in-system-directories.patch \ | ||
53 | file://debian-hacks/Check-less-things-during-configure-when-using-libxul.patch \ | ||
54 | file://debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch \ | ||
55 | file://debian-hacks/Avoid-libxpcom-being-excluded-from-linked-libraries-.patch \ | ||
56 | file://debian-hacks/Don-t-build-example-component.patch \ | ||
57 | file://debian-hacks/Don-t-install-system-profile.patch \ | ||
58 | file://debian-hacks/Ignore-system-libjpeg-libpng-and-zlib-version-checki.patch \ | ||
59 | file://debian-hacks/Add-soname-to-appropriate-libraries.patch \ | ||
60 | file://debian-hacks/Add-another-preferences-directory-for-applications-p.patch \ | ||
61 | file://debian-hacks/Gross-workaround-to-avoid-installing-test-idl-and-in.patch \ | ||
62 | file://debian-hacks/Don-t-register-plugins-if-the-MOZILLA_DISABLE_PLUGIN.patch \ | ||
63 | file://debian-hacks/Install-missing-nanojit-and-.tbl-headers-from-js-src.patch \ | ||
64 | file://debian-hacks/Use-a-variable-for-xulrunner-base-version-in-various.patch \ | ||
65 | file://debian-hacks/Install-js-shell-when-running-make-install-from-js-s.patch \ | ||
66 | file://debian-hacks/Don-t-error-out-when-run-time-libsqlite-is-older-tha.patch \ | ||
67 | file://debian-hacks/Do-build-time-detection-of-2-bytes-wchar_t-and-char1.patch \ | ||
68 | file://debian-hacks/pkg-config-files-don-t-need-to-require-the-version-o.patch \ | ||
69 | file://debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch \ | ||
70 | file://debian-hacks/Fix-tracejit-to-build-against-nanojit-headers-in-dis.patch \ | ||
71 | file://debian-hacks/Load-distribution-search-plugins-from-etc-appname-se.patch \ | ||
72 | file://debian-hacks/Handle-transition-to-etc-appname-searchplugins-more-.patch \ | ||
73 | file://debian-hacks/Bug-508942-Use-Preprocessor.py-filters-in-defines-an.patch \ | ||
74 | file://configure.patch \ | ||
75 | file://powerpc_va_list.patch \ | ||
76 | file://vendor.js" | ||
77 | |||
78 | SRC_URI[archive.md5sum] = "2f0e3a1dd7480e03f374c0121b4155e2" | ||
79 | SRC_URI[archive.sha256sum] = "94b4d5a339d97dc56fd349f93407c3af4f408a4a8409a64e3680d564d37594f8" | ||
80 | |||
81 | S = "${WORKDIR}/mozilla-esr10" | ||
82 | |||
83 | inherit mozilla | ||
84 | |||
85 | EXTRA_OEMAKE = "installdir=${libdir}/${PN}" | ||
86 | |||
87 | ARM_INSTRUCTION_SET = "arm" | ||
88 | TARGET_CC_ARCH += " -I${STAGING_INCDIR}/freetype2" | ||
89 | |||
90 | do_install() { | ||
91 | oe_runmake DESTDIR="${D}" destdir="${D}" install | ||
92 | install -d ${D}${datadir}/applications | ||
93 | install -d ${D}${datadir}/pixmaps | ||
94 | install -m 0644 ${WORKDIR}/mozilla-${PN}.desktop ${D}${datadir}/applications/ | ||
95 | install -m 0644 ${WORKDIR}/mozilla-${PN}.png ${D}${datadir}/pixmaps/ | ||
96 | install -m 0644 ${WORKDIR}/vendor.js ${D}${libdir}/${PN}/defaults/pref/ | ||
97 | rm -f ${D}${libdir}/${PN}/TestGtkEmbed | ||
98 | rm -f ${D}${libdir}/${PN}/defaults/pref/firefox-l10n.js | ||
99 | |||
100 | # use locale settings | ||
101 | grep -Rl intl.locale.matchOS ${D}${libdir}/${PN}/ \ | ||
102 | | grep '.js$' \ | ||
103 | | xargs sed -i 's/\(pref("intl.locale.matchOS",\s*\)false)/\1true)/g' | ||
104 | |||
105 | # disable application updating | ||
106 | grep -Rl app.update.enabled ${D}${libdir}/${PN}/ \ | ||
107 | | grep '.js$' \ | ||
108 | | xargs sed -i 's/\(pref("app.update.enabled",\s*\)true)/\1false)/g' | ||
109 | } | ||
110 | |||
111 | PACKAGES += "${PN}-inspector" | ||
112 | |||
113 | FILES_${PN}-inspector = "${libdir}/${PN}/chrome/inspector* \ | ||
114 | ${libdir}/${PN}/components/*nspector* \ | ||
115 | ${libdir}/${PN}/extensions/inspector* \ | ||
116 | ${libdir}/${PN}/defaults/preferences/inspector*" | ||
117 | FILES_${PN} = "${bindir}/${PN} \ | ||
118 | ${datadir}/applications/ \ | ||
119 | ${datadir}/pixmaps/ \ | ||
120 | ${libdir}/${PN}/* \ | ||
121 | ${libdir}/${PN}/.autoreg \ | ||
122 | ${bindir}/defaults" | ||
123 | FILES_${PN}-dev += "${datadir}/idl ${bindir}/${PN}-config ${libdir}/${PN}-devel-*" | ||
124 | FILES_${PN}-staticdev += "${libdir}/${PN}-devel-*/sdk/lib/*.a" | ||
125 | FILES_${PN}-dbg += "${libdir}/${PN}/.debug \ | ||
126 | ${libdir}/${PN}/*/.debug \ | ||
127 | ${libdir}/${PN}/*/*/.debug \ | ||
128 | ${libdir}/${PN}/*/*/*/.debug \ | ||
129 | ${libdir}/${PN}-devel-*/*/.debug \ | ||
130 | ${libdir}/${PN}-devel-*/*/*/.debug \ | ||
131 | ${libdir}/${PN}-devel-*/*/*/*/.debug \ | ||
132 | ${bindir}/.debug" | ||
133 | |||
134 | # We don't build XUL as system shared lib, so we can mark all libs as private | ||
135 | PRIVATE_LIBS = "libmozjs.so \ | ||
136 | libxpcom.so \ | ||
137 | libnspr4.so \ | ||
138 | libxul.so \ | ||
139 | libmozalloc.so \ | ||
140 | libplc4.so \ | ||
141 | libplds4.so" | ||
142 | |||
143 | # mark libraries also provided by nss as private too | ||
144 | PRIVATE_LIBS += " \ | ||
145 | libfreebl3.so \ | ||
146 | libnss3.so \ | ||
147 | libnssckbi.so \ | ||
148 | libsmime3.so \ | ||
149 | libnssutil3.so \ | ||
150 | libnssdbm3.so \ | ||
151 | libssl3.so \ | ||
152 | libsoftokn3.so \ | ||
153 | " | ||
diff --git a/meta-linaro-integration/recipes-overlayed/fwts/files/0001-ACPI-improve-the-return-values-and-the-log-info-in-t.patch b/meta-linaro-integration/recipes-overlayed/fwts/files/0001-ACPI-improve-the-return-values-and-the-log-info-in-t.patch new file mode 100644 index 0000000..4138358 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/fwts/files/0001-ACPI-improve-the-return-values-and-the-log-info-in-t.patch | |||
@@ -0,0 +1,73 @@ | |||
1 | From e5a46ebd6dfeda4dbcec135d6482dfca7832999b Mon Sep 17 00:00:00 2001 | ||
2 | From: Fu Wei <fu.wei@linaro.org> | ||
3 | Date: Tue, 25 Nov 2014 16:53:51 +0800 | ||
4 | Subject: [PATCH 1/3] ACPI: improve the return values and the log info in the | ||
5 | fwts_acpi_handle_fadt_tables function. | ||
6 | |||
7 | If the 32-bit or/and 64-bit point is/are null, reture FWTS_NULL_POINTER instead of FWTS_ERROR. | ||
8 | Add the error log message for loading FACS/DSDT fail. | ||
9 | |||
10 | It is a prerequisite for ignoring a missing FACS table in hardware-reduced mode. | ||
11 | |||
12 | Upstream-status: Accepted [14.12.00] | ||
13 | Signed-off-by: Fu Wei <fu.wei@linaro.org> | ||
14 | |||
15 | --- | ||
16 | src/lib/src/fwts_acpi_tables.c | 12 +++++++----- | ||
17 | 1 file changed, 7 insertions(+), 5 deletions(-) | ||
18 | |||
19 | diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c | ||
20 | index 56498e0..96a117e 100644 | ||
21 | --- a/src/lib/src/fwts_acpi_tables.c | ||
22 | +++ b/src/lib/src/fwts_acpi_tables.c | ||
23 | @@ -311,19 +311,19 @@ static int fwts_acpi_handle_fadt_tables( | ||
24 | } | ||
25 | /* Is it sane? */ | ||
26 | if (addr == 0) { | ||
27 | - fwts_log_error(fw, "Failed to load %s: Cannot determine " | ||
28 | + fwts_log_warning(fw, "Failed to load %s: Cannot determine " | ||
29 | "address of %s from FADT, fields %s and %s are zero.", | ||
30 | name, name, name_addr32, name_addr64); | ||
31 | - return FWTS_ERROR; | ||
32 | + return FWTS_NULL_POINTER; | ||
33 | } | ||
34 | } else if ((addr32 != NULL) && (fadt->header.length >= 44)) { | ||
35 | addr = (off_t)*addr32; | ||
36 | /* Is it sane? */ | ||
37 | if (addr == 0) { | ||
38 | - fwts_log_error(fw, "Failed to load %s: Cannot determine " | ||
39 | + fwts_log_warning(fw, "Failed to load %s: Cannot determine " | ||
40 | "address of %s from FADT, field %s is zero.", | ||
41 | name, name, name_addr32); | ||
42 | - return FWTS_ERROR; | ||
43 | + return FWTS_NULL_POINTER; | ||
44 | } | ||
45 | } else if (fadt->header.length < 44) { | ||
46 | fwts_log_error(fw, "Failed to load %s: FADT is too small and " | ||
47 | @@ -333,7 +333,7 @@ static int fwts_acpi_handle_fadt_tables( | ||
48 | } else { | ||
49 | /* This should not happen, addr64 or addr32 are NULL */ | ||
50 | fwts_log_error(fw, "Failed to load %s: fwts error with FADT.", name); | ||
51 | - return FWTS_ERROR; | ||
52 | + return FWTS_NULL_POINTER; | ||
53 | } | ||
54 | |||
55 | /* Sane address found, load and add the table */ | ||
56 | @@ -375,12 +375,14 @@ static int fwts_acpi_handle_fadt( | ||
57 | "FACS", "FIRMWARE_CTRL", "X_FIRMWARE_CTRL", | ||
58 | &fadt->firmware_control, &fadt->x_firmware_ctrl, | ||
59 | provenance) != FWTS_OK) { | ||
60 | + fwts_log_error(fw, "Failed to load FACS!"); | ||
61 | return FWTS_ERROR; | ||
62 | } | ||
63 | /* Determine DSDT addr and load it */ | ||
64 | if (fwts_acpi_handle_fadt_tables(fw, fadt, | ||
65 | "DSDT", "DSTD", "X_DSDT", | ||
66 | &fadt->dsdt, &fadt->x_dsdt, provenance) != FWTS_OK) { | ||
67 | + fwts_log_error(fw, "Failed to load DSDT!"); | ||
68 | return FWTS_ERROR; | ||
69 | } | ||
70 | return FWTS_OK; | ||
71 | -- | ||
72 | 2.1.1 | ||
73 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/fwts/files/0002-ACPI-add-the-hardware-reduced-mode-check-function-in.patch b/meta-linaro-integration/recipes-overlayed/fwts/files/0002-ACPI-add-the-hardware-reduced-mode-check-function-in.patch new file mode 100644 index 0000000..0e0805b --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/fwts/files/0002-ACPI-add-the-hardware-reduced-mode-check-function-in.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From ff40052c103ed67677b9c4a17cdcee62ca8f6aed Mon Sep 17 00:00:00 2001 | ||
2 | From: Fu Wei <fu.wei@linaro.org> | ||
3 | Date: Tue, 25 Nov 2014 17:12:24 +0800 | ||
4 | Subject: [PATCH 2/3] ACPI: add the hardware reduced mode check function in | ||
5 | src/lib/src/fwts_acpi_tables.c. | ||
6 | |||
7 | It is a prerequisite for ignoring a missing FACS table in hardware-reduced mode. | ||
8 | |||
9 | Upstream-status: Accepted [14.12.00] | ||
10 | Signed-off-by: Fu Wei <fu.wei@linaro.org> | ||
11 | --- | ||
12 | src/lib/include/fwts_acpi.h | 1 + | ||
13 | src/lib/include/fwts_acpi_tables.h | 2 ++ | ||
14 | src/lib/src/fwts_acpi_tables.c | 14 ++++++++++++++ | ||
15 | 3 files changed, 17 insertions(+) | ||
16 | |||
17 | diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h | ||
18 | index 24ebc84..73a3461 100644 | ||
19 | --- a/src/lib/include/fwts_acpi.h | ||
20 | +++ b/src/lib/include/fwts_acpi.h | ||
21 | @@ -46,6 +46,7 @@ extern const char *fwts_acpi_fadt_preferred_pm_profile[]; | ||
22 | |||
23 | #define FWTS_ACPI_FADT_PREFERRED_PM_PROFILE(x) \ | ||
24 | ((x) > 8) ? "Reserved" : fwts_acpi_fadt_preferred_pm_profile[x] | ||
25 | +#define FWTS_ACPI_FADT_FLAGS_HW_REDUCED_ACPI (1<<20) | ||
26 | |||
27 | /* 5.2.3.1 Generic Address Structure */ | ||
28 | typedef struct { | ||
29 | diff --git a/src/lib/include/fwts_acpi_tables.h b/src/lib/include/fwts_acpi_tables.h | ||
30 | index 6977e87..798dfc5 100644 | ||
31 | --- a/src/lib/include/fwts_acpi_tables.h | ||
32 | +++ b/src/lib/include/fwts_acpi_tables.h | ||
33 | @@ -45,4 +45,6 @@ int fwts_acpi_find_table_by_addr(fwts_framework *fw, const uint64_t addr, fwts_a | ||
34 | int fwts_acpi_get_table(fwts_framework *fw, const int index, fwts_acpi_table_info **info); | ||
35 | uint8_t fwts_acpi_checksum(const uint8_t *data, const int length); | ||
36 | |||
37 | +fwts_bool fwts_acpi_is_reduced_hardware(const fwts_acpi_table_fadt *fadt); | ||
38 | + | ||
39 | #endif | ||
40 | diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c | ||
41 | index 96a117e..7f73a10 100644 | ||
42 | --- a/src/lib/src/fwts_acpi_tables.c | ||
43 | +++ b/src/lib/src/fwts_acpi_tables.c | ||
44 | @@ -275,6 +275,20 @@ int fwts_acpi_free_tables(void) | ||
45 | } | ||
46 | |||
47 | /* | ||
48 | + * fwts_acpi_is_reduced_hardware() | ||
49 | + * Check the ACPI tables for HW_REDUCED_ACPI bit in flag field. | ||
50 | + */ | ||
51 | +fwts_bool fwts_acpi_is_reduced_hardware(const fwts_acpi_table_fadt *fadt) | ||
52 | +{ | ||
53 | + if ((fadt->header.revision >= 5) && | ||
54 | + (fadt->header.length >= 116)&& | ||
55 | + (fadt->flags && FWTS_ACPI_FADT_FLAGS_HW_REDUCED_ACPI)) { | ||
56 | + return FWTS_TRUE; | ||
57 | + } | ||
58 | + return FWTS_FALSE; | ||
59 | +} | ||
60 | + | ||
61 | +/* | ||
62 | * fwts_acpi_handle_fadt_tables() | ||
63 | * depending on whether 32 or 64 bit address is usable, get the table | ||
64 | * address and load it. This handles the DSDT and FACS as pointed to | ||
65 | -- | ||
66 | 2.1.1 | ||
67 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/fwts/files/0003-ACPI-a-missing-FACS-table-can-be-ignored-under-some.patch b/meta-linaro-integration/recipes-overlayed/fwts/files/0003-ACPI-a-missing-FACS-table-can-be-ignored-under-some.patch new file mode 100644 index 0000000..2a54533 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/fwts/files/0003-ACPI-a-missing-FACS-table-can-be-ignored-under-some.patch | |||
@@ -0,0 +1,85 @@ | |||
1 | From 778310b83da2358a4e25444fcf9101e16f0a8b5b Mon Sep 17 00:00:00 2001 | ||
2 | From: Fu Wei <fu.wei@linaro.org> | ||
3 | Date: Tue, 25 Nov 2014 17:24:20 +0800 | ||
4 | Subject: [PATCH 3/3] ACPI: a missing FACS table can be ignored under some | ||
5 | circumstances | ||
6 | |||
7 | Both of the FADT fields FIRMWARE_CTRL and X_FIRMWARE_CTRL are | ||
8 | allowed to be null, if and only if ACPI is operating in hardware- | ||
9 | reduced mode. If the ACPI tables are from before ACPI 5.0, or if | ||
10 | ACPI is not operating in hardware-reduced mode, at least one of the | ||
11 | FIRMWARE_CTRL or X_FIRMWARE_CTRL fields _must_ be non-null. | ||
12 | |||
13 | This patch corrects the logic to ensure that a missing FACS is only | ||
14 | allowed under the proper circumstances. | ||
15 | |||
16 | Upstream-status: Accepted [14.12.00] | ||
17 | Signed-off-by: Fu Wei <fu.wei@linaro.org> | ||
18 | --- | ||
19 | src/acpi/acpitables/acpitables.c | 5 +++-- | ||
20 | src/lib/src/fwts_acpi_tables.c | 24 +++++++++++++++++------- | ||
21 | 2 files changed, 20 insertions(+), 9 deletions(-) | ||
22 | |||
23 | diff --git a/src/acpi/acpitables/acpitables.c b/src/acpi/acpitables/acpitables.c | ||
24 | index 255261c..3d261cb 100644 | ||
25 | --- a/src/acpi/acpitables/acpitables.c | ||
26 | +++ b/src/acpi/acpitables/acpitables.c | ||
27 | @@ -75,10 +75,11 @@ static void acpi_table_check_fadt(fwts_framework *fw, fwts_acpi_table_info *tabl | ||
28 | |||
29 | if (fadt->firmware_control == 0) { | ||
30 | if (table->length >= 140) { | ||
31 | - if (fadt->x_firmware_ctrl == 0) { | ||
32 | + if ((fadt->x_firmware_ctrl == 0) && !(fwts_acpi_is_reduced_hardware(fadt))) { | ||
33 | fwts_failed(fw, LOG_LEVEL_CRITICAL, "FADTFACSZero", "FADT 32 bit FIRMWARE_CONTROL and 64 bit X_FIRMWARE_CONTROL (FACS address) are null."); | ||
34 | fwts_advice(fw, "The 32 bit FIRMWARE_CTRL or 64 bit X_FIRMWARE_CTRL should point to a valid " | ||
35 | - "Firmware ACPI Control Structure (FACS). This is a firmware bug and needs to be fixed."); | ||
36 | + "Firmware ACPI Control Structure (FACS) when ACPI hardware reduced mode is not set. " | ||
37 | + "This is a firmware bug and needs to be fixed."); | ||
38 | } | ||
39 | } else { | ||
40 | fwts_failed(fw, LOG_LEVEL_MEDIUM, "FADT32BitFACSNull", "FADT 32 bit FIRMWARE_CONTROL is null."); | ||
41 | diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c | ||
42 | index 7f73a10..a8285f1 100644 | ||
43 | --- a/src/lib/src/fwts_acpi_tables.c | ||
44 | +++ b/src/lib/src/fwts_acpi_tables.c | ||
45 | @@ -373,6 +373,7 @@ static int fwts_acpi_handle_fadt( | ||
46 | const fwts_acpi_table_provenance provenance) | ||
47 | { | ||
48 | static uint64_t facs_last_phys_addr; /* default to zero */ | ||
49 | + int result = FWTS_ERROR; | ||
50 | |||
51 | /* | ||
52 | * The FADT handling may occur twice if it appears | ||
53 | @@ -384,13 +385,22 @@ static int fwts_acpi_handle_fadt( | ||
54 | |||
55 | facs_last_phys_addr = phys_addr; | ||
56 | |||
57 | - /* Determine FACS addr and load it */ | ||
58 | - if (fwts_acpi_handle_fadt_tables(fw, fadt, | ||
59 | - "FACS", "FIRMWARE_CTRL", "X_FIRMWARE_CTRL", | ||
60 | - &fadt->firmware_control, &fadt->x_firmware_ctrl, | ||
61 | - provenance) != FWTS_OK) { | ||
62 | - fwts_log_error(fw, "Failed to load FACS!"); | ||
63 | - return FWTS_ERROR; | ||
64 | + /* Determine FACS addr and load it. | ||
65 | + * Will ignore the missing FACS in the hardware-reduced mode. | ||
66 | + */ | ||
67 | + result = fwts_acpi_handle_fadt_tables(fw, fadt, | ||
68 | + "FACS", "FIRMWARE_CTRL", "X_FIRMWARE_CTRL", | ||
69 | + &fadt->firmware_control, &fadt->x_firmware_ctrl, | ||
70 | + provenance); | ||
71 | + if ( result != FWTS_OK) { | ||
72 | + if ((result == FWTS_NULL_POINTER) && | ||
73 | + fwts_acpi_is_reduced_hardware(fadt)) { | ||
74 | + fwts_log_info(fw, "Ignore the missing FACS. " | ||
75 | + "It is optional in hardware-reduced mode"); | ||
76 | + } else { | ||
77 | + fwts_log_error(fw, "Failed to load FACS!"); | ||
78 | + return FWTS_ERROR; | ||
79 | + } | ||
80 | } | ||
81 | /* Determine DSDT addr and load it */ | ||
82 | if (fwts_acpi_handle_fadt_tables(fw, fadt, | ||
83 | -- | ||
84 | 2.1.1 | ||
85 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/fwts/fwts_git.bb b/meta-linaro-integration/recipes-overlayed/fwts/fwts_git.bb new file mode 100644 index 0000000..2825da6 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/fwts/fwts_git.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "Firmware testsuite" | ||
2 | DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to exercise and test different aspects of a machine's firmware. Many of these tests need super user access to read BIOS data and ACPI tables, so the tool requires running with super user privileges (e.g. with sudo)." | ||
3 | HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" | ||
4 | |||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=deb8af5388e838d133eaa036f4d1496f" | ||
7 | |||
8 | PV = "14.09.00" | ||
9 | |||
10 | SRCREV = "cf14f3b4bab716dea95de772ad52786c1cbe862a" | ||
11 | SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \ | ||
12 | file://0001-ACPI-improve-the-return-values-and-the-log-info-in-t.patch \ | ||
13 | file://0002-ACPI-add-the-hardware-reduced-mode-check-function-in.patch \ | ||
14 | file://0003-ACPI-a-missing-FACS-table-can-be-ignored-under-some.patch \ | ||
15 | " | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | DEPENDS = "libpcre json-c glib-2.0" | ||
20 | |||
21 | inherit autotools-brokensep | ||
22 | |||
23 | FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}" | ||
24 | FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la" | ||
25 | FILES_${PN}-staticdev += "${libdir}/fwts/lib*a" | ||
26 | FILES_${PN}-dbg += "${libdir}/fwts/.debug" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/kexec/kexec-tools.inc b/meta-linaro-integration/recipes-overlayed/kexec/kexec-tools.inc new file mode 100644 index 0000000..695c11e --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/kexec/kexec-tools.inc | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "Kexec fast reboot tools" | ||
2 | DESCRIPTION = "Kexec is a fast reboot feature that lets you reboot to a new Linux kernel" | ||
3 | AUTHOR = "Eric Biederman" | ||
4 | HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/" | ||
5 | SECTION = "kernel/userland" | ||
6 | LICENSE = "GPLv2" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \ | ||
8 | file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09" | ||
9 | DEPENDS = "zlib xz" | ||
10 | |||
11 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz" | ||
12 | |||
13 | inherit autotools-brokensep | ||
14 | |||
15 | COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|powerpc|mips).*-(linux|freebsd.*)" | ||
16 | |||
17 | INSANE_SKIP_${PN} = "arch" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/kexec/kexec-tools/add-arm64-support.patch b/meta-linaro-integration/recipes-overlayed/kexec/kexec-tools/add-arm64-support.patch new file mode 100644 index 0000000..30b0229 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/kexec/kexec-tools/add-arm64-support.patch | |||
@@ -0,0 +1,521 @@ | |||
1 | From 98215763db92c85668fd217cfc719322ce54e704 Mon Sep 17 00:00:00 2001 | ||
2 | From: Geoff Levand <geoff.levand@linaro.org> | ||
3 | Date: Tue, 13 May 2014 10:59:52 -0700 | ||
4 | Subject: [PATCH 1/1] Add arm64 support | ||
5 | |||
6 | Signed-off-by: Geoff Levand <geoff.levand@linaro.org> | ||
7 | Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> | ||
8 | --- | ||
9 | configure.ac | 3 | ||
10 | kexec/Makefile | 1 | ||
11 | kexec/arch/arm64/Makefile | 31 +++++ | ||
12 | kexec/arch/arm64/include/arch/options.h | 30 ++++ | ||
13 | kexec/arch/arm64/kexec-arm64.c | 194 ++++++++++++++++++++++++++++++++ | ||
14 | kexec/arch/arm64/kexec-arm64.h | 28 ++++ | ||
15 | kexec/arch/arm64/kexec-elf-arm64.c | 147 ++++++++++++++++++++++++ | ||
16 | kexec/kexec-syscall.h | 9 + | ||
17 | 8 files changed, 441 insertions(+), 2 deletions(-) | ||
18 | create mode 100644 kexec/arch/arm64/Makefile | ||
19 | create mode 100644 kexec/arch/arm64/include/arch/options.h | ||
20 | create mode 100644 kexec/arch/arm64/kexec-arm64.c | ||
21 | create mode 100644 kexec/arch/arm64/kexec-arm64.h | ||
22 | create mode 100644 kexec/arch/arm64/kexec-elf-arm64.c | ||
23 | |||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -35,6 +35,9 @@ case $target_cpu in | ||
27 | ARCH="ppc64" | ||
28 | SUBARCH="LE" | ||
29 | ;; | ||
30 | + aarch64* ) | ||
31 | + ARCH="arm64" | ||
32 | + ;; | ||
33 | arm* ) | ||
34 | ARCH="arm" | ||
35 | ;; | ||
36 | --- a/kexec/Makefile | ||
37 | +++ b/kexec/Makefile | ||
38 | @@ -71,6 +71,7 @@ KEXEC_SRCS += $($(ARCH)_FS2DT) | ||
39 | |||
40 | include $(srcdir)/kexec/arch/alpha/Makefile | ||
41 | include $(srcdir)/kexec/arch/arm/Makefile | ||
42 | +include $(srcdir)/kexec/arch/arm64/Makefile | ||
43 | include $(srcdir)/kexec/arch/i386/Makefile | ||
44 | include $(srcdir)/kexec/arch/ia64/Makefile | ||
45 | include $(srcdir)/kexec/arch/m68k/Makefile | ||
46 | --- /dev/null | ||
47 | +++ b/kexec/arch/arm64/Makefile | ||
48 | @@ -0,0 +1,31 @@ | ||
49 | + | ||
50 | +arm64_FS2DT += kexec/fs2dt.c | ||
51 | +arm64_FS2DT_INCLUDE += -include $(srcdir)/kexec/arch/arm64/kexec-arm64.h | ||
52 | + | ||
53 | +arm64_KEXEC_SRCS += \ | ||
54 | + kexec/arch/arm64/kexec-arm64.c \ | ||
55 | + kexec/arch/arm64/kexec-elf-arm64.c | ||
56 | + | ||
57 | +arm64_ARCH_REUSE_INITRD = | ||
58 | +arm64_ADD_SEGMENT = | ||
59 | +arm64_VIRT_TO_PHYS = | ||
60 | + | ||
61 | +dist += $(arm64_KEXEC_SRCS) \ | ||
62 | + kexec/arch/arm64/Makefile \ | ||
63 | + kexec/arch/arm64/kexec-arm64.h | ||
64 | + | ||
65 | +ifdef HAVE_LIBFDT | ||
66 | + | ||
67 | +LIBS += -lfdt | ||
68 | + | ||
69 | +else | ||
70 | + | ||
71 | +include $(srcdir)/kexec/libfdt/Makefile.libfdt | ||
72 | + | ||
73 | +libfdt_SRCS += $(LIBFDT_SRCS:%=kexec/libfdt/%) | ||
74 | + | ||
75 | +arm64_CPPFLAGS = -I$(srcdir)/kexec/libfdt | ||
76 | + | ||
77 | +arm64_KEXEC_SRCS += $(libfdt_SRCS) | ||
78 | + | ||
79 | +endif | ||
80 | --- /dev/null | ||
81 | +++ b/kexec/arch/arm64/include/arch/options.h | ||
82 | @@ -0,0 +1,30 @@ | ||
83 | +#ifndef KEXEC_ARCH_ARM64_OPTIONS_H | ||
84 | +#define KEXEC_ARCH_ARM64_OPTIONS_H | ||
85 | + | ||
86 | +#define OPT_APPEND ((OPT_MAX)+0) | ||
87 | +#define OPT_RAMDISK ((OPT_MAX)+1) | ||
88 | +#define OPT_DTB ((OPT_MAX)+2) | ||
89 | +#define OPT_ARCH_MAX ((OPT_MAX)+3) | ||
90 | + | ||
91 | +#define KEXEC_ARCH_OPTIONS \ | ||
92 | + KEXEC_OPTIONS \ | ||
93 | + { "append", 1, NULL, OPT_APPEND }, \ | ||
94 | + { "command-line", 1, NULL, OPT_APPEND }, \ | ||
95 | + { "dtb", 1, NULL, OPT_DTB }, \ | ||
96 | + { "initrd", 1, NULL, OPT_RAMDISK }, \ | ||
97 | + { "ramdisk", 1, NULL, OPT_RAMDISK }, \ | ||
98 | + | ||
99 | +#define KEXEC_ARCH_OPT_STR KEXEC_OPT_STR /* Only accept long arch options. */ | ||
100 | + | ||
101 | +#define KEXEC_ALL_OPTIONS KEXEC_ARCH_OPTIONS | ||
102 | +#define KEXEC_ALL_OPT_STR KEXEC_ARCH_OPT_STR | ||
103 | + | ||
104 | +struct arm64_opts { | ||
105 | + const char *command_line; | ||
106 | + const char *ramdisk; | ||
107 | + const char *dtb; | ||
108 | +}; | ||
109 | + | ||
110 | +struct arm64_opts arm64_opts; | ||
111 | + | ||
112 | +#endif /* KEXEC_ARCH_ARM64_OPTIONS_H */ | ||
113 | --- /dev/null | ||
114 | +++ b/kexec/arch/arm64/kexec-arm64.c | ||
115 | @@ -0,0 +1,194 @@ | ||
116 | +/* | ||
117 | + * ARM64 kexec support. | ||
118 | + */ | ||
119 | + | ||
120 | +#define _GNU_SOURCE | ||
121 | + | ||
122 | +#include <dirent.h> | ||
123 | +#include <errno.h> | ||
124 | +#include <getopt.h> | ||
125 | +#include <stdio.h> | ||
126 | +#include <stddef.h> | ||
127 | + | ||
128 | +//#include <linux/kexec.h> | ||
129 | + | ||
130 | +#include "../../kexec.h" | ||
131 | +#include "../../kexec-syscall.h" | ||
132 | +#include "kexec-arm64.h" | ||
133 | +#include "arch/options.h" | ||
134 | + | ||
135 | +/* Global varables the core kexec routines expect. */ | ||
136 | + | ||
137 | +unsigned char reuse_initrd; | ||
138 | +off_t initrd_base = 0; | ||
139 | +off_t initrd_size = 0; | ||
140 | + | ||
141 | +struct memory_ranges usablemem_rgns = { | ||
142 | +}; | ||
143 | + | ||
144 | +const struct arch_map_entry arches[] = { | ||
145 | + { "aarch64", KEXEC_ARCH_ARM64 }, | ||
146 | + { NULL, 0 }, | ||
147 | +}; | ||
148 | + | ||
149 | +/* arm64 global varables. */ | ||
150 | + | ||
151 | +struct arm64_opts arm64_opts; | ||
152 | + | ||
153 | +void arch_usage(void) | ||
154 | +{ | ||
155 | + fprintf(stderr, "%s:%d: ->\n", __func__, __LINE__); | ||
156 | + | ||
157 | + printf( | ||
158 | +" --append=STRING Set the kernel command line to STRING.\n" | ||
159 | +" --command-line=STRING Set the kernel command line to STRING.\n" | ||
160 | +" --dtb=FILE Use FILE as the device tree blob.\n" | ||
161 | +" --initrd=FILE Use FILE as the kernel initial ramdisk.\n" | ||
162 | +" --ramdisk=FILE Use FILE as the kernel initial ramdisk.\n"); | ||
163 | + | ||
164 | + fprintf(stderr, "%s:%d: <-\n", __func__, __LINE__); | ||
165 | +} | ||
166 | + | ||
167 | +int arch_process_options(int argc, char **argv) | ||
168 | +{ | ||
169 | + static const char short_options[] = KEXEC_OPT_STR ""; | ||
170 | + static const struct option options[] = { | ||
171 | + KEXEC_ARCH_OPTIONS | ||
172 | + { 0 } | ||
173 | + }; | ||
174 | + int opt; | ||
175 | + | ||
176 | + for (opt = 0; opt != -1; ) { | ||
177 | + opt = getopt_long(argc, argv, short_options, options, 0); | ||
178 | + | ||
179 | + switch (opt) { | ||
180 | + case OPT_APPEND: | ||
181 | + arm64_opts.command_line = optarg; | ||
182 | + break; | ||
183 | + case OPT_RAMDISK: | ||
184 | + arm64_opts.ramdisk = optarg; | ||
185 | + break; | ||
186 | + case OPT_DTB: | ||
187 | + arm64_opts.dtb = optarg; | ||
188 | + break; | ||
189 | + default: | ||
190 | + break; /* Ignore core and unknown options */ | ||
191 | + } | ||
192 | + } | ||
193 | + | ||
194 | + dbgprintf("%s:%d: command_line: %s\n", __func__, __LINE__, | ||
195 | + arm64_opts.command_line); | ||
196 | + dbgprintf("%s:%d: ramdisk: %s\n", __func__, __LINE__, | ||
197 | + arm64_opts.ramdisk); | ||
198 | + dbgprintf("%s:%d: dtb: %s\n", __func__, __LINE__, arm64_opts.dtb); | ||
199 | + | ||
200 | + return 0; | ||
201 | +} | ||
202 | + | ||
203 | +void arch_reuse_initrd(void) | ||
204 | +{ | ||
205 | + fprintf(stderr, "%s:%d: ->\n", __func__, __LINE__); | ||
206 | + reuse_initrd = 1; | ||
207 | +} | ||
208 | + | ||
209 | +unsigned long virt_to_phys(unsigned long v) | ||
210 | +{ | ||
211 | + const unsigned long memstart_addr = 0x080000000UL; // FIXME: get from memory_range/DT | ||
212 | + const unsigned long page_offset = 0xffffffc000000000UL; // FIXME: from where??? | ||
213 | + unsigned long p = (v & ~page_offset) + memstart_addr; | ||
214 | + | ||
215 | + fprintf(stderr, "%s:%d: %016lx -> %016lx\n", __func__, __LINE__, v, p); | ||
216 | + return p; | ||
217 | +} | ||
218 | + | ||
219 | +void add_segment(struct kexec_info *info, const void *buf, size_t bufsz, | ||
220 | + unsigned long base, size_t memsz) | ||
221 | +{ | ||
222 | + fprintf(stderr, "%s:%d: ->\n", __func__, __LINE__); | ||
223 | + add_segment_phys_virt(info, buf, bufsz, base, memsz, 1); | ||
224 | + fprintf(stderr, "%s:%d: <-\n", __func__, __LINE__); | ||
225 | +} | ||
226 | + | ||
227 | +int get_memory_ranges(struct memory_range **range, int *ranges, | ||
228 | + unsigned long kexec_flags) | ||
229 | +{ | ||
230 | + /* FIXME: Should get this info from device tree. */ | ||
231 | + static struct memory_range memory_range[KEXEC_SEGMENT_MAX]; | ||
232 | + const char *iomem; | ||
233 | + int range_count = 0; | ||
234 | + char line[MAX_LINE]; | ||
235 | + FILE *fp; | ||
236 | + | ||
237 | + iomem = proc_iomem(); | ||
238 | + fp = fopen(iomem, "r"); | ||
239 | + | ||
240 | + if (!fp) { | ||
241 | + fprintf(stderr, "Cannot open %s: %s\n", iomem, strerror(errno)); | ||
242 | + return -1; | ||
243 | + } | ||
244 | + | ||
245 | + dbgprintf("memory ranges:\n"); | ||
246 | + | ||
247 | + while(fgets(line, sizeof(line), fp) != 0) { | ||
248 | + struct memory_range r; | ||
249 | + char *str; | ||
250 | + int consumed; | ||
251 | + | ||
252 | + if (range_count >= KEXEC_SEGMENT_MAX) | ||
253 | + break; | ||
254 | + | ||
255 | + if (sscanf(line, "%Lx-%Lx : %n", &r.start, &r.end, &consumed) | ||
256 | + != 2) | ||
257 | + continue; | ||
258 | + | ||
259 | + str = line + consumed; | ||
260 | + r.end++; | ||
261 | + | ||
262 | + if (memcmp(str, "System RAM\n", 11)) { | ||
263 | + dbgprintf(" Skip: %016Lx - %016Lx : %s", r.start, r.end, | ||
264 | + str); | ||
265 | + continue; | ||
266 | + } | ||
267 | + | ||
268 | + r.type = RANGE_RAM; | ||
269 | + memory_range[range_count] = r; | ||
270 | + range_count++; | ||
271 | + | ||
272 | + dbgprintf(" Add: %016Lx - %016Lx : %s", r.start, r.end, str); | ||
273 | + } | ||
274 | + | ||
275 | + fclose(fp); | ||
276 | + *range = memory_range; | ||
277 | + *ranges = range_count; | ||
278 | + | ||
279 | + return 0; | ||
280 | +} | ||
281 | + | ||
282 | +struct file_type file_type[] = { | ||
283 | + { "elf-arm64", elf_arm64_probe, elf_arm64_load, elf_arm64_usage }, | ||
284 | +}; | ||
285 | + | ||
286 | +int file_types = sizeof(file_type) / sizeof(file_type[0]); | ||
287 | + | ||
288 | +int arch_compat_trampoline(struct kexec_info *info) | ||
289 | +{ | ||
290 | + return 0; | ||
291 | +} | ||
292 | +int machine_verify_elf_rel(struct mem_ehdr *ehdr) | ||
293 | +{ | ||
294 | + return 0; | ||
295 | +} | ||
296 | + | ||
297 | +void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type, | ||
298 | + void *location, unsigned long address, unsigned long value) | ||
299 | +{ | ||
300 | +} | ||
301 | + | ||
302 | +void arch_update_purgatory(struct kexec_info *UNUSED(info)) | ||
303 | +{ | ||
304 | +} | ||
305 | + | ||
306 | +int is_crashkernel_mem_reserved(void) | ||
307 | +{ | ||
308 | + return 0; | ||
309 | +} | ||
310 | --- /dev/null | ||
311 | +++ b/kexec/arch/arm64/kexec-arm64.h | ||
312 | @@ -0,0 +1,28 @@ | ||
313 | +/* | ||
314 | + * ARM64 kexec support. | ||
315 | + */ | ||
316 | + | ||
317 | +#if !defined(KEXEC_ARM64_H) | ||
318 | +#define KEXEC_ARM64_H | ||
319 | + | ||
320 | +/* #include <linux/kexec.h> FIXME: this is broken */ | ||
321 | +#include <sys/types.h> | ||
322 | + | ||
323 | +#include "../../kexec.h" | ||
324 | + | ||
325 | +#define KEXEC_SEGMENT_MAX 16 /* FIXME: this should come from <linux/kexec.h> */ | ||
326 | + | ||
327 | +#define BOOT_BLOCK_VERSION 17 | ||
328 | +#define BOOT_BLOCK_LAST_COMP_VERSION 16 | ||
329 | +#define COMMAND_LINE_SIZE 512 | ||
330 | + | ||
331 | +int elf_arm64_probe(const char *buf, off_t len); | ||
332 | +int elf_arm64_load(int argc, char **argv, const char *buf, off_t len, | ||
333 | + struct kexec_info *info); | ||
334 | +void elf_arm64_usage(void); | ||
335 | + | ||
336 | +struct memory_ranges usablemem_rgns; | ||
337 | +off_t initrd_base; | ||
338 | +off_t initrd_size; | ||
339 | + | ||
340 | +#endif | ||
341 | --- /dev/null | ||
342 | +++ b/kexec/arch/arm64/kexec-elf-arm64.c | ||
343 | @@ -0,0 +1,147 @@ | ||
344 | +/* | ||
345 | + * ARM64 kexec support. | ||
346 | + */ | ||
347 | + | ||
348 | +#define _GNU_SOURCE | ||
349 | + | ||
350 | +#include <elf.h> | ||
351 | +#include <getopt.h> | ||
352 | +#include <libfdt.h> | ||
353 | + | ||
354 | +#include "kexec-arm64.h" | ||
355 | + | ||
356 | +#include "../../kexec-syscall.h" | ||
357 | +#include "../../fs2dt.h" | ||
358 | + | ||
359 | +#include "arch/options.h" | ||
360 | + | ||
361 | +#if !defined(EM_AARCH64) | ||
362 | +# define EM_AARCH64 183 | ||
363 | +#endif | ||
364 | + | ||
365 | +int elf_arm64_probe(const char *buf, off_t len) | ||
366 | +{ | ||
367 | + int result; | ||
368 | + struct mem_ehdr ehdr; | ||
369 | + | ||
370 | + fprintf(stderr, "%s:%d: ->\n", __func__, __LINE__); | ||
371 | + | ||
372 | + result = build_elf_exec_info(buf, len, &ehdr, 0); | ||
373 | + | ||
374 | + if (result < 0) { | ||
375 | + dbgprintf("Not an ELF executable\n"); | ||
376 | + goto out; | ||
377 | + } | ||
378 | + | ||
379 | + if (ehdr.e_machine != EM_AARCH64) { | ||
380 | + dbgprintf("Not an AARCH64 executable\n"); | ||
381 | + result = -1; | ||
382 | + goto out; | ||
383 | + } | ||
384 | + | ||
385 | + result = 0; | ||
386 | + | ||
387 | +out: | ||
388 | + free_elf_info(&ehdr); | ||
389 | + fprintf(stderr, "%s:%d: <-\n", __func__, __LINE__); | ||
390 | + return result; | ||
391 | +} | ||
392 | + | ||
393 | +static off_t round_up(off_t v) | ||
394 | +{ | ||
395 | + return _ALIGN_DOWN(v + getpagesize(), getpagesize()); | ||
396 | +} | ||
397 | + | ||
398 | +int elf_arm64_load(int argc, char **argv, const char *buf, off_t len, | ||
399 | + struct kexec_info *info) | ||
400 | +{ | ||
401 | + char *dtb_buf; | ||
402 | + off_t dtb_base; | ||
403 | + off_t dtb_size; | ||
404 | + struct mem_ehdr ehdr; | ||
405 | + int result; | ||
406 | + //unsigned int command_line_len = strlen(arm64_opts.command_line) + 1; | ||
407 | + | ||
408 | + fprintf(stderr, "%s:%d: ->\n", __func__, __LINE__); | ||
409 | + | ||
410 | + if (info->kexec_flags & KEXEC_ON_CRASH) { | ||
411 | + fprintf(stderr, "kexec: kdump not yet supported on arm64\n"); | ||
412 | + return -1; | ||
413 | + } | ||
414 | + | ||
415 | + result = build_elf_exec_info(buf, len, &ehdr, 0); | ||
416 | + | ||
417 | + if (result < 0) { | ||
418 | + free_elf_info(&ehdr); | ||
419 | + fprintf(stderr, "%s:%d: build_elf_exec_info failed\n", __func__, | ||
420 | + __LINE__); | ||
421 | + return result; | ||
422 | + } | ||
423 | + | ||
424 | + elf_exec_build_load(info, &ehdr, buf, len, 0); | ||
425 | + | ||
426 | + info->entry = (void*)0x80080000UL; // FIXME | ||
427 | + | ||
428 | + initrd_base = 0; | ||
429 | + initrd_size = 0; | ||
430 | + | ||
431 | + if (arm64_opts.ramdisk) { | ||
432 | + char *buf; | ||
433 | + | ||
434 | + buf = slurp_file(arm64_opts.ramdisk, &initrd_size); | ||
435 | + | ||
436 | + if (!buf) | ||
437 | + fprintf(stderr, "kexec: empty ramdisk file\n"); | ||
438 | + else { | ||
439 | + initrd_base = locate_hole(info, initrd_size, 0, 0, -1, -1); | ||
440 | + | ||
441 | + add_segment_phys_virt(info, buf, initrd_size, initrd_base, | ||
442 | + initrd_size, 0); | ||
443 | + } | ||
444 | + } | ||
445 | + | ||
446 | + fprintf(stderr, "%s:%d: initrd_base: %lx, initrd_size: %lx\n", __func__, | ||
447 | + __LINE__, (unsigned long)initrd_base, (unsigned long)initrd_size); | ||
448 | + | ||
449 | + if (arm64_opts.dtb) | ||
450 | + dtb_buf = slurp_file(arm64_opts.dtb, &dtb_size); | ||
451 | + else | ||
452 | + create_flatten_tree(&dtb_buf, &dtb_size, | ||
453 | + arm64_opts.command_line); | ||
454 | + | ||
455 | + fprintf(stderr, "%s:%d: dt magic: %x : %x\n", __func__, __LINE__, | ||
456 | + fdt32_to_cpu(*(uint32_t*)dtb_buf), *(uint32_t*)dtb_buf); | ||
457 | + | ||
458 | + result = fdt_check_header(dtb_buf); | ||
459 | + | ||
460 | + if (result) { | ||
461 | + fprintf(stderr, "Invalid FDT.\n"); | ||
462 | + return -1; | ||
463 | + } | ||
464 | + | ||
465 | + if (arm64_opts.command_line) { | ||
466 | + // FIXME: need to handle command line... | ||
467 | + fprintf(stderr, "%s:%d: command line support TODO\n", __func__, __LINE__); | ||
468 | + } | ||
469 | + | ||
470 | +if (1) { | ||
471 | + dtb_base = (unsigned long)info->entry + round_up(0xA43FA0); // computed kernel mem size. | ||
472 | + | ||
473 | + fprintf(stderr, "%s:%d: dtb_base: %lx, dtb_size: %lx\n", __func__, | ||
474 | + __LINE__, (unsigned long)dtb_base, (unsigned long)dtb_size); | ||
475 | +} else { | ||
476 | + dtb_base = locate_hole(info, dtb_size, 0, 0, -1, -1); | ||
477 | + | ||
478 | + fprintf(stderr, "%s:%d: dtb_base: %lx, dtb_size: %lx\n", __func__, | ||
479 | + __LINE__, (unsigned long)dtb_base, (unsigned long)dtb_size); | ||
480 | +} | ||
481 | + add_segment_phys_virt(info, dtb_buf, dtb_size, dtb_base, dtb_size, 0); | ||
482 | + | ||
483 | + fprintf(stderr, "%s:%d: <-\n", __func__, __LINE__); | ||
484 | + return 0; | ||
485 | +} | ||
486 | + | ||
487 | +void elf_arm64_usage(void) | ||
488 | +{ | ||
489 | + fprintf(stderr, "%s:%d\n", __func__, __LINE__); | ||
490 | +} | ||
491 | --- a/kexec/kexec-syscall.h | ||
492 | +++ b/kexec/kexec-syscall.h | ||
493 | @@ -39,8 +39,8 @@ | ||
494 | #ifdef __s390__ | ||
495 | #define __NR_kexec_load 277 | ||
496 | #endif | ||
497 | -#ifdef __arm__ | ||
498 | -#define __NR_kexec_load __NR_SYSCALL_BASE + 347 | ||
499 | +#if defined(__arm__) || defined(__arm64__) | ||
500 | +#define __NR_kexec_load __NR_SYSCALL_BASE + 347 | ||
501 | #endif | ||
502 | #if defined(__mips__) | ||
503 | #define __NR_kexec_load 4311 | ||
504 | @@ -76,6 +76,8 @@ static inline long kexec_load(void *entr | ||
505 | #define KEXEC_ARCH_PPC64 (21 << 16) | ||
506 | #define KEXEC_ARCH_IA_64 (50 << 16) | ||
507 | #define KEXEC_ARCH_ARM (40 << 16) | ||
508 | +#define KEXEC_ARCH_ARM64 (183 << 16) | ||
509 | +/* #define KEXEC_ARCH_AARCH64 (183 << 16) */ | ||
510 | #define KEXEC_ARCH_S390 (22 << 16) | ||
511 | #define KEXEC_ARCH_SH (42 << 16) | ||
512 | #define KEXEC_ARCH_MIPS_LE (10 << 16) | ||
513 | @@ -121,5 +123,8 @@ static inline long kexec_load(void *entr | ||
514 | #ifdef __m68k__ | ||
515 | #define KEXEC_ARCH_NATIVE KEXEC_ARCH_68K | ||
516 | #endif | ||
517 | +#if defined(__arm64__) | ||
518 | +#define KEXEC_ARCH_NATIVE KEXEC_ARCH_ARM64 | ||
519 | +#endif | ||
520 | |||
521 | #endif /* KEXEC_SYSCALL_H */ | ||
diff --git a/meta-linaro-integration/recipes-overlayed/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch b/meta-linaro-integration/recipes-overlayed/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch new file mode 100644 index 0000000..ab1fe96 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch | |||
@@ -0,0 +1,82 @@ | |||
1 | kexec-tools: Refine kdump device_tree sort | ||
2 | |||
3 | The commit b02d735bf was to rearrange the device-tree entries, and | ||
4 | assumed that these entries are sorted in the ascending order. but | ||
5 | acctually when I was validating kexec and kdump, the order of | ||
6 | serial node still is changed. So the patch is to sort these entries | ||
7 | by the directory name in ascending order. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Yang Wei <Wei.Yang@windriver.com> | ||
12 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
13 | --- | ||
14 | kexec/arch/ppc/fs2dt.c | 13 ++++++++++--- | ||
15 | kexec/fs2dt.c | 13 ++++++++++--- | ||
16 | 2 files changed, 20 insertions(+), 6 deletions(-) | ||
17 | |||
18 | diff --git a/kexec/arch/ppc/fs2dt.c b/kexec/arch/ppc/fs2dt.c | ||
19 | index 4121c7d..cc04b04 100644 | ||
20 | --- a/kexec/arch/ppc/fs2dt.c | ||
21 | +++ b/kexec/arch/ppc/fs2dt.c | ||
22 | @@ -296,6 +296,9 @@ static int comparefunc(const void *dentry1, const void *dentry2) | ||
23 | { | ||
24 | char *str1 = (*(struct dirent **)dentry1)->d_name; | ||
25 | char *str2 = (*(struct dirent **)dentry2)->d_name; | ||
26 | + char* ptr1 = strchr(str1, '@'); | ||
27 | + char* ptr2 = strchr(str2, '@'); | ||
28 | + int len1, len2; | ||
29 | |||
30 | /* | ||
31 | * strcmp scans from left to right and fails to idetify for some | ||
32 | @@ -303,9 +306,13 @@ static int comparefunc(const void *dentry1, const void *dentry2) | ||
33 | * Therefore, we get the wrong sorted order like memory@10000000 and | ||
34 | * memory@f000000. | ||
35 | */ | ||
36 | - if (strchr(str1, '@') && strchr(str2, '@') && | ||
37 | - (strlen(str1) > strlen(str2))) | ||
38 | - return 1; | ||
39 | + if (ptr1 && ptr2) { | ||
40 | + len1 = ptr1 - str1; | ||
41 | + len2 = ptr2 - str2; | ||
42 | + if (!strncmp(str1, str2, len1 >len2 ? len1: len2) && | ||
43 | + (strlen(str1) > strlen(str2))) | ||
44 | + return 1; | ||
45 | + } | ||
46 | |||
47 | return strcmp(str1, str2); | ||
48 | } | ||
49 | diff --git a/kexec/fs2dt.c b/kexec/fs2dt.c | ||
50 | index 5e6b98d..1c0345b 100644 | ||
51 | --- a/kexec/fs2dt.c | ||
52 | +++ b/kexec/fs2dt.c | ||
53 | @@ -475,6 +475,9 @@ static int comparefunc(const struct dirent **dentry1, | ||
54 | { | ||
55 | char *str1 = (*(struct dirent **)dentry1)->d_name; | ||
56 | char *str2 = (*(struct dirent **)dentry2)->d_name; | ||
57 | + char* ptr1 = strchr(str1, '@'); | ||
58 | + char* ptr2 = strchr(str2, '@'); | ||
59 | + int len1, len2; | ||
60 | |||
61 | /* | ||
62 | * strcmp scans from left to right and fails to idetify for some | ||
63 | @@ -482,9 +485,13 @@ static int comparefunc(const struct dirent **dentry1, | ||
64 | * Therefore, we get the wrong sorted order like memory@10000000 and | ||
65 | * memory@f000000. | ||
66 | */ | ||
67 | - if (strchr(str1, '@') && strchr(str2, '@') && | ||
68 | - (strlen(str1) > strlen(str2))) | ||
69 | - return 1; | ||
70 | + if (ptr1 && ptr2) { | ||
71 | + len1 = ptr1 - str1; | ||
72 | + len2 = ptr2 - str2; | ||
73 | + if (!strncmp(str1, str2, len1 >len2 ? len1: len2) && | ||
74 | + (strlen(str1) > strlen(str2))) | ||
75 | + return 1; | ||
76 | + } | ||
77 | |||
78 | return strcmp(str1, str2); | ||
79 | } | ||
80 | -- | ||
81 | 1.7.9.5 | ||
82 | |||
diff --git a/meta-linaro-integration/recipes-overlayed/kexec/kexec-tools_2.0.7.bb b/meta-linaro-integration/recipes-overlayed/kexec/kexec-tools_2.0.7.bb new file mode 100644 index 0000000..f0ece0d --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/kexec/kexec-tools_2.0.7.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | require kexec-tools.inc | ||
2 | export LDFLAGS = "-L${STAGING_LIBDIR}" | ||
3 | EXTRA_OECONF = " --with-zlib=yes" | ||
4 | |||
5 | SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch" | ||
6 | |||
7 | SRC_URI[md5sum] = "2309ba43981cb6d39d07ac3a9aac30ab" | ||
8 | SRC_URI[sha256sum] = "dde5c38be39882c6c91f0129647349c4e1943b077d3020af1970b481ee954eb0" | ||
9 | |||
10 | PACKAGES =+ "kexec kdump vmcore-dmesg" | ||
11 | |||
12 | ALLOW_EMPTY_${PN} = "1" | ||
13 | RRECOMMENDS_${PN} = "kexec kdump vmcore-dmesg" | ||
14 | |||
15 | FILES_kexec = "${sbindir}/kexec" | ||
16 | FILES_kdump = "${sbindir}/kdump" | ||
17 | FILES_vmcore-dmesg = "${sbindir}/vmcore-dmesg" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/libpng/libpng_1.6.13.bb b/meta-linaro-integration/recipes-overlayed/libpng/libpng_1.6.13.bb new file mode 100644 index 0000000..8798a96 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/libpng/libpng_1.6.13.bb | |||
@@ -0,0 +1,28 @@ | |||
1 | SUMMARY = "PNG image format decoding library" | ||
2 | HOMEPAGE = "http://www.libpng.org/" | ||
3 | SECTION = "libs" | ||
4 | LICENSE = "Libpng" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=46401ee4b225b9ec066cb96cf1025c0f \ | ||
6 | file://png.h;endline=15;md5=8167a17735fc618d1df109f8b0f839a6 \ | ||
7 | file://png.h;beginline=229;endline=343;md5=5cdf8564a14e2f00339e4437a83b4913" | ||
8 | DEPENDS = "zlib" | ||
9 | LIBV = "16" | ||
10 | |||
11 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ | ||
12 | " | ||
13 | |||
14 | SRC_URI[md5sum] = "9822c25466f060142359f80ed142c9e5" | ||
15 | SRC_URI[sha256sum] = "d9c8ce54a5fc8052ed794ca65b553384a74c0608b09ae163cbbb07176018e625" | ||
16 | |||
17 | BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config" | ||
18 | |||
19 | inherit autotools binconfig-disabled pkgconfig | ||
20 | |||
21 | # Work around missing symbols | ||
22 | EXTRA_OECONF_append = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}" | ||
23 | |||
24 | PACKAGES =+ "${PN}-tools" | ||
25 | |||
26 | FILES_${PN}-tools = "${bindir}/png-fix-itxt ${bindir}/pngfix" | ||
27 | |||
28 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/libunwind/libunwind-1.1/AArch64-port.patch b/meta-linaro-integration/recipes-overlayed/libunwind/libunwind-1.1/AArch64-port.patch new file mode 100644 index 0000000..228ec32 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/libunwind/libunwind-1.1/AArch64-port.patch | |||
@@ -0,0 +1,2529 @@ | |||
1 | From ac6c0a6535975f1dc2da6e4e2766614baac2a14a Mon Sep 17 00:00:00 2001 | ||
2 | From: Yvan Roux <yvan.roux@linaro.org> | ||
3 | Date: Sat, 11 May 2013 09:18:23 -0600 | ||
4 | Subject: [PATCH] AArch64 port. | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | --- | ||
9 | Makefile.am | 6 | ||
10 | README | 1 | ||
11 | configure.ac | 6 | ||
12 | include/libunwind-aarch64.h | 187 ++++++++++++++++++++++ | ||
13 | include/libunwind.h.in | 4 | ||
14 | include/tdep-aarch64/dwarf-config.h | 52 ++++++ | ||
15 | include/tdep-aarch64/jmpbuf.h | 33 +++ | ||
16 | include/tdep-aarch64/libunwind_i.h | 294 +++++++++++++++++++++++++++++++++++ | ||
17 | include/tdep/dwarf-config.h | 4 | ||
18 | include/tdep/jmpbuf.h | 2 | ||
19 | include/tdep/libunwind_i.h.in | 4 | ||
20 | src/Makefile.am | 39 ++++ | ||
21 | src/aarch64/Gcreate_addr_space.c | 60 +++++++ | ||
22 | src/aarch64/Gget_proc_info.c | 39 ++++ | ||
23 | src/aarch64/Gget_save_loc.c | 100 +++++++++++ | ||
24 | src/aarch64/Gglobal.c | 57 ++++++ | ||
25 | src/aarch64/Ginit.c | 187 ++++++++++++++++++++++ | ||
26 | src/aarch64/Ginit_local.c | 55 ++++++ | ||
27 | src/aarch64/Ginit_remote.c | 45 +++++ | ||
28 | src/aarch64/Gis_signal_frame.c | 64 +++++++ | ||
29 | src/aarch64/Gregs.c | 113 +++++++++++++ | ||
30 | src/aarch64/Gresume.c | 177 +++++++++++++++++++++ | ||
31 | src/aarch64/Gstep.c | 129 +++++++++++++++ | ||
32 | src/aarch64/Lcreate_addr_space.c | 5 | ||
33 | src/aarch64/Lget_proc_info.c | 5 | ||
34 | src/aarch64/Lget_save_loc.c | 5 | ||
35 | src/aarch64/Lglobal.c | 5 | ||
36 | src/aarch64/Linit.c | 5 | ||
37 | src/aarch64/Linit_local.c | 5 | ||
38 | src/aarch64/Linit_remote.c | 5 | ||
39 | src/aarch64/Lis_signal_frame.c | 5 | ||
40 | src/aarch64/Lregs.c | 5 | ||
41 | src/aarch64/Lresume.c | 5 | ||
42 | src/aarch64/Lstep.c | 5 | ||
43 | src/aarch64/gen-offsets.c | 68 ++++++++ | ||
44 | src/aarch64/init.h | 127 +++++++++++++++ | ||
45 | src/aarch64/is_fpreg.c | 32 +++ | ||
46 | src/aarch64/offsets.h | 49 +++++ | ||
47 | src/aarch64/regname.c | 106 ++++++++++++ | ||
48 | src/aarch64/siglongjmp.S | 12 + | ||
49 | src/aarch64/unwind_i.h | 43 +++++ | ||
50 | src/coredump/_UCD_access_reg_linux.c | 5 | ||
51 | src/ptrace/_UPT_reg_offset.c | 36 ++++ | ||
52 | 43 files changed, 2184 insertions(+), 7 deletions(-) | ||
53 | create mode 100644 include/libunwind-aarch64.h | ||
54 | create mode 100644 include/tdep-aarch64/dwarf-config.h | ||
55 | create mode 100644 include/tdep-aarch64/jmpbuf.h | ||
56 | create mode 100644 include/tdep-aarch64/libunwind_i.h | ||
57 | create mode 100644 src/aarch64/Gcreate_addr_space.c | ||
58 | create mode 100644 src/aarch64/Gget_proc_info.c | ||
59 | create mode 100644 src/aarch64/Gget_save_loc.c | ||
60 | create mode 100644 src/aarch64/Gglobal.c | ||
61 | create mode 100644 src/aarch64/Ginit.c | ||
62 | create mode 100644 src/aarch64/Ginit_local.c | ||
63 | create mode 100644 src/aarch64/Ginit_remote.c | ||
64 | create mode 100644 src/aarch64/Gis_signal_frame.c | ||
65 | create mode 100644 src/aarch64/Gregs.c | ||
66 | create mode 100644 src/aarch64/Gresume.c | ||
67 | create mode 100644 src/aarch64/Gstep.c | ||
68 | create mode 100644 src/aarch64/Lcreate_addr_space.c | ||
69 | create mode 100644 src/aarch64/Lget_proc_info.c | ||
70 | create mode 100644 src/aarch64/Lget_save_loc.c | ||
71 | create mode 100644 src/aarch64/Lglobal.c | ||
72 | create mode 100644 src/aarch64/Linit.c | ||
73 | create mode 100644 src/aarch64/Linit_local.c | ||
74 | create mode 100644 src/aarch64/Linit_remote.c | ||
75 | create mode 100644 src/aarch64/Lis_signal_frame.c | ||
76 | create mode 100644 src/aarch64/Lregs.c | ||
77 | create mode 100644 src/aarch64/Lresume.c | ||
78 | create mode 100644 src/aarch64/Lstep.c | ||
79 | create mode 100644 src/aarch64/gen-offsets.c | ||
80 | create mode 100644 src/aarch64/init.h | ||
81 | create mode 100644 src/aarch64/is_fpreg.c | ||
82 | create mode 100644 src/aarch64/offsets.h | ||
83 | create mode 100644 src/aarch64/regname.c | ||
84 | create mode 100644 src/aarch64/siglongjmp.S | ||
85 | create mode 100644 src/aarch64/unwind_i.h | ||
86 | |||
87 | --- a/Makefile.am | ||
88 | +++ b/Makefile.am | ||
89 | @@ -2,6 +2,9 @@ include_HEADERS = include/libunwind-dyna | ||
90 | include/libunwind-ptrace.h \ | ||
91 | include/libunwind-coredump.h | ||
92 | |||
93 | +if ARCH_AARCH64 | ||
94 | +include_HEADERS += include/libunwind-aarch64.h | ||
95 | +endif | ||
96 | if ARCH_ARM | ||
97 | include_HEADERS += include/libunwind-arm.h | ||
98 | endif | ||
99 | @@ -41,6 +44,9 @@ SUBDIRS = src tests doc | ||
100 | noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h \ | ||
101 | include/compiler.h include/libunwind_i.h include/mempool.h \ | ||
102 | include/remote.h \ | ||
103 | + include/tdep-aarch64/dwarf-config.h \ | ||
104 | + include/tdep-aarch64/jmpbuf.h \ | ||
105 | + include/tdep-aarch64/libunwind_i.h \ | ||
106 | include/tdep-arm/dwarf-config.h include/tdep-arm/ex_tables.h \ | ||
107 | include/tdep-arm/jmpbuf.h include/tdep-arm/libunwind_i.h \ | ||
108 | include/tdep-ia64/jmpbuf.h include/tdep-ia64/rse.h \ | ||
109 | --- a/README | ||
110 | +++ b/README | ||
111 | @@ -9,6 +9,7 @@ several architecture/operating-system co | ||
112 | Linux/IA-64: Fully tested and supported. | ||
113 | Linux/PARISC: Works well, but C library missing unwind-info. | ||
114 | HP-UX/IA-64: Mostly works but known to have some serious limitations. | ||
115 | + Linux/AArch64: Newly added. | ||
116 | Linux/PPC64: Newly added. | ||
117 | Linux/SuperH: Newly added. | ||
118 | FreeBSD/i386: Newly added. | ||
119 | --- a/configure.ac | ||
120 | +++ b/configure.ac | ||
121 | @@ -104,7 +104,7 @@ SET_ARCH([$target_cpu],[target_arch]) | ||
122 | |||
123 | AC_ARG_ENABLE(coredump, | ||
124 | AS_HELP_STRING([--enable-coredump],[building libunwind-coredump library]),, | ||
125 | - [AS_CASE([$host_arch], [arm*|mips*|sh*|x86*], [enable_coredump=yes], [enable_coredump=no])] | ||
126 | + [AS_CASE([$host_arch], [aarch64*|arm*|mips*|sh*|x86*], [enable_coredump=yes], [enable_coredump=no])] | ||
127 | ) | ||
128 | |||
129 | AC_MSG_CHECKING([if we should build libunwind-coredump]) | ||
130 | @@ -121,6 +121,7 @@ AC_MSG_RESULT([$target_os]) | ||
131 | |||
132 | AM_CONDITIONAL(BUILD_COREDUMP, test x$enable_coredump = xyes) | ||
133 | AM_CONDITIONAL(REMOTE_ONLY, test x$target_arch != x$host_arch) | ||
134 | +AM_CONDITIONAL(ARCH_AARCH64, test x$target_arch = xaarch64) | ||
135 | AM_CONDITIONAL(ARCH_ARM, test x$target_arch = xarm) | ||
136 | AM_CONDITIONAL(ARCH_IA64, test x$target_arch = xia64) | ||
137 | AM_CONDITIONAL(ARCH_HPPA, test x$target_arch = xhppa) | ||
138 | @@ -137,7 +138,7 @@ AM_CONDITIONAL(OS_FREEBSD, expr x$target | ||
139 | AC_MSG_CHECKING([for ELF helper width]) | ||
140 | case "${target_arch}" in | ||
141 | (arm|hppa|ppc32|x86|sh) use_elf32=yes; AC_MSG_RESULT([32]);; | ||
142 | -(ia64|ppc64|x86_64) use_elf64=yes; AC_MSG_RESULT([64]);; | ||
143 | +(aarch64|ia64|ppc64|x86_64) use_elf64=yes; AC_MSG_RESULT([64]);; | ||
144 | (mips) use_elfxx=yes; AC_MSG_RESULT([xx]);; | ||
145 | *) AC_MSG_ERROR([Unknown ELF target: ${target_arch}]) | ||
146 | esac | ||
147 | @@ -186,6 +187,7 @@ AS_HELP_STRING([--enable-cxx-exceptions] | ||
148 | # C++ exception handling doesn't work too well on x86 | ||
149 | case $target_arch in | ||
150 | x86*) enable_cxx_exceptions=no;; | ||
151 | + aarch64*) enable_cxx_exceptions=no;; | ||
152 | arm*) enable_cxx_exceptions=no;; | ||
153 | mips*) enable_cxx_exceptions=no;; | ||
154 | *) enable_cxx_exceptions=yes;; | ||
155 | --- /dev/null | ||
156 | +++ b/include/libunwind-aarch64.h | ||
157 | @@ -0,0 +1,187 @@ | ||
158 | +/* libunwind - a platform-independent unwind library | ||
159 | + Copyright (C) 2001-2004 Hewlett-Packard Co | ||
160 | + Contributed by David Mosberger-Tang <davidm@hpl.hp.com> | ||
161 | + Copyright (C) 2013 Linaro Limited | ||
162 | + | ||
163 | +This file is part of libunwind. | ||
164 | + | ||
165 | +Permission is hereby granted, free of charge, to any person obtaining | ||
166 | +a copy of this software and associated documentation files (the | ||
167 | +"Software"), to deal in the Software without restriction, including | ||
168 | +without limitation the rights to use, copy, modify, merge, publish, | ||
169 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
170 | +permit persons to whom the Software is furnished to do so, subject to | ||
171 | +the following conditions: | ||
172 | + | ||
173 | +The above copyright notice and this permission notice shall be | ||
174 | +included in all copies or substantial portions of the Software. | ||
175 | + | ||
176 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
177 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
178 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
179 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
180 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
181 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
182 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
183 | + | ||
184 | +#ifndef LIBUNWIND_H | ||
185 | +#define LIBUNWIND_H | ||
186 | + | ||
187 | +#if defined(__cplusplus) || defined(c_plusplus) | ||
188 | +extern "C" { | ||
189 | +#endif | ||
190 | + | ||
191 | +#include <inttypes.h> | ||
192 | +#include <stddef.h> | ||
193 | +#include <ucontext.h> | ||
194 | + | ||
195 | +#define UNW_TARGET aarch64 | ||
196 | +#define UNW_TARGET_AARCH64 1 | ||
197 | + | ||
198 | +#define _U_TDEP_QP_TRUE 0 /* see libunwind-dynamic.h */ | ||
199 | + | ||
200 | +/* This needs to be big enough to accommodate "struct cursor", while | ||
201 | + leaving some slack for future expansion. Changing this value will | ||
202 | + require recompiling all users of this library. Stack allocation is | ||
203 | + relatively cheap and unwind-state copying is relatively rare, so we | ||
204 | + want to err on making it rather too big than too small. */ | ||
205 | + | ||
206 | +#define UNW_TDEP_CURSOR_LEN 4096 | ||
207 | + | ||
208 | +typedef uint64_t unw_word_t; | ||
209 | +typedef int64_t unw_sword_t; | ||
210 | + | ||
211 | +typedef long double unw_tdep_fpreg_t; | ||
212 | + | ||
213 | +typedef struct | ||
214 | + { | ||
215 | + /* no aarch64-specific auxiliary proc-info */ | ||
216 | + } | ||
217 | +unw_tdep_proc_info_t; | ||
218 | + | ||
219 | +typedef enum | ||
220 | + { | ||
221 | + /* 64-bit general registers. */ | ||
222 | + UNW_AARCH64_X0, | ||
223 | + UNW_AARCH64_X1, | ||
224 | + UNW_AARCH64_X2, | ||
225 | + UNW_AARCH64_X3, | ||
226 | + UNW_AARCH64_X4, | ||
227 | + UNW_AARCH64_X5, | ||
228 | + UNW_AARCH64_X6, | ||
229 | + UNW_AARCH64_X7, | ||
230 | + UNW_AARCH64_X8, | ||
231 | + | ||
232 | + /* Temporary registers. */ | ||
233 | + UNW_AARCH64_X9, | ||
234 | + UNW_AARCH64_X10, | ||
235 | + UNW_AARCH64_X11, | ||
236 | + UNW_AARCH64_X12, | ||
237 | + UNW_AARCH64_X13, | ||
238 | + UNW_AARCH64_X14, | ||
239 | + UNW_AARCH64_X15, | ||
240 | + | ||
241 | + /* Intra-procedure-call temporary registers. */ | ||
242 | + UNW_AARCH64_X16, | ||
243 | + UNW_AARCH64_X17, | ||
244 | + | ||
245 | + /* Callee-saved registers. */ | ||
246 | + UNW_AARCH64_X18, | ||
247 | + UNW_AARCH64_X19, | ||
248 | + UNW_AARCH64_X20, | ||
249 | + UNW_AARCH64_X21, | ||
250 | + UNW_AARCH64_X22, | ||
251 | + UNW_AARCH64_X23, | ||
252 | + UNW_AARCH64_X24, | ||
253 | + UNW_AARCH64_X25, | ||
254 | + UNW_AARCH64_X26, | ||
255 | + UNW_AARCH64_X27, | ||
256 | + UNW_AARCH64_X28, | ||
257 | + | ||
258 | + /* 64-bit frame pointer. */ | ||
259 | + UNW_AARCH64_X29, | ||
260 | + | ||
261 | + /* 64-bit link register. */ | ||
262 | + UNW_AARCH64_X30, | ||
263 | + | ||
264 | + /* 64-bit stack pointer. */ | ||
265 | + UNW_AARCH64_SP = 31, | ||
266 | + UNW_AARCH64_PC, | ||
267 | + UNW_AARCH64_PSTATE, | ||
268 | + | ||
269 | + /* 128-bit FP/Advanced SIMD registers. */ | ||
270 | + UNW_AARCH64_V0 = 64, | ||
271 | + UNW_AARCH64_V1, | ||
272 | + UNW_AARCH64_V2, | ||
273 | + UNW_AARCH64_V3, | ||
274 | + UNW_AARCH64_V4, | ||
275 | + UNW_AARCH64_V5, | ||
276 | + UNW_AARCH64_V6, | ||
277 | + UNW_AARCH64_V7, | ||
278 | + UNW_AARCH64_V8, | ||
279 | + UNW_AARCH64_V9, | ||
280 | + UNW_AARCH64_V10, | ||
281 | + UNW_AARCH64_V11, | ||
282 | + UNW_AARCH64_V12, | ||
283 | + UNW_AARCH64_V13, | ||
284 | + UNW_AARCH64_V14, | ||
285 | + UNW_AARCH64_V15, | ||
286 | + UNW_AARCH64_V16, | ||
287 | + UNW_AARCH64_V17, | ||
288 | + UNW_AARCH64_V18, | ||
289 | + UNW_AARCH64_V19, | ||
290 | + UNW_AARCH64_V20, | ||
291 | + UNW_AARCH64_V21, | ||
292 | + UNW_AARCH64_V22, | ||
293 | + UNW_AARCH64_V23, | ||
294 | + UNW_AARCH64_V24, | ||
295 | + UNW_AARCH64_V25, | ||
296 | + UNW_AARCH64_V26, | ||
297 | + UNW_AARCH64_V27, | ||
298 | + UNW_AARCH64_V28, | ||
299 | + UNW_AARCH64_V29, | ||
300 | + UNW_AARCH64_V30, | ||
301 | + UNW_AARCH64_V31, | ||
302 | + | ||
303 | + UNW_AARCH64_FPSR, | ||
304 | + UNW_AARCH64_FPCR, | ||
305 | + | ||
306 | + /* For AArch64, the CFA is the value of SP (x31) at the call site of the | ||
307 | + previous frame. */ | ||
308 | + UNW_AARCH64_CFA = UNW_AARCH64_SP, | ||
309 | + | ||
310 | + UNW_TDEP_LAST_REG = UNW_AARCH64_FPCR, | ||
311 | + | ||
312 | + UNW_TDEP_IP = UNW_AARCH64_X30, | ||
313 | + UNW_TDEP_SP = UNW_AARCH64_SP, | ||
314 | + UNW_TDEP_EH = UNW_AARCH64_X0, | ||
315 | + | ||
316 | + } | ||
317 | +aarch64_regnum_t; | ||
318 | + | ||
319 | +/* Use R0 through R3 to pass exception handling information. */ | ||
320 | +#define UNW_TDEP_NUM_EH_REGS 4 | ||
321 | + | ||
322 | +typedef struct unw_tdep_save_loc | ||
323 | + { | ||
324 | + /* Additional target-dependent info on a save location. */ | ||
325 | + } | ||
326 | +unw_tdep_save_loc_t; | ||
327 | + | ||
328 | + | ||
329 | +/* On AArch64, we can directly use ucontext_t as the unwind context. */ | ||
330 | +typedef ucontext_t unw_tdep_context_t; | ||
331 | + | ||
332 | +#include "libunwind-common.h" | ||
333 | +#include "libunwind-dynamic.h" | ||
334 | + | ||
335 | +#define unw_tdep_getcontext(uc) (getcontext (uc), 0) | ||
336 | +#define unw_tdep_is_fpreg UNW_ARCH_OBJ(is_fpreg) | ||
337 | + | ||
338 | +extern int unw_tdep_is_fpreg (int); | ||
339 | + | ||
340 | +#if defined(__cplusplus) || defined(c_plusplus) | ||
341 | +} | ||
342 | +#endif | ||
343 | + | ||
344 | +#endif /* LIBUNWIND_H */ | ||
345 | --- a/include/libunwind.h.in | ||
346 | +++ b/include/libunwind.h.in | ||
347 | @@ -3,7 +3,9 @@ | ||
348 | |||
349 | #ifndef UNW_REMOTE_ONLY | ||
350 | |||
351 | -#if defined __arm__ | ||
352 | +#if defined __aarch64__ | ||
353 | +#include "libunwind-aarch64.h" | ||
354 | +#elif defined __arm__ | ||
355 | # include "libunwind-arm.h" | ||
356 | #elif defined __hppa__ | ||
357 | # include "libunwind-hppa.h" | ||
358 | --- /dev/null | ||
359 | +++ b/include/tdep-aarch64/dwarf-config.h | ||
360 | @@ -0,0 +1,52 @@ | ||
361 | +/* libunwind - a platform-independent unwind library | ||
362 | + Copyright (C) 2008 CodeSourcery | ||
363 | + Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> | ||
364 | + Copyright (C) 2013 Linaro Limited | ||
365 | + | ||
366 | +This file is part of libunwind. | ||
367 | + | ||
368 | +Permission is hereby granted, free of charge, to any person obtaining | ||
369 | +a copy of this software and associated documentation files (the | ||
370 | +"Software"), to deal in the Software without restriction, including | ||
371 | +without limitation the rights to use, copy, modify, merge, publish, | ||
372 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
373 | +permit persons to whom the Software is furnished to do so, subject to | ||
374 | +the following conditions: | ||
375 | + | ||
376 | +The above copyright notice and this permission notice shall be | ||
377 | +included in all copies or substantial portions of the Software. | ||
378 | + | ||
379 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
380 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
381 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
382 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
383 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
384 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
385 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
386 | + | ||
387 | +#ifndef dwarf_config_h | ||
388 | +#define dwarf_config_h | ||
389 | + | ||
390 | +/* This matches the value udes by GCC (see | ||
391 | + gcc/config/aarch64/aarch64.h:DWARF_FRAME_REGISTERS. */ | ||
392 | +#define DWARF_NUM_PRESERVED_REGS 97 | ||
393 | + | ||
394 | +/* Return TRUE if the ADDR_SPACE uses big-endian byte-order. */ | ||
395 | +#define dwarf_is_big_endian(addr_space) 0 | ||
396 | + | ||
397 | +#define dwarf_to_unw_regnum(reg) (((reg) <= UNW_AARCH64_V31) ? (reg) : 0) | ||
398 | + | ||
399 | +/* Convert a pointer to a dwarf_cursor structure to a pointer to | ||
400 | + unw_cursor_t. */ | ||
401 | +#define dwarf_to_cursor(c) ((unw_cursor_t *) (c)) | ||
402 | + | ||
403 | +typedef struct dwarf_loc | ||
404 | + { | ||
405 | + unw_word_t val; | ||
406 | +#ifndef UNW_LOCAL_ONLY | ||
407 | + unw_word_t type; /* see DWARF_LOC_TYPE_* macros. */ | ||
408 | +#endif | ||
409 | + } | ||
410 | +dwarf_loc_t; | ||
411 | + | ||
412 | +#endif /* dwarf_config_h */ | ||
413 | --- /dev/null | ||
414 | +++ b/include/tdep-aarch64/jmpbuf.h | ||
415 | @@ -0,0 +1,33 @@ | ||
416 | +/* libunwind - a platform-independent unwind library | ||
417 | + Copyright (C) 2008 CodeSourcery | ||
418 | + Copyright (C) 2013 Linaro Limited | ||
419 | + | ||
420 | +This file is part of libunwind. | ||
421 | + | ||
422 | +Permission is hereby granted, free of charge, to any person obtaining | ||
423 | +a copy of this software and associated documentation files (the | ||
424 | +"Software"), to deal in the Software without restriction, including | ||
425 | +without limitation the rights to use, copy, modify, merge, publish, | ||
426 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
427 | +permit persons to whom the Software is furnished to do so, subject to | ||
428 | +the following conditions: | ||
429 | + | ||
430 | +The above copyright notice and this permission notice shall be | ||
431 | +included in all copies or substantial portions of the Software. | ||
432 | + | ||
433 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
434 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
435 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
436 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
437 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
438 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
439 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
440 | + | ||
441 | +/* Use glibc's jump-buffer indices; NPTL peeks at SP: */ | ||
442 | + | ||
443 | +/* FIXME for AArch64 */ | ||
444 | + | ||
445 | +#define JB_SP 13 | ||
446 | +#define JB_RP 14 | ||
447 | +#define JB_MASK_SAVED 15 | ||
448 | +#define JB_MASK 16 | ||
449 | --- /dev/null | ||
450 | +++ b/include/tdep-aarch64/libunwind_i.h | ||
451 | @@ -0,0 +1,294 @@ | ||
452 | +/* libunwind - a platform-independent unwind library | ||
453 | + Copyright (C) 2001-2005 Hewlett-Packard Co | ||
454 | + Contributed by David Mosberger-Tang <davidm@hpl.hp.com> | ||
455 | + Copyright (C) 2013 Linaro Limited | ||
456 | + | ||
457 | +This file is part of libunwind. | ||
458 | + | ||
459 | +Permission is hereby granted, free of charge, to any person obtaining | ||
460 | +a copy of this software and associated documentation files (the | ||
461 | +"Software"), to deal in the Software without restriction, including | ||
462 | +without limitation the rights to use, copy, modify, merge, publish, | ||
463 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
464 | +permit persons to whom the Software is furnished to do so, subject to | ||
465 | +the following conditions: | ||
466 | + | ||
467 | +The above copyright notice and this permission notice shall be | ||
468 | +included in all copies or substantial portions of the Software. | ||
469 | + | ||
470 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
471 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
472 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
473 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
474 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
475 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
476 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
477 | + | ||
478 | +#ifndef AARCH64_LIBUNWIND_I_H | ||
479 | +#define AARCH64_LIBUNWIND_I_H | ||
480 | + | ||
481 | +/* Target-dependent definitions that are internal to libunwind but need | ||
482 | + to be shared with target-independent code. */ | ||
483 | + | ||
484 | +#include <stdlib.h> | ||
485 | +#include <libunwind.h> | ||
486 | + | ||
487 | +#include "elf64.h" | ||
488 | +#include "mempool.h" | ||
489 | +#include "dwarf.h" | ||
490 | + | ||
491 | +typedef struct | ||
492 | + { | ||
493 | + /* no aarch64-specific fast trace */ | ||
494 | + } | ||
495 | +unw_tdep_frame_t; | ||
496 | + | ||
497 | +#ifdef UNW_LOCAL_ONLY | ||
498 | + | ||
499 | +typedef unw_word_t aarch64_loc_t; | ||
500 | + | ||
501 | +#else /* !UNW_LOCAL_ONLY */ | ||
502 | + | ||
503 | +typedef struct aarch64_loc | ||
504 | + { | ||
505 | + unw_word_t w0, w1; | ||
506 | + } | ||
507 | +aarch64_loc_t; | ||
508 | + | ||
509 | +#endif /* !UNW_LOCAL_ONLY */ | ||
510 | + | ||
511 | +struct unw_addr_space | ||
512 | + { | ||
513 | + struct unw_accessors acc; | ||
514 | + int big_endian; | ||
515 | + unw_caching_policy_t caching_policy; | ||
516 | +#ifdef HAVE_ATOMIC_OPS_H | ||
517 | + AO_t cache_generation; | ||
518 | +#else | ||
519 | + uint32_t cache_generation; | ||
520 | +#endif | ||
521 | + unw_word_t dyn_generation; /* see dyn-common.h */ | ||
522 | + unw_word_t dyn_info_list_addr; /* (cached) dyn_info_list_addr */ | ||
523 | + struct dwarf_rs_cache global_cache; | ||
524 | + struct unw_debug_frame_list *debug_frames; | ||
525 | + }; | ||
526 | + | ||
527 | +struct cursor | ||
528 | + { | ||
529 | + struct dwarf_cursor dwarf; /* must be first */ | ||
530 | + enum | ||
531 | + { | ||
532 | + AARCH64_SCF_NONE, | ||
533 | + AARCH64_SCF_LINUX_RT_SIGFRAME, | ||
534 | + } | ||
535 | + sigcontext_format; | ||
536 | + unw_word_t sigcontext_addr; | ||
537 | + unw_word_t sigcontext_sp; | ||
538 | + unw_word_t sigcontext_pc; | ||
539 | + }; | ||
540 | + | ||
541 | +#define DWARF_GET_LOC(l) ((l).val) | ||
542 | + | ||
543 | +#ifdef UNW_LOCAL_ONLY | ||
544 | +# define DWARF_NULL_LOC DWARF_LOC (0, 0) | ||
545 | +# define DWARF_IS_NULL_LOC(l) (DWARF_GET_LOC (l) == 0) | ||
546 | +# define DWARF_LOC(r, t) ((dwarf_loc_t) { .val = (r) }) | ||
547 | +# define DWARF_IS_REG_LOC(l) 0 | ||
548 | +# define DWARF_REG_LOC(c,r) (DWARF_LOC((unw_word_t) \ | ||
549 | + tdep_uc_addr((c)->as_arg, (r)), 0)) | ||
550 | +# define DWARF_MEM_LOC(c,m) DWARF_LOC ((m), 0) | ||
551 | +# define DWARF_FPREG_LOC(c,r) (DWARF_LOC((unw_word_t) \ | ||
552 | + tdep_uc_addr((c)->as_arg, (r)), 0)) | ||
553 | + | ||
554 | +static inline int | ||
555 | +dwarf_getfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t *val) | ||
556 | +{ | ||
557 | + if (!DWARF_GET_LOC (loc)) | ||
558 | + return -1; | ||
559 | + *val = *(unw_fpreg_t *) DWARF_GET_LOC (loc); | ||
560 | + return 0; | ||
561 | +} | ||
562 | + | ||
563 | +static inline int | ||
564 | +dwarf_putfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t val) | ||
565 | +{ | ||
566 | + if (!DWARF_GET_LOC (loc)) | ||
567 | + return -1; | ||
568 | + *(unw_fpreg_t *) DWARF_GET_LOC (loc) = val; | ||
569 | + return 0; | ||
570 | +} | ||
571 | + | ||
572 | +static inline int | ||
573 | +dwarf_get (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t *val) | ||
574 | +{ | ||
575 | + if (!DWARF_GET_LOC (loc)) | ||
576 | + return -1; | ||
577 | + *val = *(unw_word_t *) DWARF_GET_LOC (loc); | ||
578 | + return 0; | ||
579 | +} | ||
580 | + | ||
581 | +static inline int | ||
582 | +dwarf_put (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t val) | ||
583 | +{ | ||
584 | + if (!DWARF_GET_LOC (loc)) | ||
585 | + return -1; | ||
586 | + *(unw_word_t *) DWARF_GET_LOC (loc) = val; | ||
587 | + return 0; | ||
588 | +} | ||
589 | + | ||
590 | +#else /* !UNW_LOCAL_ONLY */ | ||
591 | +# define DWARF_LOC_TYPE_FP (1 << 0) | ||
592 | +# define DWARF_LOC_TYPE_REG (1 << 1) | ||
593 | +# define DWARF_NULL_LOC DWARF_LOC (0, 0) | ||
594 | +# define DWARF_IS_NULL_LOC(l) \ | ||
595 | + ({ dwarf_loc_t _l = (l); _l.val == 0 && _l.type == 0; }) | ||
596 | +# define DWARF_LOC(r, t) ((dwarf_loc_t) { .val = (r), .type = (t) }) | ||
597 | +# define DWARF_IS_REG_LOC(l) (((l).type & DWARF_LOC_TYPE_REG) != 0) | ||
598 | +# define DWARF_IS_FP_LOC(l) (((l).type & DWARF_LOC_TYPE_FP) != 0) | ||
599 | +# define DWARF_REG_LOC(c,r) DWARF_LOC((r), DWARF_LOC_TYPE_REG) | ||
600 | +# define DWARF_MEM_LOC(c,m) DWARF_LOC ((m), 0) | ||
601 | +# define DWARF_FPREG_LOC(c,r) DWARF_LOC((r), (DWARF_LOC_TYPE_REG \ | ||
602 | + | DWARF_LOC_TYPE_FP)) | ||
603 | + | ||
604 | +static inline int | ||
605 | +dwarf_getfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t *val) | ||
606 | +{ | ||
607 | + char *valp = (char *) &val; | ||
608 | + unw_word_t addr; | ||
609 | + int ret; | ||
610 | + | ||
611 | + if (DWARF_IS_NULL_LOC (loc)) | ||
612 | + return -UNW_EBADREG; | ||
613 | + | ||
614 | + if (DWARF_IS_REG_LOC (loc)) | ||
615 | + return (*c->as->acc.access_fpreg) (c->as, DWARF_GET_LOC (loc), | ||
616 | + val, 0, c->as_arg); | ||
617 | + | ||
618 | + addr = DWARF_GET_LOC (loc); | ||
619 | + if ((ret = (*c->as->acc.access_mem) (c->as, addr + 0, (unw_word_t *) valp, | ||
620 | + 0, c->as_arg)) < 0) | ||
621 | + return ret; | ||
622 | + | ||
623 | + return (*c->as->acc.access_mem) (c->as, addr + 4, (unw_word_t *) valp + 1, 0, | ||
624 | + c->as_arg); | ||
625 | +} | ||
626 | + | ||
627 | +static inline int | ||
628 | +dwarf_putfp (struct dwarf_cursor *c, dwarf_loc_t loc, unw_fpreg_t val) | ||
629 | +{ | ||
630 | + char *valp = (char *) &val; | ||
631 | + unw_word_t addr; | ||
632 | + int ret; | ||
633 | + | ||
634 | + if (DWARF_IS_NULL_LOC (loc)) | ||
635 | + return -UNW_EBADREG; | ||
636 | + | ||
637 | + if (DWARF_IS_REG_LOC (loc)) | ||
638 | + return (*c->as->acc.access_fpreg) (c->as, DWARF_GET_LOC (loc), | ||
639 | + &val, 1, c->as_arg); | ||
640 | + | ||
641 | + addr = DWARF_GET_LOC (loc); | ||
642 | + if ((ret = (*c->as->acc.access_mem) (c->as, addr + 0, (unw_word_t *) valp, | ||
643 | + 1, c->as_arg)) < 0) | ||
644 | + return ret; | ||
645 | + | ||
646 | + return (*c->as->acc.access_mem) (c->as, addr + 4, (unw_word_t *) valp + 1, | ||
647 | + 1, c->as_arg); | ||
648 | +} | ||
649 | + | ||
650 | +static inline int | ||
651 | +dwarf_get (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t *val) | ||
652 | +{ | ||
653 | + if (DWARF_IS_NULL_LOC (loc)) | ||
654 | + return -UNW_EBADREG; | ||
655 | + | ||
656 | + /* If a code-generator were to save a value of type unw_word_t in a | ||
657 | + floating-point register, we would have to support this case. I | ||
658 | + suppose it could happen with MMX registers, but does it really | ||
659 | + happen? */ | ||
660 | + assert (!DWARF_IS_FP_LOC (loc)); | ||
661 | + | ||
662 | + if (DWARF_IS_REG_LOC (loc)) | ||
663 | + return (*c->as->acc.access_reg) (c->as, DWARF_GET_LOC (loc), val, | ||
664 | + 0, c->as_arg); | ||
665 | + else | ||
666 | + return (*c->as->acc.access_mem) (c->as, DWARF_GET_LOC (loc), val, | ||
667 | + 0, c->as_arg); | ||
668 | +} | ||
669 | + | ||
670 | +static inline int | ||
671 | +dwarf_put (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t val) | ||
672 | +{ | ||
673 | + if (DWARF_IS_NULL_LOC (loc)) | ||
674 | + return -UNW_EBADREG; | ||
675 | + | ||
676 | + /* If a code-generator were to save a value of type unw_word_t in a | ||
677 | + floating-point register, we would have to support this case. I | ||
678 | + suppose it could happen with MMX registers, but does it really | ||
679 | + happen? */ | ||
680 | + assert (!DWARF_IS_FP_LOC (loc)); | ||
681 | + | ||
682 | + if (DWARF_IS_REG_LOC (loc)) | ||
683 | + return (*c->as->acc.access_reg) (c->as, DWARF_GET_LOC (loc), &val, | ||
684 | + 1, c->as_arg); | ||
685 | + else | ||
686 | + return (*c->as->acc.access_mem) (c->as, DWARF_GET_LOC (loc), &val, | ||
687 | + 1, c->as_arg); | ||
688 | +} | ||
689 | + | ||
690 | +#endif /* !UNW_LOCAL_ONLY */ | ||
691 | + | ||
692 | + | ||
693 | + | ||
694 | +#define tdep_getcontext_trace unw_getcontext | ||
695 | +#define tdep_init_done UNW_OBJ(init_done) | ||
696 | +#define tdep_init UNW_OBJ(init) | ||
697 | +/* Platforms that support UNW_INFO_FORMAT_TABLE need to define | ||
698 | + tdep_search_unwind_table. */ | ||
699 | +#define tdep_search_unwind_table dwarf_search_unwind_table | ||
700 | +#define tdep_find_unwind_table dwarf_find_unwind_table | ||
701 | +#define tdep_uc_addr UNW_OBJ(uc_addr) | ||
702 | +#define tdep_get_elf_image UNW_ARCH_OBJ(get_elf_image) | ||
703 | +#define tdep_access_reg UNW_OBJ(access_reg) | ||
704 | +#define tdep_access_fpreg UNW_OBJ(access_fpreg) | ||
705 | +#define tdep_fetch_frame(c,ip,n) do {} while(0) | ||
706 | +#define tdep_cache_frame(c,rs) do {} while(0) | ||
707 | +#define tdep_reuse_frame(c,rs) do {} while(0) | ||
708 | +#define tdep_stash_frame(c,rs) do {} while(0) | ||
709 | +#define tdep_trace(cur,addr,n) (-UNW_ENOINFO) | ||
710 | + | ||
711 | +#ifdef UNW_LOCAL_ONLY | ||
712 | +# define tdep_find_proc_info(c,ip,n) \ | ||
713 | + dwarf_find_proc_info((c)->as, (ip), &(c)->pi, (n), \ | ||
714 | + (c)->as_arg) | ||
715 | +# define tdep_put_unwind_info(as,pi,arg) \ | ||
716 | + dwarf_put_unwind_info((as), (pi), (arg)) | ||
717 | +#else | ||
718 | +# define tdep_find_proc_info(c,ip,n) \ | ||
719 | + (*(c)->as->acc.find_proc_info)((c)->as, (ip), &(c)->pi, (n), \ | ||
720 | + (c)->as_arg) | ||
721 | +# define tdep_put_unwind_info(as,pi,arg) \ | ||
722 | + (*(as)->acc.put_unwind_info)((as), (pi), (arg)) | ||
723 | +#endif | ||
724 | + | ||
725 | +#define tdep_get_as(c) ((c)->dwarf.as) | ||
726 | +#define tdep_get_as_arg(c) ((c)->dwarf.as_arg) | ||
727 | +#define tdep_get_ip(c) ((c)->dwarf.ip) | ||
728 | +#define tdep_big_endian(as) ((as)->big_endian) | ||
729 | + | ||
730 | +extern int tdep_init_done; | ||
731 | + | ||
732 | +extern void tdep_init (void); | ||
733 | +extern int tdep_search_unwind_table (unw_addr_space_t as, unw_word_t ip, | ||
734 | + unw_dyn_info_t *di, unw_proc_info_t *pi, | ||
735 | + int need_unwind_info, void *arg); | ||
736 | +extern void *tdep_uc_addr (unw_tdep_context_t *uc, int reg); | ||
737 | +extern int tdep_get_elf_image (struct elf_image *ei, pid_t pid, unw_word_t ip, | ||
738 | + unsigned long *segbase, unsigned long *mapoff, | ||
739 | + char *path, size_t pathlen); | ||
740 | +extern int tdep_access_reg (struct cursor *c, unw_regnum_t reg, | ||
741 | + unw_word_t *valp, int write); | ||
742 | +extern int tdep_access_fpreg (struct cursor *c, unw_regnum_t reg, | ||
743 | + unw_fpreg_t *valp, int write); | ||
744 | + | ||
745 | +#endif /* AARCH64_LIBUNWIND_I_H */ | ||
746 | --- a/include/tdep/dwarf-config.h | ||
747 | +++ b/include/tdep/dwarf-config.h | ||
748 | @@ -1,7 +1,9 @@ | ||
749 | /* Provide a real file - not a symlink - as it would cause multiarch conflicts | ||
750 | when multiple different arch releases are installed simultaneously. */ | ||
751 | |||
752 | -#if defined __arm__ | ||
753 | +#if defined __aarch64__ | ||
754 | +# include "tdep-aarch64/dwarf-config.h" | ||
755 | +#elif defined __arm__ | ||
756 | # include "tdep-arm/dwarf-config.h" | ||
757 | #elif defined __hppa__ | ||
758 | # include "tdep-hppa/dwarf-config.h" | ||
759 | --- a/include/tdep/jmpbuf.h | ||
760 | +++ b/include/tdep/jmpbuf.h | ||
761 | @@ -3,6 +3,8 @@ | ||
762 | |||
763 | #ifndef UNW_REMOTE_ONLY | ||
764 | |||
765 | +#if defined __aarch64__ | ||
766 | +# include "tdep-aarch64/jmpbuf.h" | ||
767 | #if defined __arm__ | ||
768 | # include "tdep-arm/jmpbuf.h" | ||
769 | #elif defined __hppa__ | ||
770 | --- a/include/tdep/libunwind_i.h.in | ||
771 | +++ b/include/tdep/libunwind_i.h.in | ||
772 | @@ -3,7 +3,9 @@ | ||
773 | |||
774 | #ifndef UNW_REMOTE_ONLY | ||
775 | |||
776 | -#if defined __arm__ | ||
777 | +#if defined __aarch64__ | ||
778 | +# include "tdep-aarch64/libunwind_i.h" | ||
779 | +#elif defined __arm__ | ||
780 | # include "tdep-arm/libunwind_i.h" | ||
781 | #elif defined __hppa__ | ||
782 | # include "tdep-hppa/libunwind_i.h" | ||
783 | --- a/src/Makefile.am | ||
784 | +++ b/src/Makefile.am | ||
785 | @@ -170,6 +170,28 @@ libunwind_elfxx_la_SOURCES = elfxx.c | ||
786 | noinst_LTLIBRARIES += $(LIBUNWIND_ELF) | ||
787 | libunwind_la_LIBADD += $(LIBUNWIND_ELF) | ||
788 | |||
789 | +# The list of files that go into libunwind and libunwind-aarch64: | ||
790 | +noinst_HEADERS += aarch64/init.h aarch64/offsets.h aarch64/unwind_i.h | ||
791 | +libunwind_la_SOURCES_aarch64_common = $(libunwind_la_SOURCES_common) \ | ||
792 | + aarch64/is_fpreg.c aarch64/regname.c | ||
793 | + | ||
794 | +# The list of files that go into libunwind: | ||
795 | +libunwind_la_SOURCES_aarch64 = $(libunwind_la_SOURCES_aarch64_common) \ | ||
796 | + $(libunwind_la_SOURCES_local) \ | ||
797 | + aarch64/Lcreate_addr_space.c aarch64/Lget_proc_info.c \ | ||
798 | + aarch64/Lget_save_loc.c aarch64/Lglobal.c aarch64/Linit.c \ | ||
799 | + aarch64/Linit_local.c aarch64/Linit_remote.c \ | ||
800 | + aarch64/Lis_signal_frame.c aarch64/Lregs.c aarch64/Lresume.c \ | ||
801 | + aarch64/Lstep.c | ||
802 | + | ||
803 | +libunwind_aarch64_la_SOURCES_aarch64 = $(libunwind_la_SOURCES_aarch64_common) \ | ||
804 | + $(libunwind_la_SOURCES_generic) \ | ||
805 | + aarch64/Gcreate_addr_space.c aarch64/Gget_proc_info.c \ | ||
806 | + aarch64/Gget_save_loc.c aarch64/Gglobal.c aarch64/Ginit.c \ | ||
807 | + aarch64/Ginit_local.c aarch64/Ginit_remote.c \ | ||
808 | + aarch64/Gis_signal_frame.c aarch64/Gregs.c aarch64/Gresume.c \ | ||
809 | + aarch64/Gstep.c | ||
810 | + | ||
811 | # The list of files that go into libunwind and libunwind-arm: | ||
812 | noinst_HEADERS += arm/init.h arm/offsets.h arm/unwind_i.h | ||
813 | libunwind_la_SOURCES_arm_common = $(libunwind_la_SOURCES_common) \ | ||
814 | @@ -418,6 +440,18 @@ if OS_FREEBSD | ||
815 | libunwind_coredump_la_SOURCES += coredump/_UCD_access_reg_freebsd.c | ||
816 | endif | ||
817 | |||
818 | +if ARCH_AARCH64 | ||
819 | + lib_LTLIBRARIES += libunwind-aarch64.la | ||
820 | + libunwind_la_SOURCES = $(libunwind_la_SOURCES_aarch64) | ||
821 | + libunwind_aarch64_la_SOURCES = $(libunwind_aarch64_la_SOURCES_aarch64) | ||
822 | + libunwind_aarch64_la_LDFLAGS = $(COMMON_SO_LDFLAGS) -version-info $(SOVERSION) | ||
823 | + libunwind_aarch64_la_LIBADD = libunwind-dwarf-generic.la | ||
824 | + libunwind_aarch64_la_LIBADD += libunwind-elf64.la | ||
825 | +if !REMOTE_ONLY | ||
826 | + libunwind_aarch64_la_LIBADD += libunwind.la -lc | ||
827 | +endif | ||
828 | + libunwind_setjmp_la_SOURCES += aarch64/siglongjmp.S | ||
829 | +else | ||
830 | if ARCH_ARM | ||
831 | lib_LTLIBRARIES += libunwind-arm.la | ||
832 | libunwind_la_SOURCES = $(libunwind_la_SOURCES_arm) | ||
833 | @@ -545,6 +579,7 @@ endif # ARCH_MIPS | ||
834 | endif # ARCH_HPPA | ||
835 | endif # ARCH_IA64 | ||
836 | endif # ARCH_ARM | ||
837 | +endif # ARCH_AARCH64 | ||
838 | |||
839 | # libunwind-setjmp depends on libunwind-$(arch). Therefore must be added | ||
840 | # at the end. | ||
841 | @@ -567,7 +602,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I | ||
842 | AM_CCASFLAGS = $(AM_CPPFLAGS) | ||
843 | noinst_HEADERS += unwind/unwind-internal.h | ||
844 | |||
845 | -EXTRA_DIST = $(libunwind_la_SOURCES_arm) \ | ||
846 | +EXTRA_DIST = $(libunwind_la_SOURCES_aarch64) \ | ||
847 | + $(libunwind_la_SOURCES_arm) \ | ||
848 | $(libunwind_la_SOURCES_hppa) \ | ||
849 | $(libunwind_la_SOURCES_ia64) \ | ||
850 | $(libunwind_la_SOURCES_mips) \ | ||
851 | @@ -579,6 +615,7 @@ EXTRA_DIST = $(libunwind_la_SOURCES_arm) | ||
852 | $(libunwind_la_SOURCES_common) \ | ||
853 | $(libunwind_la_SOURCES_local) \ | ||
854 | $(libunwind_la_SOURCES_generic) \ | ||
855 | + $(libunwind_aarch64_la_SOURCES_aarch64) \ | ||
856 | $(libunwind_arm_la_SOURCES_arm) \ | ||
857 | $(libunwind_hppa_la_SOURCES_hppa) \ | ||
858 | $(libunwind_ia64_la_SOURCES_ia64) \ | ||
859 | --- /dev/null | ||
860 | +++ b/src/aarch64/Gcreate_addr_space.c | ||
861 | @@ -0,0 +1,60 @@ | ||
862 | +/* libunwind - a platform-independent unwind library | ||
863 | + Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> | ||
864 | + Copyright (C) 2013 Linaro Limited | ||
865 | + | ||
866 | +This file is part of libunwind. | ||
867 | + | ||
868 | +Permission is hereby granted, free of charge, to any person obtaining | ||
869 | +a copy of this software and associated documentation files (the | ||
870 | +"Software"), to deal in the Software without restriction, including | ||
871 | +without limitation the rights to use, copy, modify, merge, publish, | ||
872 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
873 | +permit persons to whom the Software is furnished to do so, subject to | ||
874 | +the following conditions: | ||
875 | + | ||
876 | +The above copyright notice and this permission notice shall be | ||
877 | +included in all copies or substantial portions of the Software. | ||
878 | + | ||
879 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
880 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
881 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
882 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
883 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
884 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
885 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
886 | + | ||
887 | +#include <string.h> | ||
888 | +#include <stdlib.h> | ||
889 | + | ||
890 | +#include "unwind_i.h" | ||
891 | + | ||
892 | +PROTECTED unw_addr_space_t | ||
893 | +unw_create_addr_space (unw_accessors_t *a, int byte_order) | ||
894 | +{ | ||
895 | +#ifdef UNW_LOCAL_ONLY | ||
896 | + return NULL; | ||
897 | +#else | ||
898 | + unw_addr_space_t as; | ||
899 | + | ||
900 | + /* AArch64 supports little-endian and big-endian. */ | ||
901 | + if (byte_order != 0 && byte_order != __LITTLE_ENDIAN | ||
902 | + && byte_order != __BIG_ENDIAN) | ||
903 | + return NULL; | ||
904 | + | ||
905 | + as = malloc (sizeof (*as)); | ||
906 | + if (!as) | ||
907 | + return NULL; | ||
908 | + | ||
909 | + memset (as, 0, sizeof (*as)); | ||
910 | + | ||
911 | + as->acc = *a; | ||
912 | + | ||
913 | + /* Default to little-endian for AArch64. */ | ||
914 | + if (byte_order == 0 || byte_order == __LITTLE_ENDIAN) | ||
915 | + as->big_endian = 0; | ||
916 | + else | ||
917 | + as->big_endian = 1; | ||
918 | + | ||
919 | + return as; | ||
920 | +#endif | ||
921 | +} | ||
922 | --- /dev/null | ||
923 | +++ b/src/aarch64/Gget_proc_info.c | ||
924 | @@ -0,0 +1,39 @@ | ||
925 | +/* libunwind - a platform-independent unwind library | ||
926 | + Copyright (C) 2008 CodeSourcery | ||
927 | + | ||
928 | +This file is part of libunwind. | ||
929 | + | ||
930 | +Permission is hereby granted, free of charge, to any person obtaining | ||
931 | +a copy of this software and associated documentation files (the | ||
932 | +"Software"), to deal in the Software without restriction, including | ||
933 | +without limitation the rights to use, copy, modify, merge, publish, | ||
934 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
935 | +permit persons to whom the Software is furnished to do so, subject to | ||
936 | +the following conditions: | ||
937 | + | ||
938 | +The above copyright notice and this permission notice shall be | ||
939 | +included in all copies or substantial portions of the Software. | ||
940 | + | ||
941 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
942 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
943 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
944 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
945 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
946 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
947 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
948 | + | ||
949 | +#include "unwind_i.h" | ||
950 | + | ||
951 | +PROTECTED int | ||
952 | +unw_get_proc_info (unw_cursor_t *cursor, unw_proc_info_t *pi) | ||
953 | +{ | ||
954 | + struct cursor *c = (struct cursor *) cursor; | ||
955 | + int ret; | ||
956 | + | ||
957 | + ret = dwarf_make_proc_info (&c->dwarf); | ||
958 | + if (ret < 0) | ||
959 | + return ret; | ||
960 | + | ||
961 | + *pi = c->dwarf.pi; | ||
962 | + return 0; | ||
963 | +} | ||
964 | --- /dev/null | ||
965 | +++ b/src/aarch64/Gget_save_loc.c | ||
966 | @@ -0,0 +1,100 @@ | ||
967 | +/* libunwind - a platform-independent unwind library | ||
968 | + Copyright (C) 2008 CodeSourcery | ||
969 | + Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> | ||
970 | + Copyright (C) 2013 Linaro Limited | ||
971 | + | ||
972 | +This file is part of libunwind. | ||
973 | + | ||
974 | +Permission is hereby granted, free of charge, to any person obtaining | ||
975 | +a copy of this software and associated documentation files (the | ||
976 | +"Software"), to deal in the Software without restriction, including | ||
977 | +without limitation the rights to use, copy, modify, merge, publish, | ||
978 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
979 | +permit persons to whom the Software is furnished to do so, subject to | ||
980 | +the following conditions: | ||
981 | + | ||
982 | +The above copyright notice and this permission notice shall be | ||
983 | +included in all copies or substantial portions of the Software. | ||
984 | + | ||
985 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
986 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
987 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
988 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
989 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
990 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
991 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
992 | + | ||
993 | +#include "unwind_i.h" | ||
994 | + | ||
995 | +PROTECTED int | ||
996 | +unw_get_save_loc (unw_cursor_t *cursor, int reg, unw_save_loc_t *sloc) | ||
997 | +{ | ||
998 | + struct cursor *c = (struct cursor *) cursor; | ||
999 | + dwarf_loc_t loc; | ||
1000 | + | ||
1001 | + switch (reg) | ||
1002 | + { | ||
1003 | + case UNW_AARCH64_X0: | ||
1004 | + case UNW_AARCH64_X1: | ||
1005 | + case UNW_AARCH64_X2: | ||
1006 | + case UNW_AARCH64_X3: | ||
1007 | + case UNW_AARCH64_X4: | ||
1008 | + case UNW_AARCH64_X5: | ||
1009 | + case UNW_AARCH64_X6: | ||
1010 | + case UNW_AARCH64_X7: | ||
1011 | + case UNW_AARCH64_X8: | ||
1012 | + case UNW_AARCH64_X9: | ||
1013 | + case UNW_AARCH64_X10: | ||
1014 | + case UNW_AARCH64_X11: | ||
1015 | + case UNW_AARCH64_X12: | ||
1016 | + case UNW_AARCH64_X13: | ||
1017 | + case UNW_AARCH64_X14: | ||
1018 | + case UNW_AARCH64_X15: | ||
1019 | + case UNW_AARCH64_X16: | ||
1020 | + case UNW_AARCH64_X17: | ||
1021 | + case UNW_AARCH64_X18: | ||
1022 | + case UNW_AARCH64_X19: | ||
1023 | + case UNW_AARCH64_X20: | ||
1024 | + case UNW_AARCH64_X21: | ||
1025 | + case UNW_AARCH64_X22: | ||
1026 | + case UNW_AARCH64_X23: | ||
1027 | + case UNW_AARCH64_X24: | ||
1028 | + case UNW_AARCH64_X25: | ||
1029 | + case UNW_AARCH64_X26: | ||
1030 | + case UNW_AARCH64_X27: | ||
1031 | + case UNW_AARCH64_X28: | ||
1032 | + case UNW_AARCH64_X29: | ||
1033 | + case UNW_AARCH64_X30: | ||
1034 | + case UNW_AARCH64_SP: | ||
1035 | + case UNW_AARCH64_PC: | ||
1036 | + case UNW_AARCH64_PSTATE: | ||
1037 | + loc = c->dwarf.loc[reg]; | ||
1038 | + break; | ||
1039 | + | ||
1040 | + default: | ||
1041 | + loc = DWARF_NULL_LOC; /* default to "not saved" */ | ||
1042 | + break; | ||
1043 | + } | ||
1044 | + | ||
1045 | + memset (sloc, 0, sizeof (*sloc)); | ||
1046 | + | ||
1047 | + if (DWARF_IS_NULL_LOC (loc)) | ||
1048 | + { | ||
1049 | + sloc->type = UNW_SLT_NONE; | ||
1050 | + return 0; | ||
1051 | + } | ||
1052 | + | ||
1053 | +#if !defined(UNW_LOCAL_ONLY) | ||
1054 | + if (DWARF_IS_REG_LOC (loc)) | ||
1055 | + { | ||
1056 | + sloc->type = UNW_SLT_REG; | ||
1057 | + sloc->u.regnum = DWARF_GET_LOC (loc); | ||
1058 | + } | ||
1059 | + else | ||
1060 | +#endif | ||
1061 | + { | ||
1062 | + sloc->type = UNW_SLT_MEMORY; | ||
1063 | + sloc->u.addr = DWARF_GET_LOC (loc); | ||
1064 | + } | ||
1065 | + return 0; | ||
1066 | +} | ||
1067 | --- /dev/null | ||
1068 | +++ b/src/aarch64/Gglobal.c | ||
1069 | @@ -0,0 +1,57 @@ | ||
1070 | +/* libunwind - a platform-independent unwind library | ||
1071 | + Copyright (C) 2008 CodeSourcery | ||
1072 | + Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> | ||
1073 | + Copyright (C) 2013 Linaro Limited | ||
1074 | + | ||
1075 | +This file is part of libunwind. | ||
1076 | + | ||
1077 | +Permission is hereby granted, free of charge, to any person obtaining | ||
1078 | +a copy of this software and associated documentation files (the | ||
1079 | +"Software"), to deal in the Software without restriction, including | ||
1080 | +without limitation the rights to use, copy, modify, merge, publish, | ||
1081 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
1082 | +permit persons to whom the Software is furnished to do so, subject to | ||
1083 | +the following conditions: | ||
1084 | + | ||
1085 | +The above copyright notice and this permission notice shall be | ||
1086 | +included in all copies or substantial portions of the Software. | ||
1087 | + | ||
1088 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
1089 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
1090 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
1091 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
1092 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
1093 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
1094 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
1095 | + | ||
1096 | +#include "unwind_i.h" | ||
1097 | +#include "dwarf_i.h" | ||
1098 | + | ||
1099 | +HIDDEN define_lock (aarch64_lock); | ||
1100 | +HIDDEN int tdep_init_done; | ||
1101 | + | ||
1102 | +HIDDEN void | ||
1103 | +tdep_init (void) | ||
1104 | +{ | ||
1105 | + intrmask_t saved_mask; | ||
1106 | + | ||
1107 | + sigfillset (&unwi_full_mask); | ||
1108 | + | ||
1109 | + lock_acquire (&aarch64_lock, saved_mask); | ||
1110 | + { | ||
1111 | + if (tdep_init_done) | ||
1112 | + /* another thread else beat us to it... */ | ||
1113 | + goto out; | ||
1114 | + | ||
1115 | + mi_init (); | ||
1116 | + | ||
1117 | + dwarf_init (); | ||
1118 | + | ||
1119 | +#ifndef UNW_REMOTE_ONLY | ||
1120 | + aarch64_local_addr_space_init (); | ||
1121 | +#endif | ||
1122 | + tdep_init_done = 1; /* signal that we're initialized... */ | ||
1123 | + } | ||
1124 | + out: | ||
1125 | + lock_release (&aarch64_lock, saved_mask); | ||
1126 | +} | ||
1127 | --- /dev/null | ||
1128 | +++ b/src/aarch64/Ginit.c | ||
1129 | @@ -0,0 +1,187 @@ | ||
1130 | +/* libunwind - a platform-independent unwind library | ||
1131 | + Copyright (C) 2008 CodeSourcery | ||
1132 | + Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> | ||
1133 | + Copyright (C) 2013 Linaro Limited | ||
1134 | + | ||
1135 | +This file is part of libunwind. | ||
1136 | + | ||
1137 | +Permission is hereby granted, free of charge, to any person obtaining | ||
1138 | +a copy of this software and associated documentation files (the | ||
1139 | +"Software"), to deal in the Software without restriction, including | ||
1140 | +without limitation the rights to use, copy, modify, merge, publish, | ||
1141 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
1142 | +permit persons to whom the Software is furnished to do so, subject to | ||
1143 | +the following conditions: | ||
1144 | + | ||
1145 | +The above copyright notice and this permission notice shall be | ||
1146 | +included in all copies or substantial portions of the Software. | ||
1147 | + | ||
1148 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
1149 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
1150 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
1151 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
1152 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
1153 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
1154 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
1155 | + | ||
1156 | +#include <stdlib.h> | ||
1157 | +#include <string.h> | ||
1158 | + | ||
1159 | +#include "unwind_i.h" | ||
1160 | + | ||
1161 | +#ifdef UNW_REMOTE_ONLY | ||
1162 | + | ||
1163 | +/* unw_local_addr_space is a NULL pointer in this case. */ | ||
1164 | +PROTECTED unw_addr_space_t unw_local_addr_space; | ||
1165 | + | ||
1166 | +#else /* !UNW_REMOTE_ONLY */ | ||
1167 | + | ||
1168 | +static struct unw_addr_space local_addr_space; | ||
1169 | + | ||
1170 | +PROTECTED unw_addr_space_t unw_local_addr_space = &local_addr_space; | ||
1171 | + | ||
1172 | +static inline void * | ||
1173 | +uc_addr (ucontext_t *uc, int reg) | ||
1174 | +{ | ||
1175 | + if (reg >= UNW_AARCH64_X0 && reg <= UNW_AARCH64_V31) | ||
1176 | + return &uc->uc_mcontext.regs[reg]; | ||
1177 | + else | ||
1178 | + return NULL; | ||
1179 | +} | ||
1180 | + | ||
1181 | +# ifdef UNW_LOCAL_ONLY | ||
1182 | + | ||
1183 | +HIDDEN void * | ||
1184 | +tdep_uc_addr (ucontext_t *uc, int reg) | ||
1185 | +{ | ||
1186 | + return uc_addr (uc, reg); | ||
1187 | +} | ||
1188 | + | ||
1189 | +# endif /* UNW_LOCAL_ONLY */ | ||
1190 | + | ||
1191 | +HIDDEN unw_dyn_info_list_t _U_dyn_info_list; | ||
1192 | + | ||
1193 | +/* XXX fix me: there is currently no way to locate the dyn-info list | ||
1194 | + by a remote unwinder. On ia64, this is done via a special | ||
1195 | + unwind-table entry. Perhaps something similar can be done with | ||
1196 | + DWARF2 unwind info. */ | ||
1197 | + | ||
1198 | +static void | ||
1199 | +put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) | ||
1200 | +{ | ||
1201 | + /* it's a no-op */ | ||
1202 | +} | ||
1203 | + | ||
1204 | +static int | ||
1205 | +get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, | ||
1206 | + void *arg) | ||
1207 | +{ | ||
1208 | + *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; | ||
1209 | + return 0; | ||
1210 | +} | ||
1211 | + | ||
1212 | +static int | ||
1213 | +access_mem (unw_addr_space_t as, unw_word_t addr, unw_word_t *val, int write, | ||
1214 | + void *arg) | ||
1215 | +{ | ||
1216 | + if (write) | ||
1217 | + { | ||
1218 | + Debug (16, "mem[%lx] <- %lx\n", addr, *val); | ||
1219 | + *(unw_word_t *) addr = *val; | ||
1220 | + } | ||
1221 | + else | ||
1222 | + { | ||
1223 | + *val = *(unw_word_t *) addr; | ||
1224 | + Debug (16, "mem[%lx] -> %lx\n", addr, *val); | ||
1225 | + } | ||
1226 | + return 0; | ||
1227 | +} | ||
1228 | + | ||
1229 | +static int | ||
1230 | +access_reg (unw_addr_space_t as, unw_regnum_t reg, unw_word_t *val, int write, | ||
1231 | + void *arg) | ||
1232 | +{ | ||
1233 | + unw_word_t *addr; | ||
1234 | + ucontext_t *uc = arg; | ||
1235 | + | ||
1236 | + if (unw_is_fpreg (reg)) | ||
1237 | + goto badreg; | ||
1238 | + | ||
1239 | + if (!(addr = uc_addr (uc, reg))) | ||
1240 | + goto badreg; | ||
1241 | + | ||
1242 | + if (write) | ||
1243 | + { | ||
1244 | + *(unw_word_t *) addr = *val; | ||
1245 | + Debug (12, "%s <- %lx\n", unw_regname (reg), *val); | ||
1246 | + } | ||
1247 | + else | ||
1248 | + { | ||
1249 | + *val = *(unw_word_t *) addr; | ||
1250 | + Debug (12, "%s -> %lx\n", unw_regname (reg), *val); | ||
1251 | + } | ||
1252 | + return 0; | ||
1253 | + | ||
1254 | + badreg: | ||
1255 | + Debug (1, "bad register number %u\n", reg); | ||
1256 | + return -UNW_EBADREG; | ||
1257 | +} | ||
1258 | + | ||
1259 | +static int | ||
1260 | +access_fpreg (unw_addr_space_t as, unw_regnum_t reg, unw_fpreg_t *val, | ||
1261 | + int write, void *arg) | ||
1262 | +{ | ||
1263 | + ucontext_t *uc = arg; | ||
1264 | + unw_fpreg_t *addr; | ||
1265 | + | ||
1266 | + if (!unw_is_fpreg (reg)) | ||
1267 | + goto badreg; | ||
1268 | + | ||
1269 | + if (!(addr = uc_addr (uc, reg))) | ||
1270 | + goto badreg; | ||
1271 | + | ||
1272 | + if (write) | ||
1273 | + { | ||
1274 | + Debug (12, "%s <- %08lx.%08lx.%08lx\n", unw_regname (reg), | ||
1275 | + ((long *)val)[0], ((long *)val)[1], ((long *)val)[2]); | ||
1276 | + *(unw_fpreg_t *) addr = *val; | ||
1277 | + } | ||
1278 | + else | ||
1279 | + { | ||
1280 | + *val = *(unw_fpreg_t *) addr; | ||
1281 | + Debug (12, "%s -> %08lx.%08lx.%08lx\n", unw_regname (reg), | ||
1282 | + ((long *)val)[0], ((long *)val)[1], ((long *)val)[2]); | ||
1283 | + } | ||
1284 | + return 0; | ||
1285 | + | ||
1286 | + badreg: | ||
1287 | + Debug (1, "bad register number %u\n", reg); | ||
1288 | + /* attempt to access a non-preserved register */ | ||
1289 | + return -UNW_EBADREG; | ||
1290 | +} | ||
1291 | + | ||
1292 | +static int | ||
1293 | +get_static_proc_name (unw_addr_space_t as, unw_word_t ip, | ||
1294 | + char *buf, size_t buf_len, unw_word_t *offp, | ||
1295 | + void *arg) | ||
1296 | +{ | ||
1297 | + return _Uelf64_get_proc_name (as, getpid (), ip, buf, buf_len, offp); | ||
1298 | +} | ||
1299 | + | ||
1300 | +HIDDEN void | ||
1301 | +aarch64_local_addr_space_init (void) | ||
1302 | +{ | ||
1303 | + memset (&local_addr_space, 0, sizeof (local_addr_space)); | ||
1304 | + local_addr_space.caching_policy = UNW_CACHE_GLOBAL; | ||
1305 | + local_addr_space.acc.find_proc_info = dwarf_find_proc_info; | ||
1306 | + local_addr_space.acc.put_unwind_info = put_unwind_info; | ||
1307 | + local_addr_space.acc.get_dyn_info_list_addr = get_dyn_info_list_addr; | ||
1308 | + local_addr_space.acc.access_mem = access_mem; | ||
1309 | + local_addr_space.acc.access_reg = access_reg; | ||
1310 | + local_addr_space.acc.access_fpreg = access_fpreg; | ||
1311 | + local_addr_space.acc.resume = aarch64_local_resume; | ||
1312 | + local_addr_space.acc.get_proc_name = get_static_proc_name; | ||
1313 | + unw_flush_cache (&local_addr_space, 0, 0); | ||
1314 | +} | ||
1315 | + | ||
1316 | +#endif /* !UNW_REMOTE_ONLY */ | ||
1317 | --- /dev/null | ||
1318 | +++ b/src/aarch64/Ginit_local.c | ||
1319 | @@ -0,0 +1,55 @@ | ||
1320 | +/* libunwind - a platform-independent unwind library | ||
1321 | + Copyright (C) 2008 CodeSourcery | ||
1322 | + Copyright (C) 2011-2013 Linaro Limited | ||
1323 | + | ||
1324 | +This file is part of libunwind. | ||
1325 | + | ||
1326 | +Permission is hereby granted, free of charge, to any person obtaining | ||
1327 | +a copy of this software and associated documentation files (the | ||
1328 | +"Software"), to deal in the Software without restriction, including | ||
1329 | +without limitation the rights to use, copy, modify, merge, publish, | ||
1330 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
1331 | +permit persons to whom the Software is furnished to do so, subject to | ||
1332 | +the following conditions: | ||
1333 | + | ||
1334 | +The above copyright notice and this permission notice shall be | ||
1335 | +included in all copies or substantial portions of the Software. | ||
1336 | + | ||
1337 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
1338 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
1339 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
1340 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
1341 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
1342 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
1343 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
1344 | + | ||
1345 | +#include "unwind_i.h" | ||
1346 | +#include "init.h" | ||
1347 | + | ||
1348 | +#ifdef UNW_REMOTE_ONLY | ||
1349 | + | ||
1350 | +PROTECTED int | ||
1351 | +unw_init_local (unw_cursor_t *cursor, unw_context_t *uc) | ||
1352 | +{ | ||
1353 | + return -UNW_EINVAL; | ||
1354 | +} | ||
1355 | + | ||
1356 | +#else /* !UNW_REMOTE_ONLY */ | ||
1357 | + | ||
1358 | +PROTECTED int | ||
1359 | +unw_init_local (unw_cursor_t *cursor, unw_context_t *uc) | ||
1360 | +{ | ||
1361 | + struct cursor *c = (struct cursor *) cursor; | ||
1362 | + | ||
1363 | + if (!tdep_init_done) | ||
1364 | + tdep_init (); | ||
1365 | + | ||
1366 | + Debug (1, "(cursor=%p)\n", c); | ||
1367 | + | ||
1368 | + c->dwarf.as = unw_local_addr_space; | ||
1369 | + c->dwarf.as_arg = uc; | ||
1370 | + | ||
1371 | + return common_init (c, 1); | ||
1372 | +} | ||
1373 | + | ||
1374 | +#endif /* !UNW_REMOTE_ONLY */ | ||
1375 | --- /dev/null | ||
1376 | +++ b/src/aarch64/Ginit_remote.c | ||
1377 | @@ -0,0 +1,45 @@ | ||
1378 | +/* libunwind - a platform-independent unwind library | ||
1379 | + Copyright (C) 2008 CodeSourcery | ||
1380 | + | ||
1381 | +This file is part of libunwind. | ||
1382 | + | ||
1383 | +Permission is hereby granted, free of charge, to any person obtaining | ||
1384 | +a copy of this software and associated documentation files (the | ||
1385 | +"Software"), to deal in the Software without restriction, including | ||
1386 | +without limitation the rights to use, copy, modify, merge, publish, | ||
1387 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
1388 | +permit persons to whom the Software is furnished to do so, subject to | ||
1389 | +the following conditions: | ||
1390 | + | ||
1391 | +The above copyright notice and this permission notice shall be | ||
1392 | +included in all copies or substantial portions of the Software. | ||
1393 | + | ||
1394 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
1395 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
1396 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
1397 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
1398 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
1399 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
1400 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
1401 | + | ||
1402 | +#include "init.h" | ||
1403 | +#include "unwind_i.h" | ||
1404 | + | ||
1405 | +PROTECTED int | ||
1406 | +unw_init_remote (unw_cursor_t *cursor, unw_addr_space_t as, void *as_arg) | ||
1407 | +{ | ||
1408 | +#ifdef UNW_LOCAL_ONLY | ||
1409 | + return -UNW_EINVAL; | ||
1410 | +#else /* !UNW_LOCAL_ONLY */ | ||
1411 | + struct cursor *c = (struct cursor *) cursor; | ||
1412 | + | ||
1413 | + if (!tdep_init_done) | ||
1414 | + tdep_init (); | ||
1415 | + | ||
1416 | + Debug (1, "(cursor=%p)\n", c); | ||
1417 | + | ||
1418 | + c->dwarf.as = as; | ||
1419 | + c->dwarf.as_arg = as_arg; | ||
1420 | + return common_init (c, 0); | ||
1421 | +#endif /* !UNW_LOCAL_ONLY */ | ||
1422 | +} | ||
1423 | --- /dev/null | ||
1424 | +++ b/src/aarch64/Gis_signal_frame.c | ||
1425 | @@ -0,0 +1,64 @@ | ||
1426 | +/* libunwind - a platform-independent unwind library | ||
1427 | + Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> | ||
1428 | + Copyright (C) 2013 Linaro Limited | ||
1429 | + | ||
1430 | +This file is part of libunwind. | ||
1431 | + | ||
1432 | +Permission is hereby granted, free of charge, to any person obtaining | ||
1433 | +a copy of this software and associated documentation files (the | ||
1434 | +"Software"), to deal in the Software without restriction, including | ||
1435 | +without limitation the rights to use, copy, modify, merge, publish, | ||
1436 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
1437 | +permit persons to whom the Software is furnished to do so, subject to | ||
1438 | +the following conditions: | ||
1439 | + | ||
1440 | +The above copyright notice and this permission notice shall be | ||
1441 | +included in all copies or substantial portions of the Software. | ||
1442 | + | ||
1443 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
1444 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
1445 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
1446 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
1447 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
1448 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
1449 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
1450 | + | ||
1451 | +#include "unwind_i.h" | ||
1452 | + | ||
1453 | +/* The restorer stub will always have the form: | ||
1454 | + | ||
1455 | + d2801168 movz x8, #0x8b | ||
1456 | + d4000001 svc #0x0 | ||
1457 | +*/ | ||
1458 | + | ||
1459 | +PROTECTED int | ||
1460 | +unw_is_signal_frame (unw_cursor_t *cursor) | ||
1461 | +{ | ||
1462 | +#ifdef __linux__ | ||
1463 | + struct cursor *c = (struct cursor *) cursor; | ||
1464 | + unw_word_t w0, ip; | ||
1465 | + unw_addr_space_t as; | ||
1466 | + unw_accessors_t *a; | ||
1467 | + void *arg; | ||
1468 | + int ret; | ||
1469 | + | ||
1470 | + as = c->dwarf.as; | ||
1471 | + a = unw_get_accessors (as); | ||
1472 | + arg = c->dwarf.as_arg; | ||
1473 | + | ||
1474 | + ip = c->dwarf.ip; | ||
1475 | + | ||
1476 | + ret = (*a->access_mem) (as, ip, &w0, 0, arg); | ||
1477 | + if (ret < 0) | ||
1478 | + return ret; | ||
1479 | + | ||
1480 | + /* FIXME: distinguish 32bit insn vs 64bit registers. */ | ||
1481 | + if (w0 != 0xd4000001d2801168) | ||
1482 | + return 0; | ||
1483 | + | ||
1484 | + return 1; | ||
1485 | + | ||
1486 | +#else | ||
1487 | + return -UNW_ENOINFO; | ||
1488 | +#endif | ||
1489 | +} | ||
1490 | --- /dev/null | ||
1491 | +++ b/src/aarch64/Gregs.c | ||
1492 | @@ -0,0 +1,113 @@ | ||
1493 | +/* libunwind - a platform-independent unwind library | ||
1494 | + Copyright (C) 2008 CodeSourcery | ||
1495 | + Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> | ||
1496 | + Copyright (C) 2013 Linaro Limited | ||
1497 | + | ||
1498 | +This file is part of libunwind. | ||
1499 | + | ||
1500 | +Permission is hereby granted, free of charge, to any person obtaining | ||
1501 | +a copy of this software and associated documentation files (the | ||
1502 | +"Software"), to deal in the Software without restriction, including | ||
1503 | +without limitation the rights to use, copy, modify, merge, publish, | ||
1504 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
1505 | +permit persons to whom the Software is furnished to do so, subject to | ||
1506 | +the following conditions: | ||
1507 | + | ||
1508 | +The above copyright notice and this permission notice shall be | ||
1509 | +included in all copies or substantial portions of the Software. | ||
1510 | + | ||
1511 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
1512 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
1513 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
1514 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
1515 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
1516 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
1517 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
1518 | + | ||
1519 | +#include "unwind_i.h" | ||
1520 | + | ||
1521 | +HIDDEN int | ||
1522 | +tdep_access_reg (struct cursor *c, unw_regnum_t reg, unw_word_t *valp, | ||
1523 | + int write) | ||
1524 | +{ | ||
1525 | + dwarf_loc_t loc = DWARF_NULL_LOC; | ||
1526 | + unsigned int mask; | ||
1527 | + | ||
1528 | + switch (reg) | ||
1529 | + { | ||
1530 | + case UNW_AARCH64_X0: | ||
1531 | + case UNW_AARCH64_X1: | ||
1532 | + case UNW_AARCH64_X2: | ||
1533 | + case UNW_AARCH64_X3: | ||
1534 | + mask = 1 << reg; | ||
1535 | + if (write) | ||
1536 | + { | ||
1537 | + c->dwarf.eh_args[reg] = *valp; | ||
1538 | + c->dwarf.eh_valid_mask |= mask; | ||
1539 | + return 0; | ||
1540 | + } | ||
1541 | + else if ((c->dwarf.eh_valid_mask & mask) != 0) | ||
1542 | + { | ||
1543 | + *valp = c->dwarf.eh_args[reg]; | ||
1544 | + return 0; | ||
1545 | + } | ||
1546 | + else | ||
1547 | + loc = c->dwarf.loc[reg]; | ||
1548 | + break; | ||
1549 | + | ||
1550 | + case UNW_AARCH64_X4: | ||
1551 | + case UNW_AARCH64_X5: | ||
1552 | + case UNW_AARCH64_X6: | ||
1553 | + case UNW_AARCH64_X7: | ||
1554 | + case UNW_AARCH64_X8: | ||
1555 | + case UNW_AARCH64_X9: | ||
1556 | + case UNW_AARCH64_X10: | ||
1557 | + case UNW_AARCH64_X11: | ||
1558 | + case UNW_AARCH64_X12: | ||
1559 | + case UNW_AARCH64_X13: | ||
1560 | + case UNW_AARCH64_X14: | ||
1561 | + case UNW_AARCH64_X15: | ||
1562 | + case UNW_AARCH64_X16: | ||
1563 | + case UNW_AARCH64_X17: | ||
1564 | + case UNW_AARCH64_X18: | ||
1565 | + case UNW_AARCH64_X19: | ||
1566 | + case UNW_AARCH64_X20: | ||
1567 | + case UNW_AARCH64_X21: | ||
1568 | + case UNW_AARCH64_X22: | ||
1569 | + case UNW_AARCH64_X23: | ||
1570 | + case UNW_AARCH64_X24: | ||
1571 | + case UNW_AARCH64_X25: | ||
1572 | + case UNW_AARCH64_X26: | ||
1573 | + case UNW_AARCH64_X27: | ||
1574 | + case UNW_AARCH64_X28: | ||
1575 | + case UNW_AARCH64_X29: | ||
1576 | + case UNW_AARCH64_X30: | ||
1577 | + case UNW_AARCH64_PC: | ||
1578 | + case UNW_AARCH64_PSTATE: | ||
1579 | + loc = c->dwarf.loc[reg]; | ||
1580 | + break; | ||
1581 | + | ||
1582 | + case UNW_AARCH64_SP: | ||
1583 | + if (write) | ||
1584 | + return -UNW_EREADONLYREG; | ||
1585 | + *valp = c->dwarf.cfa; | ||
1586 | + return 0; | ||
1587 | + | ||
1588 | + default: | ||
1589 | + Debug (1, "bad register number %u\n", reg); | ||
1590 | + return -UNW_EBADREG; | ||
1591 | + } | ||
1592 | + | ||
1593 | + if (write) | ||
1594 | + return dwarf_put (&c->dwarf, loc, *valp); | ||
1595 | + else | ||
1596 | + return dwarf_get (&c->dwarf, loc, valp); | ||
1597 | +} | ||
1598 | + | ||
1599 | +HIDDEN int | ||
1600 | +tdep_access_fpreg (struct cursor *c, unw_regnum_t reg, unw_fpreg_t *valp, | ||
1601 | + int write) | ||
1602 | +{ | ||
1603 | + Debug (1, "bad register number %u\n", reg); | ||
1604 | + return -UNW_EBADREG; | ||
1605 | +} | ||
1606 | --- /dev/null | ||
1607 | +++ b/src/aarch64/Gresume.c | ||
1608 | @@ -0,0 +1,177 @@ | ||
1609 | +/* libunwind - a platform-independent unwind library | ||
1610 | + Copyright (C) 2008 CodeSourcery | ||
1611 | + Copyright (C) 2011-2013 Linaro Limited | ||
1612 | + Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> | ||
1613 | + | ||
1614 | +This file is part of libunwind. | ||
1615 | + | ||
1616 | +Permission is hereby granted, free of charge, to any person obtaining | ||
1617 | +a copy of this software and associated documentation files (the | ||
1618 | +"Software"), to deal in the Software without restriction, including | ||
1619 | +without limitation the rights to use, copy, modify, merge, publish, | ||
1620 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
1621 | +permit persons to whom the Software is furnished to do so, subject to | ||
1622 | +the following conditions: | ||
1623 | + | ||
1624 | +The above copyright notice and this permission notice shall be | ||
1625 | +included in all copies or substantial portions of the Software. | ||
1626 | + | ||
1627 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
1628 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
1629 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
1630 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
1631 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
1632 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
1633 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
1634 | + | ||
1635 | +#include "unwind_i.h" | ||
1636 | +#include "offsets.h" | ||
1637 | + | ||
1638 | +#ifndef UNW_REMOTE_ONLY | ||
1639 | + | ||
1640 | +HIDDEN inline int | ||
1641 | +aarch64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg) | ||
1642 | +{ | ||
1643 | +#ifdef __linux__ | ||
1644 | + struct cursor *c = (struct cursor *) cursor; | ||
1645 | + unw_tdep_context_t *uc = c->dwarf.as_arg; | ||
1646 | + | ||
1647 | + if (c->sigcontext_format == AARCH64_SCF_NONE) | ||
1648 | + { | ||
1649 | + /* Since there are no signals involved here we restore the non scratch | ||
1650 | + registers only. */ | ||
1651 | + unsigned long regs[11]; | ||
1652 | + regs[0] = uc->uc_mcontext.regs[19]; | ||
1653 | + regs[1] = uc->uc_mcontext.regs[20]; | ||
1654 | + regs[2] = uc->uc_mcontext.regs[21]; | ||
1655 | + regs[3] = uc->uc_mcontext.regs[22]; | ||
1656 | + regs[4] = uc->uc_mcontext.regs[23]; | ||
1657 | + regs[5] = uc->uc_mcontext.regs[24]; | ||
1658 | + regs[6] = uc->uc_mcontext.regs[25]; | ||
1659 | + regs[7] = uc->uc_mcontext.regs[26]; | ||
1660 | + regs[8] = uc->uc_mcontext.regs[27]; | ||
1661 | + regs[9] = uc->uc_mcontext.regs[28]; | ||
1662 | + regs[10] = uc->uc_mcontext.regs[30]; /* LR */ | ||
1663 | + unsigned long sp = uc->uc_mcontext.sp; | ||
1664 | + | ||
1665 | + struct regs_overlay { | ||
1666 | + char x[sizeof(regs)]; | ||
1667 | + }; | ||
1668 | + | ||
1669 | + asm volatile ( | ||
1670 | + "ldp x19, x20, [%0]\n" | ||
1671 | + "ldp x21, x22, [%0,16]\n" | ||
1672 | + "ldp x23, x24, [%0,32]\n" | ||
1673 | + "ldp x25, x26, [%0,48]\n" | ||
1674 | + "ldp x27, x28, [%0,64]\n" | ||
1675 | + "ldr x30, [%0,80]\n" | ||
1676 | + "mov sp, %1\n" | ||
1677 | + "ret \n" | ||
1678 | + : | ||
1679 | + : "r" (regs), | ||
1680 | + "r" (sp), | ||
1681 | + "m" (*(struct regs_overlay *)regs) | ||
1682 | + ); | ||
1683 | + } | ||
1684 | + else | ||
1685 | + { | ||
1686 | + struct sigcontext *sc = (struct sigcontext *) c->sigcontext_addr; | ||
1687 | + | ||
1688 | + if (c->dwarf.eh_valid_mask & 0x1) sc->regs[0] = c->dwarf.eh_args[0]; | ||
1689 | + if (c->dwarf.eh_valid_mask & 0x2) sc->regs[1] = c->dwarf.eh_args[1]; | ||
1690 | + if (c->dwarf.eh_valid_mask & 0x4) sc->regs[2] = c->dwarf.eh_args[2]; | ||
1691 | + if (c->dwarf.eh_valid_mask & 0x8) sc->regs[3] = c->dwarf.eh_args[3]; | ||
1692 | + | ||
1693 | + sc->regs[4] = uc->uc_mcontext.regs[4]; | ||
1694 | + sc->regs[5] = uc->uc_mcontext.regs[5]; | ||
1695 | + sc->regs[6] = uc->uc_mcontext.regs[6]; | ||
1696 | + sc->regs[7] = uc->uc_mcontext.regs[7]; | ||
1697 | + sc->regs[8] = uc->uc_mcontext.regs[8]; | ||
1698 | + sc->regs[9] = uc->uc_mcontext.regs[9]; | ||
1699 | + sc->regs[10] = uc->uc_mcontext.regs[10]; | ||
1700 | + sc->regs[11] = uc->uc_mcontext.regs[11]; | ||
1701 | + sc->regs[12] = uc->uc_mcontext.regs[12]; | ||
1702 | + sc->regs[13] = uc->uc_mcontext.regs[13]; | ||
1703 | + sc->regs[14] = uc->uc_mcontext.regs[14]; | ||
1704 | + sc->regs[15] = uc->uc_mcontext.regs[15]; | ||
1705 | + sc->regs[16] = uc->uc_mcontext.regs[16]; | ||
1706 | + sc->regs[17] = uc->uc_mcontext.regs[17]; | ||
1707 | + sc->regs[18] = uc->uc_mcontext.regs[18]; | ||
1708 | + sc->regs[19] = uc->uc_mcontext.regs[19]; | ||
1709 | + sc->regs[20] = uc->uc_mcontext.regs[20]; | ||
1710 | + sc->regs[21] = uc->uc_mcontext.regs[21]; | ||
1711 | + sc->regs[22] = uc->uc_mcontext.regs[22]; | ||
1712 | + sc->regs[23] = uc->uc_mcontext.regs[23]; | ||
1713 | + sc->regs[24] = uc->uc_mcontext.regs[24]; | ||
1714 | + sc->regs[25] = uc->uc_mcontext.regs[25]; | ||
1715 | + sc->regs[26] = uc->uc_mcontext.regs[26]; | ||
1716 | + sc->regs[27] = uc->uc_mcontext.regs[27]; | ||
1717 | + sc->regs[28] = uc->uc_mcontext.regs[28]; | ||
1718 | + sc->regs[29] = uc->uc_mcontext.regs[29]; | ||
1719 | + sc->regs[30] = uc->uc_mcontext.regs[30]; | ||
1720 | + sc->sp = uc->uc_mcontext.sp; | ||
1721 | + sc->pc = uc->uc_mcontext.pc; | ||
1722 | + sc->pstate = uc->uc_mcontext.pstate; | ||
1723 | + | ||
1724 | + asm volatile ( | ||
1725 | + "mov sp, %0\n" | ||
1726 | + "ret %1\n" | ||
1727 | + : : "r" (c->sigcontext_sp), "r" (c->sigcontext_pc) | ||
1728 | + ); | ||
1729 | + } | ||
1730 | + unreachable(); | ||
1731 | +#else | ||
1732 | + printf ("%s: implement me\n", __FUNCTION__); | ||
1733 | +#endif | ||
1734 | + return -UNW_EINVAL; | ||
1735 | +} | ||
1736 | + | ||
1737 | +#endif /* !UNW_REMOTE_ONLY */ | ||
1738 | + | ||
1739 | +static inline void | ||
1740 | +establish_machine_state (struct cursor *c) | ||
1741 | +{ | ||
1742 | + unw_addr_space_t as = c->dwarf.as; | ||
1743 | + void *arg = c->dwarf.as_arg; | ||
1744 | + unw_fpreg_t fpval; | ||
1745 | + unw_word_t val; | ||
1746 | + int reg; | ||
1747 | + | ||
1748 | + Debug (8, "copying out cursor state\n"); | ||
1749 | + | ||
1750 | + for (reg = 0; reg <= UNW_AARCH64_PSTATE; ++reg) | ||
1751 | + { | ||
1752 | + Debug (16, "copying %s %d\n", unw_regname (reg), reg); | ||
1753 | + if (unw_is_fpreg (reg)) | ||
1754 | + { | ||
1755 | + if (tdep_access_fpreg (c, reg, &fpval, 0) >= 0) | ||
1756 | + as->acc.access_fpreg (as, reg, &fpval, 1, arg); | ||
1757 | + } | ||
1758 | + else | ||
1759 | + { | ||
1760 | + if (tdep_access_reg (c, reg, &val, 0) >= 0) | ||
1761 | + as->acc.access_reg (as, reg, &val, 1, arg); | ||
1762 | + } | ||
1763 | + } | ||
1764 | +} | ||
1765 | + | ||
1766 | +PROTECTED int | ||
1767 | +unw_resume (unw_cursor_t *cursor) | ||
1768 | +{ | ||
1769 | + struct cursor *c = (struct cursor *) cursor; | ||
1770 | + | ||
1771 | + Debug (1, "(cursor=%p)\n", c); | ||
1772 | + | ||
1773 | + if (!c->dwarf.ip) | ||
1774 | + { | ||
1775 | + /* This can happen easily when the frame-chain gets truncated | ||
1776 | + due to bad or missing unwind-info. */ | ||
1777 | + Debug (1, "refusing to resume execution at address 0\n"); | ||
1778 | + return -UNW_EINVAL; | ||
1779 | + } | ||
1780 | + | ||
1781 | + establish_machine_state (c); | ||
1782 | + | ||
1783 | + return (*c->dwarf.as->acc.resume) (c->dwarf.as, (unw_cursor_t *) c, | ||
1784 | + c->dwarf.as_arg); | ||
1785 | +} | ||
1786 | --- /dev/null | ||
1787 | +++ b/src/aarch64/Gstep.c | ||
1788 | @@ -0,0 +1,129 @@ | ||
1789 | +/* libunwind - a platform-independent unwind library | ||
1790 | + Copyright (C) 2008 CodeSourcery | ||
1791 | + Copyright (C) 2011-2013 Linaro Limited | ||
1792 | + Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> | ||
1793 | + | ||
1794 | +This file is part of libunwind. | ||
1795 | + | ||
1796 | +Permission is hereby granted, free of charge, to any person obtaining | ||
1797 | +a copy of this software and associated documentation files (the | ||
1798 | +"Software"), to deal in the Software without restriction, including | ||
1799 | +without limitation the rights to use, copy, modify, merge, publish, | ||
1800 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
1801 | +permit persons to whom the Software is furnished to do so, subject to | ||
1802 | +the following conditions: | ||
1803 | + | ||
1804 | +The above copyright notice and this permission notice shall be | ||
1805 | +included in all copies or substantial portions of the Software. | ||
1806 | + | ||
1807 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
1808 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
1809 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
1810 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
1811 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
1812 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
1813 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
1814 | + | ||
1815 | +#include "unwind_i.h" | ||
1816 | +#include "offsets.h" | ||
1817 | + | ||
1818 | +PROTECTED int | ||
1819 | +unw_handle_signal_frame (unw_cursor_t *cursor) | ||
1820 | +{ | ||
1821 | + struct cursor *c = (struct cursor *) cursor; | ||
1822 | + int ret; | ||
1823 | + unw_word_t sc_addr, sp, sp_addr = c->dwarf.cfa; | ||
1824 | + struct dwarf_loc sp_loc = DWARF_LOC (sp_addr, 0); | ||
1825 | + | ||
1826 | + if ((ret = dwarf_get (&c->dwarf, sp_loc, &sp)) < 0) | ||
1827 | + return -UNW_EUNSPEC; | ||
1828 | + | ||
1829 | + ret = unw_is_signal_frame (cursor); | ||
1830 | + Debug(1, "unw_is_signal_frame()=%d\n", ret); | ||
1831 | + | ||
1832 | + /* Save the SP and PC to be able to return execution at this point | ||
1833 | + later in time (unw_resume). */ | ||
1834 | + c->sigcontext_sp = c->dwarf.cfa; | ||
1835 | + c->sigcontext_pc = c->dwarf.ip; | ||
1836 | + | ||
1837 | + if (ret) | ||
1838 | + { | ||
1839 | + c->sigcontext_format = AARCH64_SCF_LINUX_RT_SIGFRAME; | ||
1840 | + sc_addr = sp_addr + sizeof (siginfo_t) + LINUX_UC_MCONTEXT_OFF; | ||
1841 | + } | ||
1842 | + else | ||
1843 | + return -UNW_EUNSPEC; | ||
1844 | + | ||
1845 | + c->sigcontext_addr = sc_addr; | ||
1846 | + | ||
1847 | + /* Update the dwarf cursor. | ||
1848 | + Set the location of the registers to the corresponding addresses of the | ||
1849 | + uc_mcontext / sigcontext structure contents. */ | ||
1850 | + c->dwarf.loc[UNW_AARCH64_X0] = DWARF_LOC (sc_addr + LINUX_SC_X0_OFF, 0); | ||
1851 | + c->dwarf.loc[UNW_AARCH64_X1] = DWARF_LOC (sc_addr + LINUX_SC_X1_OFF, 0); | ||
1852 | + c->dwarf.loc[UNW_AARCH64_X2] = DWARF_LOC (sc_addr + LINUX_SC_X2_OFF, 0); | ||
1853 | + c->dwarf.loc[UNW_AARCH64_X3] = DWARF_LOC (sc_addr + LINUX_SC_X3_OFF, 0); | ||
1854 | + c->dwarf.loc[UNW_AARCH64_X4] = DWARF_LOC (sc_addr + LINUX_SC_X4_OFF, 0); | ||
1855 | + c->dwarf.loc[UNW_AARCH64_X5] = DWARF_LOC (sc_addr + LINUX_SC_X5_OFF, 0); | ||
1856 | + c->dwarf.loc[UNW_AARCH64_X6] = DWARF_LOC (sc_addr + LINUX_SC_X6_OFF, 0); | ||
1857 | + c->dwarf.loc[UNW_AARCH64_X7] = DWARF_LOC (sc_addr + LINUX_SC_X7_OFF, 0); | ||
1858 | + c->dwarf.loc[UNW_AARCH64_X8] = DWARF_LOC (sc_addr + LINUX_SC_X8_OFF, 0); | ||
1859 | + c->dwarf.loc[UNW_AARCH64_X9] = DWARF_LOC (sc_addr + LINUX_SC_X9_OFF, 0); | ||
1860 | + c->dwarf.loc[UNW_AARCH64_X10] = DWARF_LOC (sc_addr + LINUX_SC_X10_OFF, 0); | ||
1861 | + c->dwarf.loc[UNW_AARCH64_X11] = DWARF_LOC (sc_addr + LINUX_SC_X11_OFF, 0); | ||
1862 | + c->dwarf.loc[UNW_AARCH64_X12] = DWARF_LOC (sc_addr + LINUX_SC_X12_OFF, 0); | ||
1863 | + c->dwarf.loc[UNW_AARCH64_X13] = DWARF_LOC (sc_addr + LINUX_SC_X13_OFF, 0); | ||
1864 | + c->dwarf.loc[UNW_AARCH64_X14] = DWARF_LOC (sc_addr + LINUX_SC_X14_OFF, 0); | ||
1865 | + c->dwarf.loc[UNW_AARCH64_X15] = DWARF_LOC (sc_addr + LINUX_SC_X15_OFF, 0); | ||
1866 | + c->dwarf.loc[UNW_AARCH64_X16] = DWARF_LOC (sc_addr + LINUX_SC_X16_OFF, 0); | ||
1867 | + c->dwarf.loc[UNW_AARCH64_X17] = DWARF_LOC (sc_addr + LINUX_SC_X17_OFF, 0); | ||
1868 | + c->dwarf.loc[UNW_AARCH64_X18] = DWARF_LOC (sc_addr + LINUX_SC_X18_OFF, 0); | ||
1869 | + c->dwarf.loc[UNW_AARCH64_X19] = DWARF_LOC (sc_addr + LINUX_SC_X19_OFF, 0); | ||
1870 | + c->dwarf.loc[UNW_AARCH64_X20] = DWARF_LOC (sc_addr + LINUX_SC_X20_OFF, 0); | ||
1871 | + c->dwarf.loc[UNW_AARCH64_X21] = DWARF_LOC (sc_addr + LINUX_SC_X21_OFF, 0); | ||
1872 | + c->dwarf.loc[UNW_AARCH64_X22] = DWARF_LOC (sc_addr + LINUX_SC_X22_OFF, 0); | ||
1873 | + c->dwarf.loc[UNW_AARCH64_X23] = DWARF_LOC (sc_addr + LINUX_SC_X23_OFF, 0); | ||
1874 | + c->dwarf.loc[UNW_AARCH64_X24] = DWARF_LOC (sc_addr + LINUX_SC_X24_OFF, 0); | ||
1875 | + c->dwarf.loc[UNW_AARCH64_X25] = DWARF_LOC (sc_addr + LINUX_SC_X25_OFF, 0); | ||
1876 | + c->dwarf.loc[UNW_AARCH64_X26] = DWARF_LOC (sc_addr + LINUX_SC_X26_OFF, 0); | ||
1877 | + c->dwarf.loc[UNW_AARCH64_X27] = DWARF_LOC (sc_addr + LINUX_SC_X27_OFF, 0); | ||
1878 | + c->dwarf.loc[UNW_AARCH64_X28] = DWARF_LOC (sc_addr + LINUX_SC_X28_OFF, 0); | ||
1879 | + c->dwarf.loc[UNW_AARCH64_X29] = DWARF_LOC (sc_addr + LINUX_SC_X29_OFF, 0); | ||
1880 | + c->dwarf.loc[UNW_AARCH64_X30] = DWARF_LOC (sc_addr + LINUX_SC_X30_OFF, 0); | ||
1881 | + c->dwarf.loc[UNW_AARCH64_SP] = DWARF_LOC (sc_addr + LINUX_SC_SP_OFF, 0); | ||
1882 | + c->dwarf.loc[UNW_AARCH64_PC] = DWARF_LOC (sc_addr + LINUX_SC_PC_OFF, 0); | ||
1883 | + c->dwarf.loc[UNW_AARCH64_PSTATE] = DWARF_LOC (sc_addr + LINUX_SC_PSTATE_OFF, 0); | ||
1884 | + | ||
1885 | + /* Set SP/CFA and PC/IP. */ | ||
1886 | + dwarf_get (&c->dwarf, c->dwarf.loc[UNW_AARCH64_SP], &c->dwarf.cfa); | ||
1887 | + dwarf_get (&c->dwarf, c->dwarf.loc[UNW_AARCH64_PC], &c->dwarf.ip); | ||
1888 | + | ||
1889 | + c->dwarf.pi_valid = 0; | ||
1890 | + | ||
1891 | + return 1; | ||
1892 | +} | ||
1893 | + | ||
1894 | +PROTECTED int | ||
1895 | +unw_step (unw_cursor_t *cursor) | ||
1896 | +{ | ||
1897 | + struct cursor *c = (struct cursor *) cursor; | ||
1898 | + int ret; | ||
1899 | + | ||
1900 | + Debug (1, "(cursor=%p, ip=0x%016lx, cfa=0x%016lx))\n", | ||
1901 | + c, c->dwarf.ip, c->dwarf.cfa); | ||
1902 | + | ||
1903 | + /* Check if this is a signal frame. */ | ||
1904 | + if (unw_is_signal_frame (cursor)) | ||
1905 | + return unw_handle_signal_frame (cursor); | ||
1906 | + | ||
1907 | + ret = dwarf_step (&c->dwarf); | ||
1908 | + Debug(1, "dwarf_step()=%d\n", ret); | ||
1909 | + | ||
1910 | + if (unlikely (ret == -UNW_ESTOPUNWIND)) | ||
1911 | + return ret; | ||
1912 | + | ||
1913 | + if (unlikely (ret < 0)) | ||
1914 | + return 0; | ||
1915 | + | ||
1916 | + return (c->dwarf.ip == 0) ? 0 : 1; | ||
1917 | +} | ||
1918 | --- /dev/null | ||
1919 | +++ b/src/aarch64/Lcreate_addr_space.c | ||
1920 | @@ -0,0 +1,5 @@ | ||
1921 | +#define UNW_LOCAL_ONLY | ||
1922 | +#include <libunwind.h> | ||
1923 | +#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) | ||
1924 | +#include "Gcreate_addr_space.c" | ||
1925 | +#endif | ||
1926 | --- /dev/null | ||
1927 | +++ b/src/aarch64/Lget_proc_info.c | ||
1928 | @@ -0,0 +1,5 @@ | ||
1929 | +#define UNW_LOCAL_ONLY | ||
1930 | +#include <libunwind.h> | ||
1931 | +#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) | ||
1932 | +#include "Gget_proc_info.c" | ||
1933 | +#endif | ||
1934 | --- /dev/null | ||
1935 | +++ b/src/aarch64/Lget_save_loc.c | ||
1936 | @@ -0,0 +1,5 @@ | ||
1937 | +#define UNW_LOCAL_ONLY | ||
1938 | +#include <libunwind.h> | ||
1939 | +#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) | ||
1940 | +#include "Gget_save_loc.c" | ||
1941 | +#endif | ||
1942 | --- /dev/null | ||
1943 | +++ b/src/aarch64/Lglobal.c | ||
1944 | @@ -0,0 +1,5 @@ | ||
1945 | +#define UNW_LOCAL_ONLY | ||
1946 | +#include <libunwind.h> | ||
1947 | +#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) | ||
1948 | +#include "Gglobal.c" | ||
1949 | +#endif | ||
1950 | --- /dev/null | ||
1951 | +++ b/src/aarch64/Linit.c | ||
1952 | @@ -0,0 +1,5 @@ | ||
1953 | +#define UNW_LOCAL_ONLY | ||
1954 | +#include <libunwind.h> | ||
1955 | +#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) | ||
1956 | +#include "Ginit.c" | ||
1957 | +#endif | ||
1958 | --- /dev/null | ||
1959 | +++ b/src/aarch64/Linit_local.c | ||
1960 | @@ -0,0 +1,5 @@ | ||
1961 | +#define UNW_LOCAL_ONLY | ||
1962 | +#include <libunwind.h> | ||
1963 | +#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) | ||
1964 | +#include "Ginit_local.c" | ||
1965 | +#endif | ||
1966 | --- /dev/null | ||
1967 | +++ b/src/aarch64/Linit_remote.c | ||
1968 | @@ -0,0 +1,5 @@ | ||
1969 | +#define UNW_LOCAL_ONLY | ||
1970 | +#include <libunwind.h> | ||
1971 | +#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) | ||
1972 | +#include "Ginit_remote.c" | ||
1973 | +#endif | ||
1974 | --- /dev/null | ||
1975 | +++ b/src/aarch64/Lis_signal_frame.c | ||
1976 | @@ -0,0 +1,5 @@ | ||
1977 | +#define UNW_LOCAL_ONLY | ||
1978 | +#include <libunwind.h> | ||
1979 | +#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) | ||
1980 | +#include "Gis_signal_frame.c" | ||
1981 | +#endif | ||
1982 | --- /dev/null | ||
1983 | +++ b/src/aarch64/Lregs.c | ||
1984 | @@ -0,0 +1,5 @@ | ||
1985 | +#define UNW_LOCAL_ONLY | ||
1986 | +#include <libunwind.h> | ||
1987 | +#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) | ||
1988 | +#include "Gregs.c" | ||
1989 | +#endif | ||
1990 | --- /dev/null | ||
1991 | +++ b/src/aarch64/Lresume.c | ||
1992 | @@ -0,0 +1,5 @@ | ||
1993 | +#define UNW_LOCAL_ONLY | ||
1994 | +#include <libunwind.h> | ||
1995 | +#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) | ||
1996 | +#include "Gresume.c" | ||
1997 | +#endif | ||
1998 | --- /dev/null | ||
1999 | +++ b/src/aarch64/Lstep.c | ||
2000 | @@ -0,0 +1,5 @@ | ||
2001 | +#define UNW_LOCAL_ONLY | ||
2002 | +#include <libunwind.h> | ||
2003 | +#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY) | ||
2004 | +#include "Gstep.c" | ||
2005 | +#endif | ||
2006 | --- /dev/null | ||
2007 | +++ b/src/aarch64/gen-offsets.c | ||
2008 | @@ -0,0 +1,68 @@ | ||
2009 | +#include <stdio.h> | ||
2010 | +#include <stddef.h> | ||
2011 | +#include <ucontext.h> | ||
2012 | +#include <asm/sigcontext.h> | ||
2013 | + | ||
2014 | +#define UC(N,X) \ | ||
2015 | + printf ("#define LINUX_UC_" N "_OFF\t0x%X\n", offsetof (ucontext_t, X)) | ||
2016 | + | ||
2017 | +#define SC(N,X) \ | ||
2018 | + printf ("#define LINUX_SC_" N "_OFF\t0x%X\n", offsetof (struct sigcontext, X)) | ||
2019 | + | ||
2020 | +int | ||
2021 | +main (void) | ||
2022 | +{ | ||
2023 | + printf ( | ||
2024 | +"/* Linux-specific definitions: */\n\n" | ||
2025 | + | ||
2026 | +"/* Define various structure offsets to simplify cross-compilation. */\n\n" | ||
2027 | + | ||
2028 | +"/* Offsets for AArch64 Linux \"ucontext_t\": */\n\n"); | ||
2029 | + | ||
2030 | + UC ("FLAGS", uc_flags); | ||
2031 | + UC ("LINK", uc_link); | ||
2032 | + UC ("STACK", uc_stack); | ||
2033 | + UC ("MCONTEXT", uc_mcontext); | ||
2034 | + UC ("SIGMASK", uc_sigmask); | ||
2035 | + | ||
2036 | + printf ("\n/* Offsets for AArch64 Linux \"struct sigcontext\": */\n\n"); | ||
2037 | + | ||
2038 | + SC ("R0", regs[0]); | ||
2039 | + SC ("R1", regs[1]); | ||
2040 | + SC ("R2", regs[2]); | ||
2041 | + SC ("R3", regs[3]); | ||
2042 | + SC ("R4", regs[4]); | ||
2043 | + SC ("R5", regs[5]); | ||
2044 | + SC ("R6", regs[6]); | ||
2045 | + SC ("R7", regs[7]); | ||
2046 | + SC ("R8", regs[8]); | ||
2047 | + SC ("R9", regs[9]); | ||
2048 | + SC ("R10", regs[10]); | ||
2049 | + SC ("R11", regs[11]); | ||
2050 | + SC ("R12", regs[12]); | ||
2051 | + SC ("R13", regs[13]); | ||
2052 | + SC ("R14", regs[14]); | ||
2053 | + SC ("R15", regs[15]); | ||
2054 | + SC ("R16", regs[16]); | ||
2055 | + SC ("R17", regs[17]); | ||
2056 | + SC ("R18", regs[18]); | ||
2057 | + SC ("R19", regs[19]); | ||
2058 | + SC ("R20", regs[20]); | ||
2059 | + SC ("R21", regs[21]); | ||
2060 | + SC ("R22", regs[22]); | ||
2061 | + SC ("R23", regs[23]); | ||
2062 | + SC ("R24", regs[24]); | ||
2063 | + SC ("R25", regs[25]); | ||
2064 | + SC ("R26", regs[26]); | ||
2065 | + SC ("R27", regs[27]); | ||
2066 | + SC ("R28", regs[28]); | ||
2067 | + SC ("R29", regs[29]); | ||
2068 | + SC ("R30", regs[30]); | ||
2069 | + SC ("R31", regs[31]); | ||
2070 | + | ||
2071 | + SC ("PC", pc); | ||
2072 | + SC ("SP", sp); | ||
2073 | + SC ("Fault", fault_address); | ||
2074 | + SC ("state", pstate); | ||
2075 | + return 0; | ||
2076 | +} | ||
2077 | --- /dev/null | ||
2078 | +++ b/src/aarch64/init.h | ||
2079 | @@ -0,0 +1,127 @@ | ||
2080 | +/* libunwind - a platform-independent unwind library | ||
2081 | + Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> | ||
2082 | + Copyright (C) 2013 Linaro Limited | ||
2083 | + | ||
2084 | +This file is part of libunwind. | ||
2085 | + | ||
2086 | +Permission is hereby granted, free of charge, to any person obtaining | ||
2087 | +a copy of this software and associated documentation files (the | ||
2088 | +"Software"), to deal in the Software without restriction, including | ||
2089 | +without limitation the rights to use, copy, modify, merge, publish, | ||
2090 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
2091 | +permit persons to whom the Software is furnished to do so, subject to | ||
2092 | +the following conditions: | ||
2093 | + | ||
2094 | +The above copyright notice and this permission notice shall be | ||
2095 | +included in all copies or substantial portions of the Software. | ||
2096 | + | ||
2097 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
2098 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
2099 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
2100 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
2101 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
2102 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
2103 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
2104 | + | ||
2105 | +#include "unwind_i.h" | ||
2106 | + | ||
2107 | +static inline int | ||
2108 | +common_init (struct cursor *c, unsigned use_prev_instr) | ||
2109 | +{ | ||
2110 | + int ret, i; | ||
2111 | + | ||
2112 | + c->dwarf.loc[UNW_AARCH64_X0] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X0); | ||
2113 | + c->dwarf.loc[UNW_AARCH64_X1] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X1); | ||
2114 | + c->dwarf.loc[UNW_AARCH64_X2] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X2); | ||
2115 | + c->dwarf.loc[UNW_AARCH64_X3] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X3); | ||
2116 | + c->dwarf.loc[UNW_AARCH64_X4] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X4); | ||
2117 | + c->dwarf.loc[UNW_AARCH64_X5] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X5); | ||
2118 | + c->dwarf.loc[UNW_AARCH64_X6] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X6); | ||
2119 | + c->dwarf.loc[UNW_AARCH64_X7] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X7); | ||
2120 | + c->dwarf.loc[UNW_AARCH64_X8] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X8); | ||
2121 | + c->dwarf.loc[UNW_AARCH64_X9] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X9); | ||
2122 | + c->dwarf.loc[UNW_AARCH64_X10] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X10); | ||
2123 | + c->dwarf.loc[UNW_AARCH64_X11] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X11); | ||
2124 | + c->dwarf.loc[UNW_AARCH64_X12] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X12); | ||
2125 | + c->dwarf.loc[UNW_AARCH64_X13] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X13); | ||
2126 | + c->dwarf.loc[UNW_AARCH64_X14] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X14); | ||
2127 | + c->dwarf.loc[UNW_AARCH64_X15] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X15); | ||
2128 | + c->dwarf.loc[UNW_AARCH64_X16] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X16); | ||
2129 | + c->dwarf.loc[UNW_AARCH64_X17] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X17); | ||
2130 | + c->dwarf.loc[UNW_AARCH64_X18] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X18); | ||
2131 | + c->dwarf.loc[UNW_AARCH64_X19] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X19); | ||
2132 | + c->dwarf.loc[UNW_AARCH64_X20] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X20); | ||
2133 | + c->dwarf.loc[UNW_AARCH64_X21] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X21); | ||
2134 | + c->dwarf.loc[UNW_AARCH64_X22] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X22); | ||
2135 | + c->dwarf.loc[UNW_AARCH64_X23] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X23); | ||
2136 | + c->dwarf.loc[UNW_AARCH64_X24] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X24); | ||
2137 | + c->dwarf.loc[UNW_AARCH64_X25] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X25); | ||
2138 | + c->dwarf.loc[UNW_AARCH64_X26] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X26); | ||
2139 | + c->dwarf.loc[UNW_AARCH64_X27] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X27); | ||
2140 | + c->dwarf.loc[UNW_AARCH64_X28] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X28); | ||
2141 | + c->dwarf.loc[UNW_AARCH64_X29] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X29); | ||
2142 | + c->dwarf.loc[UNW_AARCH64_X30] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_X30); | ||
2143 | + c->dwarf.loc[UNW_AARCH64_SP] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_SP); | ||
2144 | + c->dwarf.loc[UNW_AARCH64_PC] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_PC); | ||
2145 | + c->dwarf.loc[UNW_AARCH64_PSTATE] = DWARF_REG_LOC (&c->dwarf, | ||
2146 | + UNW_AARCH64_PSTATE); | ||
2147 | + c->dwarf.loc[UNW_AARCH64_V0] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V0); | ||
2148 | + c->dwarf.loc[UNW_AARCH64_V1] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V1); | ||
2149 | + c->dwarf.loc[UNW_AARCH64_V2] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V2); | ||
2150 | + c->dwarf.loc[UNW_AARCH64_V3] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V3); | ||
2151 | + c->dwarf.loc[UNW_AARCH64_V4] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V4); | ||
2152 | + c->dwarf.loc[UNW_AARCH64_V5] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V5); | ||
2153 | + c->dwarf.loc[UNW_AARCH64_V6] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V6); | ||
2154 | + c->dwarf.loc[UNW_AARCH64_V7] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V7); | ||
2155 | + c->dwarf.loc[UNW_AARCH64_V8] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V8); | ||
2156 | + c->dwarf.loc[UNW_AARCH64_V9] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V9); | ||
2157 | + c->dwarf.loc[UNW_AARCH64_V10] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V10); | ||
2158 | + c->dwarf.loc[UNW_AARCH64_V11] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V11); | ||
2159 | + c->dwarf.loc[UNW_AARCH64_V12] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V12); | ||
2160 | + c->dwarf.loc[UNW_AARCH64_V13] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V13); | ||
2161 | + c->dwarf.loc[UNW_AARCH64_V14] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V14); | ||
2162 | + c->dwarf.loc[UNW_AARCH64_V15] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V15); | ||
2163 | + c->dwarf.loc[UNW_AARCH64_V16] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V16); | ||
2164 | + c->dwarf.loc[UNW_AARCH64_V17] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V17); | ||
2165 | + c->dwarf.loc[UNW_AARCH64_V18] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V18); | ||
2166 | + c->dwarf.loc[UNW_AARCH64_V19] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V19); | ||
2167 | + c->dwarf.loc[UNW_AARCH64_V20] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V20); | ||
2168 | + c->dwarf.loc[UNW_AARCH64_V21] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V21); | ||
2169 | + c->dwarf.loc[UNW_AARCH64_V22] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V22); | ||
2170 | + c->dwarf.loc[UNW_AARCH64_V23] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V23); | ||
2171 | + c->dwarf.loc[UNW_AARCH64_V24] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V24); | ||
2172 | + c->dwarf.loc[UNW_AARCH64_V25] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V25); | ||
2173 | + c->dwarf.loc[UNW_AARCH64_V26] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V26); | ||
2174 | + c->dwarf.loc[UNW_AARCH64_V27] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V27); | ||
2175 | + c->dwarf.loc[UNW_AARCH64_V28] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V28); | ||
2176 | + c->dwarf.loc[UNW_AARCH64_V29] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V29); | ||
2177 | + c->dwarf.loc[UNW_AARCH64_V30] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V30); | ||
2178 | + c->dwarf.loc[UNW_AARCH64_V31] = DWARF_REG_LOC (&c->dwarf, UNW_AARCH64_V31); | ||
2179 | + | ||
2180 | + for (i = UNW_AARCH64_PSTATE + 1; i < UNW_AARCH64_V0; ++i) | ||
2181 | + c->dwarf.loc[i] = DWARF_NULL_LOC; | ||
2182 | + | ||
2183 | + ret = dwarf_get (&c->dwarf, c->dwarf.loc[UNW_AARCH64_PC], &c->dwarf.ip); | ||
2184 | + if (ret < 0) | ||
2185 | + return ret; | ||
2186 | + | ||
2187 | + ret = dwarf_get (&c->dwarf, c->dwarf.loc[UNW_AARCH64_SP], &c->dwarf.cfa); | ||
2188 | + if (ret < 0) | ||
2189 | + return ret; | ||
2190 | + | ||
2191 | + c->sigcontext_format = AARCH64_SCF_NONE; | ||
2192 | + c->sigcontext_addr = 0; | ||
2193 | + c->sigcontext_sp = 0; | ||
2194 | + c->sigcontext_pc = 0; | ||
2195 | + | ||
2196 | + c->dwarf.args_size = 0; | ||
2197 | + c->dwarf.ret_addr_column = 0; | ||
2198 | + c->dwarf.stash_frames = 0; | ||
2199 | + c->dwarf.use_prev_instr = use_prev_instr; | ||
2200 | + c->dwarf.pi_valid = 0; | ||
2201 | + c->dwarf.pi_is_dynamic = 0; | ||
2202 | + c->dwarf.hint = 0; | ||
2203 | + c->dwarf.prev_rs = 0; | ||
2204 | + | ||
2205 | + return 0; | ||
2206 | +} | ||
2207 | --- /dev/null | ||
2208 | +++ b/src/aarch64/is_fpreg.c | ||
2209 | @@ -0,0 +1,32 @@ | ||
2210 | +/* libunwind - a platform-independent unwind library | ||
2211 | + Copyright (C) 2008 CodeSourcery | ||
2212 | + Copyright (C) 2013 Linaro Limited | ||
2213 | + | ||
2214 | +This file is part of libunwind. | ||
2215 | + | ||
2216 | +Permission is hereby granted, free of charge, to any person obtaining | ||
2217 | +a copy of this software and associated documentation files (the | ||
2218 | +"Software"), to deal in the Software without restriction, including | ||
2219 | +without limitation the rights to use, copy, modify, merge, publish, | ||
2220 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
2221 | +permit persons to whom the Software is furnished to do so, subject to | ||
2222 | +the following conditions: | ||
2223 | + | ||
2224 | +The above copyright notice and this permission notice shall be | ||
2225 | +included in all copies or substantial portions of the Software. | ||
2226 | + | ||
2227 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
2228 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
2229 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
2230 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
2231 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
2232 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
2233 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
2234 | + | ||
2235 | +#include "libunwind_i.h" | ||
2236 | + | ||
2237 | +PROTECTED int | ||
2238 | +unw_is_fpreg (int regnum) | ||
2239 | +{ | ||
2240 | + return (regnum >= UNW_AARCH64_V0 && regnum <= UNW_AARCH64_V31); | ||
2241 | +} | ||
2242 | --- /dev/null | ||
2243 | +++ b/src/aarch64/offsets.h | ||
2244 | @@ -0,0 +1,49 @@ | ||
2245 | +/* Linux-specific definitions: */ | ||
2246 | + | ||
2247 | +/* Define various structure offsets to simplify cross-compilation. */ | ||
2248 | + | ||
2249 | +/* Offsets for AArch64 Linux "ucontext_t": */ | ||
2250 | + | ||
2251 | +#define LINUX_UC_FLAGS_OFF 0x0 | ||
2252 | +#define LINUX_UC_LINK_OFF 0x8 | ||
2253 | +#define LINUX_UC_STACK_OFF 0x10 | ||
2254 | +#define LINUX_UC_SIGMASK_OFF 0x28 | ||
2255 | +#define LINUX_UC_MCONTEXT_OFF 0xb0 | ||
2256 | + | ||
2257 | +/* Offsets for AArch64 Linux "struct sigcontext": */ | ||
2258 | + | ||
2259 | +#define LINUX_SC_FAULTADDRESS_OFF 0x00 | ||
2260 | +#define LINUX_SC_X0_OFF 0x008 | ||
2261 | +#define LINUX_SC_X1_OFF 0x010 | ||
2262 | +#define LINUX_SC_X2_OFF 0x018 | ||
2263 | +#define LINUX_SC_X3_OFF 0x020 | ||
2264 | +#define LINUX_SC_X4_OFF 0x028 | ||
2265 | +#define LINUX_SC_X5_OFF 0x030 | ||
2266 | +#define LINUX_SC_X6_OFF 0x038 | ||
2267 | +#define LINUX_SC_X7_OFF 0x040 | ||
2268 | +#define LINUX_SC_X8_OFF 0x048 | ||
2269 | +#define LINUX_SC_X9_OFF 0x050 | ||
2270 | +#define LINUX_SC_X10_OFF 0x058 | ||
2271 | +#define LINUX_SC_X11_OFF 0x060 | ||
2272 | +#define LINUX_SC_X12_OFF 0x068 | ||
2273 | +#define LINUX_SC_X13_OFF 0x070 | ||
2274 | +#define LINUX_SC_X14_OFF 0x078 | ||
2275 | +#define LINUX_SC_X15_OFF 0x080 | ||
2276 | +#define LINUX_SC_X16_OFF 0x088 | ||
2277 | +#define LINUX_SC_X17_OFF 0x090 | ||
2278 | +#define LINUX_SC_X18_OFF 0x098 | ||
2279 | +#define LINUX_SC_X19_OFF 0x0a0 | ||
2280 | +#define LINUX_SC_X20_OFF 0x0a8 | ||
2281 | +#define LINUX_SC_X21_OFF 0x0b0 | ||
2282 | +#define LINUX_SC_X22_OFF 0x0b8 | ||
2283 | +#define LINUX_SC_X23_OFF 0x0c0 | ||
2284 | +#define LINUX_SC_X24_OFF 0x0c8 | ||
2285 | +#define LINUX_SC_X25_OFF 0x0d0 | ||
2286 | +#define LINUX_SC_X26_OFF 0x0d8 | ||
2287 | +#define LINUX_SC_X27_OFF 0x0e0 | ||
2288 | +#define LINUX_SC_X28_OFF 0x0e8 | ||
2289 | +#define LINUX_SC_X29_OFF 0x0f0 | ||
2290 | +#define LINUX_SC_X30_OFF 0x0f8 | ||
2291 | +#define LINUX_SC_SP_OFF 0x100 | ||
2292 | +#define LINUX_SC_PC_OFF 0x108 | ||
2293 | +#define LINUX_SC_PSTATE_OFF 0x110 | ||
2294 | --- /dev/null | ||
2295 | +++ b/src/aarch64/regname.c | ||
2296 | @@ -0,0 +1,106 @@ | ||
2297 | +/* libunwind - a platform-independent unwind library | ||
2298 | + Copyright (C) 2012 Tommi Rantala <tt.rantala@gmail.com> | ||
2299 | + Copyright (C) 2013 Linaro Limited | ||
2300 | + | ||
2301 | +This file is part of libunwind. | ||
2302 | + | ||
2303 | +Permission is hereby granted, free of charge, to any person obtaining | ||
2304 | +a copy of this software and associated documentation files (the | ||
2305 | +"Software"), to deal in the Software without restriction, including | ||
2306 | +without limitation the rights to use, copy, modify, merge, publish, | ||
2307 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
2308 | +permit persons to whom the Software is furnished to do so, subject to | ||
2309 | +the following conditions: | ||
2310 | + | ||
2311 | +The above copyright notice and this permission notice shall be | ||
2312 | +included in all copies or substantial portions of the Software. | ||
2313 | + | ||
2314 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
2315 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
2316 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
2317 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
2318 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
2319 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
2320 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
2321 | + | ||
2322 | +#include "unwind_i.h" | ||
2323 | + | ||
2324 | +static const char *const regname[] = | ||
2325 | + { | ||
2326 | + [UNW_AARCH64_X0] = "x0", | ||
2327 | + [UNW_AARCH64_X1] = "x1", | ||
2328 | + [UNW_AARCH64_X2] = "x2", | ||
2329 | + [UNW_AARCH64_X3] = "x3", | ||
2330 | + [UNW_AARCH64_X4] = "x4", | ||
2331 | + [UNW_AARCH64_X5] = "x5", | ||
2332 | + [UNW_AARCH64_X6] = "x6", | ||
2333 | + [UNW_AARCH64_X7] = "x7", | ||
2334 | + [UNW_AARCH64_X8] = "x8", | ||
2335 | + [UNW_AARCH64_X9] = "x9", | ||
2336 | + [UNW_AARCH64_X10] = "x10", | ||
2337 | + [UNW_AARCH64_X11] = "x11", | ||
2338 | + [UNW_AARCH64_X12] = "x12", | ||
2339 | + [UNW_AARCH64_X13] = "x13", | ||
2340 | + [UNW_AARCH64_X14] = "x14", | ||
2341 | + [UNW_AARCH64_X15] = "x15", | ||
2342 | + [UNW_AARCH64_X16] = "ip0", | ||
2343 | + [UNW_AARCH64_X17] = "ip1", | ||
2344 | + [UNW_AARCH64_X18] = "x18", | ||
2345 | + [UNW_AARCH64_X19] = "x19", | ||
2346 | + [UNW_AARCH64_X20] = "x20", | ||
2347 | + [UNW_AARCH64_X21] = "x21", | ||
2348 | + [UNW_AARCH64_X22] = "x22", | ||
2349 | + [UNW_AARCH64_X23] = "x23", | ||
2350 | + [UNW_AARCH64_X24] = "x24", | ||
2351 | + [UNW_AARCH64_X25] = "x25", | ||
2352 | + [UNW_AARCH64_X26] = "x26", | ||
2353 | + [UNW_AARCH64_X27] = "x27", | ||
2354 | + [UNW_AARCH64_X28] = "x28", | ||
2355 | + [UNW_AARCH64_X29] = "fp", | ||
2356 | + [UNW_AARCH64_X30] = "lr", | ||
2357 | + [UNW_AARCH64_SP] = "sp", | ||
2358 | + [UNW_AARCH64_PC] = "pc", | ||
2359 | + [UNW_AARCH64_V0] = "v0", | ||
2360 | + [UNW_AARCH64_V1] = "v1", | ||
2361 | + [UNW_AARCH64_V2] = "v2", | ||
2362 | + [UNW_AARCH64_V3] = "v3", | ||
2363 | + [UNW_AARCH64_V4] = "v4", | ||
2364 | + [UNW_AARCH64_V5] = "v5", | ||
2365 | + [UNW_AARCH64_V6] = "v6", | ||
2366 | + [UNW_AARCH64_V7] = "v7", | ||
2367 | + [UNW_AARCH64_V8] = "v8", | ||
2368 | + [UNW_AARCH64_V9] = "v9", | ||
2369 | + [UNW_AARCH64_V10] = "v10", | ||
2370 | + [UNW_AARCH64_V11] = "v11", | ||
2371 | + [UNW_AARCH64_V12] = "v12", | ||
2372 | + [UNW_AARCH64_V13] = "v13", | ||
2373 | + [UNW_AARCH64_V14] = "v14", | ||
2374 | + [UNW_AARCH64_V15] = "v15", | ||
2375 | + [UNW_AARCH64_V16] = "v16", | ||
2376 | + [UNW_AARCH64_V17] = "v17", | ||
2377 | + [UNW_AARCH64_V18] = "v18", | ||
2378 | + [UNW_AARCH64_V19] = "v19", | ||
2379 | + [UNW_AARCH64_V20] = "v20", | ||
2380 | + [UNW_AARCH64_V21] = "v21", | ||
2381 | + [UNW_AARCH64_V22] = "v22", | ||
2382 | + [UNW_AARCH64_V23] = "v23", | ||
2383 | + [UNW_AARCH64_V24] = "v24", | ||
2384 | + [UNW_AARCH64_V25] = "v25", | ||
2385 | + [UNW_AARCH64_V26] = "v26", | ||
2386 | + [UNW_AARCH64_V27] = "v27", | ||
2387 | + [UNW_AARCH64_V28] = "v28", | ||
2388 | + [UNW_AARCH64_V29] = "v29", | ||
2389 | + [UNW_AARCH64_V30] = "v30", | ||
2390 | + [UNW_AARCH64_V31] = "v31", | ||
2391 | + [UNW_AARCH64_FPSR] = "fpsr", | ||
2392 | + [UNW_AARCH64_FPCR] = "fpcr", | ||
2393 | + }; | ||
2394 | + | ||
2395 | +PROTECTED const char * | ||
2396 | +unw_regname (unw_regnum_t reg) | ||
2397 | +{ | ||
2398 | + if (reg < (unw_regnum_t) ARRAY_SIZE (regname) && regname[reg] != NULL) | ||
2399 | + return regname[reg]; | ||
2400 | + else | ||
2401 | + return "???"; | ||
2402 | +} | ||
2403 | --- /dev/null | ||
2404 | +++ b/src/aarch64/siglongjmp.S | ||
2405 | @@ -0,0 +1,12 @@ | ||
2406 | + /* Dummy implementation for now. */ | ||
2407 | + | ||
2408 | + .global _UI_siglongjmp_cont | ||
2409 | + .global _UI_longjmp_cont | ||
2410 | + | ||
2411 | +_UI_siglongjmp_cont: | ||
2412 | +_UI_longjmp_cont: | ||
2413 | + ret | ||
2414 | +#ifdef __linux__ | ||
2415 | + /* We do not need executable stack. */ | ||
2416 | + .section .note.GNU-stack,"",%progbits | ||
2417 | +#endif | ||
2418 | --- /dev/null | ||
2419 | +++ b/src/aarch64/unwind_i.h | ||
2420 | @@ -0,0 +1,43 @@ | ||
2421 | +/* libunwind - a platform-independent unwind library | ||
2422 | + Copyright (C) 2008 CodeSourcery | ||
2423 | + Copyright (C) 2013 Linaro Limited | ||
2424 | + | ||
2425 | +This file is part of libunwind. | ||
2426 | + | ||
2427 | +Permission is hereby granted, free of charge, to any person obtaining | ||
2428 | +a copy of this software and associated documentation files (the | ||
2429 | +"Software"), to deal in the Software without restriction, including | ||
2430 | +without limitation the rights to use, copy, modify, merge, publish, | ||
2431 | +distribute, sublicense, and/or sell copies of the Software, and to | ||
2432 | +permit persons to whom the Software is furnished to do so, subject to | ||
2433 | +the following conditions: | ||
2434 | + | ||
2435 | +The above copyright notice and this permission notice shall be | ||
2436 | +included in all copies or substantial portions of the Software. | ||
2437 | + | ||
2438 | +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
2439 | +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
2440 | +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
2441 | +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
2442 | +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
2443 | +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
2444 | +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
2445 | + | ||
2446 | +#ifndef unwind_i_h | ||
2447 | +#define unwind_i_h | ||
2448 | + | ||
2449 | +#include <stdint.h> | ||
2450 | + | ||
2451 | +#include <libunwind-aarch64.h> | ||
2452 | + | ||
2453 | +#include "libunwind_i.h" | ||
2454 | + | ||
2455 | +#define aarch64_lock UNW_OBJ(lock) | ||
2456 | +#define aarch64_local_resume UNW_OBJ(local_resume) | ||
2457 | +#define aarch64_local_addr_space_init UNW_OBJ(local_addr_space_init) | ||
2458 | + | ||
2459 | +extern void aarch64_local_addr_space_init (void); | ||
2460 | +extern int aarch64_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, | ||
2461 | + void *arg); | ||
2462 | + | ||
2463 | +#endif /* unwind_i_h */ | ||
2464 | --- a/src/coredump/_UCD_access_reg_linux.c | ||
2465 | +++ b/src/coredump/_UCD_access_reg_linux.c | ||
2466 | @@ -39,7 +39,10 @@ _UCD_access_reg (unw_addr_space_t as, | ||
2467 | return -UNW_EINVAL; | ||
2468 | } | ||
2469 | |||
2470 | -#if defined(UNW_TARGET_ARM) | ||
2471 | +#if defined(UNW_TARGET_AARCH64) | ||
2472 | + if (regnum < 0 || regnum >= UNW_AARCH64_FPCR) | ||
2473 | + goto badreg; | ||
2474 | +#elif defined(UNW_TARGET_ARM) | ||
2475 | if (regnum < 0 || regnum >= 16) | ||
2476 | goto badreg; | ||
2477 | #elif defined(UNW_TARGET_SH) | ||
2478 | --- a/src/ptrace/_UPT_reg_offset.c | ||
2479 | +++ b/src/ptrace/_UPT_reg_offset.c | ||
2480 | @@ -1,6 +1,7 @@ | ||
2481 | /* libunwind - a platform-independent unwind library | ||
2482 | Copyright (C) 2003-2004 Hewlett-Packard Co | ||
2483 | Contributed by David Mosberger-Tang <davidm@hpl.hp.com> | ||
2484 | + Copyright (C) 2013 Linaro Limited | ||
2485 | |||
2486 | This file is part of libunwind. | ||
2487 | |||
2488 | @@ -501,6 +502,41 @@ const int _UPT_reg_offset[UNW_REG_LAST + | ||
2489 | [UNW_ARM_R15] = 0x3c, | ||
2490 | #elif defined(UNW_TARGET_MIPS) | ||
2491 | #elif defined(UNW_TARGET_SH) | ||
2492 | +#elif defined(UNW_TARGET_AARCH64) | ||
2493 | + [UNW_AARCH64_X0] = 0x00, | ||
2494 | + [UNW_AARCH64_X1] = 0x08, | ||
2495 | + [UNW_AARCH64_X2] = 0x10, | ||
2496 | + [UNW_AARCH64_X3] = 0x18, | ||
2497 | + [UNW_AARCH64_X4] = 0x20, | ||
2498 | + [UNW_AARCH64_X5] = 0x28, | ||
2499 | + [UNW_AARCH64_X6] = 0x30, | ||
2500 | + [UNW_AARCH64_X7] = 0x38, | ||
2501 | + [UNW_AARCH64_X8] = 0x40, | ||
2502 | + [UNW_AARCH64_X9] = 0x48, | ||
2503 | + [UNW_AARCH64_X10] = 0x50, | ||
2504 | + [UNW_AARCH64_X11] = 0x58, | ||
2505 | + [UNW_AARCH64_X12] = 0x60, | ||
2506 | + [UNW_AARCH64_X13] = 0x68, | ||
2507 | + [UNW_AARCH64_X14] = 0x70, | ||
2508 | + [UNW_AARCH64_X15] = 0x78, | ||
2509 | + [UNW_AARCH64_X16] = 0x80, | ||
2510 | + [UNW_AARCH64_X17] = 0x88, | ||
2511 | + [UNW_AARCH64_X18] = 0x90, | ||
2512 | + [UNW_AARCH64_X19] = 0x98, | ||
2513 | + [UNW_AARCH64_X20] = 0xa0, | ||
2514 | + [UNW_AARCH64_X21] = 0xa8, | ||
2515 | + [UNW_AARCH64_X22] = 0xb0, | ||
2516 | + [UNW_AARCH64_X23] = 0xb8, | ||
2517 | + [UNW_AARCH64_X24] = 0xc0, | ||
2518 | + [UNW_AARCH64_X25] = 0xc8, | ||
2519 | + [UNW_AARCH64_X26] = 0xd0, | ||
2520 | + [UNW_AARCH64_X27] = 0xd8, | ||
2521 | + [UNW_AARCH64_X28] = 0xe0, | ||
2522 | + [UNW_AARCH64_X29] = 0xe8, | ||
2523 | + [UNW_AARCH64_X30] = 0xf0, | ||
2524 | + [UNW_AARCH64_SP] = 0xf8, | ||
2525 | + [UNW_AARCH64_PC] = 0x100, | ||
2526 | + [UNW_AARCH64_PSTATE] = 0x108 | ||
2527 | #else | ||
2528 | # error Fix me. | ||
2529 | #endif | ||
diff --git a/meta-linaro-integration/recipes-overlayed/libunwind/libunwind-1.1/Support-building-with-older-compilers.patch b/meta-linaro-integration/recipes-overlayed/libunwind/libunwind-1.1/Support-building-with-older-compilers.patch new file mode 100644 index 0000000..268b702 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/libunwind/libunwind-1.1/Support-building-with-older-compilers.patch | |||
@@ -0,0 +1,72 @@ | |||
1 | From 10b064ffe902d5af31bb49bd8e4f03c545f8d462 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ladislav Michl <ladis@linux-mips.org> | ||
3 | Date: Tue, 13 Nov 2012 11:19:47 +0100 | ||
4 | Subject: [PATCH] Support building with older compilers. | ||
5 | |||
6 | Add a check for __builtin_unreachable. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | --- | ||
10 | configure.ac | 11 +++++++++++ | ||
11 | include/libunwind_i.h | 6 ++++++ | ||
12 | src/arm/Gresume.c | 2 +- | ||
13 | src/sh/Gresume.c | 2 +- | ||
14 | 4 files changed, 19 insertions(+), 2 deletions(-) | ||
15 | |||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -285,6 +285,17 @@ if test x$have__builtin___clear_cache = | ||
19 | fi | ||
20 | AC_MSG_RESULT([$have__builtin___clear_cache]) | ||
21 | |||
22 | +AC_MSG_CHECKING([for __builtin_unreachable]) | ||
23 | +AC_LINK_IFELSE( | ||
24 | + [AC_LANG_PROGRAM([[]], [[__builtin_unreachable()]])], | ||
25 | + [have__builtin_unreachable=yes], | ||
26 | + [have__builtin_unreachable=no]) | ||
27 | +if test x$have__builtin_unreachable = xyes; then | ||
28 | + AC_DEFINE([HAVE__BUILTIN_UNREACHABLE], [1], | ||
29 | + [Defined if __builtin_unreachable() is available]) | ||
30 | +fi | ||
31 | +AC_MSG_RESULT([$have__builtin_unreachable]) | ||
32 | + | ||
33 | AC_MSG_CHECKING([for __sync atomics]) | ||
34 | AC_LINK_IFELSE( | ||
35 | [AC_LANG_PROGRAM([[]], [[ | ||
36 | --- a/include/libunwind_i.h | ||
37 | +++ b/include/libunwind_i.h | ||
38 | @@ -72,6 +72,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE | ||
39 | # endif | ||
40 | #endif | ||
41 | |||
42 | +#if defined(HAVE__BUILTIN_UNREACHABLE) | ||
43 | +# define unreachable() __builtin_unreachable() | ||
44 | +#else | ||
45 | +# define unreachable() do { } while (1) | ||
46 | +#endif | ||
47 | + | ||
48 | #ifdef DEBUG | ||
49 | # define UNW_DEBUG 1 | ||
50 | #else | ||
51 | --- a/src/arm/Gresume.c | ||
52 | +++ b/src/arm/Gresume.c | ||
53 | @@ -96,7 +96,7 @@ arm_local_resume (unw_addr_space_t as, u | ||
54 | : : "r" (c->sigcontext_sp), "r" (c->sigcontext_pc) | ||
55 | ); | ||
56 | } | ||
57 | - __builtin_unreachable(); | ||
58 | + unreachable(); | ||
59 | #else | ||
60 | printf ("%s: implement me\n", __FUNCTION__); | ||
61 | #endif | ||
62 | --- a/src/sh/Gresume.c | ||
63 | +++ b/src/sh/Gresume.c | ||
64 | @@ -109,7 +109,7 @@ sh_local_resume (unw_addr_space_t as, un | ||
65 | "r" (c->sigcontext_pc) | ||
66 | ); | ||
67 | } | ||
68 | - __builtin_unreachable(); | ||
69 | + unreachable(); | ||
70 | #endif | ||
71 | return -UNW_EINVAL; | ||
72 | } | ||
diff --git a/meta-linaro-integration/recipes-overlayed/libunwind/libunwind.inc b/meta-linaro-integration/recipes-overlayed/libunwind/libunwind.inc new file mode 100644 index 0000000..6743b21 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/libunwind/libunwind.inc | |||
@@ -0,0 +1,31 @@ | |||
1 | DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" | ||
2 | HOMEPAGE = "http://www.nongnu.org/libunwind" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5" | ||
5 | |||
6 | SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" | ||
7 | |||
8 | inherit autotools | ||
9 | |||
10 | PACKAGECONFIG ??= "" | ||
11 | PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,lzma" | ||
12 | |||
13 | EXTRA_OECONF_arm = "--enable-debug-frame" | ||
14 | EXTRA_OECONF_aarch64 = "--enable-debug-frame" | ||
15 | |||
16 | CFLAGS += "${ATOMICOPS}" | ||
17 | ATOMICOPS_armv5 = "-DAO_USE_PTHREAD_DEFS=1" | ||
18 | ATOMICOPS_armv4 = "-DAO_USE_PTHREAD_DEFS=1" | ||
19 | ATOMICOPS ?= "" | ||
20 | |||
21 | LDFLAGS += "${LIBATOMICS}" | ||
22 | LIBATOMICS_armv5 = "-latomic_ops" | ||
23 | LIBATOMICS_armv4 = "-latomic_ops" | ||
24 | LIBATOMICS ?= "" | ||
25 | |||
26 | DEPENDS += "${DEPLIBATOMICS}" | ||
27 | DEPLIBATOMICS_armv5 = "libatomics-ops" | ||
28 | DEPLIBATOMICS_armv4 = "libatomics-ops" | ||
29 | DEPLIBATOMICS ?= "" | ||
30 | |||
31 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/libunwind/libunwind_1.1.bb b/meta-linaro-integration/recipes-overlayed/libunwind/libunwind_1.1.bb new file mode 100644 index 0000000..2e52430 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/libunwind/libunwind_1.1.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require libunwind.inc | ||
2 | |||
3 | SRC_URI += "\ | ||
4 | file://Support-building-with-older-compilers.patch \ | ||
5 | file://AArch64-port.patch \ | ||
6 | " | ||
7 | |||
8 | SRC_URI[md5sum] = "fb4ea2f6fbbe45bf032cd36e586883ce" | ||
9 | SRC_URI[sha256sum] = "9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a" | ||
diff --git a/meta-linaro-integration/recipes-overlayed/nss-myhostname/nss-myhostname_0.3.bb b/meta-linaro-integration/recipes-overlayed/nss-myhostname/nss-myhostname_0.3.bb new file mode 100644 index 0000000..b9ddeaf --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/nss-myhostname/nss-myhostname_0.3.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | SUMMARY = "Name Service Switch module for resolving the local hostname" | ||
2 | DESCRIPTION = "plugin for the GNU Name Service Switch (NSS) functionality of \ | ||
3 | the GNU C Library (glibc) providing host name resolution for the locally \ | ||
4 | configured system hostname as returned by gethostname(2)." | ||
5 | HOMEPAGE = "http://0pointer.de/lennart/projects/nss-myhostname/" | ||
6 | LICENSE = "LGPLv2.1" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" | ||
8 | |||
9 | SRC_URI = "http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${PV}.tar.gz" | ||
10 | |||
11 | SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f" | ||
12 | SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67e7caf2" | ||
13 | |||
14 | inherit autotools | ||
15 | |||
16 | # /etc/nsswitch.conf needs to be present | ||
17 | RDEPENDS_${PN} = "base-files" | ||
18 | |||
19 | pkg_postinst_${PN} () { | ||
20 | sed -e '/^hosts:/s/\s*\<myhostname\>//' \ | ||
21 | -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \ | ||
22 | -i ${D}${sysconfdir}/nsswitch.conf | ||
23 | } | ||
24 | |||
25 | pkg_prerm_${PN} () { | ||
26 | sed -e '/^hosts:/s/\s*\<myhostname\>//' \ | ||
27 | -e '/^hosts:/s/\s*myhostname//' \ | ||
28 | -i ${D}${sysconfdir}/nsswitch.conf | ||
29 | } | ||
diff --git a/meta-linaro-integration/recipes-overlayed/pm-qa/pm-qa_git.bb b/meta-linaro-integration/recipes-overlayed/pm-qa/pm-qa_git.bb new file mode 100644 index 0000000..dc16aef --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/pm-qa/pm-qa_git.bb | |||
@@ -0,0 +1,65 @@ | |||
1 | DESCRIPTION = "Utilities for testing Power Management" | ||
2 | HOMEPAGE = "https://wiki.linaro.org/WorkingGroups/PowerManagement/Resources/TestSuite/PmQa" | ||
3 | |||
4 | LICENSE = "GPLv2" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
6 | |||
7 | PV = "0.4.14" | ||
8 | |||
9 | BRANCH ?= "master" | ||
10 | |||
11 | # Corresponds to tag pm-qa-v0.4.14 | ||
12 | SRCREV = "9111d1930f02337394cf16e84ad2a27f33607cbb" | ||
13 | |||
14 | SRC_URI = "git://git.linaro.org/power/pm-qa.git;protocol=git;branch=${BRANCH}" | ||
15 | |||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | CFLAGS += "-pthread" | ||
19 | |||
20 | do_compile () { | ||
21 | # Find all the .c files in this project and build them. | ||
22 | for x in `find . -name "*.c"` | ||
23 | do | ||
24 | util=`echo ${x} | sed s/.c$//` | ||
25 | oe_runmake ${util} | ||
26 | done | ||
27 | } | ||
28 | |||
29 | do_install () { | ||
30 | install -d ${D}${bindir} | ||
31 | install -d ${D}${libdir}/${PN} | ||
32 | |||
33 | # Install the compiled binaries that were built in the previous step | ||
34 | for x in `find . -name "*.c"` | ||
35 | do | ||
36 | util=`echo ${x} | sed s/.c$//` | ||
37 | util_basename=`basename ${util}` | ||
38 | install -m 0755 ${util} ${D}${bindir}/${util_basename} | ||
39 | done | ||
40 | |||
41 | # Install the helper scripts in a subdirectory of $libdir | ||
42 | for script in `find . -name "*.sh" | grep include` | ||
43 | do | ||
44 | # Remove hardcoded relative paths | ||
45 | sed -i -e 's#..\/utils\/##' ${script} | ||
46 | |||
47 | script_basename=`basename ${script}` | ||
48 | install -m 0755 $script ${D}${libdir}/${PN}/${script_basename} | ||
49 | done | ||
50 | |||
51 | # Install the shell scripts NOT in the $libdir directory since those | ||
52 | # will be installed elsewhere | ||
53 | for script in `find . -name "*.sh" | grep -v include` | ||
54 | do | ||
55 | # if the script includes any helper scripts from the $libdir | ||
56 | # directory then change the source path to the absolute path | ||
57 | # to reflect the install location of the helper scripts. | ||
58 | sed -i -e "s#source ../include#source ${libdir}/${PN}#g" ${script} | ||
59 | # Remove hardcoded relative paths | ||
60 | sed -i -e 's#..\/utils\/##' ${script} | ||
61 | |||
62 | script_basename=`basename ${script}` | ||
63 | install -m 0755 $script ${D}${bindir}/${script_basename} | ||
64 | done | ||
65 | } | ||
diff --git a/meta-linaro-integration/recipes-overlayed/shadow/files/securetty b/meta-linaro-integration/recipes-overlayed/shadow/files/securetty new file mode 100644 index 0000000..c36f6e0 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/shadow/files/securetty | |||
@@ -0,0 +1,233 @@ | |||
1 | # /etc/securetty: list of terminals on which root is allowed to login. | ||
2 | # See securetty(5) and login(1). | ||
3 | console | ||
4 | |||
5 | # Standard serial ports | ||
6 | ttyS0 | ||
7 | ttyS1 | ||
8 | ttyS2 | ||
9 | ttyS3 | ||
10 | |||
11 | # ARM AMBA SoCs | ||
12 | ttyAMA0 | ||
13 | ttyAMA1 | ||
14 | ttyAMA2 | ||
15 | ttyAMA3 | ||
16 | |||
17 | # QCOM Socs | ||
18 | ttyHSL0 | ||
19 | ttyHSL1 | ||
20 | ttyHSL2 | ||
21 | ttyHSL3 | ||
22 | ttyMSM0 | ||
23 | ttyMSM1 | ||
24 | ttyMSM2 | ||
25 | |||
26 | # Samsung ARM SoCs | ||
27 | ttySAC0 | ||
28 | ttySAC1 | ||
29 | ttySAC2 | ||
30 | ttySAC3 | ||
31 | |||
32 | # STM SoCs | ||
33 | ttyAS0 | ||
34 | ttyAS1 | ||
35 | ttyAS2 | ||
36 | ttyAS3 | ||
37 | |||
38 | # TI OMAP SoCs | ||
39 | ttyO0 | ||
40 | ttyO1 | ||
41 | ttyO2 | ||
42 | ttyO3 | ||
43 | |||
44 | # SBSA compatible UART | ||
45 | ttySBSA0 | ||
46 | |||
47 | # USB dongles | ||
48 | ttyUSB0 | ||
49 | ttyUSB1 | ||
50 | ttyUSB2 | ||
51 | |||
52 | # USB serial gadget | ||
53 | ttyGS0 | ||
54 | |||
55 | # PowerMac | ||
56 | ttyPZ0 | ||
57 | ttyPZ1 | ||
58 | ttyPZ2 | ||
59 | ttyPZ3 | ||
60 | |||
61 | # Embedded MPC platforms | ||
62 | ttyPSC0 | ||
63 | ttyPSC1 | ||
64 | ttyPSC2 | ||
65 | ttyPSC3 | ||
66 | ttyPSC4 | ||
67 | ttyPSC5 | ||
68 | |||
69 | # PA-RISC mux ports | ||
70 | ttyB0 | ||
71 | ttyB1 | ||
72 | |||
73 | # Standard hypervisor virtual console | ||
74 | hvc0 | ||
75 | |||
76 | # Oldstyle Xen console | ||
77 | xvc0 | ||
78 | |||
79 | # Standard consoles | ||
80 | tty1 | ||
81 | tty2 | ||
82 | tty3 | ||
83 | tty4 | ||
84 | tty5 | ||
85 | tty6 | ||
86 | tty7 | ||
87 | tty8 | ||
88 | tty9 | ||
89 | tty10 | ||
90 | tty11 | ||
91 | tty12 | ||
92 | tty13 | ||
93 | tty14 | ||
94 | tty15 | ||
95 | tty16 | ||
96 | tty17 | ||
97 | tty18 | ||
98 | tty19 | ||
99 | tty20 | ||
100 | tty21 | ||
101 | tty22 | ||
102 | tty23 | ||
103 | tty24 | ||
104 | tty25 | ||
105 | tty26 | ||
106 | tty27 | ||
107 | tty28 | ||
108 | tty29 | ||
109 | tty30 | ||
110 | tty31 | ||
111 | tty32 | ||
112 | tty33 | ||
113 | tty34 | ||
114 | tty35 | ||
115 | tty36 | ||
116 | tty37 | ||
117 | tty38 | ||
118 | tty39 | ||
119 | tty40 | ||
120 | tty41 | ||
121 | tty42 | ||
122 | tty43 | ||
123 | tty44 | ||
124 | tty45 | ||
125 | tty46 | ||
126 | tty47 | ||
127 | tty48 | ||
128 | tty49 | ||
129 | tty50 | ||
130 | tty51 | ||
131 | tty52 | ||
132 | tty53 | ||
133 | tty54 | ||
134 | tty55 | ||
135 | tty56 | ||
136 | tty57 | ||
137 | tty58 | ||
138 | tty59 | ||
139 | tty60 | ||
140 | tty61 | ||
141 | tty62 | ||
142 | tty63 | ||
143 | |||
144 | # Local X displays (allows empty passwords with pam_unix's nullok_secure) | ||
145 | pts/0 | ||
146 | pts/1 | ||
147 | pts/2 | ||
148 | pts/3 | ||
149 | |||
150 | # Embedded Freescale i.MX ports | ||
151 | ttymxc0 | ||
152 | ttymxc1 | ||
153 | ttymxc2 | ||
154 | ttymxc3 | ||
155 | ttymxc4 | ||
156 | ttymxc5 | ||
157 | |||
158 | # Freescale lpuart ports | ||
159 | ttyLP0 | ||
160 | ttyLP1 | ||
161 | ttyLP2 | ||
162 | ttyLP3 | ||
163 | ttyLP4 | ||
164 | ttyLP5 | ||
165 | |||
166 | # Standard serial ports, with devfs | ||
167 | tts/0 | ||
168 | tts/1 | ||
169 | |||
170 | # Standard consoles, with devfs | ||
171 | vc/1 | ||
172 | vc/2 | ||
173 | vc/3 | ||
174 | vc/4 | ||
175 | vc/5 | ||
176 | vc/6 | ||
177 | vc/7 | ||
178 | vc/8 | ||
179 | vc/9 | ||
180 | vc/10 | ||
181 | vc/11 | ||
182 | vc/12 | ||
183 | vc/13 | ||
184 | vc/14 | ||
185 | vc/15 | ||
186 | vc/16 | ||
187 | vc/17 | ||
188 | vc/18 | ||
189 | vc/19 | ||
190 | vc/20 | ||
191 | vc/21 | ||
192 | vc/22 | ||
193 | vc/23 | ||
194 | vc/24 | ||
195 | vc/25 | ||
196 | vc/26 | ||
197 | vc/27 | ||
198 | vc/28 | ||
199 | vc/29 | ||
200 | vc/30 | ||
201 | vc/31 | ||
202 | vc/32 | ||
203 | vc/33 | ||
204 | vc/34 | ||
205 | vc/35 | ||
206 | vc/36 | ||
207 | vc/37 | ||
208 | vc/38 | ||
209 | vc/39 | ||
210 | vc/40 | ||
211 | vc/41 | ||
212 | vc/42 | ||
213 | vc/43 | ||
214 | vc/44 | ||
215 | vc/45 | ||
216 | vc/46 | ||
217 | vc/47 | ||
218 | vc/48 | ||
219 | vc/49 | ||
220 | vc/50 | ||
221 | vc/51 | ||
222 | vc/52 | ||
223 | vc/53 | ||
224 | vc/54 | ||
225 | vc/55 | ||
226 | vc/56 | ||
227 | vc/57 | ||
228 | vc/58 | ||
229 | vc/59 | ||
230 | vc/60 | ||
231 | vc/61 | ||
232 | vc/62 | ||
233 | vc/63 | ||
diff --git a/meta-linaro-integration/recipes-overlayed/shadow/shadow-securetty_%.bbappend b/meta-linaro-integration/recipes-overlayed/shadow/shadow-securetty_%.bbappend new file mode 100644 index 0000000..2350ab8 --- /dev/null +++ b/meta-linaro-integration/recipes-overlayed/shadow/shadow-securetty_%.bbappend | |||
@@ -0,0 +1,3 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
2 | |||
3 | SRC_URI += "file://securetty" | ||