From e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:04:02 -0600 Subject: Revert "resolve merge" This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344. --- .../linuxthreads/sysdeps/pthread/res-state.c | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 libpthread/linuxthreads/sysdeps/pthread/res-state.c (limited to 'libpthread/linuxthreads/sysdeps/pthread/res-state.c') diff --git a/libpthread/linuxthreads/sysdeps/pthread/res-state.c b/libpthread/linuxthreads/sysdeps/pthread/res-state.c new file mode 100644 index 000000000..6b4354972 --- /dev/null +++ b/libpthread/linuxthreads/sysdeps/pthread/res-state.c @@ -0,0 +1,46 @@ +/* Copyright (C) 1996, 97, 98, 2002, 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include + +#ifndef __UCLIBC_HAS_TLS__ +# undef _res +extern struct __res_state _res; +#endif + +/* When threaded, _res may be a per-thread variable. */ +struct __res_state * +#ifndef __UCLIBC_HAS_TLS__ +weak_const_function +#endif +__res_state (void) +{ +#ifndef __UCLIBC_HAS_TLS__ + if (! SINGLE_THREAD_P) + { + pthread_descr self = thread_self(); + return LIBC_THREAD_GETMEM (self, p_resp); + } + return &_res; +#else + return __resp; +#endif +} +libc_hidden_def (__res_state) -- cgit v1.2.3