Commit Graph

9728 Commits

Author SHA1 Message Date
Dmitriy Ivanov
1d2b4c022c Merge "Move libraries for unit-tests to separate folder" 2014-06-17 23:00:03 +00:00
Elliott Hughes
d150eab4ed am c02f242d: am b6ca7474: Merge "Add a flag control that PRIVATE libm can be chosen"
* commit 'c02f242d330f11ccfd6322164ce1b16861416ff1':
  Add a flag control that PRIVATE libm can be chosen
2014-06-17 22:45:46 +00:00
Elliott Hughes
c02f242d33 am b6ca7474: Merge "Add a flag control that PRIVATE libm can be chosen"
* commit 'b6ca7474023f7832d4230756781031b7687517e6':
  Add a flag control that PRIVATE libm can be chosen
2014-06-17 22:42:16 +00:00
Dmitriy Ivanov
1f5e1a3cbc Move libraries for unit-tests to separate folder
Change-Id: I1653f3f2fd63ba25525369bc725c8f7438ecf021
2014-06-17 15:08:53 -07:00
Elliott Hughes
8a72b6187f am 775b2a0d: am 4ac22649: Merge "Add <linux/tty.h> to libc/include/sys/ioctl.h"
* commit '775b2a0d9ca8ba17f9f443b203536c9879bd519c':
  Add <linux/tty.h> to libc/include/sys/ioctl.h
2014-06-17 21:58:19 +00:00
Elliott Hughes
775b2a0d9c am 4ac22649: Merge "Add <linux/tty.h> to libc/include/sys/ioctl.h"
* commit '4ac22649441339d0a81e0fc6428ac7f1867ffe6f':
  Add <linux/tty.h> to libc/include/sys/ioctl.h
2014-06-17 21:53:05 +00:00
Elliott Hughes
477b45b89d Merge "Build tzcode with -Werror." 2014-06-17 21:42:00 +00:00
Elliott Hughes
5f564540a9 Build tzcode with -Werror.
Parts of this are just getting us in sync with upstream, but the
'const' stuff is our own mess. We should kill the *_tz functions
and lose this difference from upstream.

Change-Id: I17d26534ed3f54667143d78147a8c53be56d7b33
2014-06-19 13:54:10 -07:00
Elliott Hughes
942fa486f6 Merge "Update localtime.c." 2014-06-17 21:42:00 +00:00
Elliott Hughes
906eb9999b Update localtime.c.
This brings us closer to upstream's ToT localtime.c; our main interest
being their alternative fix for the stack usage we addressed in commit
8a8b0c9bfc.

Bug: 14468519
Change-Id: Ic28600115afda7f3158d91255edf422678bac082
2014-06-18 19:48:14 -07:00
Christopher Ferris
5c8647665c Merge "add 64-bit bionic implementation for denver arch" 2014-06-17 21:42:00 +00:00
Nick Kralevich
8a7cffc85d Merge "Reenable support for non-PIE executables" 2014-06-17 21:42:00 +00:00
Nick Kralevich
d81b3b275d Reenable support for non-PIE executables
On Nakasi builds, /system/bin/tf_daemon is a pre-compiled
vendor supplied binary. When support for non-PIE executables
was removed, that daemon failed to start, which induced
a number of bugs.

  * keystore is broken
  * CTS runs will hang after a certain period of time

Temporarily reenable non-PIE support for 32-bit platforms
until Nakasi is fixed.

This rolls back the following commits:

  Cleanup: updated comments
  * 6275f20834
  Cleanup: remove AARCH/ARM_COPY relocation support
  * b906e13c55

And restricts the following patch to 64 bit only:

  Remove support for non-PIE executables
  * 2aebf5429b

Bug: 14566672
Bug: 15086752
Bug: 15732002
Change-Id: Ia2501aa14bd30feb4a6ce66bdb7c9f066dba0b5f
2014-06-19 09:09:54 -07:00
Christopher Ferris
0b09153c12 Merge "Move common macros into bionic_macros.h." 2014-06-17 21:42:00 +00:00
Christopher Ferris
03eebcb6e8 Move common macros into bionic_macros.h.
Bug: 15590152
Change-Id: I730636613ef3653f68c5ab1d43b53beaf8e0dc25
2014-06-18 14:23:46 -07:00
Dan Albert
49d5399bbc Merge "Hide __atexit and remove __atexit_invalid." 2014-06-17 21:42:00 +00:00
Dan Albert
11f715c62e Hide __atexit and remove __atexit_invalid.
Bug: 11156955
Change-Id: I8c72edee8ecb92b75a282384277253bae19f7455
2014-06-18 13:19:22 -07:00
Dmitriy Ivanov
64dfbd242c Merge "Fix weak function lookups" 2014-06-17 21:07:34 +00:00
Dmitriy Ivanov
ce44166c73 Fix weak function lookups
* Linker now correctly resolves function defined
   with __attribute__((weak)).

