diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2013-09-19 09:02:16 +0200 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2013-09-19 09:02:16 +0200 |
| commit | f4b0dac07fbd45caae118a07a263c17b0b349cc1 (patch) | |
| tree | cfd82bdf26d30e861e00032ec5bdd6b7e5871c9e | |
| parent | 9d4657148a52bcfaaf4337e6222b085ffac79dca (diff) | |
| download | bionic-linaro_android_4.3.tar.gz | |
Redo clang patch in a way that doesn't break gcc 4.8linaro_android_4.3
Change-Id: I6b0ed3cf05b552c982f851d161c5bcb7f1cd5930
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | libc/bionic/libc_init_common.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libc/bionic/libc_init_common.cpp b/libc/bionic/libc_init_common.cpp index 68a7309cf..6384d5abd 100644 --- a/libc/bionic/libc_init_common.cpp +++ b/libc/bionic/libc_init_common.cpp @@ -59,8 +59,14 @@ char** environ; uintptr_t __stack_chk_guard = 0; // Declared in <asm/page.h>. -extern "C" unsigned int __page_size = PAGE_SIZE; -extern "C" unsigned int __page_shift = PAGE_SHIFT; +#ifdef __clang__ +extern "C" { +#endif + unsigned int __page_size = PAGE_SIZE; + unsigned int __page_shift = PAGE_SHIFT; +#ifdef __clang__ +} +#endif /* Init TLS for the initial thread. Called by the linker _before_ libc is mapped * in memory. Beware: all writes to libc globals from this function will |