Commit Graph

9438 Commits

Author SHA1 Message Date
Elliott Hughes
14442bb229 Temporary fix for asan_malloc_linux.cc build failure.
Bug: 15432753
Change-Id: I02a3a2c826e6d01e6809c51588a9670dcd179123
2014-06-04 15:20:46 -07:00
Elliott Hughes
aca22284fc am b27cb268: am 38732aa9: Merge "Fix debug malloc."
* commit 'b27cb268c0c1424c71d64b8a713983257d4de7ee':
  Fix debug malloc.
2014-06-04 21:49:25 +00:00
Elliott Hughes
b27cb268c0 am 38732aa9: Merge "Fix debug malloc."
* commit '38732aa9ea28b54d55c46b6b1f9367cb8fa147f1':
  Fix debug malloc.
2014-06-04 21:44:20 +00:00
Dan Albert
ab86296461 am ea5c19c4: am 623dce3b: Merge "Removes wcswcs from bionic for LP64."
* commit 'ea5c19c4cf82eb97a0ee90d6e9c7dfe0c709e2fb':
  Removes wcswcs from bionic for LP64.
2014-06-04 21:33:35 +00:00
Dan Albert
ea5c19c4cf am 623dce3b: Merge "Removes wcswcs from bionic for LP64."
* commit '623dce3bd43975ca5b8698955a9fd8f18e9d5963':
  Removes wcswcs from bionic for LP64.
2014-06-04 21:29:25 +00:00
Elliott Hughes
38732aa9ea Merge "Fix debug malloc." 2014-06-04 21:10:55 +00:00
Elliott Hughes
8e52e8fe83 Fix debug malloc.
Previously the dynamically-loaded part of the debug malloc implementation
wanted to access hidden symbols in libc itself.

Bug: 15426546
Change-Id: I6a366ef626854d1af1d705ca24842817b1c02a19
2014-06-04 14:08:20 -07:00
Dan Albert
623dce3bd4 Merge "Removes wcswcs from bionic for LP64." 2014-06-04 20:59:10 +00:00
Dan Albert
001f8f041b Removes wcswcs from bionic for LP64.
Bug: 13935372
Change-Id: I0deb15e769da4fa81bb65a87f3c86db5163a5796
2014-06-04 12:01:56 -07:00
Elliott Hughes
441216a28c am 430cf1a6: (-s ours) DO NOT MERGE fdprintf backward compatibility shim.
* commit '430cf1a6c32471ada4dad028acbfcc032da01fd3':
  DO NOT MERGE fdprintf backward compatibility shim.
2014-06-04 18:43:41 +00:00
Elliott Hughes
9100b11973 am 4832a096: (-s ours) DO NOT MERGE Fix lmp-preview-dev after bionic merge.
* commit '4832a0961dc891ef69177c9cf0c3e3ba5dd7b69d':
  DO NOT MERGE Fix lmp-preview-dev after bionic merge.
2014-06-04 18:43:41 +00:00
Christopher Ferris
88848df902 am 81b20406: Merge remote-tracking branch \'goog/master\' into merge
* commit '81b2040683415845efa2694671c3ed212137051d':
2014-06-04 18:43:40 +00:00
Elliott Hughes
5406127ca0 am 8c5d3170: am e120cba3: Merge "Cherrypick upstream OpenBSD\'s vfwprintf.c revision 1.11."
* commit '8c5d3170411e00c8f0cc126d84e4b08e6a1223d1':
  Cherrypick upstream OpenBSD's vfwprintf.c revision 1.11.
2014-06-04 17:32:11 +00:00
Dan Albert
bb87e9a823 am 4855a97e: am 452e0913: Merge "Adds functionality specified by uchar.h"
* commit '4855a97ed06500de7515e2984d9f44cae7bf756a':
  Adds functionality specified by uchar.h
2014-06-04 17:32:11 +00:00
Elliott Hughes
8c5d317041 am e120cba3: Merge "Cherrypick upstream OpenBSD\'s vfwprintf.c revision 1.11."
* commit 'e120cba31df5249b720579312e799bd1c65f8e3d':
  Cherrypick upstream OpenBSD's vfwprintf.c revision 1.11.
2014-06-04 17:28:48 +00:00
Dan Albert
4855a97ed0 am 452e0913: Merge "Adds functionality specified by uchar.h"
* commit '452e09130010b641904e7411e0c539590a654022':
  Adds functionality specified by uchar.h
