Elliott Hughes
0837c69a63
am edf09bf9
: am 316ee626
: Merge "MIPS support to sigsuspend and sigwait routines"
...
* commit 'edf09bf990c8b011a084dbdb92050879e08ad8a9':
MIPS support to sigsuspend and sigwait routines
2012-08-10 15:17:05 -07:00
Elliott Hughes
edf09bf990
am 316ee626
: Merge "MIPS support to sigsuspend and sigwait routines"
...
* commit '316ee626b729e3f66a5505a20128af26440cfd19':
MIPS support to sigsuspend and sigwait routines
2012-08-10 15:15:23 -07:00
Elliott Hughes
316ee626b7
Merge "MIPS support to sigsuspend and sigwait routines"
2012-08-10 15:05:36 -07:00
Nick Kralevich
d7a941f210
am 17f65bf4
: am 73d99958
: am fabeb736
: am 38a02b4b
: Merge "crtend*: Add GNU_STACK note"
...
* commit '17f65bf468074083624aa7546da024193d70c50a':
crtend*: Add GNU_STACK note
2012-08-10 14:50:02 -07:00
Nick Kralevich
17f65bf468
am 73d99958
: am fabeb736
: am 38a02b4b
: Merge "crtend*: Add GNU_STACK note"
...
* commit '73d99958bb8bb4cd8f8a7632aeb7e6afaa1e38f1':
crtend*: Add GNU_STACK note
2012-08-10 14:48:44 -07:00
Nick Kralevich
73d99958bb
am fabeb736
: am 38a02b4b
: Merge "crtend*: Add GNU_STACK note"
...
* commit 'fabeb736e91d4f4f79a1cbbed696cffb50a860a9':
crtend*: Add GNU_STACK note
2012-08-10 14:46:56 -07:00
Nick Kralevich
fabeb736e9
am 38a02b4b
: Merge "crtend*: Add GNU_STACK note"
...
* commit '38a02b4b80f50aa1b3e2ee39e9e98146cf42be3d':
crtend*: Add GNU_STACK note
2012-08-10 14:42:11 -07:00
Nick Kralevich
38a02b4b80
Merge "crtend*: Add GNU_STACK note"
2012-08-10 14:29:27 -07:00
Elliott Hughes
4a20a7f77c
am 623ed02e
: am d71ada63
: am 535477ca
: am 3ede900b
: Merge "Revert "Revert "Switch to NetBSD\'s strxfrm(3)."""
...
* commit '623ed02e35fb8c5b8c868b11f53c005e39707f74':
Revert "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 14:16:50 -07:00
Elliott Hughes
623ed02e35
am d71ada63
: am 535477ca
: am 3ede900b
: Merge "Revert "Revert "Switch to NetBSD\'s strxfrm(3)."""
...
* commit 'd71ada630d5390b7fb6838cb48cb79a1581df1b1':
Revert "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 14:14:29 -07:00
Elliott Hughes
d71ada630d
am 535477ca
: am 3ede900b
: Merge "Revert "Revert "Switch to NetBSD\'s strxfrm(3)."""
...
* commit '535477ca5e29f3c14dff11ac362423156b5971ec':
Revert "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 14:12:08 -07:00
Nick Kralevich
6eee1fc68f
crtend*: Add GNU_STACK note
...
Add a GNU_STACK marker to crtend* files. This tells the linker
that these files do not require an executable stack.
When linking, a missing GNU_STACK marker in any .o file can prevent
the compiler from automatically marking the final executable as NX
safe (executable stack not required). In Android, we normally work
around this by adding -Wa,--noexecstack / -Wl,-z,noexecstack.
For files like crtend.S / crtend_so.S, which are included in every
executable / shared library, it's better to add the GNU_STACK note
directly to the assembly file. This allows the compiler to
automatically mark the final executable as NX safe without any
special command line options.
References: http://www.gentoo.org/proj/en/hardened/gnu-stack.xml
Change-Id: I07bd058f9f60ddd8b146e0fb36ba26ff84c0357d
2012-08-10 14:12:00 -07:00
Elliott Hughes
535477ca5e
am 3ede900b
: Merge "Revert "Revert "Switch to NetBSD\'s strxfrm(3)."""
...
* commit '3ede900b644c2a7c2fa41177b81735c8a09bd14a':
Revert "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 14:10:03 -07:00
Elliott Hughes
3ede900b64
Merge "Revert "Revert "Switch to NetBSD's strxfrm(3)."""
2012-08-10 14:03:06 -07:00
Elliott Hughes
63c16f85c5
am be01adce
: am 5adc7fdc
: am b54e5f2a
: am a1822dce
: Merge "Add unshare() syscall."
...
* commit 'be01adce3653912644b33e34a3c7894cf42c71e9':
Add unshare() syscall.
2012-08-10 13:10:22 -07:00
Elliott Hughes
be01adce36
am 5adc7fdc
: am b54e5f2a
: am a1822dce
: Merge "Add unshare() syscall."
...
* commit '5adc7fdc2bc8e6e513c3dd9cd0c5cb7617d08d14':
Add unshare() syscall.
2012-08-10 13:08:05 -07:00
Elliott Hughes
5adc7fdc2b
am b54e5f2a
: am a1822dce
: Merge "Add unshare() syscall."
...
* commit 'b54e5f2a2fd014a5cbf105daea7b2eb8b59dec29':
Add unshare() syscall.
2012-08-10 13:06:35 -07:00
Elliott Hughes
b54e5f2a2f
am a1822dce
: Merge "Add unshare() syscall."
...
* commit 'a1822dced3ed8625438b3cbf1c53f907f78a3a48':
Add unshare() syscall.
2012-08-10 13:04:22 -07:00
Elliott Hughes
a1822dced3
Merge "Add unshare() syscall."
2012-08-10 12:59:49 -07:00
Jeff Sharkey
e36c826f7a
Add unshare() syscall.
...
(cherry-pick of 5467f25f82934d611c60f8bc57a05114f3c1bea0.)
Bug: 6925012
Change-Id: Ic5ea2fbd606311087de05d7a3594df2fa9b2fef9
2012-08-10 12:57:43 -07:00
Elliott Hughes
c383a32926
am 4fc5f6c3
: am 5140b785
: am f6922be2
: am f91e2f72
: Merge "Fix typo in SIGTTOU description."
...
* commit '4fc5f6c366dac9c3c264b94b413b1f162a60a53d':
Fix typo in SIGTTOU description.
2012-08-10 12:54:39 -07:00
Elliott Hughes
1bb1aea178
am 7186a132
: am 55206504
: am a618ea30
: am 4ec9e343
: Merge "Revert "Switch to NetBSD\'s strxfrm(3).""
...
* commit '7186a13284bd70840b396aaec2090804e461869c':
Revert "Switch to NetBSD's strxfrm(3)."
2012-08-10 12:54:38 -07:00
Elliott Hughes
c2817899e4
am 731ecf0a
: am 29b8fb3d
: am 3e83da43
: am 9ad1d6f5
: Merge "Switch to NetBSD\'s strxfrm(3)."
...
* commit '731ecf0a317b46e12a71542fdaa289d31898f3c0':
Switch to NetBSD's strxfrm(3).
2012-08-10 12:54:37 -07:00
Elliott Hughes
4fc5f6c366
am 5140b785
: am f6922be2
: am f91e2f72
: Merge "Fix typo in SIGTTOU description."
...
* commit '5140b785a04827d34225241f99f17e49aadbf3bb':
Fix typo in SIGTTOU description.
2012-08-10 12:52:23 -07:00
Elliott Hughes
7186a13284
am 55206504
: am a618ea30
: am 4ec9e343
: Merge "Revert "Switch to NetBSD\'s strxfrm(3).""
...
* commit '552065048334cc893dadbc926701d08dc6c66fcc':
Revert "Switch to NetBSD's strxfrm(3)."
2012-08-10 12:52:22 -07:00
Elliott Hughes
731ecf0a31
am 29b8fb3d
: am 3e83da43
: am 9ad1d6f5
: Merge "Switch to NetBSD\'s strxfrm(3)."
...
* commit '29b8fb3d5ea06d05fcd36e298b464dce7dc06803':
Switch to NetBSD's strxfrm(3).
2012-08-10 12:52:20 -07:00
Elliott Hughes
5140b785a0
am f6922be2
: am f91e2f72
: Merge "Fix typo in SIGTTOU description."
...
* commit 'f6922be2a5e30fc594f48ec435d92b5386648061':
Fix typo in SIGTTOU description.
2012-08-10 12:49:12 -07:00
Elliott Hughes
5520650483
am a618ea30
: am 4ec9e343
: Merge "Revert "Switch to NetBSD\'s strxfrm(3).""
...
* commit 'a618ea30e1c9d4f06031fb4ecdae31666db92993':
Revert "Switch to NetBSD's strxfrm(3)."
2012-08-10 12:49:10 -07:00
Elliott Hughes
29b8fb3d5e
am 3e83da43
: am 9ad1d6f5
: Merge "Switch to NetBSD\'s strxfrm(3)."
...
* commit '3e83da435b3ad7bee739972fca53dbfb692e6438':
Switch to NetBSD's strxfrm(3).
2012-08-10 12:49:08 -07:00
Elliott Hughes
75501a17f2
am d18b181a
: am b6c1e34d
: am dc6d5327
: am 0836a7ff
: Merge "Auto-generate a complete NOTICE file."
...
* commit 'd18b181a25b2fa21c20ecd4faaf5c8e6e50fb35b':
Auto-generate a complete NOTICE file.
2012-08-10 12:40:35 -07:00
Elliott Hughes
d18b181a25
am b6c1e34d
: am dc6d5327
: am 0836a7ff
: Merge "Auto-generate a complete NOTICE file."
...
* commit 'b6c1e34dca58734c949b6c80d68c74104e1190e0':
Auto-generate a complete NOTICE file.
2012-08-10 12:38:37 -07:00
Elliott Hughes
b6c1e34dca
am dc6d5327
: am 0836a7ff
: Merge "Auto-generate a complete NOTICE file."
...
* commit 'dc6d5327bb6b030d154675f753d3e4f96dfa5e14':
Auto-generate a complete NOTICE file.
2012-08-10 12:36:22 -07:00
Elliott Hughes
f6922be2a5
am f91e2f72
: Merge "Fix typo in SIGTTOU description."
...
* commit 'f91e2f72861643e1d31ffc3e6c374b52d33d2423':
Fix typo in SIGTTOU description.
2012-08-10 12:34:17 -07:00
Elliott Hughes
f91e2f7286
Merge "Fix typo in SIGTTOU description."
2012-08-10 12:27:06 -07:00
Elliott Hughes
01030e6388
Fix typo in SIGTTOU description.
...
Change-Id: Ie0db3e7df3e1f17b43f5645d027a90603139be2f
2012-08-10 12:23:58 -07:00
Elliott Hughes
f8b3a920a8
Revert "Revert "Switch to NetBSD's strxfrm(3).""
...
This reverts commit 8793e7c7d2
,
and fixes the build by building upstream NetBSD source as a
separate library that's then swallowed whole into libc_common.
Change-Id: I6c9317d8c48b5ccaf85a7b185bc07fb31176ff97
2012-08-10 12:10:10 -07:00
Elliott Hughes
a618ea30e1
am 4ec9e343
: Merge "Revert "Switch to NetBSD\'s strxfrm(3).""
...
* commit '4ec9e343cf445c5032d9a782d2e92b1dba713e61':
Revert "Switch to NetBSD's strxfrm(3)."
2012-08-10 11:44:29 -07:00
Elliott Hughes
4ec9e343cf
Merge "Revert "Switch to NetBSD's strxfrm(3).""
2012-08-10 11:36:31 -07:00
Elliott Hughes
8793e7c7d2
Revert "Switch to NetBSD's strxfrm(3)."
...
This reverts commit be1d78b0dc
Change-Id: I11a95db474796f3da004f27652b081d5ba4ec9b4
2012-08-10 11:36:17 -07:00
Jeff Sharkey
b17cd156b5
am 9a477de2
: am 6ccc2c8f
: Merge "Add unshare() syscall." into jb-mr1-dev
...
* commit '9a477de2f54922ba28dbc4789b12b83e64bd1474':
Add unshare() syscall.
2012-08-10 11:33:26 -07:00
Jeff Sharkey
9a477de2f5
am 6ccc2c8f
: Merge "Add unshare() syscall." into jb-mr1-dev
...
* commit '6ccc2c8f435e42db3d844698f82ab6884798624a':
Add unshare() syscall.
2012-08-10 11:31:20 -07:00
Jeff Sharkey
6ccc2c8f43
Merge "Add unshare() syscall." into jb-mr1-dev
2012-08-10 11:29:53 -07:00
Elliott Hughes
3e83da435b
am 9ad1d6f5
: Merge "Switch to NetBSD\'s strxfrm(3)."
...
* commit '9ad1d6f58ccbc830ce87e3ddf35708e519a8f23e':
Switch to NetBSD's strxfrm(3).
2012-08-10 11:28:40 -07:00
Elliott Hughes
9ad1d6f58c
Merge "Switch to NetBSD's strxfrm(3)."
2012-08-10 11:23:30 -07:00
Jeff Sharkey
5467f25f82
Add unshare() syscall.
...
Bug: 6925012
Change-Id: I2530a8f6cea49eb32b60f8f9c4d86963773456ca
2012-08-10 11:17:59 -07:00
Elliott Hughes
be1d78b0dc
Switch to NetBSD's strxfrm(3).
...
There were two bugs in our implementation. Intel found one, but another
remainined, and tracking upstream is the way forward for functions where
we add no value.
Change-Id: Ida9bac0293fb2c4cbc942b1e0515ee0477c6538b
2012-08-10 11:03:02 -07:00
The Android Open Source Project
cb221a5cbe
am 1551f18a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '1551f18af0c75c2b2c3ca61168fe4284b54f1a2e':
2012-08-10 08:53:33 -07:00
The Android Open Source Project
1551f18af0
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Idae4db637990d9326dffba6d0679f520f7c69da0
2012-08-10 08:51:39 -07:00
Raghu Gandham
abd10011a7
MIPS support to sigsuspend and sigwait routines
...
Change-Id: I870e798ed7eac5a8c74e5784a670f3a4f24331a9
2012-08-09 18:51:19 -07:00
Elliott Hughes
dc6d5327bb
am 0836a7ff
: Merge "Auto-generate a complete NOTICE file."
...
* commit '0836a7ffb13890558fe568119b023007cce66373':
Auto-generate a complete NOTICE file.
2012-08-09 16:39:15 -07:00