Commit Graph

7881 Commits

Author SHA1 Message Date
The Android Automerger
bb63e31685 merge in master-release history after reset to master 2014-04-12 05:49:27 -07:00
Elliott Hughes
47d2456804 am 4d9a0d11: am a0b32321: Merge "Improve the <sstream> test."
* commit '4d9a0d11615f74e78ba97de487cbedf63325fd2e':
  Improve the <sstream> test.
2014-04-11 16:31:59 +00:00
Elliott Hughes
4d9a0d1161 am a0b32321: Merge "Improve the <sstream> test."
* commit 'a0b3232161f6ad60be1a3c4d97044ac2bb14808c':
  Improve the <sstream> test.
2014-04-11 16:29:26 +00:00
Elliott Hughes
a0b3232161 Merge "Improve the <sstream> test." 2014-04-11 16:23:29 +00:00
Elliott Hughes
6455ac73da Improve the <sstream> test.
It looks like libcxx's testing is crap too, and this turned up
another bug in stlport.

Change-Id: I98c93dceaa8225c3cc280166d4bb74adaf94a324
2014-04-10 20:44:27 -07:00
Elliott Hughes
8808dc6ff1 am d8b6b839: am c4e71fc9: Merge "Remove unnecessary #includes."
* commit 'd8b6b839578352abd107697d21b2e9a6671af0e9':
  Remove unnecessary #includes.
2014-04-11 00:58:27 +00:00
Elliott Hughes
d8b6b83957 am c4e71fc9: Merge "Remove unnecessary #includes."
* commit 'c4e71fc91f240d64aabf27d0da54e9cbf4298d14':
  Remove unnecessary #includes.
2014-04-11 00:56:40 +00:00
Elliott Hughes
c4e71fc91f Merge "Remove unnecessary #includes." 2014-04-11 00:50:49 +00:00
Elliott Hughes
b676aafad0 Remove unnecessary #includes.
Change-Id: Ie7e0c9ea03f35517c7dcf09fc808c12e55262bc1
2014-04-10 17:50:06 -07:00
Elliott Hughes
bdbd892567 am 727093a3: am b64868a5: Merge "Add a test for external/stlport a6df82320fcb8f26af0d067c7768fedbaeb9ad88."
* commit '727093a3e1a31fbaa8e8f45033dc33e6ef326bde':
  Add a test for external/stlport a6df82320fcb8f26af0d067c7768fedbaeb9ad88.
2014-04-10 19:13:58 +00:00
Elliott Hughes
727093a3e1 am b64868a5: Merge "Add a test for external/stlport a6df82320fcb8f26af0d067c7768fedbaeb9ad88."
* commit 'b64868a50715cfdb5c71d97144ba00acf78e2a76':
  Add a test for external/stlport a6df82320fcb8f26af0d067c7768fedbaeb9ad88.
2014-04-10 19:09:18 +00:00
Elliott Hughes
b64868a507 Merge "Add a test for external/stlport a6df82320fcb8f26af0d067c7768fedbaeb9ad88." 2014-04-10 19:03:56 +00:00
Elliott Hughes
8c42606ae1 Add a test for external/stlport a6df82320fcb8f26af0d067c7768fedbaeb9ad88.
Change-Id: If4df9f5df41ae5453a3dff6bb032b419819f8703
2014-04-10 11:34:14 -07:00
The Android Automerger
b106dbbc93 merge in master-release history after reset to master 2014-04-10 05:49:19 -07:00
Elliott Hughes
c4db98e302 am 9ac738e3: am 4e364d97: Merge "Use the glibc name user_fpregs_struct."
* commit '9ac738e3dd924b998815fe6fe4464eef4c9350f4':
  Use the glibc name user_fpregs_struct.
2014-04-10 01:07:31 +00:00
Elliott Hughes
9ac738e3dd am 4e364d97: Merge "Use the glibc name user_fpregs_struct."
* commit '4e364d972433bda04614b56bc422ca88bf406c00':
  Use the glibc name user_fpregs_struct.