2014-06-04 17:28:46 +00:00
Elliott Hughes
e120cba31d Merge "Cherrypick upstream OpenBSD's vfwprintf.c revision 1.11." 2014-06-04 16:17:10 +00:00
Dan Albert
452e091300 Merge "Adds functionality specified by uchar.h" 2014-06-04 16:10:50 +00:00
Elliott Hughes
be8df2e744 Cherrypick upstream OpenBSD's vfwprintf.c revision 1.11.
revision 1.11
date: 2014/06/04 07:45:25;  author: stsp;  state: Exp;  lines: +1 -7;  commitid:
 zJPRH5RUO224FmQu;
Remove assigned but unused local variables and macro from vfwprintf().
Found by Elliott @ google
ok mpi@

Change-Id: I716edc0c4d736a484a5317942de8e87bd8c6fd26
2014-06-04 09:00:25 -07:00
Dan Albert
7a7f9952c1 Adds functionality specified by uchar.h
mbrtoc32 and c32rtomb get their implementations from mbrtowc and wcrtomb. The
wc functions now simply call the c32 functions.

Bug: 14646575
Change-Id: I49d4b95fed0f9d790260c996c4d0f8bfd1686324
2014-06-04 08:39:24 -07:00
Elliott Hughes
27e3e3300c am 9a2aba17: am 38ed337c: Merge "Hide dlmalloc symbols."
* commit '9a2aba176a8b315207c728132591eea57f6b4d53':
  Hide dlmalloc symbols.
2014-06-04 03:51:18 +00:00
Elliott Hughes
9a2aba176a am 38ed337c: Merge "Hide dlmalloc symbols."
* commit '38ed337c1343af1aa55487777ed80de6b0d33638':
  Hide dlmalloc symbols.
2014-06-04 03:48:09 +00:00
Elliott Hughes
38ed337c13 Merge "Hide dlmalloc symbols." 2014-06-04 03:30:37 +00:00
Elliott Hughes
9b5235d74e Hide dlmalloc symbols.
We need to leave dlmalloc_trim and dlmalloc_inspect_all exposed for
the VM, but if we're seriously looking at other malloc implementations,
that's something we're going to have to fix.

Bug: 11156955
Change-Id: If85156c280044f1616c09a3c50ba674aaf0e8d3a
2014-06-03 18:47:17 -07:00
Dan Albert
651dde33e4 am d90ded5a: am c3801894: Merge "Removes bcopy and bzero from bionic."
* commit 'd90ded5a911d5c37da49fb6179cf4ff5b9d48cb3':
  Removes bcopy and bzero from bionic.
2014-06-04 01:19:26 +00:00
Dan Albert
d90ded5a91 am c3801894: Merge "Removes bcopy and bzero from bionic."
* commit 'c380189410b66dcaca5936b2fabceab4c492dd53':
  Removes bcopy and bzero from bionic.
2014-06-04 01:15:59 +00:00
Dan Albert
c380189410 Merge "Removes bcopy and bzero from bionic." 2014-06-04 01:00:40 +00:00
Dan Albert
ce9ce28e5d Removes bcopy and bzero from bionic.
These symbols are still defined for LP32 for binary compatibility, but
the declarations have been replaced with the POSIX recommended #defines.

Bug: 13935372
Change-Id: Ief7e6ca012db374588ba5839f11e8f3a13a20467
2014-06-03 17:22:07 -07:00
Elliott Hughes
ad5342a0c0 am 5bf90caa: am 3dbc2fe3: Merge "Work around "error: variable \'uio\' set but not used"."
* commit '5bf90caa78425c0053d35186b91a1c4936ccb149':
  Work around "error: variable 'uio' set but not used".
2014-06-04 00:12:10 +00:00
Elliott Hughes
2e9e17c91a am d575c374: am bd6b8497: Merge "Remove an unused parameter from the dlopen implementation."
* commit 'd575c374d290d3e590e1e7a228673c68194a473e':
  Remove an unused parameter from the dlopen implementation.
2014-06-04 00:12:09 +00:00
Elliott Hughes
b239d3fa27 am 85981760: am be15d16b: Merge "Turn on -Wunused and fix the mistakes it uncovers."
* commit '859817602d24d5c4868ed8b7d0cc69e5d3babfc6':
  Turn on -Wunused and fix the mistakes it uncovers.
2014-06-04 00:12:06 +00:00
Elliott Hughes
5bf90caa78 am 3dbc2fe3: Merge "Work around "error: variable \'uio\' set but not used"."
* commit '3dbc2fe33e7a1c0e545f7762d3c7a98429c5a82b':
  Work around "error: variable 'uio' set but not used".
