Commit Graph

2998 Commits

Author SHA1 Message Date
Irina Tirdea
e77e1afe24 Add tty defaults to bionic
Add ttydefaults.h bionic. Some userspace programs (e.g. perf) need the
definitions from this file. This header file is copied from NetBSD
(http://netbsd.org/) under the NetBSD Foundation's (TNF) license (“2 clause”
Berkeley-style license).

Change-Id: I9c862415b52b710f25adb1629a699627cd715775
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2012-09-11 22:47:31 +03:00
The Android Automerger
49b5eb4ded merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-11 06:59:14 -07:00
Elliott Hughes
20599f5c9e am eeabbaee: am f50b99f4: am e8b4d67a: am 59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
* commit 'eeabbaee88202a459ec381edc45c0995bdcfa3c8':
  Rename crtstart variables as crtbegin, to match reality.
2012-09-10 17:15:10 -07:00
Ying Wang
62fd0b699a am 33d552a4: am e3738414: am f9920563: am 67546bf2: Merge "Generate header dependency makefiles for the crt*.o"
* commit '33d552a4d1c766aeb99c71060aa091e7aafaaac9':
  Generate header dependency makefiles for the crt*.o
2012-09-10 17:14:10 -07:00
Elliott Hughes
d203fba8f0 am 934e18e7: am af4371b4: am 56ba6336: am f1d57e16: Merge "Add more pthreads tests."
* commit '934e18e715b0f6627f258d6fc8dc9406f39705f6':
  Add more pthreads tests.
2012-09-10 17:09:54 -07:00
Elliott Hughes
b3cbcb3547 am 5804b88a: am b0102454: am 7c7a7f8e: am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
* commit '5804b88a44c153fa1b39dd3095be9e905d77cee0':
  Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-10 17:05:15 -07:00
Elliott Hughes
b35a90d682 am ffcb92e7: am b18d4f63: am 72fcdbe9: am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
* commit 'ffcb92e779b347b3725e560aa3aabd122a4dbd62':
  Add mlockall and munlockall for Google TV.
2012-09-10 17:05:14 -07:00
Elliott Hughes
eeabbaee88 am f50b99f4: am e8b4d67a: am 59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
* commit 'f50b99f471a9af07b2dec6ac3fe1abca5ba9a20b':
  Rename crtstart variables as crtbegin, to match reality.
2012-09-10 12:06:50 -07:00
Elliott Hughes
f50b99f471 am e8b4d67a: am 59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
* commit 'e8b4d67a37e27ffc34086562ad13dcd9316a8249':
  Rename crtstart variables as crtbegin, to match reality.
2012-09-10 12:04:28 -07:00
Elliott Hughes
e8b4d67a37 am 59726bed: Merge "Rename crtstart variables as crtbegin, to match reality."
* commit '59726beda5bec7e3db9d0c403a0ef11d0a7f182f':
  Rename crtstart variables as crtbegin, to match reality.
2012-09-10 12:01:04 -07:00
Elliott Hughes
59726beda5 Merge "Rename crtstart variables as crtbegin, to match reality." 2012-09-10 11:52:12 -07:00
Elliott Hughes
12949e5d39 Rename crtstart variables as crtbegin, to match reality.
No functional change, but it's confusing that the variable
names don't match the filenames.

Change-Id: I7109f917797be2f056e69fddb92e4a7306281813
2012-09-10 11:16:12 -07:00
Ying Wang
33d552a4d1 am e3738414: am f9920563: am 67546bf2: Merge "Generate header dependency makefiles for the crt*.o"
* commit 'e3738414a62f9c9b43e158af590d127b9659030d':
  Generate header dependency makefiles for the crt*.o
2012-09-10 10:09:13 -07:00
Ying Wang
e3738414a6 am f9920563: am 67546bf2: Merge "Generate header dependency makefiles for the crt*.o"
* commit 'f9920563dabc21a5c741ef630e6ca8fe66fbbe5b':
  Generate header dependency makefiles for the crt*.o
2012-09-10 10:07:17 -07:00
Ying Wang
f9920563da am 67546bf2: Merge "Generate header dependency makefiles for the crt*.o"
* commit '67546bf209b2c5480aa4811b2bb3c42e7862af62':
  Generate header dependency makefiles for the crt*.o