2014-04-10 00:05:52 +00:00
Elliott Hughes
4e364d9724 Merge "Use the glibc name user_fpregs_struct." 2014-04-09 23:59:43 +00:00
Elliott Hughes
93e1907ae1 Use the glibc name user_fpregs_struct.
Instead of the kernel name user_i387_struct.

Bug: 13889008
Change-Id: Ideec2e1ce36c1faa4b5b2db1999ad2b23757ca4d
2014-04-09 16:35:36 -07:00
Elliott Hughes
c34a7c93b4 am 599921be: am e4392199: Merge "Fix mcontext_t for x86-64."
* commit '599921be7b0d21b1f16b6aff6f8a246476845a09':
  Fix mcontext_t for x86-64.
2014-04-09 23:01:59 +00:00
Elliott Hughes
599921be7b am e4392199: Merge "Fix mcontext_t for x86-64."
* commit 'e4392199af1f867f751f73b129cc71e2ea99aba9':
  Fix mcontext_t for x86-64.
2014-04-09 22:59:05 +00:00
Elliott Hughes
e4392199af Merge "Fix mcontext_t for x86-64." 2014-04-09 22:52:07 +00:00
Elliott Hughes
c5992a036b Fix mcontext_t for x86-64.
Change-Id: I1ac0e7f44bcdd06a07862993e92c3048a7474a8b
2014-04-09 13:27:48 -07:00
The Android Automerger
cd49747110 merge in master-release history after reset to master 2014-04-09 05:49:17 -07:00
Calin Juravle
08576fff6d am 49076afc: am a5d83312: Merge "Use glibc structure for __cmsg_nxthdr."
* commit '49076afc19a9f336cc958837cf56a6893de3c618':
  Use glibc structure for __cmsg_nxthdr.
2014-04-09 09:11:11 +00:00
Elliott Hughes
b2da536c1c am 2fbe6831: am b52a4ab4: Merge "Flesh out <locale.h>."
* commit '2fbe6831c455ac4883aa062ae51294625b4cfccc':
  Flesh out <locale.h>.
2014-04-09 09:11:10 +00:00
Calin Juravle
49076afc19 am a5d83312: Merge "Use glibc structure for __cmsg_nxthdr."
* commit 'a5d83312bdeae2062a45160f54ce86c4b7b164e0':
  Use glibc structure for __cmsg_nxthdr.
2014-04-09 08:58:03 +00:00
Elliott Hughes
2fbe6831c4 am b52a4ab4: Merge "Flesh out <locale.h>."
* commit 'b52a4ab4e281c7adae35b3d7ae8d99b5753b870d':
  Flesh out <locale.h>.
2014-04-09 08:58:02 +00:00
Calin Juravle
a5d83312bd Merge "Use glibc structure for __cmsg_nxthdr." 2014-04-09 06:06:48 +00:00
Elliott Hughes
b52a4ab4e2 Merge "Flesh out <locale.h>." 2014-04-09 04:13:43 +00:00
Elliott Hughes
1d4be682e3 am 327acb9b: am e6235505: Merge "Fix build: include what you use."
* commit '327acb9bbad825bc2e89eefd3fc408a0706701c3':
  Fix build: include what you use.
2014-04-09 03:22:27 +00:00
Elliott Hughes
327acb9bba am e6235505: Merge "Fix build: include what you use."
* commit 'e62355057ca703eeca22d54a8a0f5b69ca58487c':
  Fix build: include what you use.
2014-04-09 03:18:44 +00:00
Elliott Hughes
e62355057c Merge "Fix build: include what you use." 2014-04-09 02:45:48 +00:00
Elliott Hughes
764a993611 Fix build: include what you use.
Change-Id: I12b2d5e434ad3ed38d4451bd470673781e6ca8fe
2014-04-08 19:44:36 -07:00
Elliott Hughes
c4936e20a3 Flesh out <locale.h>.
This is a trivial implementation that only supports the C/POSIX locale.

