Commit Graph

8495 Commits

Author SHA1 Message Date
Elliott Hughes
640b4a5a64 Merge "Switch to current upstream OpenBSD fwrite.c." 2014-05-04 03:20:31 +00:00
Dmitriy Ivanov
1d347514c1 am 40a744fa: am 80893060: am 2d822ebe: Merge "Disallow dlopen("egl/blah.so") on LP64"
* commit '40a744fac798485c9b7a0594b1df548b7803768b':
  Disallow dlopen("egl/blah.so") on LP64
2014-05-03 01:48:37 +00:00
Dmitriy Ivanov
40a744fac7 am 80893060: am 2d822ebe: Merge "Disallow dlopen("egl/blah.so") on LP64"
* commit '80893060ddf59625e0b0906685cb2631763ecf74':
  Disallow dlopen("egl/blah.so") on LP64
2014-05-03 01:45:12 +00:00
Dmitriy Ivanov
80893060dd am 2d822ebe: Merge "Disallow dlopen("egl/blah.so") on LP64"
* commit '2d822ebe7af5aea1f93b67753e56357ce601b5a9':
  Disallow dlopen("egl/blah.so") on LP64
2014-05-03 01:42:06 +00:00
Dmitriy Ivanov
2d822ebe7a Merge "Disallow dlopen("egl/blah.so") on LP64" 2014-05-03 01:39:09 +00:00
Elliott Hughes
792ae72e41 Switch to current upstream OpenBSD fwrite.c.
Change-Id: Ife527aafc1e5438f477d711902efe6e6f59f3f8e
2014-05-02 18:22:23 -07:00
Dmitriy Ivanov
5ca7ed9005 Disallow dlopen("egl/blah.so") on LP64
Change-Id: I9a563a9dada6522129b1890bc1292667230e80a5
2014-05-02 18:18:50 -07:00
Elliott Hughes
39372de58c am c4ced713: am c01893cd: am e987803c: Merge "Sync with current OpenBSD stdio."
* commit 'c4ced713b857b68254effa753aad461082a41c3d':
  Sync with current OpenBSD stdio.
2014-05-03 01:05:51 +00:00
Elliott Hughes
c4ced713b8 am c01893cd: am e987803c: Merge "Sync with current OpenBSD stdio."
* commit 'c01893cde28ce9c8c760a29b7829159ca9de30be':
  Sync with current OpenBSD stdio.
2014-05-03 01:03:13 +00:00
Elliott Hughes
c01893cde2 am e987803c: Merge "Sync with current OpenBSD stdio."
* commit 'e987803c35b472f378f81a37beb162ac86e01503':
  Sync with current OpenBSD stdio.
2014-05-03 01:01:38 +00:00
Elliott Hughes
e987803c35 Merge "Sync with current OpenBSD stdio." 2014-05-03 00:59:06 +00:00
Elliott Hughes
f1ada79a83 Sync with current OpenBSD stdio.
We'd fallen a little behind.

Bug: 14492135
Change-Id: Ic1137ef10bffccecebd5ce51086c23db006d0ea3
2014-05-02 17:56:56 -07:00
Elliott Hughes
c42f5c6fe6 Fix iswctype.
This doesn't matter until we fix the other isw* functions, of course.

Change-Id: I0baed1c933259cf22444da391bc4a56446d66773
2014-05-02 16:25:59 -07:00
Elliott Hughes
bd0d92794f am 885275ec: am 9abfd44b: am d6ff0dce: Merge "Use the OpenBSD wcsftime."
* commit '885275eccac451fd2fce1e4e0a997976e39dc243':
  Use the OpenBSD wcsftime.
2014-05-02 23:11:12 +00:00
Elliott Hughes
885275ecca am 9abfd44b: am d6ff0dce: Merge "Use the OpenBSD wcsftime."
* commit '9abfd44b4c6c288f4ae18a58a8d88c30fe49c7b9':
  Use the OpenBSD wcsftime.
2014-05-02 23:06:26 +00:00
Elliott Hughes
9abfd44b4c am d6ff0dce: Merge "Use the OpenBSD wcsftime."
* commit 'd6ff0dcef670abd070efc6ff75bfbf265128eb2e':
  Use the OpenBSD wcsftime.
2014-05-02 23:03:00 +00:00
Elliott Hughes
d6ff0dcef6 Merge "Use the OpenBSD wcsftime." 2014-05-02 23:00:06 +00:00
Elliott Hughes
efaa461bd6 Use the OpenBSD wcsftime.
Change-Id: I81929355d245ba1e58b4a464ca6cf45915e0238e
2014-05-02 15:57:50 -07:00
Calin Juravle
9287223674 Add include guard to fileext.h
Change-Id: I89b0e3bf0b15989727b5903b40bec92d49e122d9
2014-05-02 17:34:58 +01:00
Torne (Richard Coles)
26ec9679ff Handle empty relro segment or incorrectly sized file.
If the file has no relro segment, the generated relro file will have
length 0, which caused mmap to fail. If the relro file has nonzero size,
but is too short (e.g. because it's for the wrong version of the
library), the linker would segfault while comparing the data. Fix both
these issues: don't try to map a zero length file, and don't try to
compare data that would be beyond the end of the file.

