diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /toolchain/glibc/Makefile.inc | |
parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
parent | 34592482701199604242848b80c39bd07b6c7716 (diff) |
resolve merge conflict
Diffstat (limited to 'toolchain/glibc/Makefile.inc')
-rw-r--r-- | toolchain/glibc/Makefile.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 414790a23..ff4753465 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -31,3 +31,4 @@ GLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_forced_unwind=yes \ libc_cv_c_cleanup=yes \ libc_cv_gnu99_inline=yes \ + libc_cv_sparc64_tls=yes \ |