Jean-Baptiste Queru
3487c9b4a8
am 2400c7a6
: am e49df020
: am 170ad354
: am c7de0225
: Merge "Use unambiguous mnemonics"
...
* commit '2400c7a60edb18ab62fedcad86ce0d709895e26d':
Use unambiguous mnemonics
2012-08-22 07:35:31 -07:00
Jean-Baptiste Queru
2400c7a60e
am e49df020
: am 170ad354
: am c7de0225
: Merge "Use unambiguous mnemonics"
...
* commit 'e49df0203c112bf44b166cde733554072b115ec5':
Use unambiguous mnemonics
2012-08-22 07:33:51 -07:00
Jean-Baptiste Queru
e49df0203c
am 170ad354
: am c7de0225
: Merge "Use unambiguous mnemonics"
...
* commit '170ad35419620b428c15a8945416ce8cedef3e81':
Use unambiguous mnemonics
2012-08-22 07:32:21 -07:00
Jean-Baptiste Queru
170ad35419
am c7de0225
: Merge "Use unambiguous mnemonics"
...
* commit 'c7de02259052b1eeebbfd3a0c21acf56a7e84357':
Use unambiguous mnemonics
2012-08-22 07:30:56 -07:00
Jean-Baptiste Queru
c7de022590
Merge "Use unambiguous mnemonics"
2012-08-22 07:18:50 -07:00
Erik Gilling
98b62860cf
am fed12112
: am 974e16cd
: update linux/sync.h
...
* commit 'fed121126afa91eb04a073ecc1e42535b1b52d27':
update linux/sync.h
2012-08-21 19:14:12 -07:00
Erik Gilling
fed121126a
am 974e16cd
: update linux/sync.h
...
* commit '974e16cd829b6f75a5861759e86c1c09768272f2':
update linux/sync.h
2012-08-21 19:11:07 -07:00
Erik Gilling
974e16cd82
update linux/sync.h
...
Change-Id: Ic2133976b675cdcd3ca88f4845180a7ff1c79e34
Signed-off-by: Erik Gilling <konkers@android.com>
2012-08-21 18:17:24 -07:00
The Android Open Source Project
92042e8b91
am a5b7d6dd
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'a5b7d6dd00914651f77c4ff6604a2c16df6d73b9':
2012-08-21 16:07:05 -07:00
The Android Open Source Project
a5b7d6dd00
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I559e0ba590f5beee87871ecfbdfc185566d40f9f
2012-08-21 16:04:39 -07:00
Kevin Schoedel
c0b4d18d7d
Use unambiguous mnemonics
...
Change-Id: I8da0af54cc3cbf69d9e485eb71bc44a6976b1adc
Author: Kevin P Schoedel <kevin.p.schoedel@intel.com>
Reviewed-by: Edwin Vane <edwin.vane@intel.com>
2012-08-21 15:28:23 -04:00
The Android Automerger
5d8cfb3e66
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-21 06:33:32 -07:00
Andrew Hsieh
0b8770ccbd
am 5e2aa357
: am f861705f
: am 5cd1efb2
: am 1bd035cf
: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
...
* commit '5e2aa357d2f76a01c403a208524137c6fccf7304':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:34:44 -07:00
Andrew Hsieh
5e2aa357d2
am f861705f
: am 5cd1efb2
: am 1bd035cf
: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
...
* commit 'f861705f8c64af968b542c23932994cd17bb5db9':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:33:02 -07:00
Andrew Hsieh
f861705f8c
am 5cd1efb2
: am 1bd035cf
: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
...
* commit '5cd1efb2ba68cdde13682ee37a3499b7bd974bdb':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:31:02 -07:00
Andrew Hsieh
5cd1efb2ba
am 1bd035cf
: Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
...
* commit '1bd035cf119a2e4a667f07907c7860e5ec223cee':
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
2012-08-21 03:29:14 -07:00
Andrew Hsieh
1bd035cf11
Merge "Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS"
2012-08-21 03:25:46 -07:00
Andrew Hsieh
2f7d7c6538
Enclosed functions in fenv.h with __BEGIN_DECLS/__END_DECLS
...
Those are C funcitons
Related CL: https://android-review.googlesource.com/#/c/41833/
Change-Id: I4386bcf948ad31c3690c9b7a145103088133d041
2012-08-21 15:41:34 +08:00
Ian Rogers
6acc9d10e2
am 7c6cc4df
: am 4ac3b0a1
: am 8af726b2
: am 7b0d9b79
: Merge "Restore posix_memalign"
...
* commit '7c6cc4dffdcfad48733ac3c3001f5d9b137182b1':
Restore posix_memalign
2012-08-20 19:47:21 -07:00
Ian Rogers
7c6cc4dffd
am 4ac3b0a1
: am 8af726b2
: am 7b0d9b79
: Merge "Restore posix_memalign"
...
* commit '4ac3b0a1487cc97e86bd98959e23bf2303942945':
Restore posix_memalign
2012-08-20 19:46:25 -07:00
Ian Rogers
4ac3b0a148
am 8af726b2
: am 7b0d9b79
: Merge "Restore posix_memalign"
...
* commit '8af726b24fbb9ab545719bd3980a4f0ad9bcb8a8':
Restore posix_memalign
2012-08-20 19:45:12 -07:00
Ian Rogers
8af726b24f
am 7b0d9b79
: Merge "Restore posix_memalign"
...
* commit '7b0d9b798474ab62d4bf67c79ae901f4c4789f27':
Restore posix_memalign
2012-08-20 19:43:15 -07:00
Ian Rogers
7b0d9b7984
Merge "Restore posix_memalign"
2012-08-20 19:35:25 -07:00
Brian Carlstrom
bfc1d97531
Restore posix_memalign
...
Change-Id: I24e31bcb8b1d8be9375852e76964f09becd11938
2012-08-20 19:25:39 -07:00
Brian Carlstrom
4beae98ae0
am 638b0fd9
: am cc1f4acb
: Restore posix_memalign
...
* commit '638b0fd95346c8930aabcdec933e8caa6d6b4c7c':
Restore posix_memalign
2012-08-20 18:38:50 -07:00
Brian Carlstrom
638b0fd953
am cc1f4acb
: Restore posix_memalign
...
* commit 'cc1f4acbda8f12c2020c2e5f1f8a03221c9ae4e9':
Restore posix_memalign
2012-08-20 18:36:44 -07:00
Brian Carlstrom
cc1f4acbda
Restore posix_memalign
...
Change-Id: I24e31bcb8b1d8be9375852e76964f09becd11938
2012-08-20 18:28:20 -07:00
Brian Carlstrom
d03266b2b7
am 94c82633
: am 76f60e2e
: am fe87596a
: am c37dcd3d
: Merge "Upgrade to dlmalloc 2.8.5."
...
* commit '94c82633c72acae0eb7a3390167b35eb3008b4ff':
Upgrade to dlmalloc 2.8.5.
2012-08-20 16:36:05 -07:00
Brian Carlstrom
94c82633c7
am 76f60e2e
: am fe87596a
: am c37dcd3d
: Merge "Upgrade to dlmalloc 2.8.5."
...
* commit '76f60e2ebd8750c4e4594158745e752b6a10ea0b':
Upgrade to dlmalloc 2.8.5.
2012-08-20 16:34:22 -07:00
Brian Carlstrom
76f60e2ebd
am fe87596a
: am c37dcd3d
: Merge "Upgrade to dlmalloc 2.8.5."
...
* commit 'fe87596a5ba5a5b0773b2854f9fce85f49367611':
Upgrade to dlmalloc 2.8.5.
2012-08-20 16:31:29 -07:00
Brian Carlstrom
fe87596a5b
am c37dcd3d
: Merge "Upgrade to dlmalloc 2.8.5."
...
* commit 'c37dcd3d3ab8e32c37ce034b8d1772b4a7b9add9':
Upgrade to dlmalloc 2.8.5.
2012-08-20 16:29:48 -07:00
Brian Carlstrom
c37dcd3d3a
Merge "Upgrade to dlmalloc 2.8.5."
2012-08-20 16:12:33 -07:00
Ian Rogers
999089181e
Upgrade to dlmalloc 2.8.5.
...
Move dlmalloc code to upstream-dlmalloc to make pulling upstream changes
easier.
Declare pvalloc and malloc_usable_size routines present in malloc.h but with
missing implementations. Remove other functions from malloc.h that have
no implementation nor use in Android.
Change-Id: Ia6472ec6cbebc9ad1ef99f4669de9d33fcc2efb4
2012-08-20 14:12:20 -07:00
The Android Automerger
f706b3dfcf
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-20 06:33:38 -07:00
Elliott Hughes
758b1c46fb
am 98f26893
: am dd0e991c
: am 2651d6c6
: am 9417a80e
: Merge "Always define the 64-bit int types."
...
* commit '98f26893a6a8811df1fe7e012f6cf8885e6c560e':
Always define the 64-bit int types.
2012-08-17 17:01:23 -07:00
Elliott Hughes
98f26893a6
am dd0e991c
: am 2651d6c6
: am 9417a80e
: Merge "Always define the 64-bit int types."
...
* commit 'dd0e991c6a0d4d71f1698fd57608a7d42401b6da':
Always define the 64-bit int types.
2012-08-17 17:00:03 -07:00
Elliott Hughes
dd0e991c6a
am 2651d6c6
: am 9417a80e
: Merge "Always define the 64-bit int types."
...
* commit '2651d6c6cbd0fafff83aafb61ab7bc9cbab413d2':
Always define the 64-bit int types.
2012-08-17 16:58:10 -07:00
Elliott Hughes
2651d6c6cb
am 9417a80e
: Merge "Always define the 64-bit int types."
...
* commit '9417a80e48d3bba4bea814178aaa79b905ebab8c':
Always define the 64-bit int types.
2012-08-17 16:56:14 -07:00
Elliott Hughes
9417a80e48
Merge "Always define the 64-bit int types."
2012-08-17 16:48:14 -07:00
Elliott Hughes
230df050ed
am ea5dea8e
: am db2903fa
: am cbeccc84
: am 200de748
: Merge "Fix race condition in pthread_create()"
...
* commit 'ea5dea8edb4217da7798ef29759c2b5d27f7dcfb':
Fix race condition in pthread_create()
2012-08-17 16:30:02 -07:00
Elliott Hughes
ea5dea8edb
am db2903fa
: am cbeccc84
: am 200de748
: Merge "Fix race condition in pthread_create()"
...
* commit 'db2903fac3d4548de1fd0fda1d3b7460c723282e':
Fix race condition in pthread_create()
2012-08-17 16:28:00 -07:00
Elliott Hughes
db2903fac3
am cbeccc84
: am 200de748
: Merge "Fix race condition in pthread_create()"
...
* commit 'cbeccc849a45ac9adc124a6d1781c1ddc7bad54e':
Fix race condition in pthread_create()
2012-08-17 16:26:37 -07:00
Elliott Hughes
cbeccc849a
am 200de748
: Merge "Fix race condition in pthread_create()"
...
* commit '200de748b91d7638a2c434584abcb3840704494b':
Fix race condition in pthread_create()
2012-08-17 16:23:53 -07:00
Elliott Hughes
200de748b9
Merge "Fix race condition in pthread_create()"
2012-08-17 16:19:56 -07:00
Jurijs Oniscuks
2932f04832
Fix race condition in pthread_create()
...
Save thread id to *thread_out before new
thread is allowed to run else there's a
risk that the thread has finished and
been deleted when *thread_out is assigned.
Change-Id: I6b84c61a8df06840877d4ab036f26feace3192d8
2012-08-17 16:18:32 -07:00
Elliott Hughes
6d6731adc0
Always define the 64-bit int types.
...
These preprocessor tricks have caused trouble for -std=gnu99 and -ansi, and
both netbsd's libc and glibc seem to unconditionally define these types.
Change-Id: Ib8dffa341a8ca88f80d275ba2b7f93a4c910ee32
2012-08-17 14:30:06 -07:00
Elliott Hughes
1f6639a1bf
am d060b824
: am efd39834
: am e5242bfd
: am 1771a33d
: Merge "Add link.h for all platforms with dl_phdr_info"
...
* commit 'd060b824dd293bf1ecd7814cd2e75a77186cefcb':
Add link.h for all platforms with dl_phdr_info
2012-08-17 14:04:52 -07:00
Elliott Hughes
d060b824dd
am efd39834
: am e5242bfd
: am 1771a33d
: Merge "Add link.h for all platforms with dl_phdr_info"
...
* commit 'efd3983446c6574c9662b01f441776cf299c0c80':
Add link.h for all platforms with dl_phdr_info
2012-08-17 14:03:53 -07:00
Elliott Hughes
efd3983446
am e5242bfd
: am 1771a33d
: Merge "Add link.h for all platforms with dl_phdr_info"
...
* commit 'e5242bfdd731a67282389ece515f094d57bb7300':
Add link.h for all platforms with dl_phdr_info
2012-08-17 14:01:53 -07:00
Elliott Hughes
e5242bfdd7
am 1771a33d
: Merge "Add link.h for all platforms with dl_phdr_info"
...
* commit '1771a33d11a24f1c47b1ef75e3726c5d9e751f5b':
Add link.h for all platforms with dl_phdr_info
2012-08-17 14:00:11 -07:00