Bug: https://code.google.com/p/android/issues/detail?id=70206
Change-Id: I82efb905676c25fefb1b11a13f5fecb0f1384657
2014-06-17 16:18:18 -07:00
Dan Albert
1ef3ba2b4f Merge "Revert "Hide declaration of gets(3) for C11 and later."" 2014-06-17 20:56:23 +00:00
Dan Albert
1291680c2a Revert "Hide declaration of gets(3) for C11 and later."
Breaks stlport. checkbuild lied to me?

This reverts commit c0ce590827.

Change-Id: I72fb21aba7eaea96a7c3208236fd03411527fa5e
2014-06-17 23:28:38 +00:00
Dan Albert
c0ce590827 Hide declaration of gets(3) for C11 and later.
gets(3) was removed from C11.

Change-Id: I4040a8a6c6d5d2a86878e8a80ca67964fbbb82a8
2014-06-17 15:52:07 -07:00
Elliott Hughes
b6ca747402 Merge "Add a flag control that PRIVATE libm can be chosen" 2014-06-17 20:56:23 +00:00
Elliott Hughes
4ac2264944 Merge "Add <linux/tty.h> to libc/include/sys/ioctl.h" 2014-06-17 20:56:23 +00:00
Dan Albert
185c399c58 Merge "Hide declaration of gets(3) for C11 and later." 2014-06-17 20:49:57 +00:00
Christopher Ferris
49b7175138 am d61729c0: am b656410a: Merge "Use a separate config.h for config like defines."
* commit 'd61729c0a55ce139c57cbf526cbfd3e448e3d3f1':
  Use a separate config.h for config like defines.
2014-06-17 18:35:46 +00:00
Christopher Ferris
d61729c0a5 am b656410a: Merge "Use a separate config.h for config like defines."
* commit 'b656410a73c4dfa2a3f8deba0a673080320f8605':
  Use a separate config.h for config like defines.
2014-06-17 18:30:28 +00:00
Christopher Ferris
b656410a73 Merge "Use a separate config.h for config like defines." 2014-06-17 04:51:41 +00:00
Christopher Ferris
6361964381 Use a separate config.h for config like defines.
This allows an easier way to share config parameters between unit tests
and the bionic code.

It also fixes a problem where the 32 bit bionic tests based on glibc, or
the cts list executable did not have the pvalloc,valloc tests.

Change-Id: Ib47942cb8a278252faa7498a6ef23e9578db544f
2014-06-16 23:35:53 -07:00
Christopher Ferris
c92354b66d am 6589ba15: am d10d3acd: Merge "Move jemalloc due to whole_static_library bug."
* commit '6589ba1561fd97785a0eb5c2eb8cc7d41a5b83e1':
  Move jemalloc due to whole_static_library bug.
2014-06-17 01:47:47 +00:00
Christopher Ferris
6589ba1561 am d10d3acd: Merge "Move jemalloc due to whole_static_library bug."
* commit 'd10d3acd45d045e5a705d22c2297483765e40f5f':
  Move jemalloc due to whole_static_library bug.
2014-06-17 00:57:37 +00:00
Dan Albert
c82c0b7e07 Remove SHA1 from LP64 in favor of libcrypto.
Keep the symbols around on LP32 for binary compatibility.

Bug: 11156955
Change-Id: I379a7e0fa3092e9a70daeafcbcb2aacfc314031a
2014-06-16 16:52:27 -07:00
Colin Cross
acfc63760e Revert "HACK: linker: check for handle==0xffffffff on LP64"
This reverts commit 346fea0805.

Change-Id: Id3fd79451e4218e68e39ce22f21408cbf93255ee
2014-06-16 15:44:20 -07:00
Dan Albert
c4978a5646 am 7a11b7a6: am a217a0cd: Merge "libc: Fix \'index\' symbol export."
* commit '7a11b7a674805f8373fd9f126ee46721ccab8eeb':
  libc: Fix 'index' symbol export.
2014-06-16 22:13:20 +00:00
Dan Albert
f3fc2fe72c am c732859d: am 4fb0d4fb: Merge "Revert "Revert "Remove ftime from bionic LP64"""
* commit 'c732859d241a182dc0a9c8b2a2bca9ec5926cd39':
  Revert "Revert "Remove ftime from bionic LP64""
