Elliott Hughes
b8d60a2a0c
am e71e6a2e
: am 185dd72a
: Merge "bionic: make epoll_event structure packed"
...
* commit 'e71e6a2e6042ea118d64c8b763dd9236f2a3320b':
bionic: make epoll_event structure packed
2014-05-06 02:57:23 +00:00
Elliott Hughes
e71e6a2e60
am 185dd72a
: Merge "bionic: make epoll_event structure packed"
...
* commit '185dd72a2c487502717903065e46d14039f17826':
bionic: make epoll_event structure packed
2014-05-06 02:54:13 +00:00
Elliott Hughes
185dd72a2c
Merge "bionic: make epoll_event structure packed"
2014-05-06 02:50:39 +00:00
Philip Hatcher
9ded07cff6
bionic: make epoll_event structure packed
...
Description: In the kernel the epoll_event structure is packed
in 64 bit kernel builds to allow the structure to be more easily
compatible with 32 bit user space. As a result, when user space
is 64-bit the structure must be packed as well.
Add unit test to show the ptr alignment issue.
Change-Id: I2c4848d5e38a357219091f350f9b6e3da05090da
Signed-off-by: Philip Hatcher <philip.hatcher@intel.com>
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Reviewed-by: Hazarika, Prodyut <prodyut.hazarika@intel.com>
Tested-by: Hazarika, Prodyut <prodyut.hazarika@intel.com>
2014-05-05 19:48:55 -07:00
Elliott Hughes
1911676cec
am e0cbc5da
: am 4356adc3
: Merge "Remove the non-standard time64 stuff for LP64."
...
* commit 'e0cbc5da31a0ebad76a6ca0968e26c200c70b502':
Remove the non-standard time64 stuff for LP64.
2014-05-06 01:59:16 +00:00
Elliott Hughes
e0cbc5da31
am 4356adc3
: Merge "Remove the non-standard time64 stuff for LP64."
...
* commit '4356adc3f46707b2664576857d7f4d8d6b0a81e2':
Remove the non-standard time64 stuff for LP64.
2014-05-06 01:56:43 +00:00
Elliott Hughes
4356adc3f4
Merge "Remove the non-standard time64 stuff for LP64."
2014-05-06 01:53:53 +00:00
Elliott Hughes
52defb7c70
Remove the non-standard time64 stuff for LP64.
...
We need a workaround in strftime as long as we still need to support
64-bit times on LP32.
Change-Id: I8ffb616f6312d4063fb9ea3c36b52653e8f4c5f8
2014-05-05 17:14:02 -07:00
Elliott Hughes
3356c72f27
am 48931ca1
: am 629d892d
: Merge "Update the NOTICE files and improve the script slightly."
...
* commit '48931ca1b027f428a8e7ca5e3e6a33a52ff8e197':
Update the NOTICE files and improve the script slightly.
2014-05-05 23:30:47 +00:00
Elliott Hughes
48931ca1b0
am 629d892d
: Merge "Update the NOTICE files and improve the script slightly."
...
* commit '629d892d0b5ec061b5260453d72fa54ab3d7ce37':
Update the NOTICE files and improve the script slightly.
2014-05-05 23:27:30 +00:00
Elliott Hughes
629d892d0b
Merge "Update the NOTICE files and improve the script slightly."
2014-05-05 23:24:00 +00:00
Elliott Hughes
bfa582d032
Update the NOTICE files and improve the script slightly.
...
Change-Id: Ia131634cd97ca9523e1b63dce41f66247cbaa311
2014-05-05 16:23:15 -07:00
Elliott Hughes
b303cdc2c1
am 9d586d85
: am 6916166e
: Merge "Sync with upstream OpenBSD."
...
* commit '9d586d85e5c45a38b8c0530570a6938ee1128bf0':
Sync with upstream OpenBSD.
2014-05-05 22:15:25 +00:00
Elliott Hughes
9d586d85e5
am 6916166e
: Merge "Sync with upstream OpenBSD."
...
* commit '6916166e108a0988dc6282bfae71f2746165fb47':
Sync with upstream OpenBSD.
2014-05-05 22:13:36 +00:00
Elliott Hughes
6916166e10
Merge "Sync with upstream OpenBSD."
2014-05-05 22:10:48 +00:00
Elliott Hughes
e0a36f49a9
Sync with upstream OpenBSD.
...
These trivial differences are are only current differences from upstream
OpenBSD.
Change-Id: Iddbee2c803911915a25e1da8b246e8403fa72daf
2014-05-05 14:57:23 -07:00
Elliott Hughes
c13ea3e236
am bab07de0
: am ad534985
: Merge "Disable %n in printf and vfwprintf."
...
* commit 'bab07de0bc43a284647465dc167bcf5b63891eb6':
Disable %n in printf and vfwprintf.
2014-05-05 21:55:46 +00:00
Elliott Hughes
bab07de0bc
am ad534985
: Merge "Disable %n in printf and vfwprintf."
...
* commit 'ad534985ec3e01d37d46c50caa562f6482f48347':
Disable %n in printf and vfwprintf.
2014-05-05 21:51:55 +00:00
Elliott Hughes
ad534985ec
Merge "Disable %n in printf and vfwprintf."
2014-05-05 21:49:22 +00:00
Elliott Hughes
e2341d08fa
Disable %n in printf and vfwprintf.
...
Bug: 14492135
Change-Id: If190bede29e5f68a65043ddbe8e878c660933d03
2014-05-05 14:43:17 -07:00
Elliott Hughes
2357a4cc74
am d2943b60
: am 8ec21d9d
: Merge "Switch to current upstream OpenBSD wsetup.c."
...
* commit 'd2943b60e2c56530cd602eb5f3cfa8fb76501ecd':
Switch to current upstream OpenBSD wsetup.c.
2014-05-05 21:39:41 +00:00
Elliott Hughes
d2943b60e2
am 8ec21d9d
: Merge "Switch to current upstream OpenBSD wsetup.c."
...
* commit '8ec21d9ded4c05744b3f9388bf824a508d7c95c2':
Switch to current upstream OpenBSD wsetup.c.
2014-05-05 21:36:59 +00:00
Elliott Hughes
8ec21d9ded
Merge "Switch to current upstream OpenBSD wsetup.c."
2014-05-05 21:33:22 +00:00
Elliott Hughes
53b24382f5
Switch to current upstream OpenBSD wsetup.c.
...
Change-Id: I2c1123f3e1d3c4af7fd7bf354e763934a39b78c0
2014-05-05 14:31:20 -07: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
Elliott Hughes
2d92358af5
am 23481495
: am a334c1ec
: Merge "Fix iswctype."
...
* commit '23481495a359a46fe4f6da6e61b89b0eb9636571':
Fix iswctype.
2014-05-04 03:30:55 +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
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
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
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