Improve test to explicitly generate two versions of the library: one
with -z relro, and one with -z norelro, so we can test both cases; also
explicitly test the case where the relro file has length 0.

Bug: 14299541
Change-Id: Id8b95585edda90e8bb5de452a35b70ed2d224934
2014-05-02 14:25:45 +01:00
Elliott Hughes
f3e94ae85f am 6e62c932: am fb49002b: am 790890fd: Merge "Fix wchar_t signedness problems found on x86-64."
* commit '6e62c9326aa15f68ce52216b7c3ce3f4f49f7279':
  Fix wchar_t signedness problems found on x86-64.
2014-05-02 02:38:54 +00:00
Elliott Hughes
6e62c9326a am fb49002b: am 790890fd: Merge "Fix wchar_t signedness problems found on x86-64."
* commit 'fb49002b41b43bfc85ad6deaec04f2ce67fcd55b':
  Fix wchar_t signedness problems found on x86-64.
2014-05-02 02:35:39 +00:00
Elliott Hughes
fb49002b41 am 790890fd: Merge "Fix wchar_t signedness problems found on x86-64."
* commit '790890fd5c896a098142e0783b10fa8246462249':
  Fix wchar_t signedness problems found on x86-64.
2014-05-02 02:33:19 +00:00
Elliott Hughes
790890fd5c Merge "Fix wchar_t signedness problems found on x86-64." 2014-05-02 02:31:23 +00:00
Elliott Hughes
0d0ccfe2ce Fix wchar_t signedness problems found on x86-64.
The existing tests caught this.

Change-Id: I6269844ae4301fd2c596241a59e97eb67ef166fa
2014-05-01 19:03:18 -07:00
Elliott Hughes
311fba409d am 6fbdc117: am 156f77c3: am 296f17af: Merge "Fix wchar.cpp MIPS narrowing conversion build failure."
* commit '6fbdc117db011a3f9963da632ea45b0b5a0200cb':
  Fix wchar.cpp MIPS narrowing conversion build failure.
2014-05-02 01:23:18 +00:00
Elliott Hughes
dc0ef86203 am c2ee2cd0: am ba8c37f1: am 7da31910: Merge "Fix wchar.cpp signed/unsigned comparison build failure."
* commit 'c2ee2cd09dfcaa9780285c948c091fd85d6b2171':
  Fix wchar.cpp signed/unsigned comparison build failure.
2014-05-02 01:23:15 +00:00
Elliott Hughes
6fbdc117db am 156f77c3: am 296f17af: Merge "Fix wchar.cpp MIPS narrowing conversion build failure."
* commit '156f77c3a0a9eb9ee9acaa0aecc8ab9f2d4027c4':
  Fix wchar.cpp MIPS narrowing conversion build failure.
2014-05-02 00:19:44 +00:00
Elliott Hughes
156f77c3a0 am 296f17af: Merge "Fix wchar.cpp MIPS narrowing conversion build failure."
* commit '296f17af0a630550f980dab85363093e4be55eb0':
  Fix wchar.cpp MIPS narrowing conversion build failure.
2014-05-02 00:17:45 +00:00
Elliott Hughes
296f17af0a Merge "Fix wchar.cpp MIPS narrowing conversion build failure." 2014-05-02 00:15:42 +00:00
Elliott Hughes
f83e644e2c Fix wchar.cpp MIPS narrowing conversion build failure.
Change-Id: Id9103c78958d60337dbdb807b11256c1b31c632a
2014-05-01 17:14:59 -07:00
Elliott Hughes
c2ee2cd09d am ba8c37f1: am 7da31910: Merge "Fix wchar.cpp signed/unsigned comparison build failure."
* commit 'ba8c37f1871e1ea574e48b77da665a0d56b57114':
  Fix wchar.cpp signed/unsigned comparison build failure.
2014-05-01 23:59:03 +00:00
Elliott Hughes
ba8c37f187 am 7da31910: Merge "Fix wchar.cpp signed/unsigned comparison build failure."
* commit '7da319106906ad236a0b4502cbafdd8dff7b8a39':
  Fix wchar.cpp signed/unsigned comparison build failure.
2014-05-01 23:56:03 +00:00
Elliott Hughes
7da3191069 Merge "Fix wchar.cpp signed/unsigned comparison build failure." 2014-05-01 23:50:35 +00:00
Elliott Hughes
568c86a489 Fix wchar.cpp signed/unsigned comparison build failure.
Change-Id: Id20b91f3d57c4430987b5cc88ac99c245801d73b
2014-05-01 16:49:55 -07:00
Elliott Hughes
831e1d796c am 5d4c9114: am 745b023b: am f0291ca6: Merge "Switch to a working UTF-8 mb/wc implementation."
* commit '5d4c911436445e627dcc9533bfc0792941b83a44':
  Switch to a working UTF-8 mb/wc implementation.