Change-Id: Ib11cea4249e1862aca96a8b94d58ea9a418cbe75
2014-04-08 19:37:38 -07:00
Elliott Hughes
f4870920ac am 901b2839: am 7f38a3c9: Merge "Implement _Exit(3)."
* commit '901b2839d8ce51cbfde0c922390c8322107cd27d':
  Implement _Exit(3).
2014-04-09 02:22:37 +00:00
Elliott Hughes
901b2839d8 am 7f38a3c9: Merge "Implement _Exit(3)."
* commit '7f38a3c9bef9c6efc30a6b60873bbdeea04a18f0':
  Implement _Exit(3).
2014-04-09 02:12:43 +00:00
Elliott Hughes
7f38a3c9be Merge "Implement _Exit(3)." 2014-04-09 02:07:01 +00:00
Elliott Hughes
cb48308d1a am a93d2770: am ac70d2e1: Merge "Clean up localeconv(3)."
* commit 'a93d27703f65e11077eb0b965e52d34a1b82e979':
  Clean up localeconv(3).
2014-04-09 01:45:22 +00:00
Elliott Hughes
9f525644df Implement _Exit(3).
Change-Id: Ida6ac844cc87d38c9645b197dd8188bb73e27dbe
2014-04-08 17:16:13 -07:00
Elliott Hughes
a93d27703f am ac70d2e1: Merge "Clean up localeconv(3)."
* commit 'ac70d2e1fe71f98232942237c2b463ea3adbf662':
  Clean up localeconv(3).
2014-04-08 22:04:41 +00:00
Calin Juravle
ff64831b09 Use glibc structure for __cmsg_nxthdr.
Bug: 13418328
Change-Id: I7e656b373e53e80d708325321e48dcedacf5086d
2014-04-09 00:55:24 +03:00
Elliott Hughes
ac70d2e1fe Merge "Clean up localeconv(3)." 2014-04-08 21:52:33 +00:00
Elliott Hughes
5363a45f2b Clean up localeconv(3).
The OpenBSD doesn't support C99, and the extent to which we support
locales is trivial, so just do it ourselves.

Change-Id: If0a06e627ecc593f7b8ea3e9389365782e49b00e
2014-04-08 14:34:12 -07:00
Andrew Hsieh
57ba426913 am 0f147d74: am e2239ddb: Merge "Corrected typo in mips64.mk about memcpy.cpp"
* commit '0f147d74b88ea49ddeb9af82180b67895100bb7d':
  Corrected typo in mips64.mk about memcpy.cpp
2014-04-08 20:24:52 +00:00
Andrew Hsieh
0f147d74b8 am e2239ddb: Merge "Corrected typo in mips64.mk about memcpy.cpp"
* commit 'e2239ddb727f1f07237fa664edaf43b12b18e0a6':
  Corrected typo in mips64.mk about memcpy.cpp
2014-04-08 20:21:10 +00:00
Andrew Hsieh
e2239ddb72 Merge "Corrected typo in mips64.mk about memcpy.cpp" 2014-04-08 20:09:44 +00:00
Elliott Hughes
3680504a9c am 91f4f586: am 5acd2d40: Merge "AArch64: Fix flock64 for LP64."
* commit '91f4f586f3871075a676cf5fbd73d360b13097a3':
  AArch64: Fix flock64 for LP64.
2014-04-08 19:32:56 +00:00
Elliott Hughes
91f4f586f3 am 5acd2d40: Merge "AArch64: Fix flock64 for LP64."
* commit '5acd2d40052c55255a346167e504afb884eeb3af':
  AArch64: Fix flock64 for LP64.
2014-04-08 19:29:29 +00:00
Elliott Hughes
5acd2d4005 Merge "AArch64: Fix flock64 for LP64." 2014-04-08 19:20:51 +00:00
Serban Constantinescu
48501af98f AArch64: Fix flock64 for LP64.
On LP64 systems F_GETLK64, F_SETLK64 and F_SETLKW64 definitions should
map onto the F_GETLK, F_SETLK and F_SETLKW definitions, respectively.
LP64 also doesn't have a struct flock64.

Change-Id: Ibdfed9645d9e946999acd6efa8b96ea6238ed5bf
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
2014-04-08 12:19:23 -07:00