2014-06-03 23:57:03 +00:00
Elliott Hughes
d575c374d2 am bd6b8497: Merge "Remove an unused parameter from the dlopen implementation."
* commit 'bd6b849754386a1befa2c935cde3110cadf422c6':
  Remove an unused parameter from the dlopen implementation.
2014-06-03 23:56:58 +00:00
Elliott Hughes
3dbc2fe33e Merge "Work around "error: variable 'uio' set but not used"." 2014-06-03 23:41:35 +00:00
Elliott Hughes
b082645ccb Work around "error: variable 'uio' set but not used".
I've sent the real fix upstream, and will merge that when they commit it.

Change-Id: I75e5cab87026f8990c585d364dd178753d727e2a
2014-06-03 16:39:58 -07:00
Elliott Hughes
bd6b849754 Merge "Remove an unused parameter from the dlopen implementation." 2014-06-03 23:36:35 +00:00
Elliott Hughes
859817602d am be15d16b: Merge "Turn on -Wunused and fix the mistakes it uncovers."
* commit 'be15d16b7246e32a1e622d4442cf919646bc71a9':
  Turn on -Wunused and fix the mistakes it uncovers.
2014-06-03 23:24:39 +00:00
Elliott Hughes
1a58629340 Remove an unused parameter from the dlopen implementation.
Change-Id: I9297913a743bb570b48ebbe594ff711a481e89e0
2014-06-03 16:23:08 -07:00
Elliott Hughes
be15d16b72 Merge "Turn on -Wunused and fix the mistakes it uncovers." 2014-06-03 23:14:21 +00:00
Elliott Hughes
430cf1a6c3 DO NOT MERGE fdprintf backward compatibility shim.
Fixes LP64 build.

Change-Id: Ic76005cd1f5a55344ea8ee3d070d25631d011037
2014-06-03 16:01:35 -07:00
Elliott Hughes
d286796fce Turn on -Wunused and fix the mistakes it uncovers.
Change-Id: I023d2d8b547fbc21d4124bb7510d42b06a0dc501
2014-06-03 15:22:34 -07:00
Paul Jensen
0d78bdaf65 Merge "Make host resolver call __connect() rather than connect() so mark isn't cleared." 2014-06-03 17:23:28 +00:00
Dan Albert
109c5a81d4 am 6e587086: am 2f9400b6: Merge "Use __libc_fatal() for failed malloc in new"
* commit '6e5870865e11f38ac9fcdf39c6097f1e39af9234':
  Use __libc_fatal() for failed malloc in new
2014-06-03 17:15:22 +00:00
Dan Albert
6e5870865e am 2f9400b6: Merge "Use __libc_fatal() for failed malloc in new"
* commit '2f9400b679ffe08f7190781e64edda5edf0f7297':
  Use __libc_fatal() for failed malloc in new
2014-06-03 17:12:16 +00:00
Dan Albert
2f9400b679 Merge "Use __libc_fatal() for failed malloc in new" 2014-06-03 16:53:47 +00:00
Dan Albert
989725940e Use __libc_fatal() for failed malloc in new
This way we can print a useful message to the log isntead of just dying
mysteriously.

Change-Id: Ib660c2fd8ce8bb9aa0d0bb634ae08c645d3901e5
2014-06-02 18:48:53 -07:00
Elliott Hughes
4832a0961d DO NOT MERGE Fix lmp-preview-dev after bionic merge.
Other projects in lmp-preview-dev are out of date, and it's easier to patch
bionic than to fix all of them.

(cherry picked from commit a856c6f543)

Change-Id: Id8fbdf35eb55150579f85b7bdddb5d68d3012218
2014-06-02 15:27:21 -07:00
Christopher Ferris
81b2040683 Merge remote-tracking branch 'goog/master' into merge 2014-06-02 15:27:02 -07:00
Elliott Hughes
87f0392320 am 016074f6: am 987bd5c6: am 2deef73f: Merge "Avoid a system call in \'gettid\'."
* commit '016074f6beec46fa2140e2cabd11ade488776402':
  Avoid a system call in 'gettid'.
2014-06-02 17:55:53 +00:00
Elliott Hughes
016074f6be am 987bd5c6: am 2deef73f: Merge "Avoid a system call in \'gettid\'."
* commit '987bd5c64f1381185f27afb60ec46be5e9eaba36':
  Avoid a system call in 'gettid'.
2014-06-02 17:52:28 +00:00