Dmitriy Ivanov
e2822af5ee
am c2419e9d
: am e9e4f08e
: am 580b2469
: Merge "Fixes for __cxa_finalize"
...
* commit 'c2419e9df73156f348f498514d5a423846ce1514':
Fixes for __cxa_finalize
2014-05-05 21:15:34 +00:00
Dmitriy Ivanov
c2419e9df7
am e9e4f08e
: am 580b2469
: Merge "Fixes for __cxa_finalize"
...
* commit 'e9e4f08efb48a2cc6089eefc2f717bbfa1c3b9c5':
Fixes for __cxa_finalize
2014-05-05 21:11:41 +00:00
Dmitriy Ivanov
e9e4f08efb
am 580b2469
: Merge "Fixes for __cxa_finalize"
...
* commit '580b246917d58fafc757daaf097b6bd20b17970a':
Fixes for __cxa_finalize
2014-05-05 21:09:09 +00:00
Dmitriy Ivanov
580b246917
Merge "Fixes for __cxa_finalize"
2014-05-05 21:04:33 +00:00
Dmitriy Ivanov
6b56691a67
Fixes for __cxa_finalize
...
* Ability to register atexit handler from atexit handler
* Correct way to handle both forms of atexit handler
Bug: https://code.google.com/p/android/issues/detail?id=66595
Bug: 4998315
Change-Id: I39529afaef97b6e1469c21389d54c0d7d175da28
2014-05-05 11:36:57 -07:00
The Android Automerger
fa9b2b9434
merge in master-release history after reset to f4c78487e3
2014-05-05 05:49:17 -07:00
The Android Automerger
2ba362646c
merge in master-release history after reset to f4c78487e3
2014-05-04 05:49:11 -07:00
Elliott Hughes
f4c78487e3
am 2d92358a
: am 23481495
: am a334c1ec
: Merge "Fix iswctype."
...
* commit '2d92358af5ad1846bcbe449f810bc978053dd2dd':
Fix iswctype.
2014-05-04 03:33:34 +00:00
Elliott Hughes
2d92358af5
am 23481495
: am a334c1ec
: Merge "Fix iswctype."
...
* commit '23481495a359a46fe4f6da6e61b89b0eb9636571':
Fix iswctype.
2014-05-04 03:30:55 +00:00
Elliott Hughes
efe3deb908
am 821fc960
: am d18a844c
: am 640b4a5a
: Merge "Switch to current upstream OpenBSD fwrite.c."
...
* commit '821fc9603351815b4dc8cd0217204f6cf68d96d0':
Switch to current upstream OpenBSD fwrite.c.
2014-05-04 03:30:02 +00:00
Elliott Hughes
23481495a3
am a334c1ec
: Merge "Fix iswctype."
...
* commit 'a334c1ec135ec5c031635fd2a868ccf1125ff03a':
Fix iswctype.
2014-05-04 03:28:38 +00:00
Elliott Hughes
821fc96033
am d18a844c
: am 640b4a5a
: Merge "Switch to current upstream OpenBSD fwrite.c."
...
* commit 'd18a844c36d0344a3258887238cd4cc83dc1d296':
Switch to current upstream OpenBSD fwrite.c.
2014-05-04 03:26:16 +00:00
Elliott Hughes
a334c1ec13
Merge "Fix iswctype."
2014-05-04 03:25:45 +00:00
Elliott Hughes
d18a844c36
am 640b4a5a
: Merge "Switch to current upstream OpenBSD fwrite.c."
...
* commit '640b4a5a64d39ad3c079d188dc74265373a35d8c':
Switch to current upstream OpenBSD fwrite.c.
2014-05-04 03:23:55 +00:00
Elliott Hughes
640b4a5a64
Merge "Switch to current upstream OpenBSD fwrite.c."
2014-05-04 03:20:31 +00:00
The Android Automerger
9a636f2046
merge in master-release history after reset to 1d347514c1
2014-05-03 05:49:31 -07: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