Elliott Hughes
82dcfee5fc
am 19e30fc4
: am a1c0f08d
: Merge "Fix a ENOTUP/ENOTSUP typo."
...
* commit '19e30fc41030ab0524134b097dfef88baea14f4a':
Fix a ENOTUP/ENOTSUP typo.
2012-08-02 16:07:41 -07:00
Elliott Hughes
c07196605c
am 670766c5
: am 994935f6
: Merge "Error numbers are target specific."
...
* commit '670766c5649086ad5ffe26c0deadeb460139202f':
Error numbers are target specific.
2012-08-02 16:07:40 -07:00
Raghu Gandham
405b8029a6
MIPS support for libc.
...
Change-Id: I2864dea04b3faf2d919165dcaa600af5b16c41c8
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-02 16:07:26 -07:00
Elliott Hughes
19e30fc410
am a1c0f08d
: Merge "Fix a ENOTUP/ENOTSUP typo."
...
* commit 'a1c0f08d3ccbe5c40be53903615e59113ade4922':
Fix a ENOTUP/ENOTSUP typo.
2012-08-02 15:59:22 -07:00
Elliott Hughes
670766c564
am 994935f6
: Merge "Error numbers are target specific."
...
* commit '994935f64cdbd7553ecbfbd15d4e4dd429277409':
Error numbers are target specific.
2012-08-02 15:59:21 -07:00
Elliott Hughes
a1c0f08d3c
Merge "Fix a ENOTUP/ENOTSUP typo."
2012-08-02 15:46:44 -07:00
Elliott Hughes
fccadc38bd
am 0b8dda0e
: am 673c092e
: am 54830578
: am f34ecbff
: Merge "MIPS support to the linker"
...
* commit '0b8dda0e422e9669af06d9e6d264fb14652b23b5':
MIPS support to the linker
2012-08-02 15:45:45 -07:00
Elliott Hughes
ecb53eab4b
Fix a ENOTUP/ENOTSUP typo.
...
Change-Id: Ifa347a09a2aa1f505965ae7c1383fd0caf95793c
2012-08-02 15:45:04 -07:00
Elliott Hughes
0b8dda0e42
am 673c092e
: am 54830578
: am f34ecbff
: Merge "MIPS support to the linker"
...
* commit '673c092e0fc40afa291086d06ab39a6d22e7f894':
MIPS support to the linker
2012-08-02 15:43:44 -07:00
Elliott Hughes
994935f64c
Merge "Error numbers are target specific."
2012-08-02 15:42:48 -07:00
Elliott Hughes
673c092e0f
am 54830578
: am f34ecbff
: Merge "MIPS support to the linker"
...
* commit '5483057817d071140d94299452b31881c4a6e748':
MIPS support to the linker
2012-08-02 15:39:45 -07:00
Brian Muramatsu
963a8fc036
am fa22fd9f
: am 402ec708
: Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev
...
* commit 'fa22fd9f817e0fe49e0f7524f5589710f1140d8f':
Update msm_camera.h to version that supports instance handle based lookup
2012-08-02 15:24:34 -07:00
Brian Muramatsu
fa22fd9f81
am 402ec708
: Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev
...
* commit '402ec70899909f0b32c1ac304e3f26434424a3b3':
Update msm_camera.h to version that supports instance handle based lookup
2012-08-02 15:22:34 -07:00
Brian Muramatsu
402ec70899
Merge "Update msm_camera.h to version that supports instance handle based lookup" into jb-mr1-dev
2012-08-02 15:20:58 -07:00
The Android Open Source Project
3a6e56534d
am d7b3cc0c
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'd7b3cc0c69b02cad4090a0068349f1ab83e3112f':
2012-08-02 15:09:18 -07:00
Elliott Hughes
5483057817
am f34ecbff
: Merge "MIPS support to the linker"
...
* commit 'f34ecbff0dd2b8e6961020b8c91260f33d4cf3ea':
MIPS support to the linker
2012-08-02 14:57:52 -07:00
Elliott Hughes
f34ecbff0d
Merge "MIPS support to the linker"
2012-08-02 14:43:55 -07:00
Raghu Gandham
d7daacb463
MIPS support to the linker
...
Change-Id: I37ec2d6c51d82bb9e9dbfef4b38c85366bead255
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com>
2012-08-02 14:39:50 -07:00
The Android Open Source Project
d7b3cc0c69
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ia1f59a486efa98614b8f97f9432e1040c90d2ec7
2012-08-02 11:26:02 -07:00
The Android Automerger
248321bb6f
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-02 07:41:45 -07:00
Chris Dearman
da2611084f
Error numbers are target specific.
...
Use the system supplied error numbers when mapping error numbers to messages.
Change-Id: I520556fa3e2ff668fdc4eda36ad31491fbb48ea8
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-01 17:53:07 -07:00
The Android Open Source Project
2a258c9f2d
am 8f2f2466
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '8f2f24661870c349a19bff71d85ed5eb897c7c9f':
2012-08-01 14:50:42 -07:00
The Android Open Source Project
8f2f246618
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2295284f2cccfc72a25c2675762cc613faa337a4
2012-08-01 13:11:49 -07:00
The Android Automerger
617a5ee417
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-01 07:10:06 -07:00
Ajay Dudani
cbbe9528ca
Update msm_camera.h to version that supports instance handle based lookup
...
Change-Id: If33a45f378e2cbbfe28b51643808df94e8d1f5e7
2012-07-31 21:32:50 -07:00
Shih-wei Liao
543960121c
am cfc8b93c
: am 4f13bdd4
: am 7565d5b1
: am 0ca9d074
: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
...
* commit 'cfc8b93c4e223f72a2e419f4571f55f7eb819df3':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
2012-07-31 21:07:50 -07:00
Shih-wei Liao
cfc8b93c4e
am 4f13bdd4
: am 7565d5b1
: am 0ca9d074
: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
...
* commit '4f13bdd45c73194a49d3a5844746248c7dcd9432':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
2012-07-31 21:05:09 -07:00
Shih-wei Liao
4f13bdd45c
am 7565d5b1
: am 0ca9d074
: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
...
* commit '7565d5b118420cc0dff2d59cf3542e99f415601a':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
2012-07-31 21:02:52 -07:00
Shih-wei Liao
7565d5b118
am 0ca9d074
: Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
...
* commit '0ca9d0748e3229c849e3ee17259e0e55d7214800':
Had include/arm/fenv.h, but missed include/mips/fenv.h.
2012-07-31 21:00:39 -07:00
Shih-wei Liao
0ca9d0748e
Merge "Had include/arm/fenv.h, but missed include/mips/fenv.h."
2012-07-31 20:54:18 -07:00
Elliott Hughes
96ca71a7a6
am 029cf34c
: am 81f1617a
: am 8d2c5b24
: am b910b6f8
: Merge "Updated the cleaned header file mman.h for MIPS."
...
* commit '029cf34cfd3fc50fe373527c82855924a1db41ad':
Updated the cleaned header file mman.h for MIPS.
2012-07-31 15:35:53 -07:00
Elliott Hughes
029cf34cfd
am 81f1617a
: am 8d2c5b24
: am b910b6f8
: Merge "Updated the cleaned header file mman.h for MIPS."
...
* commit '81f1617a689931388c0b223ec729297b3a2bc792':
Updated the cleaned header file mman.h for MIPS.
2012-07-31 15:33:45 -07:00
Elliott Hughes
81f1617a68
am 8d2c5b24
: am b910b6f8
: Merge "Updated the cleaned header file mman.h for MIPS."
...
* commit '8d2c5b247e701f51ce3d750e9ee3ff37009630c3':
Updated the cleaned header file mman.h for MIPS.
2012-07-31 15:32:45 -07:00
Elliott Hughes
8d2c5b247e
am b910b6f8
: Merge "Updated the cleaned header file mman.h for MIPS."
...
* commit 'b910b6f8dee14e379664635f4cd7343b3acc7b27':
Updated the cleaned header file mman.h for MIPS.
2012-07-31 15:31:53 -07:00
Elliott Hughes
b910b6f8de
Merge "Updated the cleaned header file mman.h for MIPS."
2012-07-31 15:16:07 -07:00
The Android Open Source Project
338d3fbc8b
am 6ac55791
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '6ac557918a1a5703f0376f659e5cb1a9af6a2901':
2012-07-31 15:05:49 -07:00
The Android Open Source Project
6ac557918a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Icba591905e72d5567b361d7e994cafc65e6f932a
2012-07-31 15:02:24 -07:00
Raghu Gandham
c29f295d39
Updated the cleaned header file mman.h for MIPS.
...
Change-Id: I8b3734e535711ca07fbf4066e6d967d1ce0f30eb
2012-07-31 14:47:51 -07:00
Elliott Hughes
0f004be596
am 494e534b
: am f1997971
: am 7645355e
: am a513f70b
: Merge "bionic: Stack pointer/signal race condition."
...
* commit '494e534b003a45c32e06d225cd89ad84777d28f7':
bionic: Stack pointer/signal race condition.
2012-07-31 10:43:46 -07:00
Elliott Hughes
120e7fbeb9
am ad2e065d
: am b78aa539
: am bf397b60
: am 21372896
: Merge "fix __cxa_finalize() implementation to be thread safe."
...
* commit 'ad2e065de11748e1c33562cd2005ce14843d64f0':
fix __cxa_finalize() implementation to be thread safe.
2012-07-31 10:43:45 -07:00
Elliott Hughes
494e534b00
am f1997971
: am 7645355e
: am a513f70b
: Merge "bionic: Stack pointer/signal race condition."
...
* commit 'f19979710a2f34e5a6ef5cc6f900c40690d65db4':
bionic: Stack pointer/signal race condition.
2012-07-31 10:41:41 -07:00
Elliott Hughes
ad2e065de1
am b78aa539
: am bf397b60
: am 21372896
: Merge "fix __cxa_finalize() implementation to be thread safe."
...
* commit 'b78aa5390492cfe288d0128b749b18d2c740635e':
fix __cxa_finalize() implementation to be thread safe.
2012-07-31 10:41:40 -07:00
Elliott Hughes
f19979710a
am 7645355e
: am a513f70b
: Merge "bionic: Stack pointer/signal race condition."
...
* commit '7645355ecdf29301bdc65f9ea8e00c20e51da3f5':
bionic: Stack pointer/signal race condition.
2012-07-31 10:40:06 -07:00
Elliott Hughes
b78aa53904
am bf397b60
: am 21372896
: Merge "fix __cxa_finalize() implementation to be thread safe."
...
* commit 'bf397b601189f8a63c8a842e16af5ed004ef75f5':
fix __cxa_finalize() implementation to be thread safe.
2012-07-31 10:40:05 -07:00
Elliott Hughes
7645355ecd
am a513f70b
: Merge "bionic: Stack pointer/signal race condition."
...
* commit 'a513f70b43e75136145d756388b50028ac4fc4b8':
bionic: Stack pointer/signal race condition.
2012-07-31 10:38:26 -07:00
Elliott Hughes
bf397b6011
am 21372896
: Merge "fix __cxa_finalize() implementation to be thread safe."
...
* commit '21372896ea0f13938c130c8c82cdc3a6b9ccd297':
fix __cxa_finalize() implementation to be thread safe.
2012-07-31 10:38:25 -07:00
Elliott Hughes
a513f70b43
Merge "bionic: Stack pointer/signal race condition."
2012-07-31 10:32:59 -07:00
Elliott Hughes
21372896ea
Merge "fix __cxa_finalize() implementation to be thread safe."
2012-07-31 10:31:20 -07:00
The Android Automerger
15e0ca8186
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-07-31 07:35:13 -07:00
Srinavasa Nagaraju
2270dfa0c4
fix __cxa_finalize() implementation to be thread safe.
...
__cxa_finalize() modifies the access permissions of __atexit
global variable without acquiring _ATEXIT_LOCK(). Fix it prevent
any possible races.
Change-Id: I11939d0ebcbf6f360c14163222d40a449d96948e
2012-07-31 12:30:28 +02:00