2014-06-16 22:13:08 +00:00
Dan Albert
15d00e2989 am f49791fd: am 9a3ad98f: Merge "Removes getdtablesize(3) from LP64."
* commit 'f49791fd8767a3b09fe70febc9142da45c4398f1':
  Removes getdtablesize(3) from LP64.
2014-06-16 22:13:05 +00:00
Dan Albert
7a11b7a674 am a217a0cd: Merge "libc: Fix \'index\' symbol export."
* commit 'a217a0cdb3ff78f6b59d64fd4356f87643ad9d1e':
  libc: Fix 'index' symbol export.
2014-06-16 20:25:14 +00:00
Elliott Hughes
b618aa818d am fe6e646c: Update NOTICE files.
* commit 'fe6e646cb79fe15d7815fdb9c92cc66be56ab1d4':
  Update NOTICE files.
2014-06-16 20:05:43 +00:00
Dan Albert
c732859d24 am 4fb0d4fb: Merge "Revert "Revert "Remove ftime from bionic LP64"""
* commit '4fb0d4fb312ed696081200e65ce9bf643928e5e6':
  Revert "Revert "Remove ftime from bionic LP64""
2014-06-16 19:57:15 +00:00
Dan Albert
f49791fd87 am 9a3ad98f: Merge "Removes getdtablesize(3) from LP64."
* commit '9a3ad98fd69a276f7c5fca0489d5657be75fcf69':
  Removes getdtablesize(3) from LP64.
2014-06-16 19:36:18 +00:00
Dan Albert
4fb0d4fb31 Merge "Revert "Revert "Remove ftime from bionic LP64""" 2014-06-16 19:18:38 +00:00
Dan Albert
ac6467587e Revert "Revert "Remove ftime from bionic LP64""
This reverts commit 0921204660.

Change-Id: I749af8d7d429cda9f9d09a75bd30df54e6b1dd65
2014-06-16 12:32:38 -07:00
Dan Albert
9a3ad98fd6 Merge "Removes getdtablesize(3) from LP64." 2014-06-16 19:16:50 +00:00
Elliott Hughes
fe6e646cb7 Update NOTICE files.
Change-Id: I459caf48ba861372a4d0bc75f98a9cb4acc20fd5
2014-06-16 10:24:37 -07:00
Dan Albert
462abab12b Removes getdtablesize(3) from LP64.
getdtablesize(3) was removed fro POSIX 2004. Keep the symbol around in LP32 for
binary compatibility, but remove the declaration from unistd.h.

Bug: 13935372
Change-Id: I1f96cd290bf9176f922dad58bd5a7ab2cae7ef0f
2014-06-16 10:12:37 -07:00
Christopher Ferris
d10d3acd45 Merge "Move jemalloc due to whole_static_library bug." 2014-06-16 15:49:03 +00:00
Christopher Ferris
3a37576d4b Move jemalloc due to whole_static_library bug.
Rename jemalloc.cpp to jemalloc_wrapper.cpp to avoid problems with
the libc library having two jemalloc.o files that clobber each other.

Change-Id: I9a2d966dbf414b1367ee0ef1f0d73fca6f25b518
2014-06-16 17:13:09 -07:00
Dan Albert
a217a0cdb3 Merge "libc: Fix 'index' symbol export." 2014-06-16 15:34:52 +00:00
David 'Digit' Turner
891dedb935 libc: Fix 'index' symbol export.
The C library didn't export the 'index' symbol, but its C++ name-mangling
instead, which broke the ABI and prevented some applications from loading
properly.

The main reason was that the implementation under bionic/index.cpp relied
on the declaration to specify that the function has C linkage.

However, the declaration for index() was removed from both <string.h>
and <strings.h> in a recent patch, which made the compiler think it was
ok to compile the function with C++ linkage instead!

This patch does the following:

- Move index() definition to bionic/ndk_cruft.cpp and ensure it uses
  C linkage.

  Note that this removes index() from the 64-bit library entirely, this
  is intentional and will break source compatibility. Simply replacing
  an index() call with the equivalent strchr() should be enough to fix
  this in third-party code.

- Remove bionic/index.cpp from the tree and build files.

- Remove x86 assembly implementation from arch-x86/ to avoid conflict
  with the one in ndk_cruft.cpp

BUG=15606653

Change-Id: I816b589f69c8f8a6511f6be6195d20cf1c4e8123
2014-06-16 13:10:20 -07:00
Dan Albert
ca24f7dcfa am 38ebfc09: am 72dc1c22: Merge "Revert "Backing this one out since the counterpart needs to be sent upstream.""
* commit '38ebfc09ea610687d028db5f0a7b8f6789932288':
  Revert "Backing this one out since the counterpart needs to be sent upstream."
2014-06-14 01:22:09 +00:00