2012-09-10 10:05:14 -07:00
Ying Wang
67546bf209 Merge "Generate header dependency makefiles for the crt*.o" 2012-09-10 09:48:46 -07:00
The Android Automerger
9209fd3868 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-09 06:59:39 -07:00
Elliott Hughes
934e18e715 am af4371b4: am 56ba6336: am f1d57e16: Merge "Add more pthreads tests."
* commit 'af4371b46b71116bd40b6ef1eb32fdfc301a38e9':
  Add more pthreads tests.
2012-09-07 20:36:20 -07:00
Elliott Hughes
af4371b46b am 56ba6336: am f1d57e16: Merge "Add more pthreads tests."
* commit '56ba6336d9c07cdfb5af2324aaa52da0c8d00ef2':
  Add more pthreads tests.
2012-09-07 20:35:01 -07:00
Elliott Hughes
56ba6336d9 am f1d57e16: Merge "Add more pthreads tests."
* commit 'f1d57e16686153b69a27c1eb9e339c77232c0edd':
  Add more pthreads tests.
2012-09-07 18:38:41 -07:00
Elliott Hughes
f1d57e1668 Merge "Add more pthreads tests." 2012-09-07 18:30:18 -07:00
Ying Wang
cf464878ef Generate header dependency makefiles for the crt*.o
Bug: 7127743
Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-07 17:13:37 -07:00
Elliott Hughes
4d014e15b4 Add more pthreads tests.
Someone reported a bug if pthread_detach is called while a pthread_join is
already in progress, but I'm unable to reproduce it. Keep the tests I wrote,
though.

Change-Id: I3d71450bbbb5345f2cb213dc56310ec020d528cc
2012-09-07 16:47:54 -07:00
Elliott Hughes
5804b88a44 am b0102454: am 7c7a7f8e: am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
* commit 'b010245490f50601b13ee17238e31162b6143d71':
  Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:11:35 -07:00
Elliott Hughes
ffcb92e779 am b18d4f63: am 72fcdbe9: am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
* commit 'b18d4f6361c4ae011c7661da46ad0501eecba591':
  Add mlockall and munlockall for Google TV.
2012-09-07 11:11:34 -07:00
Elliott Hughes
b010245490 am 7c7a7f8e: am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
* commit '7c7a7f8e526518f37eae3ce2a785344316f263e0':
  Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:09:23 -07:00
Elliott Hughes
b18d4f6361 am 72fcdbe9: am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
* commit '72fcdbe9025b0405251c17eb391f326e03bf92ef':
  Add mlockall and munlockall for Google TV.
2012-09-07 11:09:23 -07:00
Elliott Hughes
7c7a7f8e52 am d10309c3: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
* commit 'd10309c36b93176a473baeeddef6f3fba8bf0678':
  Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:07:13 -07:00
Elliott Hughes
72fcdbe902 am 691ef3c8: Merge "Add mlockall and munlockall for Google TV."
* commit '691ef3c80b4af278aa90d6e005ba42de1e52c140':
  Add mlockall and munlockall for Google TV.
2012-09-07 11:07:10 -07:00
Elliott Hughes
d10309c36b Merge "Rename __dso_handle_so.c to __dso_handle_so.h" 2012-09-07 10:59:20 -07:00
Elliott Hughes
691ef3c80b Merge "Add mlockall and munlockall for Google TV." 2012-09-07 10:51:49 -07:00
Andrew Hsieh
048569be54 Rename __dso_handle_so.c to __dso_handle_so.h
Also chang libc/arch-arm/bionic/crtbegin_so.c to include it
as a header.

Change-Id: Ib91b0b8caf5c8b936425aa8a4fc1a229b2b27929
2012-09-07 12:49:41 +08:00
Ian Rogers
593315c327 am e9859df7: am 973bf681: am 77039d34: am e8f81547: Merge "Fix build warning of initialization but no use."
* commit 'e9859df7cc57f761a4b9457b4d55ecff33bfdc8b':
  Fix build warning of initialization but no use.