2014-05-01 23:21:54 +00:00
Elliott Hughes
5d4c911436 am 745b023b: am f0291ca6: Merge "Switch to a working UTF-8 mb/wc implementation."
* commit '745b023b4d7372851fb1f713c017b461de8d8860':
  Switch to a working UTF-8 mb/wc implementation.
2014-05-01 23:18:49 +00:00
Elliott Hughes
745b023b4d am f0291ca6: Merge "Switch to a working UTF-8 mb/wc implementation."
* commit 'f0291ca6b7d0ef42a31ae76a18a99c81d6e6d345':
  Switch to a working UTF-8 mb/wc implementation.
2014-05-01 23:15:32 +00:00
Elliott Hughes
f0291ca6b7 Merge "Switch to a working UTF-8 mb/wc implementation." 2014-05-01 23:12:41 +00:00
Elliott Hughes
5a0aa3dee2 Switch to a working UTF-8 mb/wc implementation.
Although glibc gets by with an 8-byte mbstate_t, OpenBSD uses 12 bytes (of
the 128 bytes it reserves!).

We can actually implement UTF-8 encoding/decoding with a 0-byte mbstate_t
which means we can make things work on LP32 too, as long as we accept the
limitation that the caller needs to present us with a complete sequence
before we'll process it.

Our behavior is fine when going from characters to bytes; we just
update the source wchar_t** to say how far through the input we got.

I'll come back and use the 4 bytes we do have to cope with byte sequences
split across multiple input buffers. The fact that we don't support
UTF-8 sequences longer than 4 bytes plus the fact that the first byte of
a UTF-8 sequence encodes the length means we shouldn't need the other
fields OpenBSD used (at the cost of some recomputation in cases where a
sequence is split across buffers).

This patch also makes the minimal changes necessary to setlocale(3) to
make us behave like glibc when an app requests UTF-8. (The difference
being that our "C" locale is the same as our "C.UTF-8" locale.)

Change-Id: Ied327a8c4643744b3611bf6bb005a9b389ba4c2f
2014-05-01 14:46:54 -07:00
Christopher Ferris
b335ee5a7b am 796bf883: am 97ded7f2: am cb475651: Merge "Add ability to run on host for x86/x86_64."
* commit '796bf88381f245052e31657dd32eb9ad72b96150':
  Add ability to run on host for x86/x86_64.
2014-05-01 21:13:34 +00:00
Christopher Ferris
796bf88381 am 97ded7f2: am cb475651: Merge "Add ability to run on host for x86/x86_64."
* commit '97ded7f2bca3c3fdd1bd695b94df28071fec467b':
  Add ability to run on host for x86/x86_64.
2014-05-01 21:09:51 +00:00
Christopher Ferris
97ded7f2bc am cb475651: Merge "Add ability to run on host for x86/x86_64."
* commit 'cb475651e3270175a5e6667952069f3ae7e7645a':
  Add ability to run on host for x86/x86_64.
2014-05-01 21:07:01 +00:00
Christopher Ferris
cb475651e3 Merge "Add ability to run on host for x86/x86_64." 2014-05-01 21:03:27 +00:00
Christopher Ferris
3347a79664 Add ability to run on host for x86/x86_64.
Change-Id: I063cb71ce0f7247cefacaa653c7b87b7b3e72025
2014-05-01 13:44:57 -07:00
Christopher Ferris
97193104db am fe131747: am 24f724c4: am de54b90e: Merge "Modify hard-coded directory."
* commit 'fe13174759c4023b9499e0b22fdf9420fab185b0':
  Modify hard-coded directory.
2014-05-01 20:29:24 +00:00
Christopher Ferris
fe13174759 am 24f724c4: am de54b90e: Merge "Modify hard-coded directory."
* commit '24f724c446f5741e4a0e1739fdb8167e15e11111':
  Modify hard-coded directory.
2014-05-01 20:26:07 +00:00
Christopher Ferris
24f724c446 am de54b90e: Merge "Modify hard-coded directory."
* commit 'de54b90ed573fdea390f8a06618374adbb32f18a':
  Modify hard-coded directory.
2014-05-01 20:22:29 +00:00
Christopher Ferris
de54b90ed5 Merge "Modify hard-coded directory." 2014-05-01 20:19:20 +00:00
Christopher Ferris
8b1ade5c0b Modify hard-coded directory.
Use the ANDROID_DATA environment variable instead of the hard-coded
directory for these benchmarks.

Change-Id: I00bae7b4a24e81e77fc8f52e1fe99f4d4918f520
2014-05-01 13:10:48 -07:00