2012-09-06 11:54:48 -07:00
Ian Rogers
e9859df7cc am 973bf681: am 77039d34: am e8f81547: Merge "Fix build warning of initialization but no use."
* commit '973bf681b74d418704202cbfefef5d3be031b066':
  Fix build warning of initialization but no use.
2012-09-06 11:52:24 -07:00
Ian Rogers
973bf681b7 am 77039d34: am e8f81547: Merge "Fix build warning of initialization but no use."
* commit '77039d34449e369b9425a36eaed38d41b9d20884':
  Fix build warning of initialization but no use.
2012-09-06 11:50:22 -07:00
Ian Rogers
77039d3444 am e8f81547: Merge "Fix build warning of initialization but no use."
* commit 'e8f815473ba463b875cea757bc0a52fc32f10748':
  Fix build warning of initialization but no use.
2012-09-06 11:45:54 -07:00
Ian Rogers
e8f815473b Merge "Fix build warning of initialization but no use." 2012-09-06 11:41:52 -07:00
Elliott Hughes
1ad05db9ce Add mlockall and munlockall for Google TV.
Change-Id: I10e961d701e74aab07211ec7975f61167e387853
2012-09-06 11:24:45 -07:00
Elliott Hughes
f28d8d7042 am 684669df: am de0dc251: am 41ff8b98: am 6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
* commit '684669dfd7fdefa1e0f45e91667af628d3742429':
  Don't corrupt the thread list in static executables.
2012-09-06 10:48:52 -07:00
Elliott Hughes
684669dfd7 am de0dc251: am 41ff8b98: am 6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
* commit 'de0dc251120e03622d89d7af2ce44530d665e065':
  Don't corrupt the thread list in static executables.
2012-09-06 10:46:41 -07:00
Elliott Hughes
de0dc25112 am 41ff8b98: am 6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
* commit '41ff8b98044de19d6ea5228452c2d555c4224da7':
  Don't corrupt the thread list in static executables.
2012-09-06 10:44:13 -07:00
Elliott Hughes
41ff8b9804 am 6e3b0f2d: Merge "Don\'t corrupt the thread list in static executables."
* commit '6e3b0f2d2e89a8f3bbfc5d26dcdc13233c1111ba':
  Don't corrupt the thread list in static executables.
2012-09-06 10:40:43 -07:00
Elliott Hughes
6e3b0f2d2e Merge "Don't corrupt the thread list in static executables." 2012-09-06 10:31:52 -07:00
Ian Rogers
09f76cdd9b Fix build warning of initialization but no use.
first_run is only used with LOCK_AT_FORK, however, care needs to be
taken with the #if to avoid compiler warnings when LOCK_AT_FORK isn't
being used.

Change-Id: I6bcfac2ab8732c91607f4a1bcd7c0019f29c2eec
2012-09-06 09:59:13 -07:00
The Android Open Source Project
c99828169b am c0ee1171: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c0ee117170e9a8976ffd2afc99bce8f1242cefd1':
  Revert "Update ion header"
  :Revert "Update ion header"
2012-09-06 09:12:34 -07:00
The Android Open Source Project
c0ee117170 Reconcile with jb-mr1-release - do not merge
Change-Id: If42e786ae4ba616676fad3872f3c36f0c0be16f8
2012-09-06 07:52:32 -07:00
The Android Automerger
abce26b05a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-06 06:33:25 -07:00
Ajay Dudani
58deb845c5 am d58928e8: am 183d0a57: Update msm_ion.h ioctls so they dont conflict with ion.h
* commit 'd58928e83109aeac42e2226de3ec99a91e59a695':
  Update msm_ion.h ioctls so they dont conflict with ion.h
2012-09-05 21:52:04 -07:00
Ajay Dudani
d58928e831 am 183d0a57: Update msm_ion.h ioctls so they dont conflict with ion.h
* commit '183d0a57a292a33d92baa099b14425805a94306d':
  Update msm_ion.h ioctls so they dont conflict with ion.h
2012-09-05 21:49:44 -07:00
Ajay Dudani
1c24c54840 am bf3da78e: am 85811fc7: Revert "msm_ion: switch to using legacy_ion.h"
* commit 'bf3da78e690524414a8874313638f7cf33b44424':
  Revert "msm_ion: switch to using legacy_ion.h"
2012-09-05 21:47:56 -07:00