This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch siddhesh/is_in_module created. glibc-2.19-896-g6ad0c28
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 Aug 2014 17:08:25 -0000
- Subject: GNU C Library master sources branch siddhesh/is_in_module created. glibc-2.19-896-g6ad0c28
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, siddhesh/is_in_module has been created
at 6ad0c28b4c98468264660b6b762ba5152255e2f7 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6ad0c28b4c98468264660b6b762ba5152255e2f7
commit 6ad0c28b4c98468264660b6b762ba5152255e2f7
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Aug 12 17:04:26 2014 +0530
Evaluate IS_IN_MODULE only when building glibc components
The headers are internal, but they are referenced in the conformance
tests without setting the internal macros. Gate the IS_IN_MODULE
macro check with _LIBC to make sure we don't check it unless _LIBC is
defined.
diff --git a/include/mqueue.h b/include/mqueue.h
index 7169bda..e999d8f 100644
--- a/include/mqueue.h
+++ b/include/mqueue.h
@@ -1,6 +1,6 @@
#include <rt/mqueue.h>
-#if IS_IN_MODULE (librt)
+#if defined _LIBC && IS_IN_MODULE (librt)
hidden_proto (mq_timedsend)
hidden_proto (mq_timedreceive)
hidden_proto (mq_setattr)
diff --git a/include/stdlib.h b/include/stdlib.h
index 81cac09..69fafb4 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -226,7 +226,7 @@ extern int __qfcvt_r (long double __value, int __ndigit,
int *__restrict __decpt, int *__restrict __sign,
char *__restrict __buf, size_t __len);
-# if IS_IN_MODULE (libc)
+# if defined _LIBC && IS_IN_MODULE (libc)
# undef MB_CUR_MAX
# define MB_CUR_MAX (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX))
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4164ccf8582c6ccb9fc03f9e1224767a03b89275
commit 4164ccf8582c6ccb9fc03f9e1224767a03b89275
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Aug 12 16:24:59 2014 +0530
Put IN_MODULE definitions into CPPFLAGS and not CFLAGS
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 5bb2b51..27b2b9f 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -145,7 +145,7 @@ LDFLAGS-tst-putenv = $(no-as-needed)
$(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os $(link-libc-deps)
$(build-module)
-CFLAGS-tst-putenvmod.c = -UIN_MODULE -DIN_MODULE=MODULE_extramodules
+CPPFLAGS-tst-putenvmod = -UIN_MODULE -DIN_MODULE=MODULE_extramodules
$(objpfx)bug-getcontext: $(libm)
$(objpfx)tst-strtod-round: $(libm)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=95408e29e3b0bfb93fe1d61f721321f4b295bcca
commit 95408e29e3b0bfb93fe1d61f721321f4b295bcca
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Aug 12 15:37:09 2014 +0530
Remove NOT_IN_libc
Replace with !IS_IN_MODULE (libc). This completes the transition from
the IS_IN/NOT_IN macros to the IN_MODULE macro set.
The generated code is unchanged on x86_64.
diff --git a/Makerules b/Makerules
index fd6498c..5233e88 100644
--- a/Makerules
+++ b/Makerules
@@ -1162,7 +1162,7 @@ include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif
# The include magic above causes those files to use this variable for flags.
-CPPFLAGS-nonlib = -DNOT_IN_libc=1 -UIN_MODULE -DIN_MODULE=MODULE_nonlib
+CPPFLAGS-nonlib = -UIN_MODULE -DIN_MODULE=MODULE_nonlib
ifeq ($(build-shared),yes)
diff --git a/bits/stdio-lock.h b/bits/stdio-lock.h
index 198cb67..dcf532d 100644
--- a/bits/stdio-lock.h
+++ b/bits/stdio-lock.h
@@ -44,7 +44,7 @@ __libc_lock_define_recursive (typedef, _IO_lock_t)
#define _IO_cleanup_region_end(_doit) \
__libc_cleanup_region_end (_doit)
-#if defined _LIBC && !defined NOT_IN_libc
+#if defined _LIBC && IS_IN_MODULE (libc)
# define _IO_acquire_lock(_fp) \
_IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \
_IO_flockfile (_fp)
diff --git a/elf/Makefile b/elf/Makefile
index a8ae74e..e6736c4 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -96,7 +96,7 @@ extra-objs += sotruss-lib.os sotruss-lib.so
install-others += $(inst_auditdir)/sotruss-lib.so
install-bin-script += sotruss
generated += sotruss
-CPPFLAGS-sotruss-lib = -DNOT_IN_libc -DIN_MODULE=MODULE_extramodules
+CPPFLAGS-sotruss-lib = -UIN_MODULE -DIN_MODULE=MODULE_extramodules
$(objpfx)sotruss-lib.so: $(objpfx)sotruss-lib.os
$(build-module-asneeded)
$(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \
@@ -356,7 +356,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map)
# interp.c exists just to get this string into the libraries.
CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"'
-CPPFLAGS-interp = -DNOT_IN_libc=1 -DIN_MODULE=MODULE_extramodules
+CPPFLAGS-interp = -UIN_MODULE -DIN_MODULE=MODULE_extramodules
$(objpfx)interp.os: $(common-objpfx)config.make
ifneq (ld.so,$(rtld-installed-name))
@@ -438,8 +438,7 @@ CFLAGS-cache.c = $(SYSCONF-FLAGS)
CFLAGS-rtld.c = $(SYSCONF-FLAGS)
CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
- -DNOT_IN_libc=1 -UIN_MODULE \
- -DIN_MODULE="MODULE_rtld + MODULE_libs")
+ -UIN_MODULE -DIN_MODULE="MODULE_rtld + MODULE_libs")
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
generated += $(addsuffix .so,$(strip $(modules-names)))
diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index f330c71..b55b236 100644
--- a/elf/rtld-Rules
+++ b/elf/rtld-Rules
@@ -139,7 +139,6 @@ ifdef rtld-depfiles
endif
# This here is the whole point of all the shenanigans.
-rtld-CPPFLAGS := -DNOT_IN_libc=1 -UIN_MODULE \
- -DIN_MODULE="MODULE_rtld + MODULE_libs"
+rtld-CPPFLAGS := -UIN_MODULE -DIN_MODULE="MODULE_rtld + MODULE_libs"
endif
diff --git a/extra-lib.mk b/extra-lib.mk
index 6cc9a35..978086c 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -106,5 +106,4 @@ ifneq (,$(cpp-srcs-left))
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif
-CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -UIN_MODULE \
- -DIN_MODULE="MODULE_$(lib) + MODULE_libs"
+CPPFLAGS-$(lib) := -UIN_MODULE -DIN_MODULE="MODULE_$(lib) + MODULE_libs"
diff --git a/extra-modules.mk b/extra-modules.mk
index 9070c2b..3708c8a 100644
--- a/extra-modules.mk
+++ b/extra-modules.mk
@@ -6,4 +6,4 @@
module := $(firstword $(extra-modules-left))
extra-modules-left := $(filter-out $(module),$(extra-modules-left))
-CPPFLAGS-$(module).c += -DNOT_IN_libc -UIN_MODULE -DIN_MODULE=MODULE_extramodules
+CPPFLAGS-$(module).c += -UIN_MODULE -DIN_MODULE=MODULE_extramodules
diff --git a/iconv/Makefile b/iconv/Makefile
index 5cb42f4..97547fa 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -52,14 +52,11 @@ CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"'
CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"'
CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"'
-CPPFLAGS-iconv_charmap = -DNOT_IN_libc -UIN_MODULE \
- -DIN_MODULE=MODULE_iconv_programs
-CPPFLAGS-linereader = -DNOT_IN_libc -UIN_MODULE \
- -DIN_MODULE=MODULE_iconv_programs
-CPPFLAGS-strtab = -DNOT_IN_libc -UIN_MODULE -DIN_MODULE=MODULE_iconv_programs
-CPPFLAGS-charmap = -DNOT_IN_libc -UIN_MODULE -DIN_MODULE=MODULE_iconv_programs
-CPPFLAGS-charmap-dir = -DNOT_IN_libc -UIN_MODULE \
- -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-iconv_charmap = -UIN_MODULE -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-linereader = -UIN_MODULE -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-strtab = -UIN_MODULE -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-charmap = -UIN_MODULE -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-charmap-dir = -UIN_MODULE -DIN_MODULE=MODULE_iconv_programs
ifeq ($(run-built-tests),yes)
xtests-special += $(objpfx)test-iconvconfig.out
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 60a1086..017097e 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -76,7 +76,7 @@ test-srcs := tst-table-from tst-table-to
endif
# No code here is in libc.so.
-CPPFLAGS += -DNOT_IN_libc -UIN_MODULE -DIN_MODULE=MODULE_iconvdata
+CPPFLAGS += -UIN_MODULE -DIN_MODULE=MODULE_iconvdata
libJIS-routines := jis0201 jis0208 jis0212
libKSC-routines := ksc5601
diff --git a/include/assert.h b/include/assert.h
index 5112ce7..affe0b4 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -20,7 +20,7 @@ extern void __assert_fail_base (const char *fmt, const char *assertion,
const char *function)
__THROW __attribute__ ((__noreturn__));
-# if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+# if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
hidden_proto (__assert_fail)
hidden_proto (__assert_perror_fail)
# endif
diff --git a/include/ctype.h b/include/ctype.h
index 6a18039..0d9d9e3 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -7,7 +7,7 @@ libc_hidden_proto (__ctype_init)
extern int __isctype (int __c, int __mask);
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
/* These accessors are used by the optimized macros to find the
thread-local cache of ctype information from the current thread's
@@ -46,13 +46,13 @@ __ctype_tolower_loc (void)
return __libc_tsd_address (const int32_t *, CTYPE_TOLOWER);
}
-# endif /* Not NOT_IN_libc. */
+# endif /* Not !IS_IN_MODULE (libc). */
#endif
#include <ctype/ctype.h>
#ifndef _ISOMAC
-# if !defined __NO_CTYPE && !defined NOT_IN_libc
+# if !defined __NO_CTYPE && IS_IN_MODULE (libc)
/* The spec says that isdigit must only match the decimal digits. We
can check this without a memory access. */
# undef isdigit
diff --git a/include/errno.h b/include/errno.h
index 4b2cd31..3627729 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -27,7 +27,7 @@ extern int rtld_errno attribute_hidden;
# include <tls.h>
# undef errno
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define errno __libc_errno
# else
# define errno errno /* For #ifndef errno tests. */
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index bb86ad5..7b0feab 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -560,7 +560,7 @@ for linking")
# define hidden_nolink(name, lib, version)
#endif
-#if !defined NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libc_hidden_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs)
# define libc_hidden_def(name) hidden_def (name)
diff --git a/include/math.h b/include/math.h
index 4924784..7847a87 100644
--- a/include/math.h
+++ b/include/math.h
@@ -6,7 +6,7 @@
/* Now define the internal interfaces. */
extern int __matherr (struct exception *__exc);
-# if !defined NOT_IN_libc || IS_IN_MODULE (libm)
+# if IS_IN_MODULE (libc) || IS_IN_MODULE (libm)
hidden_proto (__finite)
hidden_proto (__isinf)
hidden_proto (__isnan)
diff --git a/include/netdb.h b/include/netdb.h
index c1c867e..2954ee9 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -6,7 +6,7 @@
/* Macros for accessing h_errno from inside libc. */
# if IS_IN_MODULE_LIB
# undef h_errno
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define h_errno __libc_h_errno
# else
# define h_errno h_errno /* For #ifndef h_errno tests. */
diff --git a/include/resolv.h b/include/resolv.h
index 3904cb7..8fbadac 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -13,7 +13,7 @@
#ifdef _RESOLV_H_
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define __resp __libc_resp
# endif
extern __thread struct __res_state *__resp attribute_tls_model_ie;
diff --git a/include/stdio.h b/include/stdio.h
index 9f2ea31..a189aeb 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -117,7 +117,7 @@ extern const char *const _sys_errlist_internal[] attribute_hidden;
extern int _sys_nerr_internal attribute_hidden;
libc_hidden_proto (__asprintf)
-# if !defined NOT_IN_libc
+# if IS_IN_MODULE (libc)
extern _IO_FILE *_IO_new_fopen (const char*, const char*);
# define fopen(fname, mode) _IO_new_fopen (fname, mode)
extern _IO_FILE *_IO_new_fdopen (int, const char*);
diff --git a/include/stdlib.h b/include/stdlib.h
index e50985a..81cac09 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -226,7 +226,7 @@ extern int __qfcvt_r (long double __value, int __ndigit,
int *__restrict __decpt, int *__restrict __sign,
char *__restrict __buf, size_t __len);
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# undef MB_CUR_MAX
# define MB_CUR_MAX (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX))
diff --git a/include/string.h b/include/string.h
index 8323412..0a3303a 100644
--- a/include/string.h
+++ b/include/string.h
@@ -57,7 +57,7 @@ extern __typeof (strcasecmp_l) __strcasecmp_l;
extern __typeof (strncasecmp_l) __strncasecmp_l;
/* Alternative version which doesn't pollute glibc's namespace. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# undef strndupa
# define strndupa(s, n) \
(__extension__ \
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 777e0f2..c6aa987 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -12,7 +12,7 @@ extern __mode_t __umask (__mode_t __mask);
extern int __mkdir (const char *__path, __mode_t __mode);
extern int __mknod (const char *__path,
__mode_t __mode, __dev_t __dev);
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
hidden_proto (__fxstat)
hidden_proto (__fxstat64)
hidden_proto (__lxstat)
diff --git a/include/wctype.h b/include/wctype.h
index a2ee9ff..d2d36bc 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -89,7 +89,7 @@ libc_hidden_proto (__towupper_l)
/* The spec says that isdigit must only match the decimal digits. We
can check this without a memory access. */
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# undef iswdigit
# define iswdigit(c) ({ wint_t __c = (c); __c >= L'0' && __c <= L'9'; })
# undef iswdigit_l
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 428a3f1..1c74e4b 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -324,7 +324,7 @@ _nl_normalize_codeset (codeset, name_len)
char *retval;
char *wp;
size_t cnt;
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
locale_t locale = newlocale (0, "C", NULL);
#else
# define locale _nl_C_locobj_ptr
diff --git a/libidn/idn-stub.c b/libidn/idn-stub.c
index 9361b25..26f7da6 100644
--- a/libidn/idn-stub.c
+++ b/libidn/idn-stub.c
@@ -130,7 +130,7 @@ __idna_to_ascii_lz (const char *input, char **output, int flags)
}
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
libc_freeres_fn (unload_libidn)
{
if (h != NULL && h != (void *) 1l)
diff --git a/libio/libioP.h b/libio/libioP.h
index bd94041..0ef9355 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -902,7 +902,7 @@ _IO_acquire_lock_clear_flags2_fct (_IO_FILE **p)
_IO_funlockfile (fp);
}
-#if !defined _IO_MTSAFE_IO && !defined NOT_IN_libc
+#if !defined _IO_MTSAFE_IO && IS_IN_MODULE (libc)
# define _IO_acquire_lock(_fp) \
do { \
_IO_FILE *_IO_acquire_lock_file = NULL
diff --git a/locale/Makefile b/locale/Makefile
index d4720c8..e5771aa 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -89,14 +89,13 @@ CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
-DLOCSRCDIR='"$(i18ndir)/locales"' \
- -DNOT_IN_libc -UIN_MODULE \
- -DIN_MODULE=MODULE_locale_programs
+ -UIN_MODULE -DIN_MODULE=MODULE_locale_programs
CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-charmap-dir.c = -Wno-write-strings
-# This makes sure -DNOT_IN_libc et al are passed for all these modules.
+# This makes sure -DIN_MODULE et al are passed for all these modules.
cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \
$(locale-modules) $(lib-modules))
lib := locale-programs
diff --git a/malloc/Makefile b/malloc/Makefile
index b143127..bdc480a 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -48,7 +48,7 @@ extra-objs = mcheck-init.o libmcheck.a
# Include the cleanup handler.
aux := set-freeres thread-freeres
-CPPFLAGS-memusagestat = -DNOT_IN_libc -UIN_MODULE -DIN_MODULE=MODULE_memusagestat
+CPPFLAGS-memusagestat = -UIN_MODULE -DIN_MODULE=MODULE_memusagestat
# The Perl script to analyze the output of the mtrace functions.
ifneq ($(PERL),no)
diff --git a/nptl/libc_multiple_threads.c b/nptl/libc_multiple_threads.c
index acf3594..cc6c224 100644
--- a/nptl/libc_multiple_threads.c
+++ b/nptl/libc_multiple_threads.c
@@ -18,7 +18,7 @@
#include <pthreadP.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifndef TLS_MULTIPLE_THREADS_IN_TCB
/* Variable set to a nonzero value either if more than one thread runs or ran,
or if a single-threaded process is trying to cancel itself. See
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 359346b..4407799 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -286,7 +286,7 @@ __do_cancel (void)
#define CANCEL_RESET(oldtype) \
__pthread_disable_asynccancel (oldtype)
-#if !defined NOT_IN_libc
+#if IS_IN_MODULE (libc)
/* Same as CANCEL_ASYNC, but for use in libc.so. */
# define LIBC_CANCEL_ASYNC() \
__libc_enable_asynccancel ()
diff --git a/nss/Makefile b/nss/Makefile
index 30f0a49..12f77b1 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -105,8 +105,7 @@ $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o)
$(inst_vardbdir)/Makefile: db-Makefile $(+force)
$(do-install)
-CPPFLAGS-nss_test1 = -DNOT_IN_libc=1 -UIN_MODULE \
- -DIN_MODULE=MODULE_extramodules
+CPPFLAGS-nss_test1 = -UIN_MODULE -DIN_MODULE=MODULE_extramodules
$(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps)
$(build-module)
ifdef libnss_test1.so-version
diff --git a/posix/regex_internal.h b/posix/regex_internal.h
index 4bbf6a8..11d907a 100644
--- a/posix/regex_internal.h
+++ b/posix/regex_internal.h
@@ -382,7 +382,7 @@ typedef struct re_dfa_t re_dfa_t;
# endif
#endif
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
int new_buf_len)
internal_function;
@@ -732,7 +732,7 @@ re_string_wchar_at (const re_string_t *pstr, int idx)
return (wint_t) pstr->wcs[idx];
}
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
static int
internal_function __attribute__ ((pure, unused))
re_string_elem_size_at (const re_string_t *pstr, int idx)
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index b4c8622..3554ba8 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -358,7 +358,7 @@ _res_hconf_init (void)
}
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# if defined SIOCGIFCONF && defined SIOCGIFNETMASK
/* List of known interfaces. */
libc_freeres_ptr (
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 3be9ed5..5bb2b51 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -145,8 +145,7 @@ LDFLAGS-tst-putenv = $(no-as-needed)
$(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os $(link-libc-deps)
$(build-module)
-CFLAGS-tst-putenvmod.c = -DNOT_IN_libc=1 -UIN_MODULE \
- -DIN_MODULE=MODULE_extramodules
+CFLAGS-tst-putenvmod.c = -UIN_MODULE -DIN_MODULE=MODULE_extramodules
$(objpfx)bug-getcontext: $(libm)
$(objpfx)tst-strtod-round: $(libm)
diff --git a/stdlib/isomac.c b/stdlib/isomac.c
index 13accb5..eb42bb6 100644
--- a/stdlib/isomac.c
+++ b/stdlib/isomac.c
@@ -176,7 +176,7 @@ static char *macros[] =
/* Format string to build command to invoke compiler. */
static const char fmt[] = "\
echo \"#include <%s>\" |\
-%s -E -dM -ansi -pedantic %s -D_LIBC -D_ISOMAC -DNOT_IN_libc -I. \
+%s -E -dM -ansi -pedantic %s -D_LIBC -D_ISOMAC -D!IS_IN_MODULE (libc) -I. \
-isystem `%s --print-prog-name=include` - 2> /dev/null > %s";
@@ -305,7 +305,7 @@ get_null_defines (void)
;
result[result_len] = xstrndup (start, end - start);
- if (strcmp (result[result_len], "NOT_IN_libc") != 0)
+ if (strcmp (result[result_len], "!IS_IN_MODULE (libc)") != 0)
{
if (first)
{
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index a2722af..d7de8ae 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -166,7 +166,7 @@ $(cross-rpcgen-objs): $(objpfx)cross-%.o: %.c $(before-compile)
$(objpfx)cross-rpcgen: $(cross-rpcgen-objs)
$(BUILD_CC) $^ $(BUILD_LDFLAGS) -o $@
-# This makes sure -DNOT_IN_libc is passed for all these modules.
+# This makes sure -DIN_MODULE is passed for all these modules.
cpp-srcs-left := $(rpcgen-objs:.o=.c)
lib := nonlib
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
diff --git a/sysdeps/arm/armv7/multiarch/memcpy.S b/sysdeps/arm/armv7/multiarch/memcpy.S
index c4f4e80..df39a59 100644
--- a/sysdeps/arm/armv7/multiarch/memcpy.S
+++ b/sysdeps/arm/armv7/multiarch/memcpy.S
@@ -22,7 +22,7 @@
#include <sysdep.h>
#include <rtld-global-offsets.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
/* Under __ARM_NEON__, memcpy_neon.S defines the name memcpy. */
# ifndef __ARM_NEON__
.text
diff --git a/sysdeps/arm/memmove.S b/sysdeps/arm/memmove.S
index 04aa7db..73f7f42 100644
--- a/sysdeps/arm/memmove.S
+++ b/sysdeps/arm/memmove.S
@@ -69,7 +69,7 @@ ENTRY(memmove)
subs ip, r0, r1
cmphi r2, ip
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
bls memcpy
#else
bls HIDDEN_JUMPTARGET(memcpy)
diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index e591ca7..51075d3 100644
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -293,7 +293,7 @@
/* Pointer mangling support. */
#if (IS_IN_MODULE (rtld) || \
- (!defined SHARED && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))))
+ (!defined SHARED && (IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread))))
# ifdef __ASSEMBLER__
# define PTR_MANGLE_LOAD(guard, tmp) \
LDST_PCREL(ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local));
diff --git a/sysdeps/generic/_itoa.h b/sysdeps/generic/_itoa.h
index 519ea47..19d484a 100644
--- a/sysdeps/generic/_itoa.h
+++ b/sysdeps/generic/_itoa.h
@@ -46,12 +46,12 @@ extern char *_itoa (unsigned long long int value, char *buflim,
extern const char _itoa_upper_digits[];
extern const char _itoa_lower_digits[];
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
hidden_proto (_itoa_upper_digits)
hidden_proto (_itoa_lower_digits)
#endif
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
extern char *_itoa_word (_ITOA_WORD_TYPE value, char *buflim,
unsigned int base, int upper_case);
#else
diff --git a/sysdeps/generic/symbol-hacks.h b/sysdeps/generic/symbol-hacks.h
index 6bec24b..5b0bc60 100644
--- a/sysdeps/generic/symbol-hacks.h
+++ b/sysdeps/generic/symbol-hacks.h
@@ -1,6 +1,6 @@
/* Some compiler optimizations may transform loops into memset/memmove
calls and without proper declaration it may generate PLT calls. */
-#if !defined __ASSEMBLER__ && !defined NOT_IN_libc && defined SHARED
+#if !defined __ASSEMBLER__ && IS_IN_MODULE (libc) && defined SHARED
asm ("memmove = __GI_memmove");
asm ("memset = __GI_memset");
asm ("memcpy = __GI_memcpy");
diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile
index 7e1a431..72913a8 100644
--- a/sysdeps/gnu/Makefile
+++ b/sysdeps/gnu/Makefile
@@ -38,7 +38,7 @@ $(objpfx)errlist-compat.c: $(errlist-c) $(..)sysdeps/gnu/errlist-compat.awk \
endif
$(make-target-directory)
$(AWK) -v maxerr=`\
- $(CC) -S $(CPPFLAGS) $(CFLAGS) -DNOT_IN_libc -UIN_MODULE \
+ $(CC) -S $(CPPFLAGS) $(CFLAGS) -UIN_MODULE \
-DIN_MODULE=MODULE_extramodules \
-DEMIT_ERR_MAX $< -o - \
| sed -n 's/^.*@@@[^0-9]*\([0-9]*\)[^0-9]*@@@.*$$/\1/p'` \
diff --git a/sysdeps/gnu/errlist.awk b/sysdeps/gnu/errlist.awk
index 7fa5305..4ce9b5c 100644
--- a/sysdeps/gnu/errlist.awk
+++ b/sysdeps/gnu/errlist.awk
@@ -110,7 +110,7 @@ END {
print " (sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0])";
print "const int _sys_nerr_internal = NERR;"
print "";
- print "#if !defined NOT_IN_libc && !defined ERRLIST_NO_COMPAT";
+ print "#if IS_IN_MODULE (libc) && !defined ERRLIST_NO_COMPAT";
print "# include <errlist-compat.c>";
print "#endif";
print "";
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index 8381434..86f8365 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -1480,7 +1480,7 @@ TRANS error; @pxref{Cancel AIO Operations}. */
(sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0])
const int _sys_nerr_internal = NERR;
-#if !defined NOT_IN_libc && !defined ERRLIST_NO_COMPAT
+#if IS_IN_MODULE (libc) && !defined ERRLIST_NO_COMPAT
# include <errlist-compat.c>
#endif
diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S
index edd9f08..9c7ba37 100644
--- a/sysdeps/i386/i586/memcpy.S
+++ b/sysdeps/i386/i586/memcpy.S
@@ -32,7 +32,7 @@
#define LEN SRC+4
.text
-#if defined PIC && !defined NOT_IN_libc
+#if defined PIC && IS_IN_MODULE (libc)
ENTRY (__memcpy_chk)
movl 12(%esp), %eax
cmpl %eax, 16(%esp)
diff --git a/sysdeps/i386/i586/memset.S b/sysdeps/i386/i586/memset.S
index 910d7bb..0a07558 100644
--- a/sysdeps/i386/i586/memset.S
+++ b/sysdeps/i386/i586/memset.S
@@ -35,7 +35,7 @@
#endif
.text
-#if defined PIC && !defined NOT_IN_libc && !BZERO_P
+#if defined PIC && IS_IN_MODULE (libc) && !BZERO_P
ENTRY (__memset_chk)
movl 12(%esp), %eax
cmpl %eax, 16(%esp)
diff --git a/sysdeps/i386/i686/memcpy.S b/sysdeps/i386/i686/memcpy.S
index 17e815e..9cada54 100644
--- a/sysdeps/i386/i686/memcpy.S
+++ b/sysdeps/i386/i686/memcpy.S
@@ -28,7 +28,7 @@
#define LEN SRC+4
.text
-#if defined PIC && !defined NOT_IN_libc
+#if defined PIC && IS_IN_MODULE (libc)
ENTRY_CHK (__memcpy_chk)
movl 12(%esp), %eax
cmpl %eax, 16(%esp)
diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S
index 4b8785f..2aa0adf 100644
--- a/sysdeps/i386/i686/memmove.S
+++ b/sysdeps/i386/i686/memmove.S
@@ -35,7 +35,7 @@
# define SRC DEST+4
# define LEN SRC+4
-# if defined PIC && !defined NOT_IN_libc
+# if defined PIC && IS_IN_MODULE (libc)
ENTRY_CHK (__memmove_chk)
movl 12(%esp), %eax
cmpl %eax, 16(%esp)
diff --git a/sysdeps/i386/i686/mempcpy.S b/sysdeps/i386/i686/mempcpy.S
index ec4b42b..84ae686 100644
--- a/sysdeps/i386/i686/mempcpy.S
+++ b/sysdeps/i386/i686/mempcpy.S
@@ -28,7 +28,7 @@
#define LEN SRC+4
.text
-#if defined PIC && !defined NOT_IN_libc
+#if defined PIC && IS_IN_MODULE (libc)
ENTRY_CHK (__mempcpy_chk)
movl 12(%esp), %eax
cmpl %eax, 16(%esp)
diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S
index 72d21fa..219f7f4 100644
--- a/sysdeps/i386/i686/memset.S
+++ b/sysdeps/i386/i686/memset.S
@@ -36,7 +36,7 @@
#endif
.text
-#if defined PIC && !defined NOT_IN_libc && !BZERO_P
+#if defined PIC && IS_IN_MODULE (libc) && !BZERO_P
ENTRY_CHK (__memset_chk)
movl 12(%esp), %eax
cmpl %eax, 16(%esp)
@@ -99,7 +99,7 @@ ENTRY (memset)
END (memset)
libc_hidden_builtin_def (memset)
-#if defined PIC && !defined NOT_IN_libc && !BZERO_P
+#if defined PIC && IS_IN_MODULE (libc) && !BZERO_P
strong_alias (__memset_chk, __memset_zero_constant_len_parameter)
.section .gnu.warning.__memset_zero_constant_len_parameter
.string "memset used with constant zero length parameter; this could be due to transposed parameters"
diff --git a/sysdeps/i386/i686/multiarch/bcopy.S b/sysdeps/i386/i686/multiarch/bcopy.S
index 4f50035..84aa470 100644
--- a/sysdeps/i386/i686/multiarch/bcopy.S
+++ b/sysdeps/i386/i686/multiarch/bcopy.S
@@ -22,7 +22,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in lib. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(bcopy)
diff --git a/sysdeps/i386/i686/multiarch/bzero.S b/sysdeps/i386/i686/multiarch/bzero.S
index cd59940..41e7374 100644
--- a/sysdeps/i386/i686/multiarch/bzero.S
+++ b/sysdeps/i386/i686/multiarch/bzero.S
@@ -22,7 +22,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in lib. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(__bzero)
diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S
index 8f5ccca..ee325f5 100644
--- a/sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S
+++ b/sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2.S b/sysdeps/i386/i686/multiarch/memchr-sse2.S
index 8d2c159..6ca1c02 100644
--- a/sysdeps/i386/i686/multiarch/memchr-sse2.S
+++ b/sysdeps/i386/i686/multiarch/memchr-sse2.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/memchr.S b/sysdeps/i386/i686/multiarch/memchr.S
index 1bdf0e7..c754917 100644
--- a/sysdeps/i386/i686/multiarch/memchr.S
+++ b/sysdeps/i386/i686/multiarch/memchr.S
@@ -21,7 +21,7 @@
#include <sysdep.h>
#include <init-arch.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define CFI_POP(REG) \
cfi_adjust_cfa_offset (-4); \
cfi_restore (REG)
diff --git a/sysdeps/i386/i686/multiarch/memcmp-sse4.S b/sysdeps/i386/i686/multiarch/memcmp-sse4.S
index a238615..12fe32b 100644
--- a/sysdeps/i386/i686/multiarch/memcmp-sse4.S
+++ b/sysdeps/i386/i686/multiarch/memcmp-sse4.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/memcmp-ssse3.S b/sysdeps/i386/i686/multiarch/memcmp-ssse3.S
index 4a0bd67..3064576 100644
--- a/sysdeps/i386/i686/multiarch/memcmp-ssse3.S
+++ b/sysdeps/i386/i686/multiarch/memcmp-ssse3.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/memcmp.S b/sysdeps/i386/i686/multiarch/memcmp.S
index e4d56fa..0999ccb 100644
--- a/sysdeps/i386/i686/multiarch/memcmp.S
+++ b/sysdeps/i386/i686/multiarch/memcmp.S
@@ -22,7 +22,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(memcmp)
diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
index c4cdcfd..bc9ce5c 100644
--- a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
+++ b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
@@ -19,7 +19,7 @@
#include <sysdep.h>
-#if !defined NOT_IN_libc \
+#if IS_IN_MODULE (libc) \
&& (defined SHARED \
|| defined USE_AS_MEMMOVE \
|| !defined USE_MULTIARCH)
diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
index c0d718b..caf439d 100644
--- a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
+++ b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if !defined NOT_IN_libc \
+#if IS_IN_MODULE (libc) \
&& (defined SHARED \
|| defined USE_AS_MEMMOVE \
|| !defined USE_MULTIARCH)
diff --git a/sysdeps/i386/i686/multiarch/memcpy.S b/sysdeps/i386/i686/multiarch/memcpy.S
index f583482..5914cfd 100644
--- a/sysdeps/i386/i686/multiarch/memcpy.S
+++ b/sysdeps/i386/i686/multiarch/memcpy.S
@@ -24,7 +24,7 @@
/* Define multiple versions only for the definition in lib and for
DSO. In static binaries we need memcpy before the initialization
happened. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
.text
ENTRY(memcpy)
.type memcpy, @gnu_indirect_function
diff --git a/sysdeps/i386/i686/multiarch/memcpy_chk.S b/sysdeps/i386/i686/multiarch/memcpy_chk.S
index bf93b68..bce829d 100644
--- a/sysdeps/i386/i686/multiarch/memcpy_chk.S
+++ b/sysdeps/i386/i686/multiarch/memcpy_chk.S
@@ -24,7 +24,7 @@
/* Define multiple versions only for the definition in lib and for
DSO. There are no multiarch memcpy functions for static binaries.
*/
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(__memcpy_chk)
diff --git a/sysdeps/i386/i686/multiarch/memmove.S b/sysdeps/i386/i686/multiarch/memmove.S
index 90cf167..ce6dce9 100644
--- a/sysdeps/i386/i686/multiarch/memmove.S
+++ b/sysdeps/i386/i686/multiarch/memmove.S
@@ -22,7 +22,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in lib. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(memmove)
diff --git a/sysdeps/i386/i686/multiarch/memmove_chk.S b/sysdeps/i386/i686/multiarch/memmove_chk.S
index 182aeb3..fcdaf35 100644
--- a/sysdeps/i386/i686/multiarch/memmove_chk.S
+++ b/sysdeps/i386/i686/multiarch/memmove_chk.S
@@ -22,7 +22,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in lib. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(__memmove_chk)
diff --git a/sysdeps/i386/i686/multiarch/mempcpy.S b/sysdeps/i386/i686/multiarch/mempcpy.S
index 56b50bb..ad46d64 100644
--- a/sysdeps/i386/i686/multiarch/mempcpy.S
+++ b/sysdeps/i386/i686/multiarch/mempcpy.S
@@ -24,7 +24,7 @@
/* Define multiple versions only for the definition in lib and for
DSO. In static binaries we need mempcpy before the initialization
happened. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
.text
ENTRY(__mempcpy)
.type __mempcpy, @gnu_indirect_function
diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk.S b/sysdeps/i386/i686/multiarch/mempcpy_chk.S
index a76341c..d83fd5d 100644
--- a/sysdeps/i386/i686/multiarch/mempcpy_chk.S
+++ b/sysdeps/i386/i686/multiarch/mempcpy_chk.S
@@ -24,7 +24,7 @@
/* Define multiple versions only for the definition in lib and for
DSO. There are no multiarch mempcpy functions for static binaries.
*/
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(__mempcpy_chk)
diff --git a/sysdeps/i386/i686/multiarch/memrchr-c.c b/sysdeps/i386/i686/multiarch/memrchr-c.c
index 44ec1a6..e323062 100644
--- a/sysdeps/i386/i686/multiarch/memrchr-c.c
+++ b/sysdeps/i386/i686/multiarch/memrchr-c.c
@@ -1,4 +1,4 @@
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define MEMRCHR __memrchr_ia32
# include <string.h>
extern void *__memrchr_ia32 (const void *, int, size_t);
diff --git a/sysdeps/i386/i686/multiarch/memrchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/memrchr-sse2-bsf.S
index 303ef9d..06971e8 100644
--- a/sysdeps/i386/i686/multiarch/memrchr-sse2-bsf.S
+++ b/sysdeps/i386/i686/multiarch/memrchr-sse2-bsf.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/memrchr-sse2.S b/sysdeps/i386/i686/multiarch/memrchr-sse2.S
index 90ba738..2299d11 100644
--- a/sysdeps/i386/i686/multiarch/memrchr-sse2.S
+++ b/sysdeps/i386/i686/multiarch/memrchr-sse2.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
# define CFI_PUSH(REG) \
diff --git a/sysdeps/i386/i686/multiarch/memrchr.S b/sysdeps/i386/i686/multiarch/memrchr.S
index 0dff8b6..66be07f 100644
--- a/sysdeps/i386/i686/multiarch/memrchr.S
+++ b/sysdeps/i386/i686/multiarch/memrchr.S
@@ -21,7 +21,7 @@
#include <sysdep.h>
#include <init-arch.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define CFI_POP(REG) \
cfi_adjust_cfa_offset (-4); \
cfi_restore (REG)
diff --git a/sysdeps/i386/i686/multiarch/memset-sse2-rep.S b/sysdeps/i386/i686/multiarch/memset-sse2-rep.S
index 8655a8c..5e411d7 100644
--- a/sysdeps/i386/i686/multiarch/memset-sse2-rep.S
+++ b/sysdeps/i386/i686/multiarch/memset-sse2-rep.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
#include <sysdep.h>
#include "asm-syntax.h"
@@ -79,7 +79,7 @@
#endif
.section .text.sse2,"ax",@progbits
-#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BZERO
+#if defined SHARED && IS_IN_MODULE (libc) && !defined USE_AS_BZERO
ENTRY (__memset_chk_sse2_rep)
movl 12(%esp), %eax
cmpl %eax, 16(%esp)
diff --git a/sysdeps/i386/i686/multiarch/memset-sse2.S b/sysdeps/i386/i686/multiarch/memset-sse2.S
index cd94e4e..40f285b 100644
--- a/sysdeps/i386/i686/multiarch/memset-sse2.S
+++ b/sysdeps/i386/i686/multiarch/memset-sse2.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
#include <sysdep.h>
#include "asm-syntax.h"
@@ -79,7 +79,7 @@
#endif
.section .text.sse2,"ax",@progbits
-#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BZERO
+#if defined SHARED && IS_IN_MODULE (libc) && !defined USE_AS_BZERO
ENTRY (__memset_chk_sse2)
movl 12(%esp), %eax
cmpl %eax, 16(%esp)
diff --git a/sysdeps/i386/i686/multiarch/memset.S b/sysdeps/i386/i686/multiarch/memset.S
index ecec1ea..c7b4fbc 100644
--- a/sysdeps/i386/i686/multiarch/memset.S
+++ b/sysdeps/i386/i686/multiarch/memset.S
@@ -22,7 +22,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in lib. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(memset)
diff --git a/sysdeps/i386/i686/multiarch/memset_chk.S b/sysdeps/i386/i686/multiarch/memset_chk.S
index 92c6099..ee9cf3d 100644
--- a/sysdeps/i386/i686/multiarch/memset_chk.S
+++ b/sysdeps/i386/i686/multiarch/memset_chk.S
@@ -22,7 +22,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in lib. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(__memset_chk)
diff --git a/sysdeps/i386/i686/multiarch/rawmemchr.S b/sysdeps/i386/i686/multiarch/rawmemchr.S
index 01850cf..43e12bc 100644
--- a/sysdeps/i386/i686/multiarch/rawmemchr.S
+++ b/sysdeps/i386/i686/multiarch/rawmemchr.S
@@ -21,7 +21,7 @@
#include <sysdep.h>
#include <init-arch.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define CFI_POP(REG) \
cfi_adjust_cfa_offset (-4); \
cfi_restore (REG)
diff --git a/sysdeps/i386/i686/multiarch/strcat-sse2.S b/sysdeps/i386/i686/multiarch/strcat-sse2.S
index efd3f67..c0f05ff 100644
--- a/sysdeps/i386/i686/multiarch/strcat-sse2.S
+++ b/sysdeps/i386/i686/multiarch/strcat-sse2.S
@@ -18,7 +18,7 @@
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/strcat-ssse3.S b/sysdeps/i386/i686/multiarch/strcat-ssse3.S
index 8527166..6a41534 100644
--- a/sysdeps/i386/i686/multiarch/strcat-ssse3.S
+++ b/sysdeps/i386/i686/multiarch/strcat-ssse3.S
@@ -18,7 +18,7 @@
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/strcat.S b/sysdeps/i386/i686/multiarch/strcat.S
index 598c3f0..c886720 100644
--- a/sysdeps/i386/i686/multiarch/strcat.S
+++ b/sysdeps/i386/i686/multiarch/strcat.S
@@ -43,7 +43,7 @@
/* Define multiple versions only for the definition in libc. Don't
define multiple versions for strncat in static library since we
need strncat before the initialization happened. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
diff --git a/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S
index 3357f53..2dd2396 100644
--- a/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S
+++ b/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/strchr-sse2.S b/sysdeps/i386/i686/multiarch/strchr-sse2.S
index e0f3a2e..77e1c1e 100644
--- a/sysdeps/i386/i686/multiarch/strchr-sse2.S
+++ b/sysdeps/i386/i686/multiarch/strchr-sse2.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/strchr.S b/sysdeps/i386/i686/multiarch/strchr.S
index 0fc4d8c..39d3502 100644
--- a/sysdeps/i386/i686/multiarch/strchr.S
+++ b/sysdeps/i386/i686/multiarch/strchr.S
@@ -21,7 +21,7 @@
#include <sysdep.h>
#include <init-arch.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(strchr)
.type strchr, @gnu_indirect_function
diff --git a/sysdeps/i386/i686/multiarch/strcmp-sse4.S b/sysdeps/i386/i686/multiarch/strcmp-sse4.S
index 42d308a..f4df297 100644
--- a/sysdeps/i386/i686/multiarch/strcmp-sse4.S
+++ b/sysdeps/i386/i686/multiarch/strcmp-sse4.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
#include <sysdep.h>
#include "asm-syntax.h"
diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
index c3107e5..2ccaf79 100644
--- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
+++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
#include <sysdep.h>
#include "asm-syntax.h"
diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
index 2ad6bf4..0181b31 100644
--- a/sysdeps/i386/i686/multiarch/strcmp.S
+++ b/sysdeps/i386/i686/multiarch/strcmp.S
@@ -50,7 +50,7 @@
/* Define multiple versions only for the definition in libc. Don't
define multiple versions for strncmp in static library since we
need strncmp before the initialization happened. */
-#if (defined SHARED || !defined USE_AS_STRNCMP) && !defined NOT_IN_libc
+#if (defined SHARED || !defined USE_AS_STRNCMP) && IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(STRCMP)
diff --git a/sysdeps/i386/i686/multiarch/strcpy-sse2.S b/sysdeps/i386/i686/multiarch/strcpy-sse2.S
index cbe040c..7649407 100644
--- a/sysdeps/i386/i686/multiarch/strcpy-sse2.S
+++ b/sysdeps/i386/i686/multiarch/strcpy-sse2.S
@@ -18,7 +18,7 @@
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/strcpy-ssse3.S b/sysdeps/i386/i686/multiarch/strcpy-ssse3.S
index 2d67994..8400ede 100644
--- a/sysdeps/i386/i686/multiarch/strcpy-ssse3.S
+++ b/sysdeps/i386/i686/multiarch/strcpy-ssse3.S
@@ -18,7 +18,7 @@
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifndef USE_AS_STRCAT
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/strcpy.S b/sysdeps/i386/i686/multiarch/strcpy.S
index f44ddf7..ed65bd5 100644
--- a/sysdeps/i386/i686/multiarch/strcpy.S
+++ b/sysdeps/i386/i686/multiarch/strcpy.S
@@ -59,7 +59,7 @@
/* Define multiple versions only for the definition in libc. Don't
define multiple versions for strncpy in static library since we
need strncpy before the initialization happened. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
diff --git a/sysdeps/i386/i686/multiarch/strcspn.S b/sysdeps/i386/i686/multiarch/strcspn.S
index c35f4bf..2bfbb21 100644
--- a/sysdeps/i386/i686/multiarch/strcspn.S
+++ b/sysdeps/i386/i686/multiarch/strcspn.S
@@ -41,7 +41,7 @@
/* Define multiple versions only for the definition in libc. Don't
define multiple versions for strpbrk in static library since we
need strpbrk before the initialization happened. */
-#if (defined SHARED || !defined USE_AS_STRPBRK) && !defined NOT_IN_libc
+#if (defined SHARED || !defined USE_AS_STRPBRK) && IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(STRCSPN)
diff --git a/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S b/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S
index 8f9b149..2505391 100644
--- a/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S
+++ b/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
#include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/strlen-sse2.S b/sysdeps/i386/i686/multiarch/strlen-sse2.S
index 20e82a6..989a69e 100644
--- a/sysdeps/i386/i686/multiarch/strlen-sse2.S
+++ b/sysdeps/i386/i686/multiarch/strlen-sse2.S
@@ -19,7 +19,7 @@
/* for strlen only SHARED version is optimized, for strcat, strncat, strnlen both STATIC and SHARED are optimized */
-#if (defined USE_AS_STRNLEN || defined USE_AS_STRCAT || defined SHARED) && !defined NOT_IN_libc
+#if (defined USE_AS_STRNLEN || defined USE_AS_STRCAT || defined SHARED) && IS_IN_MODULE (libc)
# ifndef USE_AS_STRCAT
diff --git a/sysdeps/i386/i686/multiarch/strlen.S b/sysdeps/i386/i686/multiarch/strlen.S
index 5b262a2..3c89787 100644
--- a/sysdeps/i386/i686/multiarch/strlen.S
+++ b/sysdeps/i386/i686/multiarch/strlen.S
@@ -24,7 +24,7 @@
/* Define multiple versions only for the definition in libc and for the
DSO. In static binaries, we need strlen before the initialization
happened. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
.text
ENTRY(strlen)
.type strlen, @gnu_indirect_function
diff --git a/sysdeps/i386/i686/multiarch/strnlen.S b/sysdeps/i386/i686/multiarch/strnlen.S
index 63357d7..34af137 100644
--- a/sysdeps/i386/i686/multiarch/strnlen.S
+++ b/sysdeps/i386/i686/multiarch/strnlen.S
@@ -21,7 +21,7 @@
#include <sysdep.h>
#include <init-arch.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(__strnlen)
.type __strnlen, @gnu_indirect_function
diff --git a/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S
index 622b9f2..b46f9e3 100644
--- a/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S
+++ b/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/strrchr-sse2.S b/sysdeps/i386/i686/multiarch/strrchr-sse2.S
index 1644d5d..2b7d344 100644
--- a/sysdeps/i386/i686/multiarch/strrchr-sse2.S
+++ b/sysdeps/i386/i686/multiarch/strrchr-sse2.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/strrchr.S b/sysdeps/i386/i686/multiarch/strrchr.S
index 323f3f4..6d7cfda 100644
--- a/sysdeps/i386/i686/multiarch/strrchr.S
+++ b/sysdeps/i386/i686/multiarch/strrchr.S
@@ -21,7 +21,7 @@
#include <sysdep.h>
#include <init-arch.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(strrchr)
.type strrchr, @gnu_indirect_function
diff --git a/sysdeps/i386/i686/multiarch/strspn.S b/sysdeps/i386/i686/multiarch/strspn.S
index 703fc17..ef27483 100644
--- a/sysdeps/i386/i686/multiarch/strspn.S
+++ b/sysdeps/i386/i686/multiarch/strspn.S
@@ -26,7 +26,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(strspn)
diff --git a/sysdeps/i386/i686/multiarch/wcschr-c.c b/sysdeps/i386/i686/multiarch/wcschr-c.c
index c23af26..0ed8d2f 100644
--- a/sysdeps/i386/i686/multiarch/wcschr-c.c
+++ b/sysdeps/i386/i686/multiarch/wcschr-c.c
@@ -1,6 +1,6 @@
#include <wchar.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
# undef libc_hidden_def
# define libc_hidden_def(name) \
diff --git a/sysdeps/i386/i686/multiarch/wcschr-sse2.S b/sysdeps/i386/i686/multiarch/wcschr-sse2.S
index 332bdb0..0c8dd59 100644
--- a/sysdeps/i386/i686/multiarch/wcschr-sse2.S
+++ b/sysdeps/i386/i686/multiarch/wcschr-sse2.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
# define CFI_PUSH(REG) \
diff --git a/sysdeps/i386/i686/multiarch/wcschr.S b/sysdeps/i386/i686/multiarch/wcschr.S
index 7622085..574150f 100644
--- a/sysdeps/i386/i686/multiarch/wcschr.S
+++ b/sysdeps/i386/i686/multiarch/wcschr.S
@@ -21,7 +21,7 @@
#include <sysdep.h>
#include <init-arch.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(wcschr)
.type wcschr, @gnu_indirect_function
diff --git a/sysdeps/i386/i686/multiarch/wcscmp-sse2.S b/sysdeps/i386/i686/multiarch/wcscmp-sse2.S
index 926bdcf..41a1768 100644
--- a/sysdeps/i386/i686/multiarch/wcscmp-sse2.S
+++ b/sysdeps/i386/i686/multiarch/wcscmp-sse2.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/i386/i686/multiarch/wcscmp.S b/sysdeps/i386/i686/multiarch/wcscmp.S
index 37dd07f..ca4549c 100644
--- a/sysdeps/i386/i686/multiarch/wcscmp.S
+++ b/sysdeps/i386/i686/multiarch/wcscmp.S
@@ -24,7 +24,7 @@
/* Define multiple versions only for the definition in libc and for the
DSO. In static binaries, we need wcscmp before the initialization
happened. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(wcscmp)
.type wcscmp, @gnu_indirect_function
diff --git a/sysdeps/i386/i686/multiarch/wcscpy-c.c b/sysdeps/i386/i686/multiarch/wcscpy-c.c
index a3c4024..6bbb6f2 100644
--- a/sysdeps/i386/i686/multiarch/wcscpy-c.c
+++ b/sysdeps/i386/i686/multiarch/wcscpy-c.c
@@ -1,4 +1,4 @@
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define wcscpy __wcscpy_ia32
#endif
diff --git a/sysdeps/i386/i686/multiarch/wcscpy-ssse3.S b/sysdeps/i386/i686/multiarch/wcscpy-ssse3.S
index f404252..b88ac98 100644
--- a/sysdeps/i386/i686/multiarch/wcscpy-ssse3.S
+++ b/sysdeps/i386/i686/multiarch/wcscpy-ssse3.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
# define CFI_PUSH(REG) \
diff --git a/sysdeps/i386/i686/multiarch/wcscpy.S b/sysdeps/i386/i686/multiarch/wcscpy.S
index 54a4325..854b7b7 100644
--- a/sysdeps/i386/i686/multiarch/wcscpy.S
+++ b/sysdeps/i386/i686/multiarch/wcscpy.S
@@ -22,7 +22,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(wcscpy)
.type wcscpy, @gnu_indirect_function
diff --git a/sysdeps/i386/i686/multiarch/wcslen-c.c b/sysdeps/i386/i686/multiarch/wcslen-c.c
index 8cebfea..ad15d0c 100644
--- a/sysdeps/i386/i686/multiarch/wcslen-c.c
+++ b/sysdeps/i386/i686/multiarch/wcslen-c.c
@@ -1,6 +1,6 @@
#include <wchar.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define WCSLEN __wcslen_ia32
#endif
diff --git a/sysdeps/i386/i686/multiarch/wcslen-sse2.S b/sysdeps/i386/i686/multiarch/wcslen-sse2.S
index 8e94545..ad6c37d 100644
--- a/sysdeps/i386/i686/multiarch/wcslen-sse2.S
+++ b/sysdeps/i386/i686/multiarch/wcslen-sse2.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
# define STR 4
diff --git a/sysdeps/i386/i686/multiarch/wcslen.S b/sysdeps/i386/i686/multiarch/wcslen.S
index ba97cc4..eebc5b2 100644
--- a/sysdeps/i386/i686/multiarch/wcslen.S
+++ b/sysdeps/i386/i686/multiarch/wcslen.S
@@ -21,7 +21,7 @@
#include <sysdep.h>
#include <init-arch.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(__wcslen)
.type __wcslen, @gnu_indirect_function
diff --git a/sysdeps/i386/i686/multiarch/wcsrchr-c.c b/sysdeps/i386/i686/multiarch/wcsrchr-c.c
index c7444ce..f00bf2b 100644
--- a/sysdeps/i386/i686/multiarch/wcsrchr-c.c
+++ b/sysdeps/i386/i686/multiarch/wcsrchr-c.c
@@ -1,4 +1,4 @@
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define wcsrchr __wcsrchr_ia32
#endif
diff --git a/sysdeps/i386/i686/multiarch/wcsrchr-sse2.S b/sysdeps/i386/i686/multiarch/wcsrchr-sse2.S
index f6abd6b..ff061c2 100644
--- a/sysdeps/i386/i686/multiarch/wcsrchr-sse2.S
+++ b/sysdeps/i386/i686/multiarch/wcsrchr-sse2.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
# define CFI_PUSH(REG) \
cfi_adjust_cfa_offset (4); \
diff --git a/sysdeps/i386/i686/multiarch/wcsrchr.S b/sysdeps/i386/i686/multiarch/wcsrchr.S
index 4d80b54..a3f2663 100644
--- a/sysdeps/i386/i686/multiarch/wcsrchr.S
+++ b/sysdeps/i386/i686/multiarch/wcsrchr.S
@@ -21,7 +21,7 @@
#include <sysdep.h>
#include <init-arch.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(wcsrchr)
.type wcsrchr, @gnu_indirect_function
diff --git a/sysdeps/i386/i686/multiarch/wmemcmp-c.c b/sysdeps/i386/i686/multiarch/wmemcmp-c.c
index bd37660..12c3ddf 100644
--- a/sysdeps/i386/i686/multiarch/wmemcmp-c.c
+++ b/sysdeps/i386/i686/multiarch/wmemcmp-c.c
@@ -1,6 +1,6 @@
#include <wchar.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define WMEMCMP __wmemcmp_ia32
#endif
diff --git a/sysdeps/i386/i686/multiarch/wmemcmp.S b/sysdeps/i386/i686/multiarch/wmemcmp.S
index 1b5a211..bcd9304 100644
--- a/sysdeps/i386/i686/multiarch/wmemcmp.S
+++ b/sysdeps/i386/i686/multiarch/wmemcmp.S
@@ -23,7 +23,7 @@
/* Define multiple versions only for the definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(wmemcmp)
.type wmemcmp, @gnu_indirect_function
diff --git a/sysdeps/ia64/fpu/libm-symbols.h b/sysdeps/ia64/fpu/libm-symbols.h
index 0df8076..68d988c 100644
--- a/sysdeps/ia64/fpu/libm-symbols.h
+++ b/sysdeps/ia64/fpu/libm-symbols.h
@@ -53,6 +53,6 @@
ASM_SIZE_DIRECTIVE(__ieee754_##name); \
.type __ieee754_##name, @function
-#if defined ASSEMBLER && !defined NOT_IN_libc
+#if defined ASSEMBLER && IS_IN_MODULE (libc)
# define __libm_error_support HIDDEN_JUMPTARGET(__libm_error_support)
#endif
diff --git a/sysdeps/nptl/bits/libc-lock.h b/sysdeps/nptl/bits/libc-lock.h
index 909ee7a..0b610bb 100644
--- a/sysdeps/nptl/bits/libc-lock.h
+++ b/sysdeps/nptl/bits/libc-lock.h
@@ -26,7 +26,7 @@
/* Mutex type. */
#if defined _LIBC || defined _IO_MTSAFE_IO
-# if (defined NOT_IN_libc && !IS_IN_MODULE (libpthread)) || !defined _LIBC
+# if (!IS_IN_MODULE (libc) && !IS_IN_MODULE (libpthread)) || !defined _LIBC
typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t;
# else
typedef struct { int lock; int cnt; void *owner; } __libc_lock_recursive_t;
@@ -47,7 +47,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
/* Define an initialized recursive lock variable NAME with storage
class CLASS. */
-#if defined _LIBC && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
+#if defined _LIBC && (IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread))
# define __libc_lock_define_initialized_recursive(CLASS, NAME) \
CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER;
# define _LIBC_LOCK_RECURSIVE_INITIALIZER \
@@ -60,7 +60,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Initialize a recursive mutex. */
-#if defined _LIBC && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
+#if defined _LIBC && (IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread))
# define __libc_lock_init_recursive(NAME) \
((NAME) = (__libc_lock_recursive_t) _LIBC_LOCK_RECURSIVE_INITIALIZER, 0)
#else
@@ -78,7 +78,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Finalize recursive named lock. */
-#if defined _LIBC && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
+#if defined _LIBC && (IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread))
# define __libc_lock_fini_recursive(NAME) ((void) 0)
#else
# define __libc_lock_fini_recursive(NAME) \
@@ -86,7 +86,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Lock the recursive named lock variable. */
-#if defined _LIBC && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
+#if defined _LIBC && (IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread))
# define __libc_lock_lock_recursive(NAME) \
do { \
void *self = THREAD_SELF; \
@@ -103,7 +103,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Try to lock the recursive named lock variable. */
-#if defined _LIBC && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
+#if defined _LIBC && (IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread))
# define __libc_lock_trylock_recursive(NAME) \
({ \
int result = 0; \
@@ -128,7 +128,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Unlock the recursive named lock variable. */
-#if defined _LIBC && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
+#if defined _LIBC && (IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread))
/* We do no error checking here. */
# define __libc_lock_unlock_recursive(NAME) \
do { \
diff --git a/sysdeps/nptl/bits/libc-lockP.h b/sysdeps/nptl/bits/libc-lockP.h
index 70b4418..b2353fa 100644
--- a/sysdeps/nptl/bits/libc-lockP.h
+++ b/sysdeps/nptl/bits/libc-lockP.h
@@ -35,7 +35,7 @@
#include <pthread-functions.h>
/* Mutex type. */
-#if defined NOT_IN_libc && !IS_IN_MODULE (libpthread)
+#if !IS_IN_MODULE (libc) && !IS_IN_MODULE (libpthread)
typedef pthread_mutex_t __libc_lock_t;
#else
typedef int __libc_lock_t;
@@ -69,7 +69,7 @@ typedef pthread_key_t __libc_key_t;
initialized locks must be set to one due to the lack of normal
atomic operations.) */
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread)
# if LLL_LOCK_INITIALIZER == 0
# define __libc_lock_define_initialized(CLASS,NAME) \
CLASS __libc_lock_t NAME;
@@ -108,7 +108,7 @@ typedef pthread_key_t __libc_key_t;
#endif
/* Call thread functions through the function pointer table. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# define PTFAVAIL(NAME) __libc_pthread_functions_init
# define __libc_ptf_call(FUNC, ARGS, ELSE) \
(__libc_pthread_functions_init ? PTHFCT_CALL (ptr_##FUNC, ARGS) : ELSE)
@@ -125,13 +125,13 @@ typedef pthread_key_t __libc_key_t;
/* Initialize the named lock variable, leaving it in a consistent, unlocked
state. */
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread)
# define __libc_lock_init(NAME) ((NAME) = LLL_LOCK_INITIALIZER, 0)
#else
# define __libc_lock_init(NAME) \
__libc_maybe_call (__pthread_mutex_init, (&(NAME), NULL), 0)
#endif
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
/* ((NAME) = (__libc_rwlock_t) PTHREAD_RWLOCK_INITIALIZER, 0) is
inefficient. */
# define __libc_rwlock_init(NAME) \
@@ -144,13 +144,13 @@ typedef pthread_key_t __libc_key_t;
/* Finalize the named lock variable, which must be locked. It cannot be
used again until __libc_lock_init is called again on it. This must be
called on a lock variable before the containing storage is reused. */
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread)
# define __libc_lock_fini(NAME) ((void) 0)
#else
# define __libc_lock_fini(NAME) \
__libc_maybe_call (__pthread_mutex_destroy, (&(NAME)), 0)
#endif
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# define __libc_rwlock_fini(NAME) ((void) 0)
#else
# define __libc_rwlock_fini(NAME) \
@@ -158,7 +158,7 @@ typedef pthread_key_t __libc_key_t;
#endif
/* Lock the named lock variable. */
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread)
# ifndef __libc_lock_lock
# define __libc_lock_lock(NAME) \
({ lll_lock (NAME, LLL_PRIVATE); 0; })
@@ -174,7 +174,7 @@ typedef pthread_key_t __libc_key_t;
__libc_ptf_call (__pthread_rwlock_wrlock, (&(NAME)), 0)
/* Try to lock the named lock variable. */
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread)
# ifndef __libc_lock_trylock
# define __libc_lock_trylock(NAME) \
lll_trylock (NAME)
@@ -193,7 +193,7 @@ typedef pthread_key_t __libc_key_t;
__libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0)
/* Unlock the named lock variable. */
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread)
# define __libc_lock_unlock(NAME) \
lll_unlock (NAME, LLL_PRIVATE)
#else
diff --git a/sysdeps/nptl/bits/stdio-lock.h b/sysdeps/nptl/bits/stdio-lock.h
index e2678cc..38b33a4 100644
--- a/sysdeps/nptl/bits/stdio-lock.h
+++ b/sysdeps/nptl/bits/stdio-lock.h
@@ -84,7 +84,7 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
#define _IO_cleanup_region_end(_doit) \
__libc_cleanup_region_end (_doit)
-#if defined _LIBC && !defined NOT_IN_libc
+#if defined _LIBC && IS_IN_MODULE (libc)
# ifdef __EXCEPTIONS
# define _IO_acquire_lock(_fp) \
diff --git a/sysdeps/posix/closedir.c b/sysdeps/posix/closedir.c
index 24ba1a5..228b5ba 100644
--- a/sysdeps/posix/closedir.c
+++ b/sysdeps/posix/closedir.c
@@ -43,7 +43,7 @@ __closedir (DIR *dirp)
fd = dirp->fd;
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
__libc_lock_fini (dirp->lock);
#endif
diff --git a/sysdeps/posix/opendir.c b/sysdeps/posix/opendir.c
index a4f0bc7..233cfef 100644
--- a/sysdeps/posix/opendir.c
+++ b/sysdeps/posix/opendir.c
@@ -224,7 +224,7 @@ __alloc_dir (int fd, bool close_fd, int flags, const struct stat64 *statp)
}
dirp->fd = fd;
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
__libc_lock_init (dirp->lock);
#endif
dirp->allocation = allocation;
diff --git a/sysdeps/posix/readdir.c b/sysdeps/posix/readdir.c
index 7bb956a..7d35fc6 100644
--- a/sysdeps/posix/readdir.c
+++ b/sysdeps/posix/readdir.c
@@ -40,7 +40,7 @@ __READDIR (DIR *dirp)
DIRENT_TYPE *dp;
int saved_errno = errno;
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
__libc_lock_lock (dirp->lock);
#endif
@@ -110,7 +110,7 @@ __READDIR (DIR *dirp)
/* Skip deleted files. */
} while (dp->d_ino == 0);
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
__libc_lock_unlock (dirp->lock);
#endif
diff --git a/sysdeps/posix/rewinddir.c b/sysdeps/posix/rewinddir.c
index 5a4a715..c0ab287 100644
--- a/sysdeps/posix/rewinddir.c
+++ b/sysdeps/posix/rewinddir.c
@@ -26,7 +26,7 @@ void
rewinddir (dirp)
DIR *dirp;
{
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
__libc_lock_lock (dirp->lock);
#endif
(void) __lseek (dirp->fd, (off_t) 0, SEEK_SET);
@@ -34,7 +34,7 @@ rewinddir (dirp)
dirp->offset = 0;
dirp->size = 0;
dirp->errcode = 0;
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
__libc_lock_unlock (dirp->lock);
#endif
}
diff --git a/sysdeps/powerpc/novmx-sigjmp.c b/sysdeps/powerpc/novmx-sigjmp.c
index c651f42..246f790 100644
--- a/sysdeps/powerpc/novmx-sigjmp.c
+++ b/sysdeps/powerpc/novmx-sigjmp.c
@@ -20,7 +20,7 @@
#include <bits/wordsize.h>
#include <shlib-compat.h>
-#if !defined NOT_IN_libc && defined SHARED
+#if IS_IN_MODULE (libc) && defined SHARED
# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
# include <stddef.h>
# include <novmxsetjmp.h>
@@ -41,4 +41,4 @@ __novmx__sigjmp_save (__novmx__sigjmp_buf env, int savemask)
}
# endif /* SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) */
-#endif /* !NOT_IN_libc && SHARED */
+#endif /* IS_IN_MODULE (libc) && SHARED */
diff --git a/sysdeps/powerpc/powerpc32/__longjmp.S b/sysdeps/powerpc/powerpc32/__longjmp.S
index 3371176..1ca7c56 100644
--- a/sysdeps/powerpc/powerpc32/__longjmp.S
+++ b/sysdeps/powerpc/powerpc32/__longjmp.S
@@ -19,12 +19,12 @@
#include <libc-symbols.h>
#include <shlib-compat.h>
-#if defined NOT_IN_libc
+#if !IS_IN_MODULE (libc)
/* Build a non-versioned object for rtld-*. */
# define __longjmp_symbol __longjmp
# include "__longjmp-common.S"
-#else /* !NOT_IN_libc */
+#else /* IS_IN_MODULE (libc) */
strong_alias (__vmx__longjmp, __longjmp);
# define __longjmp_symbol __vmx__longjmp
# include "__longjmp-common.S"
@@ -36,4 +36,4 @@ strong_alias (__vmx__longjmp, __longjmp);
# define __longjmp_symbol __novmx__longjmp
# include "__longjmp-common.S"
# endif
-#endif /* !NOT_IN_libc */
+#endif /* IS_IN_MODULE (libc) */
diff --git a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S
index 71b6c71..8efa7b3 100644
--- a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S
+++ b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S
@@ -19,7 +19,7 @@
#include <libc-symbols.h>
#include <sysdep.h>
-#if defined NOT_IN_libc
+#if !IS_IN_MODULE (libc)
/* Build a non-versioned object for rtld-*. */
ENTRY (_setjmp)
li r4,0 /* Set second argument to 0. */
@@ -53,4 +53,4 @@ ENTRY (__vmx_setjmp)
b __vmx__sigsetjmp@local
END (__vmx_setjmp)
libc_hidden_def (__vmx_setjmp)
-#endif /* !NOT_IN_libc */
+#endif /* IS_IN_MODULE (libc) */
diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp.S
index 08bdd54..7eff306 100644
--- a/sysdeps/powerpc/powerpc32/fpu/__longjmp.S
+++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp.S
@@ -20,12 +20,12 @@
#include <rtld-global-offsets.h>
#include <shlib-compat.h>
-#if defined NOT_IN_libc
+#if !IS_IN_MODULE (libc)
/* Build a non-versioned object for rtld-*. */
# define __longjmp_symbol __longjmp
# include "__longjmp-common.S"
-#else /* !NOT_IN_libc */
+#else /* IS_IN_MODULE (libc) */
/* Build a versioned object for libc. */
versioned_symbol (libc, __vmx__longjmp, __longjmp, GLIBC_2_3_4);
# define __longjmp_symbol __vmx__longjmp
@@ -39,4 +39,4 @@ compat_symbol (libc, __novmx__longjmp, __longjmp, GLIBC_2_0);
# define __longjmp_symbol __novmx__longjmp
# include "__longjmp-common.S"
# endif
-#endif /* !NOT_IN_libc */
+#endif /* IS_IN_MODULE (libc) */
diff --git a/sysdeps/powerpc/powerpc32/fpu/setjmp.S b/sysdeps/powerpc/powerpc32/fpu/setjmp.S
index 333f707..e0b5ee5 100644
--- a/sysdeps/powerpc/powerpc32/fpu/setjmp.S
+++ b/sysdeps/powerpc/powerpc32/fpu/setjmp.S
@@ -20,13 +20,13 @@
#include <rtld-global-offsets.h>
#include <shlib-compat.h>
-#if defined NOT_IN_libc
+#if !IS_IN_MODULE (libc)
/* Build a non-versioned object for rtld-*. */
# define __sigsetjmp_symbol __sigsetjmp
# define __sigjmp_save_symbol __sigjmp_save
# include "setjmp-common.S"
-#else /* !NOT_IN_libc */
+#else /* IS_IN_MODULE (libc) */
/* Build a versioned object for libc. */
versioned_symbol (libc, __vmx__sigsetjmp, __sigsetjmp, GLIBC_2_3_4)
# define __sigsetjmp_symbol __vmx__sigsetjmp
@@ -43,4 +43,4 @@ compat_symbol (libc, __novmx__sigsetjmp, __sigsetjmp, GLIBC_2_0)
# define __sigjmp_save_symbol __novmx__sigjmp_save
# include "setjmp-common.S"
# endif
-#endif /* !NOT_IN_libc */
+#endif /* IS_IN_MODULE (libc) */
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/bzero.c b/sysdeps/powerpc/powerpc32/power4/multiarch/bzero.c
index baaa6b4..21f0aaf 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/bzero.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/bzero.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <strings.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c
index 94c22ef..628eb9b 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# undef memcpy
/* Redefine memchr so that the compiler won't make the weak_alias point
to internal hidden definition (__GI_memchr), since PPC32 does not
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-ppc32.S b/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-ppc32.S
index 3b473a3..e853df3 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-ppc32.S
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-ppc32.S
@@ -18,7 +18,7 @@
#include <sysdep.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# undef EALIGN
# define EALIGN(name, alignt, words) \
.globl C_SYMBOL_NAME(__memcmp_ppc); \
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp.c
index 79fec67..5b03ac7 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy-ppc32.S b/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy-ppc32.S
index e525c2f..96e236a 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy-ppc32.S
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy-ppc32.S
@@ -18,7 +18,7 @@
#include <sysdep.h>
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# undef EALIGN
# define EALIGN(name, alignt, words) \
.globl C_SYMBOL_NAME(__memcpy_ppc); \
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy.c
index f263a38..dcf88bd 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy.c
@@ -19,7 +19,7 @@
/* Define multiple versions only for the definition in lib and for
DSO. In static binaries we need memcpy before the initialization
happened. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c
index 1070148..a64a27f 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
/* Redefine memmove so that the compiler won't complain about the type
mismatch with the IFUNC selector in strong_alias, below. */
# include <string.h>
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
index 38fbcc3..7d9b99a 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c
index c30e7d6..7ab8475 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define MEMRCHR __memrchr_ppc
# include <string.h>
extern void *__memrchr_ppc (const void *, int, size_t);
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c
index 610a957..bea07c4 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memset-ppc32.S b/sysdeps/powerpc/powerpc32/power4/multiarch/memset-ppc32.S
index a907eb1..fb9902e 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memset-ppc32.S
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memset-ppc32.S
@@ -18,7 +18,7 @@
#include <sysdep.h>
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# undef EALIGN
# define EALIGN(name, alignt, words) \
.globl C_SYMBOL_NAME(__memset_ppc); \
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memset.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memset.c
index e4e7982..b9447d3 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/memset.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memset.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for definition in libc. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr.c
index 3f53cd5..8f529c7 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp.c
index 6d1edf9..4729fb5 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# define strcasecmp __strcasecmp_ppc
@@ -27,7 +27,7 @@ extern __typeof (__strcasecmp) __strcasecmp_power7 attribute_hidden;
#include <string/strcasecmp.c>
#undef strcasecmp
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp_l.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp_l.c
index 6359bf4..5e2a4ec 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp_l.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp_l.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# define strcasecmp_l __strcasecmp_l_ppc
@@ -27,7 +27,7 @@ extern __typeof (__strcasecmp_l) __strcasecmp_l_power7 attribute_hidden;
#include <string/strcasecmp_l.c>
#undef strcasecmp_l
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strchr.c
index 74a9d54..64e560d 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/strchr.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strchr.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for definition in libc. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c
index dab1cbf..d4af8fe 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strlen-ppc32.S b/sysdeps/powerpc/powerpc32/power4/multiarch/strlen-ppc32.S
index 3ee9f93..f95b4d0 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/strlen-ppc32.S
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strlen-ppc32.S
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
#include <sysdep.h>
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strlen.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strlen.c
index 1b61ba0..08c70a2 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/strlen.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strlen.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strncase.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strncase.c
index a2227d8..d20c03e 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/strncase.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strncase.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# define strncasecmp __strncasecmp_ppc
extern __typeof (__strncasecmp) __strncasecmp_ppc attribute_hidden;
@@ -26,7 +26,7 @@ extern __typeof (__strncasecmp) __strncasecmp_power7 attribute_hidden;
#include <string/strncase.c>
#undef strncasecmp
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l.c
index 9fe3aa0..a3ced0f 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# define strncasecmp_l __strncasecmp_l_ppc
extern __typeof (__strncasecmp_l) __strncasecmp_l_ppc attribute_hidden;
@@ -26,7 +26,7 @@ extern __typeof (__strncasecmp_l) __strncasecmp_l_power7 attribute_hidden;
#include <string/strncase_l.c>
#undef strncasecmp_l
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S b/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S
index 9a857c7..b27704c 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S
@@ -17,7 +17,7 @@
#include <sysdep.h>
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# undef EALIGN
# define EALIGN(name, alignt, words) \
.globl C_SYMBOL_NAME(__strncmp_ppc); \
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c
index a329f77..c9c36a6 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for definition in libc. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen.c
index 62d4918..44c3544 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c
index a42f70c..62b9753 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c
@@ -17,7 +17,7 @@
#include <wchar.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
# undef libc_hidden_def
# define libc_hidden_def(name) \
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c
index 216d2bc..ccd04cc 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <wchar.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c
index c135835..3c5607e 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c
@@ -17,7 +17,7 @@
#include <wchar.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define WCSCPY __wcscpy_ppc
#endif
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c
index 251660a..acba006 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <wchar.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c
index 9c7fe2d..e85690f 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c
@@ -17,7 +17,7 @@
#include <wchar.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define WCSRCHR __wcsrchr_ppc
#endif
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c
index 42e2d8e..6e91d1d 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <wchar.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c
index 889be25..6931699 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <stddef.h>
# include <memcopy.h>
# include <shlib-compat.h>
diff --git a/sysdeps/powerpc/powerpc32/power6/memset.S b/sysdeps/powerpc/powerpc32/power6/memset.S
index 445fa44..bf365fd 100644
--- a/sysdeps/powerpc/powerpc32/power6/memset.S
+++ b/sysdeps/powerpc/powerpc32/power6/memset.S
@@ -228,7 +228,7 @@ L(nzCacheAligned128):
ori r1,r1,0
stw rCHR,60(rMEMP3)
blt cr6,L(cacheAligned1)
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
lfd 0,-128(rMEMP)
#endif
b L(nzCacheAligned256)
@@ -236,7 +236,7 @@ L(nzCacheAligned128):
L(nzCacheAligned256):
cmplwi cr1,rLEN,256
addi rMEMP3,rMEMP,64
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
/* When we are not in libc we should use only GPRs to avoid the FPU lock
interrupt. */
stw rCHR,0(rMEMP)
diff --git a/sysdeps/powerpc/powerpc32/setjmp.S b/sysdeps/powerpc/powerpc32/setjmp.S
index 9b587e0..c416ec4 100644
--- a/sysdeps/powerpc/powerpc32/setjmp.S
+++ b/sysdeps/powerpc/powerpc32/setjmp.S
@@ -19,13 +19,13 @@
#include <shlib-compat.h>
#include <libc-symbols.h>
-#if defined NOT_IN_libc
+#if !IS_IN_MODULE (libc)
/* Build a non-versioned object for rtld-*. */
# define __sigsetjmp_symbol __sigsetjmp
# define __sigjmp_save_symbol __sigjmp_save
# include "setjmp-common.S"
-#else /* !NOT_IN_libc */
+#else /* IS_IN_MODULE (libc) */
/* Build a versioned object for libc. */
versioned_symbol (libc, __vmx__sigsetjmp, __sigsetjmp, GLIBC_2_3_4)
# define __sigsetjmp_symbol __vmx__sigsetjmp
@@ -42,4 +42,4 @@ compat_symbol (libc, __novmx__sigsetjmp, __sigsetjmp, GLIBC_2_0)
# define __sigjmp_save_symbol __novmx__sigjmp_save
# include "setjmp-common.S"
# endif
-#endif /* !NOT_IN_libc */
+#endif /* IS_IN_MODULE (libc) */
diff --git a/sysdeps/powerpc/powerpc64/__longjmp.S b/sysdeps/powerpc/powerpc64/__longjmp.S
index 0f44681..f83ac99 100644
--- a/sysdeps/powerpc/powerpc64/__longjmp.S
+++ b/sysdeps/powerpc/powerpc64/__longjmp.S
@@ -20,11 +20,11 @@
#include <rtld-global-offsets.h>
#include <shlib-compat.h>
-#if defined NOT_IN_libc
+#if !IS_IN_MODULE (libc)
/* Build a non-versioned object for rtld-*. */
# include "__longjmp-common.S"
-#else /* !NOT_IN_libc */
+#else /* IS_IN_MODULE (libc) */
strong_alias (__vmx__longjmp, __longjmp)
# define __longjmp __vmx__longjmp
# include "__longjmp-common.S"
@@ -36,4 +36,4 @@ strong_alias (__vmx__longjmp, __longjmp)
# define __longjmp __novmx__longjmp
# include "__longjmp-common.S"
# endif
-#endif /* !NOT_IN_libc */
+#endif /* IS_IN_MODULE (libc) */
diff --git a/sysdeps/powerpc/powerpc64/multiarch/bzero.c b/sysdeps/powerpc/powerpc64/multiarch/bzero.c
index ed83541..a09b054 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/bzero.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/bzero.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <strings.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr.c b/sysdeps/powerpc/powerpc64/multiarch/memchr.c
index ca0f714..539618d 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memchr.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/memchr.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c
index 1a39d4a..67aa068 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c
@@ -22,7 +22,7 @@
#define weak_alias(name, aliasname) \
extern __typeof (__memcmp_ppc) aliasname \
__attribute__ ((weak, alias ("__memcmp_ppc")));
-#if !defined(NOT_IN_libc) && defined(SHARED)
+#if IS_IN_MODULE (libc) && defined(SHARED)
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \
__hidden_ver1(__memcmp_ppc, __GI_memcmp, __memcmp_ppc);
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp.c b/sysdeps/powerpc/powerpc64/multiarch/memcmp.c
index af90f0a..13c60f0 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcmp.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/memcmp.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S
index c630654..31b9d52 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S
@@ -18,7 +18,7 @@
#include <sysdep.h>
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# undef EALIGN
# define EALIGN(name, alignt, words) \
.section ".text"; \
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy.c b/sysdeps/powerpc/powerpc64/multiarch/memcpy.c
index 305e963..5aa99ed 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memcpy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/memcpy.c
@@ -19,7 +19,7 @@
/* Define multiple versions only for the definition in lib and for
DSO. In static binaries we need memcpy before the initialization
happened. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
/* Redefine memcpy so that the compiler won't complain about the type
mismatch with the IFUNC selector in strong_alias, below. */
# undef memcpy
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c
index ff78fe6..2600f17 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c
@@ -18,7 +18,7 @@
#include <string.h>
#define MEMMOVE __memmove_ppc
-#if !defined(NOT_IN_libc) && defined(SHARED)
+#if IS_IN_MODULE (libc) && defined(SHARED)
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name)
#endif
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove.c b/sysdeps/powerpc/powerpc64/multiarch/memmove.c
index 9a1ce8f..8b5a7f0 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memmove.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/memmove.c
@@ -19,7 +19,7 @@
/* Define multiple versions only for the definition in lib and for
DSO. In static binaries we need memmove before the initialization
happened. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
/* Redefine memmove so that the compiler won't complain about the type
mismatch with the IFUNC selector in strong_alias, below. */
# undef memmove
diff --git a/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c b/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
index 38fbcc3..7d9b99a 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr.c b/sysdeps/powerpc/powerpc64/multiarch/memrchr.c
index 610a957..bea07c4 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memrchr.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/memrchr.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S
index 3601a77..14bf391 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S
@@ -29,7 +29,7 @@ ENTRY (__bzero_ppc)
END_GEN_TB (__bzero_ppc,TB_TOCLESS)
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# undef EALIGN
# define EALIGN(name, alignt, words) \
.section ".text"; \
diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset.c b/sysdeps/powerpc/powerpc64/multiarch/memset.c
index aa2ae70..1c538ba 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/memset.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/memset.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for definition in libc. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
/* Redefine memset so that the compiler won't complain about the type
mismatch with the IFUNC selector in strong_alias, below. */
# undef memset
diff --git a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c b/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c
index 3f53cd5..8f529c7 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.S
index d80c82f..e5579af 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.S
@@ -18,7 +18,7 @@
#include <sysdep.h>
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# undef EALIGN
# define EALIGN(name, alignt, words) \
.section ".text"; \
diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c b/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
index c7118d5..3b7dd60 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpncpy.c b/sysdeps/powerpc/powerpc64/multiarch/stpncpy.c
index dbf8521..bed528c 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/stpncpy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/stpncpy.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c
index 7f02a25..3258d6a 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# define strcasecmp __strcasecmp_ppc
extern __typeof (__strcasecmp) __strcasecmp_ppc attribute_hidden;
@@ -26,7 +26,7 @@ extern __typeof (__strcasecmp) __strcasecmp_power7 attribute_hidden;
#include <string/strcasecmp.c>
#undef strcasecmp
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c
index a3374c3..ffeeb67 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# define strcasecmp_l __strcasecmp_l_ppc
extern __typeof (__strcasecmp_l) __strcasecmp_l_ppc attribute_hidden;
@@ -26,7 +26,7 @@ extern __typeof (__strcasecmp_l) __strcasecmp_l_power7 attribute_hidden;
#include <string/strcasecmp_l.c>
#undef strcasecmp_l
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat.c b/sysdeps/powerpc/powerpc64/multiarch/strcat.c
index 847a62d..7841d0f 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcat.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcat.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr.c b/sysdeps/powerpc/powerpc64/multiarch/strchr.c
index 74a9d54..64e560d 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strchr.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strchr.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for definition in libc. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c b/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c
index dab1cbf..d4af8fe 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S
index 93d1277..05b9599 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S
@@ -18,7 +18,7 @@
#include <sysdep.h>
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# undef EALIGN
# define EALIGN(name, alignt, words) \
.section ".text"; \
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp.c b/sysdeps/powerpc/powerpc64/multiarch/strcmp.c
index 2013301..9db92d7 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcmp.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcmp.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.S
index 33a8b1c..a8c3a04 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.S
@@ -18,7 +18,7 @@
#include <sysdep.h>
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# undef EALIGN
# define EALIGN(name, alignt, words) \
.section ".text"; \
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy.c b/sysdeps/powerpc/powerpc64/multiarch/strcpy.c
index 1b6e9e0..c48bf4e 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcpy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcpy.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcspn.c b/sysdeps/powerpc/powerpc64/multiarch/strcspn.c
index 3609d93..60bdac0 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcspn.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcspn.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S
index a195e9a..18dbac5 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S
@@ -18,7 +18,7 @@
#include <sysdep.h>
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# undef ENTRY
# define ENTRY(name) \
.section ".text"; \
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen.c b/sysdeps/powerpc/powerpc64/multiarch/strlen.c
index d2c26e9..b07fd80 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strlen.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strlen.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
/* Redefine strlen so that the compiler won't complain about the type
mismatch with the IFUNC selector in strong_alias, below. */
# undef strlen
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase.c b/sysdeps/powerpc/powerpc64/multiarch/strncase.c
index 05eba7c..545040e 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncase.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strncase.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# define strncasecmp __strncasecmp_ppc
extern __typeof (__strncasecmp) __strncasecmp_ppc attribute_hidden;
@@ -26,7 +26,7 @@ extern __typeof (__strncasecmp) __strncasecmp_power7 attribute_hidden;
#include <string/strncase.c>
#undef strncasecmp
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase_l.c b/sysdeps/powerpc/powerpc64/multiarch/strncase_l.c
index 4014269..756a572 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncase_l.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strncase_l.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# define strncasecmp_l __strncasecmp_l_ppc
extern __typeof (__strncasecmp_l) __strncasecmp_l_ppc attribute_hidden;
@@ -26,7 +26,7 @@ extern __typeof (__strncasecmp_l) __strncasecmp_l_power7 attribute_hidden;
#include <string/strncase_l.c>
#undef strncasecmp_l
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncat.c b/sysdeps/powerpc/powerpc64/multiarch/strncat.c
index db98ec1..de45daa 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncat.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strncat.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S
index 14a2bec..6e975a3 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S
@@ -17,7 +17,7 @@
#include <sysdep.h>
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
#undef EALIGN
#define EALIGN(name,alignt,words) \
.section ".text"; \
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp.c b/sysdeps/powerpc/powerpc64/multiarch/strncmp.c
index 9829d69..2dc53be 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncmp.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strncmp.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for definition in libc. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c
index e3111d2..5bb911c 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c
@@ -22,7 +22,7 @@
#define weak_alias(name, aliasname) \
extern __typeof (__strncpy_ppc) aliasname \
__attribute__ ((weak, alias ("__strncpy_ppc")));
-#if !defined(NOT_IN_libc) && defined(SHARED)
+#if IS_IN_MODULE (libc) && defined(SHARED)
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \
__hidden_ver1(__strncpy_ppc, __GI_strncpy, __strncpy_ppc);
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy.c b/sysdeps/powerpc/powerpc64/multiarch/strncpy.c
index 8fd5e4b..33032c1 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strncpy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strncpy.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/ >. */
/* Define multiple versions only for definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen.c b/sysdeps/powerpc/powerpc64/multiarch/strnlen.c
index 3926031..8b3db24 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strnlen.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strnlen.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strpbrk.c b/sysdeps/powerpc/powerpc64/multiarch/strpbrk.c
index 8b05536..0bb153a 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strpbrk.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strpbrk.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c
index 5633a9f..bcffd76 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c
@@ -22,7 +22,7 @@
#define weak_alias(name, aliasname) \
extern __typeof (__strrchr_ppc) aliasname \
__attribute__ ((weak, alias ("__strrchr_ppc")));
-#if !defined(NOT_IN_libc) && defined(SHARED)
+#if IS_IN_MODULE (libc) && defined(SHARED)
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \
__hidden_ver1(__strrchr_ppc, __GI_strrchr, __strrchr_ppc);
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr.c b/sysdeps/powerpc/powerpc64/multiarch/strrchr.c
index 046162f..5ec3e2c 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strrchr.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strrchr.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
/* Define multiple versions only for definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c
index d543772..3ed77d4 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c
@@ -22,7 +22,7 @@
#define weak_alias(name, aliasname) \
extern __typeof (__strspn_ppc) aliasname \
__attribute__ ((weak, alias ("__strspn_ppc")));
-#if !defined(NOT_IN_libc) && defined(SHARED)
+#if IS_IN_MODULE (libc) && defined(SHARED)
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \
__hidden_ver1(__strspn_ppc, __GI_strspn, __strspn_ppc);
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strspn.c b/sysdeps/powerpc/powerpc64/multiarch/strspn.c
index bf8c877..4337939 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strspn.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strspn.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <string.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcschr.c b/sysdeps/powerpc/powerpc64/multiarch/wcschr.c
index 216d2bc..ccd04cc 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/wcschr.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/wcschr.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <wchar.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c b/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c
index 5c0a6d3..c4a1397 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <wchar.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c b/sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c
index 3d0ab42..3988100 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <wchar.h>
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
index 889be25..6931699 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c
@@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <stddef.h>
# include <memcopy.h>
# include <shlib-compat.h>
diff --git a/sysdeps/powerpc/powerpc64/setjmp.S b/sysdeps/powerpc/powerpc64/setjmp.S
index c15908c..c20acfc 100644
--- a/sysdeps/powerpc/powerpc64/setjmp.S
+++ b/sysdeps/powerpc/powerpc64/setjmp.S
@@ -20,7 +20,7 @@
#include <rtld-global-offsets.h>
#include <shlib-compat.h>
-#if defined NOT_IN_libc
+#if !IS_IN_MODULE (libc)
/* Build a non-versioned object for rtld-*. */
# define setjmp_symbol setjmp
# define _setjmp_symbol _setjmp
@@ -28,7 +28,7 @@
# define __sigjmp_save_symbol __sigjmp_save
# include "setjmp-common.S"
-#else /* !NOT_IN_libc */
+#else /* IS_IN_MODULE (libc) */
/* Build a versioned object for libc. */
versioned_symbol (libc, __vmxsetjmp, setjmp, GLIBC_2_3_4)
versioned_symbol (libc, __vmx_setjmp, _setjmp, GLIBC_2_3_4)
@@ -58,4 +58,4 @@ compat_symbol (libc, __novmx__sigsetjmp,__sigsetjmp, GLIBC_2_3)
# include "setjmp-common.S"
strong_alias (__novmxsetjmp, __novmx__setjmp)
# endif
-#endif /* !NOT_IN_libc */
+#endif /* IS_IN_MODULE (libc) */
diff --git a/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c b/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c
index 2ccfc9c..8991834 100644
--- a/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c
+++ b/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c
@@ -23,7 +23,7 @@
#define STFLE_BITS_Z10 34 /* General instructions extension */
#define STFLE_BITS_Z196 45 /* Distinct operands, pop ... */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
#define IFUNC_RESOLVE(FUNC) \
asm (".globl " #FUNC "\n\t" \
diff --git a/sysdeps/s390/s390-32/multiarch/memcmp.S b/sysdeps/s390/s390-32/multiarch/memcmp.S
index f298baa..2c79120 100644
--- a/sysdeps/s390/s390-32/multiarch/memcmp.S
+++ b/sysdeps/s390/s390-32/multiarch/memcmp.S
@@ -27,7 +27,7 @@
.text
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
ENTRY(memcmp_z196)
.machine "z196"
@@ -96,7 +96,7 @@ END(memcmp_z10)
#include "../memcmp.S"
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
.globl memcmp
.set memcmp,memcmp_g5
.weak bcmp
diff --git a/sysdeps/s390/s390-32/multiarch/memcpy.S b/sysdeps/s390/s390-32/multiarch/memcpy.S
index 78ed737..15a54af 100644
--- a/sysdeps/s390/s390-32/multiarch/memcpy.S
+++ b/sysdeps/s390/s390-32/multiarch/memcpy.S
@@ -27,7 +27,7 @@
.text
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
ENTRY(memcpy_z196)
.machine "z196"
@@ -92,7 +92,7 @@ END(memcpy_z10)
#include "../memcpy.S"
-#if !defined SHARED || defined NOT_IN_libc
+#if !defined SHARED || !IS_IN_MODULE (libc)
.globl memcpy
.set memcpy,memcpy_g5
#endif
diff --git a/sysdeps/s390/s390-32/multiarch/memset.S b/sysdeps/s390/s390-32/multiarch/memset.S
index 99d7df0..a427f13 100644
--- a/sysdeps/s390/s390-32/multiarch/memset.S
+++ b/sysdeps/s390/s390-32/multiarch/memset.S
@@ -27,7 +27,7 @@
.text
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
ENTRY(memset_z196)
.machine "z196"
@@ -107,7 +107,7 @@ END(memset_mvcle)
#include "../memset.S"
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
.globl memset
.set memset,memset_g5
#endif
diff --git a/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c b/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c
index f8c69ff..e7d598b 100644
--- a/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c
+++ b/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c
@@ -23,7 +23,7 @@
#define STFLE_BITS_Z10 34 /* General instructions extension */
#define STFLE_BITS_Z196 45 /* Distinct operands, pop ... */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
#define IFUNC_RESOLVE(FUNC) \
asm (".globl " #FUNC "\n\t" \
diff --git a/sysdeps/s390/s390-64/multiarch/memcmp.S b/sysdeps/s390/s390-64/multiarch/memcmp.S
index c31d7c4..635f453 100644
--- a/sysdeps/s390/s390-64/multiarch/memcmp.S
+++ b/sysdeps/s390/s390-64/multiarch/memcmp.S
@@ -27,7 +27,7 @@
.text
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
ENTRY(memcmp_z196)
.machine "z196"
@@ -93,7 +93,7 @@ END(memcmp_z10)
#include "../memcmp.S"
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
.globl memcmp
.set memcmp,memcmp_z900
.weak bcmp
diff --git a/sysdeps/s390/s390-64/multiarch/memcpy.S b/sysdeps/s390/s390-64/multiarch/memcpy.S
index 6590f43..3cbd88c 100644
--- a/sysdeps/s390/s390-64/multiarch/memcpy.S
+++ b/sysdeps/s390/s390-64/multiarch/memcpy.S
@@ -27,7 +27,7 @@
.text
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
ENTRY(memcpy_z196)
.machine "z196"
@@ -88,7 +88,7 @@ END(memcpy_z10)
#include "../memcpy.S"
-#if !defined SHARED || defined NOT_IN_libc
+#if !defined SHARED || !IS_IN_MODULE (libc)
.globl memcpy
.set memcpy,memcpy_z900
#endif
diff --git a/sysdeps/s390/s390-64/multiarch/memset.S b/sysdeps/s390/s390-64/multiarch/memset.S
index 3b96269..1c2385a 100644
--- a/sysdeps/s390/s390-64/multiarch/memset.S
+++ b/sysdeps/s390/s390-64/multiarch/memset.S
@@ -27,7 +27,7 @@
.text
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
ENTRY(memset_z196)
.machine "z196"
@@ -103,7 +103,7 @@ END(memset_mvcle)
#include "../memset.S"
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
.globl memset
.set memset,memset_z900
#endif
diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara1.S b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara1.S
index 4b7b22d..40c43fd 100644
--- a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara1.S
+++ b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara1.S
@@ -35,7 +35,7 @@
#define XCC xcc
#endif
-#if !defined NOT_IN_libc
+#if IS_IN_MODULE (libc)
.register %g2,#scratch
.register %g3,#scratch
diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S
index a1a9642..039d8c9 100644
--- a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S
+++ b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S
@@ -137,7 +137,7 @@
LOAD(ldd, base + 0x28, %x5); \
LOAD(ldd, base + 0x30, %x6);
-#if !defined NOT_IN_libc
+#if IS_IN_MODULE (libc)
.register %g2,#scratch
.register %g3,#scratch
diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara4.S b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara4.S
index 63e0d83..970a247 100644
--- a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara4.S
+++ b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara4.S
@@ -46,7 +46,7 @@
#define STORE(type,src,addr) type src, [addr]
#define STORE_INIT(src,addr) stxa src, [addr] STORE_ASI
-#if !defined NOT_IN_libc
+#if IS_IN_MODULE (libc)
.register %g2,#scratch
.register %g3,#scratch
diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S b/sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
index ffb3646..ece3bfa 100644
--- a/sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
+++ b/sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
@@ -30,7 +30,7 @@
#define XCC xcc
#endif
-#if !defined NOT_IN_libc
+#if IS_IN_MODULE (libc)
.register %g2,#scratch
.register %g3,#scratch
diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy.S b/sysdeps/sparc/sparc64/multiarch/memcpy.S
index 62977a4..14eab8d 100644
--- a/sysdeps/sparc/sparc64/multiarch/memcpy.S
+++ b/sysdeps/sparc/sparc64/multiarch/memcpy.S
@@ -20,7 +20,7 @@
#include <sysdep.h>
-#if !defined NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(memcpy)
.type memcpy, @gnu_indirect_function
diff --git a/sysdeps/sparc/sparc64/multiarch/memset-niagara1.S b/sysdeps/sparc/sparc64/multiarch/memset-niagara1.S
index ed53522..2c97707 100644
--- a/sysdeps/sparc/sparc64/multiarch/memset-niagara1.S
+++ b/sysdeps/sparc/sparc64/multiarch/memset-niagara1.S
@@ -28,7 +28,7 @@
#define XCC xcc
#endif
-#if !defined NOT_IN_libc
+#if IS_IN_MODULE (libc)
.register %g2,#scratch
diff --git a/sysdeps/sparc/sparc64/multiarch/memset-niagara4.S b/sysdeps/sparc/sparc64/multiarch/memset-niagara4.S
index c090c50..1d5b071 100644
--- a/sysdeps/sparc/sparc64/multiarch/memset-niagara4.S
+++ b/sysdeps/sparc/sparc64/multiarch/memset-niagara4.S
@@ -21,7 +21,7 @@
#define ASI_BLK_INIT_QUAD_LDD_P 0xe2
-#if !defined NOT_IN_libc
+#if IS_IN_MODULE (libc)
.register %g2, #scratch
.register %g3, #scratch
diff --git a/sysdeps/sparc/sparc64/multiarch/memset.S b/sysdeps/sparc/sparc64/multiarch/memset.S
index 96c75e0..4f270ec 100644
--- a/sysdeps/sparc/sparc64/multiarch/memset.S
+++ b/sysdeps/sparc/sparc64/multiarch/memset.S
@@ -20,7 +20,7 @@
#include <sysdep.h>
-#if !defined NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(memset)
.type memset, @gnu_indirect_function
diff --git a/sysdeps/unix/alpha/sysdep.S b/sysdeps/unix/alpha/sysdep.S
index a39ee61..5617914 100644
--- a/sysdeps/unix/alpha/sysdep.S
+++ b/sysdeps/unix/alpha/sysdep.S
@@ -28,7 +28,7 @@
.text
#endif
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
#else
# define SYSCALL_ERROR_ERRNO errno
diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h
index d8f091c..1f2b6db 100644
--- a/sysdeps/unix/alpha/sysdep.h
+++ b/sysdeps/unix/alpha/sysdep.h
@@ -372,7 +372,7 @@ __LABEL(name) \
#else
# include <stdint.h>
# if (IS_IN_MODULE (rtld) \
- || (!defined SHARED && (!defined NOT_IN_libc \
+ || (!defined SHARED && (IS_IN_MODULE (libc) \
|| IS_IN_MODULE (libpthread))))
extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
# define PTR_MANGLE(var) \
diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh
index 6eba62c..cff9510 100644
--- a/sysdeps/unix/make-syscalls.sh
+++ b/sysdeps/unix/make-syscalls.sh
@@ -96,7 +96,7 @@ emit_weak_aliases()
*@@*)
base=`echo $name | sed 's/@@.*//'`
ver=`echo $name | sed 's/.*@@//;s/\./_/g'`
- echo " echo '#ifndef NOT_IN_libc'; \\"
+ echo " echo '#if IS_IN_MODULE (libc)'; \\"
if test -z "$vcount" ; then
source=$strong
vcount=1
@@ -113,7 +113,7 @@ emit_weak_aliases()
*@*)
base=`echo $name | sed 's/@.*//'`
ver=`echo $name | sed 's/.*@//;s/\./_/g'`
- echo " echo '#ifndef NOT_IN_libc'; \\"
+ echo " echo '#if IS_IN_MODULE (libc)'; \\"
if test -z "$vcount" ; then
source=$strong
vcount=1
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 3c450d0..7e1e167 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -178,7 +178,7 @@ ifeq ($(subdir),elf)
sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64 dl-opendir \
dl-fxstatat64
-CPPFLAGS-lddlibc4 += -DNOT_IN_libc -UIN_MODULE -DIN_MODULE=MODULE_lddlibc4
+CPPFLAGS-lddlibc4 += -UIN_MODULE -DIN_MODULE=MODULE_lddlibc4
others += pldd
install-bin += pldd
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
index 193ef31..e977ebf 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -85,7 +85,7 @@ ENTRY (name); \
# define CENABLE bl __pthread_enable_asynccancel
# define CDISABLE bl __pthread_disable_asynccancel
# define __local_multiple_threads __pthread_multiple_threads
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define CENABLE bl __libc_enable_asynccancel
# define CDISABLE bl __libc_disable_asynccancel
# define __local_multiple_threads __libc_multiple_threads
@@ -96,7 +96,7 @@ ENTRY (name); \
# error Unsupported library
# endif
-# if IS_IN_MODULE (libpthread) || !defined NOT_IN_libc
+# if IS_IN_MODULE (libpthread) || IS_IN_MODULE (libc)
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
index 2ccd1b6..c87df58 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
@@ -92,7 +92,7 @@
# define ret_ERRVAL ret
-# if NOT_IN_libc
+# if !IS_IN_MODULE (libc)
# define SYSCALL_ERROR .Lsyscall_error
# if RTLD_PRIVATE_ERRNO
# define SYSCALL_ERROR_HANDLER \
@@ -310,7 +310,7 @@
/* Pointer mangling is supported for AArch64. */
#if (IS_IN_MODULE (rtld) || \
- (!defined SHARED && (!defined NOT_IN_libc \
+ (!defined SHARED && (IS_IN_MODULE (libc) \
|| IS_IN_MODULE (libpthread))))
# ifdef __ASSEMBLER__
# define PTR_MANGLE(dst, src, guard, tmp) \
diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
index 3f4694c..6a3c2af 100644
--- a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
/* ??? Assumes that nothing comes between PSEUDO and PSEUDO_END
besides "ret". */
@@ -117,7 +117,7 @@ __LABEL($multi_error) \
# define __local_enable_asynccancel __pthread_enable_asynccancel
# define __local_disable_asynccancel __pthread_disable_asynccancel
# define __local_multiple_threads __pthread_multiple_threads
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define __local_enable_asynccancel __libc_enable_asynccancel
# define __local_disable_asynccancel __libc_disable_asynccancel
# define __local_multiple_threads __libc_multiple_threads
@@ -136,7 +136,7 @@ __LABEL($multi_error) \
# define CDISABLE jsr ra, __local_disable_asynccancel; ldgp ra, 0(gp)
# endif
-# if IS_IN_MODULE (libpthread) || !defined NOT_IN_libc
+# if IS_IN_MODULE (libpthread) || IS_IN_MODULE (libc)
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
diff --git a/sysdeps/unix/sysv/linux/alpha/vfork.S b/sysdeps/unix/sysv/linux/alpha/vfork.S
index befcd78..3a23af0 100644
--- a/sysdeps/unix/sysv/linux/alpha/vfork.S
+++ b/sysdeps/unix/sysv/linux/alpha/vfork.S
@@ -49,7 +49,7 @@ ENTRY(__libc_vfork)
PSEUDO_END (__libc_vfork)
-#if !NOT_IN_libc
+#if IS_IN_MODULE (libc)
weak_alias (__libc_vfork, vfork)
strong_alias (__libc_vfork, __vfork)
libc_hidden_def (__vfork)
diff --git a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
index 0273d77..b4890d7 100644
--- a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
/* NOTE: We do mark syscalls with unwind annotations, for the benefit of
cancellation; but they're really only accurate at the point of the
@@ -185,7 +185,7 @@
# define CENABLE bl PLTJMP(__pthread_enable_asynccancel)
# define CDISABLE bl PLTJMP(__pthread_disable_asynccancel)
# define __local_multiple_threads __pthread_multiple_threads
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define CENABLE bl PLTJMP(__libc_enable_asynccancel)
# define CDISABLE bl PLTJMP(__libc_disable_asynccancel)
# define __local_multiple_threads __libc_multiple_threads
@@ -196,7 +196,7 @@
# error Unsupported library
# endif
-# if IS_IN_MODULE (libpthread) || !defined NOT_IN_libc
+# if IS_IN_MODULE (libpthread) || IS_IN_MODULE (libc)
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h
index 52e27d0..ae15ab1 100644
--- a/sysdeps/unix/sysv/linux/arm/sysdep.h
+++ b/sysdeps/unix/sysv/linux/arm/sysdep.h
@@ -137,7 +137,7 @@
#define ret_ERRVAL PSEUDO_RET_NOERRNO
-#if NOT_IN_libc
+#if !IS_IN_MODULE (libc)
# define SYSCALL_ERROR __local_syscall_error
# if RTLD_PRIVATE_ERRNO
# define SYSCALL_ERROR_HANDLER \
diff --git a/sysdeps/unix/sysv/linux/getpid.c b/sysdeps/unix/sysv/linux/getpid.c
index 937b1d4..6375bdc 100644
--- a/sysdeps/unix/sysv/linux/getpid.c
+++ b/sysdeps/unix/sysv/linux/getpid.c
@@ -21,7 +21,7 @@
#include <sysdep.h>
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
static inline __attribute__((always_inline)) pid_t really_getpid (pid_t oldval);
static inline __attribute__((always_inline)) pid_t
@@ -48,7 +48,7 @@ really_getpid (pid_t oldval)
pid_t
__getpid (void)
{
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
INTERNAL_SYSCALL_DECL (err);
pid_t result = INTERNAL_SYSCALL (getpid, err, 0);
#else
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
index 1383e8e..89f02d4 100644
--- a/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
@@ -58,7 +58,7 @@
/* Initialize locks to zero. */
#define LLL_MUTEX_LOCK_INITIALIZER (0)
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
index 20d9ffe..6f4372f 100644
--- a/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# ifndef NO_ERROR
# define NO_ERROR -0x1000
@@ -216,7 +216,7 @@ L(pre_end): ASM_LINE_SEP \
# define CDISABLE .import __pthread_disable_asynccancel,code ASM_LINE_SEP \
bl __pthread_disable_asynccancel,%r2 ASM_LINE_SEP
# endif
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# ifdef PIC
# define CENABLE .import __libc_enable_asynccancel,code ASM_LINE_SEP \
bl __libc_enable_asynccancel,%r2 ASM_LINE_SEP
@@ -246,7 +246,7 @@ L(pre_end): ASM_LINE_SEP \
# if IS_IN_MODULE (libpthread)
# define __local_multiple_threads __pthread_multiple_threads
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define __local_multiple_threads __libc_multiple_threads
# elif IS_IN_MODULE (librt)
# define __local_multiple_threads __librt_multiple_threads
@@ -271,7 +271,7 @@ L(pre_end): ASM_LINE_SEP \
# define NO_CANCELLATION 1
#endif
-/* !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt) */
+/* IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt) */
#ifndef __ASSEMBLER__
# define RTLD_SINGLE_THREAD_P \
diff --git a/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
index 4ed46fc..b349222 100644
--- a/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
@@ -115,7 +115,7 @@ __lll_lock_wait_private:
cfi_endproc
.size __lll_lock_wait_private,.-__lll_lock_wait_private
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
.globl __lll_lock_wait
.type __lll_lock_wait,@function
.hidden __lll_lock_wait
@@ -361,7 +361,7 @@ __lll_unlock_wake_private:
cfi_endproc
.size __lll_unlock_wake_private,.-__lll_unlock_wake_private
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
.globl __lll_unlock_wake
.type __lll_unlock_wake,@function
.hidden __lll_unlock_wake
diff --git a/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/sysdeps/unix/sysv/linux/i386/lowlevellock.h
index 98e368c..a222d7c 100644
--- a/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/i386/lowlevellock.h
@@ -71,7 +71,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
@@ -169,7 +169,7 @@
value is zero. In case the operation failed, the cmpxchg instruction
has loaded the current value of the memory work which is guaranteed
to be nonzero. */
-#if defined NOT_IN_libc || defined UP
+#if !IS_IN_MODULE (libc) || defined UP
# define __lll_trylock_asm LOCK_INSTR "cmpxchgl %2, %1"
#else
# define __lll_trylock_asm "cmpl $0, %%gs:%P5\n\t" \
@@ -198,7 +198,7 @@
: "memory"); \
ret; })
-#if defined NOT_IN_libc || defined UP
+#if !IS_IN_MODULE (libc) || defined UP
# define __lll_lock_asm_start LOCK_INSTR "cmpxchgl %1, %2\n\t"
#else
# define __lll_lock_asm_start "cmpl $0, %%gs:%P6\n\t" \
@@ -324,7 +324,7 @@ extern int __lll_timedlock_elision (int *futex, short *adapt_count,
: "memory"); \
result; })
-#if defined NOT_IN_libc || defined UP
+#if !IS_IN_MODULE (libc) || defined UP
# define __lll_unlock_asm LOCK_INSTR "subl $1, %0\n\t"
#else
# define __lll_unlock_asm "cmpl $0, %%gs:%P3\n\t" \
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index 45e71d6..448239d 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -111,7 +111,7 @@
# if IS_IN_MODULE (libpthread)
# define CENABLE call __pthread_enable_asynccancel;
# define CDISABLE call __pthread_disable_asynccancel
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define CENABLE call __libc_enable_asynccancel;
# define CDISABLE call __libc_disable_asynccancel
# elif IS_IN_MODULE (librt)
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index a2e70a6..a42d0df 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -34,7 +34,7 @@
#define SYS_ify(syscall_name) __NR_##syscall_name
#if defined USE_DL_SYSINFO \
- && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
+ && (IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread))
# define I386_USE_SYSENTER 1
#else
# undef I386_USE_SYSENTER
@@ -115,7 +115,7 @@
# elif defined _LIBC_REENTRANT
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
diff --git a/sysdeps/unix/sysv/linux/ia64/lowlevellock.h b/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
index 5374793..c241c43 100644
--- a/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
@@ -52,7 +52,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
index 6cd92e0..d2e602b 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
@@ -22,11 +22,11 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSDEP_CANCEL_ERRNO __libc_errno
# else
# define SYSDEP_CANCEL_ERRNO errno
@@ -182,7 +182,7 @@ __GC_##name: \
# if IS_IN_MODULE (libpthread)
# define CENABLE br.call.sptk.many b0 = __pthread_enable_asynccancel
# define CDISABLE br.call.sptk.many b0 = __pthread_disable_asynccancel
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define CENABLE br.call.sptk.many b0 = __libc_enable_asynccancel
# define CDISABLE br.call.sptk.many b0 = __libc_disable_asynccancel
# elif IS_IN_MODULE (librt)
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.S b/sysdeps/unix/sysv/linux/ia64/sysdep.S
index 004ade1..ed4e1c7 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.S
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.S
@@ -34,7 +34,7 @@ ENTRY(__syscall_error)
st4 [r2]=r8
mov r8=-1
#else
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index 5d87c5f..f06aee4 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -61,7 +61,7 @@
#endif
#if defined USE_DL_SYSINFO \
- && (!defined NOT_IN_libc \
+ && (IS_IN_MODULE (libc) \
|| IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt))
# define IA64_USE_NEW_STUB
#else
diff --git a/sysdeps/unix/sysv/linux/lowlevellock-futex.h b/sysdeps/unix/sysv/linux/lowlevellock-futex.h
index cb599f3..8b73e0a 100644
--- a/sysdeps/unix/sysv/linux/lowlevellock-futex.h
+++ b/sysdeps/unix/sysv/linux/lowlevellock-futex.h
@@ -49,7 +49,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h b/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
index 2f94222..a7b6153 100644
--- a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
+++ b/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
@@ -35,7 +35,7 @@
/* We define __rtld_* copies for rtld.
We need them visible in libc to initialize. */
-# if IS_IN_MODULE (rtld) || !defined NOT_IN_libc
+# if IS_IN_MODULE (rtld) || IS_IN_MODULE (libc)
extern void *__rtld___vdso_read_tp;
extern void *__rtld___vdso_atomic_cmpxchg_32;
extern void *__rtld___vdso_atomic_barrier;
@@ -44,7 +44,7 @@ extern void *__rtld___vdso_atomic_barrier;
extern void __vdso_read_tp_stub (void);
extern void __vdso_atomic_cmpxchg_32_stub (void);
extern void __vdso_atomic_barrier_stub (void);
-# endif /* IS_IN_MODULE (rtld) || !NOT_IN_libc */
+# endif /* IS_IN_MODULE (rtld) || IS_IN_MODULE (libc) */
/* RTLD should only use its own copies. */
# if !IS_IN_MODULE (rtld)
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
index 85f4334..7937233 100644
--- a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -103,7 +103,7 @@
# if IS_IN_MODULE (libpthread)
# define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel)
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define CENABLE PSEUDO_JMP (__libc_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__libc_disable_asynccancel)
# elif IS_IN_MODULE (librt)
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
index 3a91e86..d0c372e 100644
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
@@ -101,7 +101,7 @@ SYSCALL_ERROR_LABEL: \
move.l %d0, %a0; \
rts;
# elif defined _LIBC_REENTRANT
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
diff --git a/sysdeps/unix/sysv/linux/microblaze/lowlevellock.h b/sysdeps/unix/sysv/linux/microblaze/lowlevellock.h
index 3907602..53864ee 100644
--- a/sysdeps/unix/sysv/linux/microblaze/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/microblaze/lowlevellock.h
@@ -52,7 +52,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h
index 718a442..0601859 100644
--- a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# if !IS_IN_MODULE (librt) || !defined(PIC)
# define AC_STACK_SIZE 16 /* space for r15, async_cancel arg and 2 temp words */
@@ -106,7 +106,7 @@ L(pseudo_cancel): \
# define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel)
# define __local_multiple_threads __pthread_multiple_threads
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define CENABLE PSEUDO_JMP (__libc_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__libc_disable_asynccancel)
# define __local_multiple_threads __libc_multiple_threads
@@ -118,7 +118,7 @@ L(pseudo_cancel): \
# endif
-# if IS_IN_MODULE (libpthread) || !defined NOT_IN_libc
+# if IS_IN_MODULE (libpthread) || IS_IN_MODULE (libc)
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
index 41e6052..b84f206 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
@@ -27,7 +27,7 @@
happen before any instructions. So we use cfi_same_value instead of
cfi_restore. */
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
#ifdef __PIC__
# undef PSEUDO
diff --git a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
index fb56c9f..1892816 100644
--- a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# ifdef __PIC__
# define PSEUDO_CPLOAD .cpload t9;
diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h
index 7a1d2a2..8eba487 100644
--- a/sysdeps/unix/sysv/linux/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/not-cancel.h
@@ -19,7 +19,7 @@
#include <sysdep.h>
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
extern int __open_nocancel (const char *, int, ...) attribute_hidden;
extern int __close_nocancel (int) attribute_hidden;
extern int __read_nocancel (int, void *, size_t) attribute_hidden;
diff --git a/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h b/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
index 1f97641..db0245b 100644
--- a/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
@@ -52,7 +52,7 @@
#define LLL_PRIVATE 0
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
index 1b10bc7..84cc52c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
@@ -23,7 +23,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -84,7 +84,7 @@
# if IS_IN_MODULE (libpthread)
# define CENABLE bl __pthread_enable_asynccancel@local
# define CDISABLE bl __pthread_disable_asynccancel@local
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define CENABLE bl __libc_enable_asynccancel@local
# define CDISABLE bl __libc_disable_asynccancel@local
# elif IS_IN_MODULE (librt)
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
index 48bb7ec..e498fe0 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
@@ -23,7 +23,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# ifdef HAVE_ASM_GLOBAL_DOT_NAME
# define DASHDASHPFX(str) .__##str
@@ -107,7 +107,7 @@
# define CENABLE bl JUMPTARGET(__pthread_enable_asynccancel); nop
# define CDISABLE bl JUMPTARGET(__pthread_disable_asynccancel); nop
# endif
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# ifdef SHARED
# define CENABLE bl JUMPTARGET(__libc_enable_asynccancel)
# define CDISABLE bl JUMPTARGET(__libc_disable_asynccancel)
diff --git a/sysdeps/unix/sysv/linux/s390/longjmp_chk.c b/sysdeps/unix/sysv/linux/s390/longjmp_chk.c
index 02c96c2..c67fb8d 100644
--- a/sysdeps/unix/sysv/linux/s390/longjmp_chk.c
+++ b/sysdeps/unix/sysv/linux/s390/longjmp_chk.c
@@ -20,7 +20,7 @@
#include <shlib-compat.h>
-#if !defined NOT_IN_libc && defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
+#if IS_IN_MODULE (libc) && defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
/* this is a copy from debug/longjmp_chk.c because we need an unique name
for __longjmp_chk, but it is already named via a define
for __libc_siglongjmp in debug/longjmp_chk.c. */
diff --git a/sysdeps/unix/sysv/linux/s390/lowlevellock.h b/sysdeps/unix/sysv/linux/s390/lowlevellock.h
index 4944e08..2035504 100644
--- a/sysdeps/unix/sysv/linux/s390/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/s390/lowlevellock.h
@@ -51,7 +51,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
index 6b7c494..20d64db 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -78,7 +78,7 @@ L(pseudo_end):
# if IS_IN_MODULE (libpthread)
# define CENABLE __pthread_enable_asynccancel
# define CDISABLE __pthread_disable_asynccancel
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define CENABLE __libc_enable_asynccancel
# define CDISABLE __libc_disable_asynccancel
# elif IS_IN_MODULE (librt)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S
index de3f8a4..dae5c1a 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S
@@ -31,7 +31,7 @@
.text
ENTRY(__syscall_error)
#ifndef PIC
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
@@ -54,7 +54,7 @@ ENTRY(__syscall_error)
br %r14
1: .long rtld_errno - 0b
# else
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
index c505f67..fb59d58 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
@@ -105,7 +105,7 @@
br %r14; \
2: .long rtld_errno-1b
# elif defined _LIBC_REENTRANT
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S b/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
index 290e464..9146066 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S
@@ -52,7 +52,7 @@ ENTRY (__libc_vfork)
br %r14
PSEUDO_END (__libc_vfork)
-#if !NOT_IN_libc
+#if IS_IN_MODULE (libc)
weak_alias (__libc_vfork, vfork)
strong_alias (__libc_vfork, __vfork)
libc_hidden_def (__vfork)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
index fc41beb..c9bce52 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -73,7 +73,7 @@ L(pseudo_end):
# define CENABLE __pthread_enable_asynccancel
# define CDISABLE __pthread_disable_asynccancel
# define __local_multiple_threads __pthread_multiple_threads
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define CENABLE __libc_enable_asynccancel
# define CDISABLE __libc_disable_asynccancel
# define __local_multiple_threads __libc_multiple_threads
@@ -111,7 +111,7 @@ L(pseudo_end):
#define LR7_6 lg %r7,56+160(%r15); \
cfi_restore (%r7);
-# if IS_IN_MODULE (libpthread) || !defined NOT_IN_libc
+# if IS_IN_MODULE (libpthread) || IS_IN_MODULE (libc)
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S
index 0fbfe9c..8dc9f05 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S
@@ -32,7 +32,7 @@
.text
ENTRY(__syscall_error)
#ifndef PIC
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
@@ -55,7 +55,7 @@ ENTRY(__syscall_error)
lghi %r2,-1
br %r14
# else
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
index cf49000..2e11a20 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
@@ -113,7 +113,7 @@
lghi %r2,-1; \
br %r14
# elif defined _LIBC_REENTRANT
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S b/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
index 7de1bb0..3975086 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S
@@ -53,7 +53,7 @@ ENTRY (__libc_vfork)
br %r14
PSEUDO_END (__libc_vfork)
-#if !NOT_IN_libc
+#if IS_IN_MODULE (libc)
weak_alias (__libc_vfork, vfork)
strong_alias (__libc_vfork, __vfork)
libc_hidden_def (__vfork)
diff --git a/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index 84b8edb..ef6b850 100644
--- a/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/sh/lowlevellock.S
@@ -172,7 +172,7 @@ __lll_lock_wait_private:
cfi_endproc
.size __lll_lock_wait_private,.-__lll_lock_wait_private
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
.globl __lll_lock_wait
.type __lll_lock_wait,@function
.hidden __lll_lock_wait
@@ -454,7 +454,7 @@ __lll_unlock_wake_private:
cfi_endproc
.size __lll_unlock_wake_private,.-__lll_unlock_wake_private
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
.globl __lll_unlock_wake
.type __lll_unlock_wake,@function
.hidden __lll_unlock_wake
diff --git a/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/sysdeps/unix/sysv/linux/sh/lowlevellock.h
index 19bf59c..c756992 100644
--- a/sysdeps/unix/sysv/linux/sh/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/sh/lowlevellock.h
@@ -49,7 +49,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
index a0373bd..808aa2d 100644
--- a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# define _IMM12 #-12
# define _IMM16 #-16
@@ -108,7 +108,7 @@
# if IS_IN_MODULE (libpthread)
# define __local_enable_asynccancel __pthread_enable_asynccancel
# define __local_disable_asynccancel __pthread_disable_asynccancel
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define __local_enable_asynccancel __libc_enable_asynccancel
# define __local_disable_asynccancel __libc_disable_asynccancel
# elif IS_IN_MODULE (librt)
diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.h b/sysdeps/unix/sysv/linux/sh/sysdep.h
index fc0e4e3..4e3b87b 100644
--- a/sysdeps/unix/sysv/linux/sh/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sh/sysdep.h
@@ -116,7 +116,7 @@
# elif defined _LIBC_REENTRANT
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
diff --git a/sysdeps/unix/sysv/linux/sh/vfork.S b/sysdeps/unix/sysv/linux/sh/vfork.S
index 76326f5..ce69bc6 100644
--- a/sysdeps/unix/sysv/linux/sh/vfork.S
+++ b/sysdeps/unix/sysv/linux/sh/vfork.S
@@ -66,7 +66,7 @@ ENTRY (__libc_vfork)
.align 2
PSEUDO_END (__libc_vfork)
-#if !NOT_IN_libc
+#if IS_IN_MODULE (libc)
weak_alias (__libc_vfork, vfork)
strong_alias (__libc_vfork, __vfork)
libc_hidden_def (__vfork)
diff --git a/sysdeps/unix/sysv/linux/sparc/lowlevellock.h b/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
index 59c771f..28c6726 100644
--- a/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
@@ -57,7 +57,7 @@ extern void __cpu_relax (void);
#define BUSY_WAIT_NOP __cpu_relax ()
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
index a2395d9..4fc3bc1 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -71,7 +71,7 @@ __##syscall_name##_nocancel: \
# if IS_IN_MODULE (libpthread)
# define CENABLE call __pthread_enable_asynccancel
# define CDISABLE call __pthread_disable_asynccancel
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define CENABLE call __libc_enable_asynccancel
# define CDISABLE call __libc_disable_asynccancel
# elif IS_IN_MODULE (librt)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
index cd6cec5..6ddd1bf 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
@@ -79,7 +79,7 @@ ENTRY(name); \
mov -1, %o0;
# elif defined _LIBC_REENTRANT
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S b/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S
index 567163f..9f548d1 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S
@@ -89,7 +89,7 @@ ENTRY (__brk)
#endif
st %o0, [%g1]
#else
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
call HIDDEN_JUMPTARGET(__errno_location)
#else
call __errno_location
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
index 5cbb4d0..541c0d9 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -69,7 +69,7 @@ __##syscall_name##_nocancel: \
# if IS_IN_MODULE (libpthread)
# define CENABLE call __pthread_enable_asynccancel
# define CDISABLE call __pthread_disable_asynccancel
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define CENABLE call __libc_enable_asynccancel
# define CDISABLE call __libc_disable_asynccancel
# elif IS_IN_MODULE (librt)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
index e33fdbc..4617818 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
@@ -89,7 +89,7 @@ ENTRY(name); \
mov -1, %o0;
# elif defined _LIBC_REENTRANT
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
diff --git a/sysdeps/unix/sysv/linux/tile/lowlevellock.h b/sysdeps/unix/sysv/linux/tile/lowlevellock.h
index 78faf3d..da78cd2 100644
--- a/sysdeps/unix/sysv/linux/tile/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/tile/lowlevellock.h
@@ -52,7 +52,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h
index d188c56..ac18abe 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
/* Allow hacking in some extra code if desired. */
#ifndef PSEUDO_EXTRA
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h
index 385e3a5..499491c 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep.h
@@ -45,7 +45,7 @@
#ifndef PIC
/* For static code, on error jump to __syscall_error directly. */
# define SYSCALL_ERROR_NAME __syscall_error
-#elif !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
+#elif IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread)
/* Use the internal name for libc/libpthread shared objects. */
# define SYSCALL_ERROR_NAME __GI___syscall_error
#else
diff --git a/sysdeps/unix/sysv/linux/tile/waitpid.S b/sysdeps/unix/sysv/linux/tile/waitpid.S
index 3bf7fe0..d8d6351 100644
--- a/sysdeps/unix/sysv/linux/tile/waitpid.S
+++ b/sysdeps/unix/sysv/linux/tile/waitpid.S
@@ -1,7 +1,7 @@
/*
extern pid_t __waitpid_nocancel (pid_t, int *, int) attribute_hidden;
*/
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
/* Call __NR_wait4, providing fourth argument (struct rusage *) as NULL. */
#define PSEUDO_EXTRA move r3, zero;
diff --git a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
index f2dca07..893078c 100644
--- a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
@@ -108,7 +108,7 @@ __lll_lock_wait_private:
cfi_endproc
.size __lll_lock_wait_private,.-__lll_lock_wait_private
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
.globl __lll_lock_wait
.type __lll_lock_wait,@function
.hidden __lll_lock_wait
@@ -348,7 +348,7 @@ __lll_unlock_wake_private:
cfi_endproc
.size __lll_unlock_wake_private,.-__lll_unlock_wake_private
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
.globl __lll_unlock_wake
.type __lll_unlock_wake,@function
.hidden __lll_unlock_wake
diff --git a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
index 5df4239..eb9ef80 100644
--- a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
@@ -72,7 +72,7 @@
#ifndef __ASSEMBLER__
-#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
@@ -145,7 +145,7 @@
value is zero. In case the operation failed, the cmpxchg instruction
has loaded the current value of the memory work which is guaranteed
to be nonzero. */
-#if defined NOT_IN_libc || defined UP
+#if !IS_IN_MODULE (libc) || defined UP
# define __lll_trylock_asm LOCK_INSTR "cmpxchgl %2, %1"
#else
# define __lll_trylock_asm "cmpl $0, __libc_multiple_threads(%%rip)\n\t" \
@@ -174,7 +174,7 @@
: "memory"); \
ret; })
-#if defined NOT_IN_libc || defined UP
+#if !IS_IN_MODULE (libc) || defined UP
# define __lll_lock_asm_start LOCK_INSTR "cmpxchgl %4, %2\n\t" \
"jz 24f\n\t"
#else
@@ -316,7 +316,7 @@ extern int __lll_timedlock_elision (int *futex, short *adapt_count,
: "memory", "cx", "cc", "r10", "r11"); \
result; })
-#if defined NOT_IN_libc || defined UP
+#if !IS_IN_MODULE (libc) || defined UP
# define __lll_unlock_asm_start LOCK_INSTR "decl %0\n\t" \
"je 24f\n\t"
#else
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
index b9ab67c..423ae2f 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
+#if IS_IN_MODULE (libc) || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
/* The code to disable cancellation depends on the fact that the called
functions are special. They don't modify registers other than %rax
@@ -63,7 +63,7 @@
# define CENABLE call __pthread_enable_asynccancel;
# define CDISABLE call __pthread_disable_asynccancel;
# define __local_multiple_threads __pthread_multiple_threads
-# elif !defined NOT_IN_libc
+# elif IS_IN_MODULE (libc)
# define CENABLE call __libc_enable_asynccancel;
# define CDISABLE call __libc_disable_asynccancel;
# define __local_multiple_threads __libc_multiple_threads
@@ -74,7 +74,7 @@
# error Unsupported library
# endif
-# if IS_IN_MODULE (libpthread) || !defined NOT_IN_libc
+# if IS_IN_MODULE (libpthread) || IS_IN_MODULE (libc)
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
index dafb2f3..85aac0f 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
@@ -115,7 +115,7 @@
neg %eax; \
movl %eax, (%rcx)
# else
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define SYSCALL_ERROR_ERRNO __libc_errno
# else
# define SYSCALL_ERROR_ERRNO errno
diff --git a/sysdeps/wordsize-32/symbol-hacks.h b/sysdeps/wordsize-32/symbol-hacks.h
index 11e4701..f897691 100644
--- a/sysdeps/wordsize-32/symbol-hacks.h
+++ b/sysdeps/wordsize-32/symbol-hacks.h
@@ -23,7 +23,7 @@
therefore we get PLTs. Unnecessarily so. Changing gcc is a big
task which might not be worth it so we play tricks with the
assembler. */
-#if !defined __ASSEMBLER__ && !defined in_divdi3_c && !defined NOT_IN_libc && defined SHARED
+#if !defined __ASSEMBLER__ && !defined in_divdi3_c && IS_IN_MODULE (libc) && defined SHARED
asm ("__divdi3 = __divdi3_internal");
asm ("__udivdi3 = __udivdi3_internal");
asm ("__moddi3 = __moddi3_internal");
diff --git a/sysdeps/x86_64/memcpy.S b/sysdeps/x86_64/memcpy.S
index 60f3c65..b8b3c47 100644
--- a/sysdeps/x86_64/memcpy.S
+++ b/sysdeps/x86_64/memcpy.S
@@ -30,7 +30,7 @@
# define RETVAL (0)
#else
# define RETVAL (-8)
-# if defined SHARED && !defined USE_MULTIARCH && !defined NOT_IN_libc
+# if defined SHARED && !defined USE_MULTIARCH && IS_IN_MODULE (libc)
# define memcpy __memcpy
# undef libc_hidden_builtin_def
# define libc_hidden_builtin_def(name) \
@@ -44,7 +44,7 @@
.text
-#if defined PIC && !defined NOT_IN_libc
+#if defined PIC && IS_IN_MODULE (libc)
ENTRY_CHK (__memcpy_chk)
cmpq %rdx, %rcx
@@ -253,14 +253,14 @@ L(32after):
/* Handle blocks smaller than 1/2 L1. */
L(fasttry): /* first 1/2 L1 */
-#ifndef NOT_IN_libc /* only up to this algorithm outside of libc.so */
+#if IS_IN_MODULE (libc) /* only up to this algorithm outside of libc.so */
mov __x86_data_cache_size_half(%rip), %R11_LP
cmpq %rdx, %r11 /* calculate the smaller of */
cmovaq %rdx, %r11 /* remaining bytes and 1/2 L1 */
#endif
L(fast): /* good ol' MOVS */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
movq %r11, %rcx
andq $-8, %r11
#else
@@ -275,7 +275,7 @@ L(fast): /* good ol' MOVS */
.p2align 4,, 4
L(fastskip):
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
subq %r11, %rdx /* check for more */
testq $-8, %rdx
jnz L(fastafter)
@@ -294,7 +294,7 @@ L(fastskip):
#endif
retq /* exit */
-#ifndef NOT_IN_libc /* none of the algorithms below for RTLD */
+#if IS_IN_MODULE (libc) /* none of the algorithms below for RTLD */
.p2align 4
@@ -570,13 +570,13 @@ L(NTskip):
#endif
retq /* exit */
-#endif /* !NOT_IN_libc */
+#endif /* IS_IN_MODULE (libc) */
END(memcpy)
#ifndef USE_AS_MEMPCPY
libc_hidden_builtin_def (memcpy)
-# if defined SHARED && !defined USE_MULTIARCH && !defined NOT_IN_libc
+# if defined SHARED && !defined USE_MULTIARCH && IS_IN_MODULE (libc)
# undef memcpy
# include <shlib-compat.h>
versioned_symbol (libc, __memcpy, memcpy, GLIBC_2_14);
diff --git a/sysdeps/x86_64/memmove.c b/sysdeps/x86_64/memmove.c
index 202f5b8..9b8f52e 100644
--- a/sysdeps/x86_64/memmove.c
+++ b/sysdeps/x86_64/memmove.c
@@ -17,7 +17,7 @@
#include "string/memmove.c"
-#if !defined memmove && !defined NOT_IN_libc
+#if !defined memmove && IS_IN_MODULE (libc)
#include <shlib-compat.h>
#if SHLIB_COMPAT (libc, GLIBC_2_2_5, GLIBC_2_14)
diff --git a/sysdeps/x86_64/memset.S b/sysdeps/x86_64/memset.S
index db4fb84..8145481 100644
--- a/sysdeps/x86_64/memset.S
+++ b/sysdeps/x86_64/memset.S
@@ -20,7 +20,7 @@
#include <sysdep.h>
.text
-#if !defined NOT_IN_libc
+#if IS_IN_MODULE (libc)
ENTRY(__bzero)
movq %rdi, %rax /* Set return value. */
movq %rsi, %rdx /* Set n. */
@@ -42,7 +42,7 @@ ENTRY(__memset_tail)
END(__memset_tail)
#endif
-#if defined PIC && !defined NOT_IN_libc
+#if defined PIC && IS_IN_MODULE (libc)
ENTRY_CHK (__memset_chk)
cmpq %rdx, %rcx
jb HIDDEN_JUMPTARGET (__chk_fail)
@@ -125,7 +125,7 @@ L(between8_16bytes):
END (memset)
libc_hidden_builtin_def (memset)
-#if defined PIC && !defined NOT_IN_libc && !defined USE_MULTIARCH
+#if defined PIC && IS_IN_MODULE (libc) && !defined USE_MULTIARCH
strong_alias (__memset_chk, __memset_zero_constant_len_parameter)
.section .gnu.warning.__memset_zero_constant_len_parameter
.string "memset used with constant zero length parameter; this could be due to transposed parameters"
diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h
index ef0abbd..2246f56 100644
--- a/sysdeps/x86_64/multiarch/init-arch.h
+++ b/sysdeps/x86_64/multiarch/init-arch.h
@@ -122,7 +122,7 @@ extern void __init_cpu_features (void) attribute_hidden;
extern const struct cpu_features *__get_cpu_features (void)
__attribute__ ((const));
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
# define __get_cpu_features() (&__cpu_features)
# endif
diff --git a/sysdeps/x86_64/multiarch/memcmp-sse4.S b/sysdeps/x86_64/multiarch/memcmp-sse4.S
index e753d62..3dc0f97 100644
--- a/sysdeps/x86_64/multiarch/memcmp-sse4.S
+++ b/sysdeps/x86_64/multiarch/memcmp-sse4.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/x86_64/multiarch/memcmp-ssse3.S b/sysdeps/x86_64/multiarch/memcmp-ssse3.S
index 5f7572f..7d79f46 100644
--- a/sysdeps/x86_64/multiarch/memcmp-ssse3.S
+++ b/sysdeps/x86_64/multiarch/memcmp-ssse3.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/x86_64/multiarch/memcmp.S b/sysdeps/x86_64/multiarch/memcmp.S
index 627d8d0..421cfc1 100644
--- a/sysdeps/x86_64/multiarch/memcmp.S
+++ b/sysdeps/x86_64/multiarch/memcmp.S
@@ -22,7 +22,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(memcmp)
.type memcmp, @gnu_indirect_function
diff --git a/sysdeps/x86_64/multiarch/memcpy-avx-unaligned.S b/sysdeps/x86_64/multiarch/memcpy-avx-unaligned.S
index 3cac1e3..f2373b1 100644
--- a/sysdeps/x86_64/multiarch/memcpy-avx-unaligned.S
+++ b/sysdeps/x86_64/multiarch/memcpy-avx-unaligned.S
@@ -18,7 +18,7 @@
#include <sysdep.h>
-#if !defined NOT_IN_libc \
+#if IS_IN_MODULE (libc) \
&& (defined SHARED \
|| defined USE_AS_MEMMOVE \
|| !defined USE_MULTIARCH)
diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
index 899ccbc..2190a40 100644
--- a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
+++ b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
@@ -19,7 +19,7 @@
#include <sysdep.h>
-#if !defined NOT_IN_libc \
+#if IS_IN_MODULE (libc) \
&& (defined SHARED \
|| defined USE_AS_MEMMOVE \
|| !defined USE_MULTIARCH)
diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3.S b/sysdeps/x86_64/multiarch/memcpy-ssse3.S
index 0ad9a00..b00d1ea 100644
--- a/sysdeps/x86_64/multiarch/memcpy-ssse3.S
+++ b/sysdeps/x86_64/multiarch/memcpy-ssse3.S
@@ -19,7 +19,7 @@
#include <sysdep.h>
-#if !defined NOT_IN_libc \
+#if IS_IN_MODULE (libc) \
&& (defined SHARED \
|| defined USE_AS_MEMMOVE \
|| !defined USE_MULTIARCH)
diff --git a/sysdeps/x86_64/multiarch/memcpy.S b/sysdeps/x86_64/multiarch/memcpy.S
index e666695..48cb757 100644
--- a/sysdeps/x86_64/multiarch/memcpy.S
+++ b/sysdeps/x86_64/multiarch/memcpy.S
@@ -25,7 +25,7 @@
/* Define multiple versions only for the definition in lib and for
DSO. In static binaries we need memcpy before the initialization
happened. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
.text
ENTRY(__new_memcpy)
.type __new_memcpy, @gnu_indirect_function
diff --git a/sysdeps/x86_64/multiarch/memcpy_chk.S b/sysdeps/x86_64/multiarch/memcpy_chk.S
index 076b19a..cf19ed7 100644
--- a/sysdeps/x86_64/multiarch/memcpy_chk.S
+++ b/sysdeps/x86_64/multiarch/memcpy_chk.S
@@ -24,7 +24,7 @@
/* Define multiple versions only for the definition in lib and for
DSO. There are no multiarch memcpy functions for static binaries.
*/
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(__memcpy_chk)
diff --git a/sysdeps/x86_64/multiarch/memmove.c b/sysdeps/x86_64/multiarch/memmove.c
index 0c9af7e..bb7f1c2 100644
--- a/sysdeps/x86_64/multiarch/memmove.c
+++ b/sysdeps/x86_64/multiarch/memmove.c
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define MEMMOVE __memmove_sse2
# ifdef SHARED
# undef libc_hidden_builtin_def
@@ -41,7 +41,7 @@ extern __typeof (__redirect_memmove) __memmove_avx_unaligned attribute_hidden;
#include "string/memmove.c"
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <shlib-compat.h>
# include "init-arch.h"
diff --git a/sysdeps/x86_64/multiarch/mempcpy.S b/sysdeps/x86_64/multiarch/mempcpy.S
index 7589d8c..fd8f2fb 100644
--- a/sysdeps/x86_64/multiarch/mempcpy.S
+++ b/sysdeps/x86_64/multiarch/mempcpy.S
@@ -24,7 +24,7 @@
/* Define multiple versions only for the definition in lib and for
DSO. In static binaries we need mempcpy before the initialization
happened. */
-#if defined SHARED && !defined NOT_IN_libc
+#if defined SHARED && IS_IN_MODULE (libc)
ENTRY(__mempcpy)
.type __mempcpy, @gnu_indirect_function
cmpl $0, KIND_OFFSET+__cpu_features(%rip)
diff --git a/sysdeps/x86_64/multiarch/mempcpy_chk.S b/sysdeps/x86_64/multiarch/mempcpy_chk.S
index 88e0b74..a33be97 100644
--- a/sysdeps/x86_64/multiarch/mempcpy_chk.S
+++ b/sysdeps/x86_64/multiarch/mempcpy_chk.S
@@ -24,7 +24,7 @@
/* Define multiple versions only for the definition in lib and for
DSO. There are no multiarch mempcpy functions for static binaries.
*/
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifdef SHARED
.text
ENTRY(__mempcpy_chk)
diff --git a/sysdeps/x86_64/multiarch/memset-avx2.S b/sysdeps/x86_64/multiarch/memset-avx2.S
index b45f8a0..42e5c86 100644
--- a/sysdeps/x86_64/multiarch/memset-avx2.S
+++ b/sysdeps/x86_64/multiarch/memset-avx2.S
@@ -18,7 +18,7 @@
#include <sysdep.h>
-#if !defined NOT_IN_libc
+#if IS_IN_MODULE (libc)
#include "asm-syntax.h"
#ifndef MEMSET
diff --git a/sysdeps/x86_64/multiarch/memset.S b/sysdeps/x86_64/multiarch/memset.S
index 00d46d1..c5fda89 100644
--- a/sysdeps/x86_64/multiarch/memset.S
+++ b/sysdeps/x86_64/multiarch/memset.S
@@ -23,7 +23,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in lib. */
-# ifndef NOT_IN_libc
+# if IS_IN_MODULE (libc)
ENTRY(memset)
.type memset, @gnu_indirect_function
cmpl $0, __cpu_features+KIND_OFFSET(%rip)
@@ -37,7 +37,7 @@ ENTRY(memset)
END(memset)
# endif
-# if !defined NOT_IN_libc
+# if IS_IN_MODULE (libc)
# undef memset
# define memset __memset_sse2
diff --git a/sysdeps/x86_64/multiarch/memset_chk.S b/sysdeps/x86_64/multiarch/memset_chk.S
index 8a607bd..4e4f3d8 100644
--- a/sysdeps/x86_64/multiarch/memset_chk.S
+++ b/sysdeps/x86_64/multiarch/memset_chk.S
@@ -21,7 +21,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in lib. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# if defined SHARED && defined HAVE_AVX2_SUPPORT
ENTRY(__memset_chk)
.type __memset_chk, @gnu_indirect_function
diff --git a/sysdeps/x86_64/multiarch/strcat-sse2-unaligned.S b/sysdeps/x86_64/multiarch/strcat-sse2-unaligned.S
index dc782f2..ec95403 100644
--- a/sysdeps/x86_64/multiarch/strcat-sse2-unaligned.S
+++ b/sysdeps/x86_64/multiarch/strcat-sse2-unaligned.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/x86_64/multiarch/strcat-ssse3.S b/sysdeps/x86_64/multiarch/strcat-ssse3.S
index fde7b90..b9b5177 100644
--- a/sysdeps/x86_64/multiarch/strcat-ssse3.S
+++ b/sysdeps/x86_64/multiarch/strcat-ssse3.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
diff --git a/sysdeps/x86_64/multiarch/strcat.S b/sysdeps/x86_64/multiarch/strcat.S
index d5c9d84..621087a 100644
--- a/sysdeps/x86_64/multiarch/strcat.S
+++ b/sysdeps/x86_64/multiarch/strcat.S
@@ -43,7 +43,7 @@
/* Define multiple versions only for the definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(STRCAT)
.type STRCAT, @gnu_indirect_function
diff --git a/sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S b/sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S
index 0b3f096..cad00d1 100644
--- a/sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S
+++ b/sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
# include "asm-syntax.h"
diff --git a/sysdeps/x86_64/multiarch/strchr.S b/sysdeps/x86_64/multiarch/strchr.S
index 63a35fa..987da70 100644
--- a/sysdeps/x86_64/multiarch/strchr.S
+++ b/sysdeps/x86_64/multiarch/strchr.S
@@ -21,7 +21,7 @@
/* Define multiple versions only for the definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(strchr)
.type strchr, @gnu_indirect_function
diff --git a/sysdeps/x86_64/multiarch/strcmp-ssse3.S b/sysdeps/x86_64/multiarch/strcmp-ssse3.S
index 43b3f30..891005f 100644
--- a/sysdeps/x86_64/multiarch/strcmp-ssse3.S
+++ b/sysdeps/x86_64/multiarch/strcmp-ssse3.S
@@ -1,4 +1,4 @@
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define USE_SSSE3 1
# define STRCMP __strcmp_ssse3
# include "../strcmp.S"
diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
index f3e0ca1..d9cd892 100644
--- a/sysdeps/x86_64/multiarch/strcmp.S
+++ b/sysdeps/x86_64/multiarch/strcmp.S
@@ -80,7 +80,7 @@
/* Define multiple versions only for the definition in libc. Don't
define multiple versions for strncmp in static library since we
need strncmp before the initialization happened. */
-#if (defined SHARED || !defined USE_AS_STRNCMP) && !defined NOT_IN_libc
+#if (defined SHARED || !defined USE_AS_STRNCMP) && IS_IN_MODULE (libc)
.text
ENTRY(STRCMP)
.type STRCMP, @gnu_indirect_function
diff --git a/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S b/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S
index be7513d..84f471f 100644
--- a/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S
+++ b/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifndef USE_AS_STRCAT
# include <sysdep.h>
diff --git a/sysdeps/x86_64/multiarch/strcpy-ssse3.S b/sysdeps/x86_64/multiarch/strcpy-ssse3.S
index 86569ff..42eb760 100644
--- a/sysdeps/x86_64/multiarch/strcpy-ssse3.S
+++ b/sysdeps/x86_64/multiarch/strcpy-ssse3.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# ifndef USE_AS_STRCAT
# include <sysdep.h>
diff --git a/sysdeps/x86_64/multiarch/strcpy.S b/sysdeps/x86_64/multiarch/strcpy.S
index 80ed98b..bf476d7 100644
--- a/sysdeps/x86_64/multiarch/strcpy.S
+++ b/sysdeps/x86_64/multiarch/strcpy.S
@@ -57,7 +57,7 @@
/* Define multiple versions only for the definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(STRCPY)
.type STRCPY, @gnu_indirect_function
diff --git a/sysdeps/x86_64/multiarch/strcspn.S b/sysdeps/x86_64/multiarch/strcspn.S
index 24f55e9..b2f6ba1 100644
--- a/sysdeps/x86_64/multiarch/strcspn.S
+++ b/sysdeps/x86_64/multiarch/strcspn.S
@@ -41,7 +41,7 @@
/* Define multiple versions only for the definition in libc. Don't
define multiple versions for strpbrk in static library since we
need strpbrk before the initialization happened. */
-#if (defined SHARED || !defined USE_AS_STRPBRK) && !defined NOT_IN_libc
+#if (defined SHARED || !defined USE_AS_STRPBRK) && IS_IN_MODULE (libc)
.text
ENTRY(STRCSPN)
.type STRCSPN, @gnu_indirect_function
diff --git a/sysdeps/x86_64/multiarch/strspn.S b/sysdeps/x86_64/multiarch/strspn.S
index bf7308e..c18a1bf 100644
--- a/sysdeps/x86_64/multiarch/strspn.S
+++ b/sysdeps/x86_64/multiarch/strspn.S
@@ -26,7 +26,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(strspn)
.type strspn, @gnu_indirect_function
diff --git a/sysdeps/x86_64/multiarch/wcscpy-c.c b/sysdeps/x86_64/multiarch/wcscpy-c.c
index f27c069..c142629 100644
--- a/sysdeps/x86_64/multiarch/wcscpy-c.c
+++ b/sysdeps/x86_64/multiarch/wcscpy-c.c
@@ -1,4 +1,4 @@
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# define wcscpy __wcscpy_sse2
#endif
diff --git a/sysdeps/x86_64/multiarch/wcscpy-ssse3.S b/sysdeps/x86_64/multiarch/wcscpy-ssse3.S
index c79389e..7124830 100644
--- a/sysdeps/x86_64/multiarch/wcscpy-ssse3.S
+++ b/sysdeps/x86_64/multiarch/wcscpy-ssse3.S
@@ -17,7 +17,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <sysdep.h>
.section .text.ssse3,"ax",@progbits
diff --git a/sysdeps/x86_64/multiarch/wcscpy.S b/sysdeps/x86_64/multiarch/wcscpy.S
index f12ba27..909e854 100644
--- a/sysdeps/x86_64/multiarch/wcscpy.S
+++ b/sysdeps/x86_64/multiarch/wcscpy.S
@@ -22,7 +22,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(wcscpy)
diff --git a/sysdeps/x86_64/multiarch/wmemcmp-c.c b/sysdeps/x86_64/multiarch/wmemcmp-c.c
index 1074238..8159d91 100644
--- a/sysdeps/x86_64/multiarch/wmemcmp-c.c
+++ b/sysdeps/x86_64/multiarch/wmemcmp-c.c
@@ -1,4 +1,4 @@
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
# include <wchar.h>
# define WMEMCMP __wmemcmp_sse2
diff --git a/sysdeps/x86_64/multiarch/wmemcmp.S b/sysdeps/x86_64/multiarch/wmemcmp.S
index 37b9bba..e45b4af 100644
--- a/sysdeps/x86_64/multiarch/wmemcmp.S
+++ b/sysdeps/x86_64/multiarch/wmemcmp.S
@@ -22,7 +22,7 @@
#include <init-arch.h>
/* Define multiple versions only for the definition in libc. */
-#ifndef NOT_IN_libc
+#if IS_IN_MODULE (libc)
.text
ENTRY(wmemcmp)
.type wmemcmp, @gnu_indirect_function
diff --git a/sysdeps/x86_64/strcmp.S b/sysdeps/x86_64/strcmp.S
index fc45a62..fa6f429 100644
--- a/sysdeps/x86_64/strcmp.S
+++ b/sysdeps/x86_64/strcmp.S
@@ -32,7 +32,7 @@
/* The simplified code below is not set up to handle strncmp() so far.
Should this become necessary it has to be implemented. For now
just report the problem. */
-# ifdef NOT_IN_libc
+# if !IS_IN_MODULE (libc)
# error "strncmp not implemented so far"
# endif
@@ -51,7 +51,7 @@
# include "locale-defines.h"
/* No support for strcasecmp outside libc so far since it is not needed. */
-# ifdef NOT_IN_libc
+# if !IS_IN_MODULE (libc)
# error "strcasecmp_l not implemented so far"
# endif
@@ -60,7 +60,7 @@
# include "locale-defines.h"
/* No support for strncasecmp outside libc so far since it is not needed. */
-# ifdef NOT_IN_libc
+# if !IS_IN_MODULE (libc)
# error "strncasecmp_l not implemented so far"
# endif
@@ -126,7 +126,7 @@ libc_hidden_def (__strncasecmp)
#endif
ENTRY (STRCMP)
-#ifdef NOT_IN_libc
+#if !IS_IN_MODULE (libc)
/* Simple version since we can't use SSE registers in ld.so. */
L(oop): movb (%rdi), %al
cmpb (%rsi), %al
@@ -144,7 +144,7 @@ L(neq): movl $1, %eax
cmovbl %ecx, %eax
ret
END (STRCMP)
-#else /* NOT_IN_libc */
+#else /* !IS_IN_MODULE (libc) */
# ifdef USE_AS_STRCASECMP_L
/* We have to fall back on the C implementation for locales
with encodings not matching ASCII for single bytes. */
@@ -2300,5 +2300,5 @@ LABEL(unaligned_table):
.int LABEL(ashr_14) - LABEL(unaligned_table)
.int LABEL(ashr_15) - LABEL(unaligned_table)
.int LABEL(ashr_0) - LABEL(unaligned_table)
-#endif /* NOT_IN_libc */
+#endif /* !IS_IN_MODULE (libc) */
libc_hidden_builtin_def (STRCMP)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=724a60dd2fe5cfc786426983736d16d1d0a3cbda
commit 724a60dd2fe5cfc786426983736d16d1d0a3cbda
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Aug 12 14:36:01 2014 +0530
Remove last place for definition of IS_IN_* macros
Ignoring IS_IN_build, which has a different purpose altogether, this
patch removes the last bit of IS_IN_* macro definitions. Now barring
NOT_IN_libc, all cases use the IN_MODULE scheme.
Generated code unchanged on x86_64.
diff --git a/extra-lib.mk b/extra-lib.mk
index 8d3a8c0..6cc9a35 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -106,5 +106,5 @@ ifneq (,$(cpp-srcs-left))
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif
-CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -UIN_MODULE \
+CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -UIN_MODULE \
-DIN_MODULE="MODULE_$(lib) + MODULE_libs"
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a6d3bd62f9969349cf35b1c2eea87601d9fa4e26
commit a6d3bd62f9969349cf35b1c2eea87601d9fa4e26
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Aug 12 09:31:48 2014 +0530
Remove IS_IN_rtld
Replace with IS_IN_MODULE (rtld). Generated code is unchanged on
x86_64.
diff --git a/elf/Makefile b/elf/Makefile
index fdee669..a8ae74e 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -438,7 +438,7 @@ CFLAGS-cache.c = $(SYSCONF-FLAGS)
CFLAGS-rtld.c = $(SYSCONF-FLAGS)
CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
- -DNOT_IN_libc=1 -DIS_IN_rtld=1 -UIN_MODULE \
+ -DNOT_IN_libc=1 -UIN_MODULE \
-DIN_MODULE="MODULE_rtld + MODULE_libs")
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
diff --git a/elf/dl-open.c b/elf/dl-open.c
index 7cc4cc1..c49e065 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -737,7 +737,7 @@ _dl_show_scope (struct link_map *l, int from)
_dl_debug_printf ("\n");
}
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* Return non-zero if ADDR lies within one of L's segments. */
int
internal_function
diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index 72df010..f330c71 100644
--- a/elf/rtld-Rules
+++ b/elf/rtld-Rules
@@ -139,7 +139,7 @@ ifdef rtld-depfiles
endif
# This here is the whole point of all the shenanigans.
-rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -UIN_MODULE \
+rtld-CPPFLAGS := -DNOT_IN_libc=1 -UIN_MODULE \
-DIN_MODULE="MODULE_rtld + MODULE_libs"
endif
diff --git a/elf/setup-vdso.h b/elf/setup-vdso.h
index 1057cf0..cdd630c 100644
--- a/elf/setup-vdso.h
+++ b/elf/setup-vdso.h
@@ -99,7 +99,7 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)),
/* Add the vDSO to the object list. */
_dl_add_to_namespace_list (l, LM_ID_BASE);
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
/* Rearrange the list so this DSO appears after rtld_map. */
assert (l->l_next == NULL);
assert (l->l_prev == main_map);
diff --git a/include/assert.h b/include/assert.h
index d0d9259..5112ce7 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -20,7 +20,7 @@ extern void __assert_fail_base (const char *fmt, const char *assertion,
const char *function)
__THROW __attribute__ ((__noreturn__));
-# if !defined NOT_IN_libc || defined IS_IN_rtld
+# if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
hidden_proto (__assert_fail)
hidden_proto (__assert_perror_fail)
# endif
diff --git a/include/bits/stdlib-float.h b/include/bits/stdlib-float.h
index d3f5c5b..81c5a7f 100644
--- a/include/bits/stdlib-float.h
+++ b/include/bits/stdlib-float.h
@@ -1,4 +1,4 @@
/* No floating-point inline functions in rtld. */
-#ifndef IS_IN_rtld
+#if !IS_IN_MODULE (rtld)
# include <stdlib/bits/stdlib-float.h>
#endif
diff --git a/include/errno.h b/include/errno.h
index 502dd50..4b2cd31 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -4,7 +4,7 @@
#if defined _ERRNO_H && !defined _ISOMAC && !defined __cplusplus
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
# include <dl-sysdep.h>
# ifndef RTLD_PRIVATE_ERRNO
# error "dl-sysdep.h must define RTLD_PRIVATE_ERRNO!"
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 7a65d60..777e0f2 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -12,7 +12,7 @@ extern __mode_t __umask (__mode_t __mask);
extern int __mkdir (const char *__path, __mode_t __mode);
extern int __mknod (const char *__path,
__mode_t __mode, __dev_t __dev);
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
hidden_proto (__fxstat)
hidden_proto (__fxstat64)
hidden_proto (__lxstat)
diff --git a/include/unistd.h b/include/unistd.h
index 5a016b1..495ad43 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -151,7 +151,7 @@ libc_hidden_proto (__sbrk)
environment variables that normally affect them. */
extern int __libc_enable_secure attribute_relro;
extern int __libc_enable_secure_decided;
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* XXX The #ifdef should go. */
extern int __libc_enable_secure_internal attribute_relro attribute_hidden;
#endif
diff --git a/sysdeps/aarch64/setjmp.S b/sysdeps/aarch64/setjmp.S
index d548dd5..fd526a5 100644
--- a/sysdeps/aarch64/setjmp.S
+++ b/sysdeps/aarch64/setjmp.S
@@ -63,7 +63,7 @@ ENTRY (__sigsetjmp)
mov x2, sp
str x2, [x0, #JB_SP<<3]
#endif
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* In ld.so we never save the signal mask */
mov w0, #0
RET
diff --git a/sysdeps/alpha/setjmp.S b/sysdeps/alpha/setjmp.S
index 840b560..37e41de 100644
--- a/sysdeps/alpha/setjmp.S
+++ b/sysdeps/alpha/setjmp.S
@@ -86,7 +86,7 @@ $sigsetjmp_local:
ldq ra, 0(sp)
addq sp, 16, sp
ret
-#elif defined IS_IN_rtld
+#elif IS_IN_MODULE (rtld)
/* In ld.so we never save the signal mask. */
mov 0, v0
ret
diff --git a/sysdeps/arm/__longjmp.S b/sysdeps/arm/__longjmp.S
index 27d1b71..ece8a04 100644
--- a/sysdeps/arm/__longjmp.S
+++ b/sysdeps/arm/__longjmp.S
@@ -76,7 +76,7 @@ ENTRY (__longjmp)
#endif
#ifdef NEED_HWCAP
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
ldr a4, 1f
ldr a3, .Lrtld_local_ro
0: add a4, pc, a4
@@ -139,7 +139,7 @@ ENTRY (__longjmp)
DO_RET(lr)
#ifdef NEED_HWCAP
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
1: .long _GLOBAL_OFFSET_TABLE_ - 0b - PC_OFS
.Lrtld_local_ro:
.long C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF)
diff --git a/sysdeps/arm/aeabi_unwind_cpp_pr1.c b/sysdeps/arm/aeabi_unwind_cpp_pr1.c
index f650613..c5bbac2 100644
--- a/sysdeps/arm/aeabi_unwind_cpp_pr1.c
+++ b/sysdeps/arm/aeabi_unwind_cpp_pr1.c
@@ -27,7 +27,7 @@ attribute_hidden
void
__aeabi_unwind_cpp_pr0 (void)
{
-#ifndef IS_IN_rtld
+#if !IS_IN_MODULE (rtld)
abort ();
#endif
}
@@ -36,7 +36,7 @@ attribute_hidden
void
__aeabi_unwind_cpp_pr1 (void)
{
-#ifndef IS_IN_rtld
+#if !IS_IN_MODULE (rtld)
abort ();
#endif
}
@@ -45,7 +45,7 @@ attribute_hidden
void
__aeabi_unwind_cpp_pr2 (void)
{
-#ifndef IS_IN_rtld
+#if !IS_IN_MODULE (rtld)
abort ();
#endif
}
diff --git a/sysdeps/arm/setjmp.S b/sysdeps/arm/setjmp.S
index 17a16c9..6e81d78 100644
--- a/sysdeps/arm/setjmp.S
+++ b/sysdeps/arm/setjmp.S
@@ -57,7 +57,7 @@ ENTRY (__sigsetjmp)
#ifdef NEED_HWCAP
/* Check if we have a VFP unit. */
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
ldr a3, 1f
ldr a4, .Lrtld_local_ro
0: add a3, pc, a3
@@ -115,7 +115,7 @@ ENTRY (__sigsetjmp)
B PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
#ifdef NEED_HWCAP
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
1: .long _GLOBAL_OFFSET_TABLE_ - 0b - PC_OFS
.Lrtld_local_ro:
.long C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF)
diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index e9fba8b..e591ca7 100644
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -292,7 +292,7 @@
#endif
/* Pointer mangling support. */
-#if (defined IS_IN_rtld || \
+#if (IS_IN_MODULE (rtld) || \
(!defined SHARED && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))))
# ifdef __ASSEMBLER__
# define PTR_MANGLE_LOAD(guard, tmp) \
diff --git a/sysdeps/generic/_itoa.h b/sysdeps/generic/_itoa.h
index 98e91cc..519ea47 100644
--- a/sysdeps/generic/_itoa.h
+++ b/sysdeps/generic/_itoa.h
@@ -46,7 +46,7 @@ extern char *_itoa (unsigned long long int value, char *buflim,
extern const char _itoa_upper_digits[];
extern const char _itoa_lower_digits[];
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
hidden_proto (_itoa_upper_digits)
hidden_proto (_itoa_lower_digits)
#endif
diff --git a/sysdeps/generic/dl-sysdep.h b/sysdeps/generic/dl-sysdep.h
index ae0e4be..5a8221c 100644
--- a/sysdeps/generic/dl-sysdep.h
+++ b/sysdeps/generic/dl-sysdep.h
@@ -27,7 +27,7 @@
all the libc functions that ld.so uses are called without PLT and always
get the versions linked into ld.so rather than the libc ones. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
# define RTLD_PRIVATE_ERRNO 1
#else
# define RTLD_PRIVATE_ERRNO 0
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index e01df84..85e0d5c 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -250,7 +250,7 @@ typedef void (*receiver_fct) (int, const char *, const char *);
# define GL(name) _##name
#else
# define EXTERN
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
# define GL(name) _rtld_local._##name
# else
# define GL(name) _rtld_global._##name
@@ -409,7 +409,7 @@ struct rtld_global
#ifdef SHARED
};
# define __rtld_global_attribute__
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
# ifdef HAVE_SDATA_SECTION
# define __rtld_local_attribute__ \
__attribute__ ((visibility ("hidden"), section (".sdata")))
@@ -428,7 +428,7 @@ extern struct rtld_global _rtld_global __rtld_global_attribute__;
#ifndef SHARED
# define GLRO(name) _##name
#else
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
# define GLRO(name) _rtld_local_ro._##name
# else
# define GLRO(name) _rtld_global_ro._##name
@@ -587,7 +587,7 @@ struct rtld_global_ro
EXTERN int _dl_pointer_guard;
};
# define __rtld_global_attribute__
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
# define __rtld_local_attribute__ __attribute__ ((visibility ("hidden")))
extern struct rtld_global_ro _rtld_local_ro
attribute_relro __rtld_local_attribute__;
@@ -610,7 +610,7 @@ extern const ElfW(Phdr) *_dl_phdr;
extern size_t _dl_phnum;
#endif
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* This is the initial value of GL(dl_error_catch_tsd).
A non-TLS libpthread will change it. */
extern void **_dl_initial_error_catch_tsd (void) __attribute__ ((const))
@@ -641,7 +641,7 @@ extern char **_dl_argv
attribute_relro
#endif
;
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
extern unsigned int _dl_skip_args attribute_hidden
# ifndef DL_ARGV_NOT_RELRO
attribute_relro
@@ -665,7 +665,7 @@ extern char **_dl_argv_internal attribute_hidden
/* Flag set at startup and cleared when the last initializer has run. */
extern int _dl_starting_up;
weak_extern (_dl_starting_up)
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
extern int _dl_starting_up_internal attribute_hidden;
#endif
diff --git a/sysdeps/i386/dl-tls.h b/sysdeps/i386/dl-tls.h
index 7361372..d0d6bec 100644
--- a/sysdeps/i386/dl-tls.h
+++ b/sysdeps/i386/dl-tls.h
@@ -32,7 +32,7 @@ extern void *___tls_get_addr (tls_index *ti)
extern void *___tls_get_addr_internal (tls_index *ti)
__attribute__ ((__regparm__ (1))) attribute_hidden;
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
/* The special thing about the x86 TLS ABI is that we have two
variants of the __tls_get_addr function with different calling
conventions. The GNU version, which we are mostly concerned here,
diff --git a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S
index 7204ce0..4d4954e 100644
--- a/sysdeps/i386/setjmp.S
+++ b/sysdeps/i386/setjmp.S
@@ -46,7 +46,7 @@ ENTRY (__sigsetjmp)
movl %ecx, (JB_PC*4)(%eax)
movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* In ld.so we never save the signal mask. */
xorl %eax, %eax
ret
diff --git a/sysdeps/m68k/setjmp.c b/sysdeps/m68k/setjmp.c
index 4ba50a1..0b1a073 100644
--- a/sysdeps/m68k/setjmp.c
+++ b/sysdeps/m68k/setjmp.c
@@ -57,7 +57,7 @@ __sigsetjmp (jmp_buf env, int savemask)
: : "m" (env[0].__jmpbuf[0].__fpregs[0]));
#endif
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* In ld.so we never save the signal mask. */
return 0;
#else
diff --git a/sysdeps/mach/hurd/dl-execstack.c b/sysdeps/mach/hurd/dl-execstack.c
index 9069efb..373de0e 100644
--- a/sysdeps/mach/hurd/dl-execstack.c
+++ b/sysdeps/mach/hurd/dl-execstack.c
@@ -34,7 +34,7 @@ _dl_make_stack_executable (void **stack_endp)
return EPERM;
*stack_endp = NULL;
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
if (__mprotect ((void *)_dl_hurd_data->stack_base, _dl_hurd_data->stack_size,
PROT_READ|PROT_WRITE|PROT_EXEC) != 0)
return errno;
diff --git a/sysdeps/mach/hurd/opendir.c b/sysdeps/mach/hurd/opendir.c
index 570f085..87de72d 100644
--- a/sysdeps/mach/hurd/opendir.c
+++ b/sysdeps/mach/hurd/opendir.c
@@ -82,7 +82,7 @@ __opendirat (int dfd, const char *name)
int flags = O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC;
int fd;
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
assert (dfd == AT_FDCWD);
fd = open_not_cancel_2 (name, flags);
#else
diff --git a/sysdeps/posix/getcwd.c b/sysdeps/posix/getcwd.c
index 6201916..8e280ff 100644
--- a/sysdeps/posix/getcwd.c
+++ b/sysdeps/posix/getcwd.c
@@ -206,7 +206,7 @@ extern char *alloca ();
#ifdef __ASSUME_ATFCTS
# define __have_atfcts 1
-#elif defined IS_IN_rtld
+#elif IS_IN_MODULE (rtld)
static int __rtld_have_atfcts;
# define __have_atfcts __rtld_have_atfcts
#endif
diff --git a/sysdeps/posix/opendir.c b/sysdeps/posix/opendir.c
index 2740b3a..a4f0bc7 100644
--- a/sysdeps/posix/opendir.c
+++ b/sysdeps/posix/opendir.c
@@ -122,7 +122,7 @@ __opendirat (int dfd, const char *name)
flags |= O_CLOEXEC;
#endif
int fd;
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
assert (dfd == AT_FDCWD);
fd = open_not_cancel_2 (name, flags);
#else
diff --git a/sysdeps/posix/profil.c b/sysdeps/posix/profil.c
index 696c7a6..d965a7e 100644
--- a/sysdeps/posix/profil.c
+++ b/sysdeps/posix/profil.c
@@ -64,7 +64,7 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
{
struct sigaction act;
struct itimerval timer;
-#ifndef IS_IN_rtld
+#if !IS_IN_MODULE (rtld)
static struct sigaction oact;
static struct itimerval otimer;
# define oact_ptr &oact
diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
index 0333831..68a0cc3 100644
--- a/sysdeps/powerpc/dl-procinfo.h
+++ b/sysdeps/powerpc/dl-procinfo.h
@@ -166,7 +166,7 @@ _dl_string_platform (const char *str)
return -1;
}
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
static inline int
__attribute__ ((unused))
_dl_procinfo (unsigned int type, unsigned long int word)
diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
index 088e389..0dd5770 100644
--- a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
@@ -35,7 +35,7 @@ ENTRY (__longjmp_symbol)
addis r5,r5,_GLOBAL_OFFSET_TABLE_-got_label@ha
addi r5,r5,_GLOBAL_OFFSET_TABLE_-got_label@l
# ifdef SHARED
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
/* Inside ld.so we use the local alias to avoid runtime GOT
relocations. */
lwz r5,_rtld_local_ro@got(r5)
diff --git a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
index 926a1b1..03dd007 100644
--- a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
@@ -91,7 +91,7 @@ ENTRY (__sigsetjmp_symbol)
mtlr r6
cfi_same_value (lr)
# ifdef SHARED
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
/* Inside ld.so we use the local alias to avoid runtime GOT
relocations. */
lwz r5,_rtld_local_ro@got(r5)
diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h b/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h
index 72d720d..85311b2 100644
--- a/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h
+++ b/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h
@@ -21,7 +21,7 @@
the dl_hwcap field. The assembly is to make the compiler not optimize the
test (&_rtld_global_ro != NULL), which is always true in ISO C (but not
in that case since _rtld_global_ro might not been realocated yet). */
-#if defined(SHARED) && !defined(IS_IN_rtld)
+#if defined(SHARED) && !IS_IN_MODULE (rtld)
# define __GLRO(value) \
({ volatile void **__p = (volatile void**)(&_rtld_global_ro); \
unsigned long int __ret; \
diff --git a/sysdeps/powerpc/powerpc32/setjmp-common.S b/sysdeps/powerpc/powerpc32/setjmp-common.S
index 681b540..b2659fa 100644
--- a/sysdeps/powerpc/powerpc32/setjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/setjmp-common.S
@@ -69,7 +69,7 @@ ENTRY (__sigsetjmp_symbol)
SAVE_GP (29)
SAVE_GP (30)
SAVE_GP (31)
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
li r3,0
blr
#else
diff --git a/sysdeps/powerpc/powerpc64/__longjmp-common.S b/sysdeps/powerpc/powerpc64/__longjmp-common.S
index 9452a3c..a12cd27 100644
--- a/sysdeps/powerpc/powerpc64/__longjmp-common.S
+++ b/sysdeps/powerpc/powerpc64/__longjmp-common.S
@@ -30,7 +30,7 @@
.section ".toc","aw"
.LC__dl_hwcap:
# ifdef SHARED
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
/* Inside ld.so we use the local alias to avoid runtime GOT
relocations. */
.tc _rtld_local_ro[TC],_rtld_local_ro
@@ -130,7 +130,7 @@ L(no_vmx):
ld r0,(JB_LR*8)(r3)
ld r14,((JB_GPRS+0)*8)(r3)
lfd fp14,((JB_FPRS+0)*8)(r3)
-#if defined SHARED && !defined IS_IN_rtld
+#if defined SHARED && !IS_IN_MODULE (rtld)
std r2,FRAME_TOC_SAVE(r1) /* Restore the callers TOC save area. */
#endif
ld r15,((JB_GPRS+1)*8)(r3)
diff --git a/sysdeps/powerpc/powerpc64/setjmp-common.S b/sysdeps/powerpc/powerpc64/setjmp-common.S
index 704ee97..655850f 100644
--- a/sysdeps/powerpc/powerpc64/setjmp-common.S
+++ b/sysdeps/powerpc/powerpc64/setjmp-common.S
@@ -29,7 +29,7 @@
.section ".toc","aw"
.LC__dl_hwcap:
# ifdef SHARED
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
/* Inside ld.so we use the local alias to avoid runtime GOT
relocations. */
.tc _rtld_local_ro[TC],_rtld_local_ro
@@ -49,7 +49,7 @@ ENTRY (setjmp_symbol)
b JUMPTARGET (GLUE(__sigsetjmp_symbol,_ent))
END (setjmp_symbol)
-#if defined SHARED && !defined IS_IN_rtld && !defined __NO_VMX__
+#if defined SHARED && !IS_IN_MODULE (rtld) && !defined __NO_VMX__
/* When called from within libc we need a special version of _setjmp
that saves r2 since the call won't go via a plt call stub. See
bugz #269. __GI__setjmp is used in csu/libc-start.c when
@@ -80,7 +80,7 @@ JUMPTARGET(GLUE(__sigsetjmp_symbol,_ent)):
std r1,(JB_GPR1*8)(3)
#endif
mflr r0
-#if defined SHARED && !defined IS_IN_rtld
+#if defined SHARED && !IS_IN_MODULE (rtld)
ld r5,FRAME_TOC_SAVE(r1) /* Retrieve the callers TOC. */
std r5,(JB_GPR2*8)(3)
#else
@@ -213,7 +213,7 @@ L(no_vmx):
#else
li r6,0
#endif
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
li r3,0
blr
#elif defined SHARED
diff --git a/sysdeps/s390/dl-tls.h b/sysdeps/s390/dl-tls.h
index 4801bf8..e4ee1b5 100644
--- a/sysdeps/s390/dl-tls.h
+++ b/sysdeps/s390/dl-tls.h
@@ -29,7 +29,7 @@ typedef struct
extern unsigned long __tls_get_offset (unsigned long got_offset);
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
# include <shlib-compat.h>
@@ -78,9 +78,9 @@ __tls_get_offset:\n\
1: .long __tls_get_addr - 0b\n\
");
# endif
-# else /* IS_IN_rtld */
+# else /* IS_IN_MODULE (rtld) */
extern void *__tls_get_addr_internal (tls_index *ti);
-# endif /* !IS_IN_rtld */
+# endif /* !IS_IN_MODULE (rtld) */
# define GET_ADDR_OFFSET \
(ti->ti_offset - (unsigned long) __builtin_thread_pointer ())
diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp.S
index 3ebc813..32ef069 100644
--- a/sysdeps/s390/s390-32/setjmp.S
+++ b/sysdeps/s390/s390-32/setjmp.S
@@ -23,12 +23,12 @@
#include <bits/setjmp.h>
#include <shlib-compat.h>
-#if !defined IS_IN_rtld
+#if !IS_IN_MODULE (rtld)
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
/* we need a unique name in case of symbol versioning. */
# define __sigsetjmp __v1__sigsetjmp
# endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */
-#endif /* !defined IS_IN_rtld */
+#endif /* !IS_IN_MODULE (rtld) */
/* We include the BSD entry points here as well but we make
them weak. */
@@ -65,7 +65,7 @@ ENTRY(__sigsetjmp)
#endif
std %f4,40(%r2)
std %f6,48(%r2)
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* In ld.so we never save the signal mask. */
lhi %r2,0
br %r14
@@ -87,7 +87,7 @@ ENTRY(__sigsetjmp)
#endif
END (__sigsetjmp)
-#if !defined IS_IN_rtld
+#if !IS_IN_MODULE (rtld)
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
/* In glibc release 2.19 new versions of setjmp-functions were introduced,
but were reverted before 2.20. Thus both versions are the same function. */
@@ -108,4 +108,4 @@ strong_alias (__v1__sigsetjmp, __v2__sigsetjmp);
versioned_symbol (libc, __v1__sigsetjmp, __sigsetjmp, GLIBC_2_0);
compat_symbol (libc, __v2__sigsetjmp, __sigsetjmp, GLIBC_2_19);
# endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */
-#endif /* if !defined IS_IN_rtld */
+#endif /* if !IS_IN_MODULE (rtld) */
diff --git a/sysdeps/s390/s390-64/setjmp.S b/sysdeps/s390/s390-64/setjmp.S
index faa2784..55048ae 100644
--- a/sysdeps/s390/s390-64/setjmp.S
+++ b/sysdeps/s390/s390-64/setjmp.S
@@ -23,12 +23,12 @@
#include <bits/setjmp.h>
#include <shlib-compat.h>
-#if !defined IS_IN_rtld
+#if !IS_IN_MODULE (rtld)
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
/* we need a unique name in case of symbol versioning. */
# define __sigsetjmp __v1__sigsetjmp
# endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */
-#endif /* !defined IS_IN_rtld */
+#endif /* !IS_IN_MODULE (rtld) */
/* We include the BSD entry points here as well but we make
them weak. */
@@ -71,7 +71,7 @@ ENTRY(__sigsetjmp)
std %f13,120(%r2)
std %f14,128(%r2)
std %f15,136(%r2)
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* In ld.so we never save the signal mask. */
lghi %r2,0
br %r14
@@ -82,7 +82,7 @@ ENTRY(__sigsetjmp)
#endif
END (__sigsetjmp)
-#if !defined IS_IN_rtld
+#if !IS_IN_MODULE (rtld)
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
/* In glibc release 2.19 new versions of setjmp-functions were introduced,
but were reverted before 2.20. Thus both versions are the same function. */
@@ -103,4 +103,4 @@ strong_alias (__v1__sigsetjmp, __v2__sigsetjmp);
versioned_symbol (libc, __v1__sigsetjmp, __sigsetjmp, GLIBC_2_0);
compat_symbol (libc, __v2__sigsetjmp, __sigsetjmp, GLIBC_2_19);
# endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */
-#endif /* if !defined IS_IN_rtld */
+#endif /* if !IS_IN_MODULE (rtld) */
diff --git a/sysdeps/sh/sh3/setjmp.S b/sysdeps/sh/sh3/setjmp.S
index f3a8e6a..0c7f85a 100644
--- a/sysdeps/sh/sh3/setjmp.S
+++ b/sysdeps/sh/sh3/setjmp.S
@@ -46,7 +46,7 @@ ENTRY (__sigsetjmp)
mov.l r9, @-r4
mov.l r8, @-r4
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* In ld.so we never save the signal mask. */
rts
mov #0, r0
diff --git a/sysdeps/sh/sh4/setjmp.S b/sysdeps/sh/sh4/setjmp.S
index 4bbd666..ba225ac 100644
--- a/sysdeps/sh/sh4/setjmp.S
+++ b/sysdeps/sh/sh4/setjmp.S
@@ -55,7 +55,7 @@ ENTRY (__sigsetjmp)
mov.l r9, @-r4
mov.l r8, @-r4
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* In ld.so we never save the signal mask. */
rts
mov #0, r0
diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h
index df60d09..d8f091c 100644
--- a/sysdeps/unix/alpha/sysdep.h
+++ b/sysdeps/unix/alpha/sysdep.h
@@ -26,7 +26,7 @@
# include <regdef.h>
#endif
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
#endif
@@ -349,7 +349,7 @@ __LABEL(name) \
we don't deoptimize things by placing the pointer check value there. */
#ifdef __ASSEMBLER__
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
# define PTR_MANGLE(dst, src, tmp) \
ldah tmp, __pointer_chk_guard_local($29) !gprelhigh; \
ldq tmp, __pointer_chk_guard_local(tmp) !gprellow; \
@@ -371,7 +371,7 @@ __LABEL(name) \
# define PTR_DEMANGLE2(dst, tmp) PTR_MANGLE2(dst, dst, tmp)
#else
# include <stdint.h>
-# if (defined IS_IN_rtld \
+# if (IS_IN_MODULE (rtld) \
|| (!defined SHARED && (!defined NOT_IN_libc \
|| IS_IN_MODULE (libpthread))))
extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
diff --git a/sysdeps/unix/arm/sysdep.S b/sysdeps/unix/arm/sysdep.S
index 1a0f093..f60c09d 100644
--- a/sysdeps/unix/arm/sysdep.S
+++ b/sysdeps/unix/arm/sysdep.S
@@ -19,7 +19,7 @@
#define _ERRNO_H
#include <bits/errno.h>
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
#endif
@@ -36,7 +36,7 @@ __syscall_error:
moveq r0, $EAGAIN /* Yes; translate it to EAGAIN. */
#endif
-#ifndef IS_IN_rtld
+#if !IS_IN_MODULE (rtld)
mov r1, r0
GET_TLS (r2)
ldr r2, 1f
diff --git a/sysdeps/unix/i386/sysdep.S b/sysdeps/unix/i386/sysdep.S
index bfe0d00..ab33e25 100644
--- a/sysdeps/unix/i386/sysdep.S
+++ b/sysdeps/unix/i386/sysdep.S
@@ -19,7 +19,7 @@
#define _ERRNO_H
#include <bits/errno.h>
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
#endif
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
index 3c2c682..2ccd1b6 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
@@ -309,7 +309,7 @@
#endif /* __ASSEMBLER__ */
/* Pointer mangling is supported for AArch64. */
-#if (defined IS_IN_rtld || \
+#if (IS_IN_MODULE (rtld) || \
(!defined SHARED && (!defined NOT_IN_libc \
|| IS_IN_MODULE (libpthread))))
# ifdef __ASSEMBLER__
diff --git a/sysdeps/unix/sysv/linux/getcwd.c b/sysdeps/unix/sysv/linux/getcwd.c
index a9abcef..354c713 100644
--- a/sysdeps/unix/sysv/linux/getcwd.c
+++ b/sysdeps/unix/sysv/linux/getcwd.c
@@ -30,7 +30,7 @@
/* If we compile the file for use in ld.so we don't need the feature
that getcwd() allocates the buffers itself. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
# define NO_ALLOCATION 1
#endif
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h b/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
index fb61d0c..1383e8e 100644
--- a/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
@@ -58,7 +58,7 @@
/* Initialize locks to zero. */
#define LLL_MUTEX_LOCK_INITIALIZER (0)
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/sysdeps/unix/sysv/linux/i386/lowlevellock.h
index 9d9ae58..98e368c 100644
--- a/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/i386/lowlevellock.h
@@ -71,7 +71,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 01fe854..a2e70a6 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -519,7 +519,7 @@ asm (".L__X'%ebx = 1\n\t"
/* Pointer mangling support. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. Using a global variable
is too complicated here since we have no PC-relative addressing mode. */
diff --git a/sysdeps/unix/sysv/linux/ia64/lowlevellock.h b/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
index e84f530..5374793 100644
--- a/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/ia64/lowlevellock.h
@@ -52,7 +52,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/ia64/setjmp.S b/sysdeps/unix/sysv/linux/ia64/setjmp.S
index f919a49..b60d4d8 100644
--- a/sysdeps/unix/sysv/linux/ia64/setjmp.S
+++ b/sysdeps/unix/sysv/linux/ia64/setjmp.S
@@ -178,7 +178,7 @@ ENTRY(__sigsetjmp)
;;
st8.nta [r2]=r25 // ar.unat
st8.nta [r3]=in0 // &__jmp_buf
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* In ld.so we never save the signal mask. */
;;
#else
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index 1b9984a..5d87c5f 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -364,7 +364,7 @@
#endif /* not __ASSEMBLER__ */
/* Pointer mangling support. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/lowlevellock-futex.h b/sysdeps/unix/sysv/linux/lowlevellock-futex.h
index 343afd6..cb599f3 100644
--- a/sysdeps/unix/sysv/linux/lowlevellock-futex.h
+++ b/sysdeps/unix/sysv/linux/lowlevellock-futex.h
@@ -49,7 +49,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h b/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
index f967524..2f94222 100644
--- a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
+++ b/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
@@ -23,7 +23,7 @@
#ifdef SHARED
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
# define M68K_VDSO_SYMBOL(name) __rtld_##name
# define STR_M68K_VDSO_SYMBOL(name) "__rtld_" #name
# else
@@ -35,7 +35,7 @@
/* We define __rtld_* copies for rtld.
We need them visible in libc to initialize. */
-# if defined IS_IN_rtld || !defined NOT_IN_libc
+# if IS_IN_MODULE (rtld) || !defined NOT_IN_libc
extern void *__rtld___vdso_read_tp;
extern void *__rtld___vdso_atomic_cmpxchg_32;
extern void *__rtld___vdso_atomic_barrier;
@@ -44,14 +44,14 @@ extern void *__rtld___vdso_atomic_barrier;
extern void __vdso_read_tp_stub (void);
extern void __vdso_atomic_cmpxchg_32_stub (void);
extern void __vdso_atomic_barrier_stub (void);
-# endif /* IS_IN_rtld || !NOT_IN_libc */
+# endif /* IS_IN_MODULE (rtld) || !NOT_IN_libc */
/* RTLD should only use its own copies. */
-# ifndef IS_IN_rtld
+# if !IS_IN_MODULE (rtld)
extern void *__vdso_read_tp;
extern void *__vdso_atomic_cmpxchg_32;
extern void *__vdso_atomic_barrier;
-# endif /* !IS_IN_rtld */
+# endif /* !IS_IN_MODULE (rtld) */
# endif /* !__ASSEMBLER__ */
diff --git a/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S b/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
index 032b1f2..a28e544 100644
--- a/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
+++ b/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
@@ -51,7 +51,7 @@ END (__vdso_read_tp_stub)
equivalent helper function (which clobbers fewer registers than
a normal function call) in a vdso; tail call to the
helper. */
-# ifdef IS_IN_rtld
+# if IS_IN_MODULE (rtld)
/* rtld gets a hidden copy of __m68k_read_tp. */
.hidden __m68k_read_tp
# endif
diff --git a/sysdeps/unix/sysv/linux/microblaze/lowlevellock.h b/sysdeps/unix/sysv/linux/microblaze/lowlevellock.h
index 0ba63a1..3907602 100644
--- a/sysdeps/unix/sysv/linux/microblaze/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/microblaze/lowlevellock.h
@@ -52,7 +52,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h b/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
index a651d23..1f97641 100644
--- a/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
@@ -52,7 +52,7 @@
#define LLL_PRIVATE 0
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
index 1a5e37a..f5482cf 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
@@ -272,7 +272,7 @@
/* Pointer mangling support. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
index 93e454e..4e643ab 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
@@ -282,7 +282,7 @@
/* Pointer mangling support. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/s390/lowlevellock.h b/sysdeps/unix/sysv/linux/s390/lowlevellock.h
index eaf2d58..4944e08 100644
--- a/sysdeps/unix/sysv/linux/s390/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/s390/lowlevellock.h
@@ -51,7 +51,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
index 00919e3..c505f67 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
@@ -366,7 +366,7 @@
_ret; })
/* Pointer mangling support. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
index d3bafca..cf49000 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
@@ -372,7 +372,7 @@
_ret; })
/* Pointer mangling support. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/sysdeps/unix/sysv/linux/sh/lowlevellock.h
index 10a2c25..19bf59c 100644
--- a/sysdeps/unix/sysv/linux/sh/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/sh/lowlevellock.h
@@ -49,7 +49,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.h b/sysdeps/unix/sysv/linux/sh/sysdep.h
index 3f68938..fc0e4e3 100644
--- a/sysdeps/unix/sysv/linux/sh/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sh/sysdep.h
@@ -338,7 +338,7 @@
#endif /* __ASSEMBLER__ */
/* Pointer mangling support. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. Using a global variable
is too complicated here since we have no PC-relative addressing mode. */
diff --git a/sysdeps/unix/sysv/linux/sparc/lowlevellock.h b/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
index d764075..59c771f 100644
--- a/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
@@ -57,7 +57,7 @@ extern void __cpu_relax (void);
#define BUSY_WAIT_NOP __cpu_relax ()
#endif
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
index 09ef2c9..cd6cec5 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
@@ -21,7 +21,7 @@
#include <sysdeps/unix/sysv/linux/sparc/sysdep.h>
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
#endif
#include <tls.h>
@@ -125,7 +125,7 @@ ENTRY(name); \
#endif /* __ASSEMBLER__ */
/* Pointer mangling support. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
index a0f2305..e33fdbc 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
@@ -21,7 +21,7 @@
#include <sysdeps/unix/sysv/linux/sparc/sysdep.h>
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
#endif
#include <tls.h>
@@ -140,7 +140,7 @@ ENTRY(name); \
#define STACK_BIAS 2047
/* Pointer mangling support. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/tile/lowlevellock.h b/sysdeps/unix/sysv/linux/tile/lowlevellock.h
index e3e52a4..78faf3d 100644
--- a/sysdeps/unix/sysv/linux/tile/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/tile/lowlevellock.h
@@ -52,7 +52,7 @@
#define LLL_SHARED FUTEX_PRIVATE_FLAG
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h
index 1ede20b..385e3a5 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep.h
@@ -205,7 +205,7 @@
#endif /* not __ASSEMBLER__ */
/* Pointer mangling support. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
index 55b4e16..5df4239 100644
--- a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+++ b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
@@ -72,7 +72,7 @@
#ifndef __ASSEMBLER__
-#if !defined NOT_IN_libc || defined IS_IN_rtld
+#if !defined NOT_IN_libc || IS_IN_MODULE (rtld)
/* In libc.so or ld.so all futexes are private. */
# ifdef __ASSUME_PRIVATE_FUTEX
# define __lll_private_flag(fl, private) \
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
index 4a619da..dafb2f3 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
@@ -22,7 +22,7 @@
#include <sysdeps/unix/x86_64/sysdep.h>
#include <tls.h>
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
#endif
@@ -393,7 +393,7 @@
/* Pointer mangling support. */
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
# ifdef __ASSEMBLER__
diff --git a/sysdeps/unix/x86_64/sysdep.S b/sysdeps/unix/x86_64/sysdep.S
index 9f5eb38..6432f23 100644
--- a/sysdeps/unix/x86_64/sysdep.S
+++ b/sysdeps/unix/x86_64/sysdep.S
@@ -20,7 +20,7 @@
#include <bits/errno.h>
#include <tls.h>
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
#endif
diff --git a/sysdeps/x86_64/setjmp.S b/sysdeps/x86_64/setjmp.S
index 4459212..f16f1d5 100644
--- a/sysdeps/x86_64/setjmp.S
+++ b/sysdeps/x86_64/setjmp.S
@@ -54,7 +54,7 @@ ENTRY (__sigsetjmp)
#endif
movq %rax, (JB_PC*8)(%rdi)
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
/* In ld.so we never save the signal mask. */
xorl %eax, %eax
retq
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=dc71d37d8140ce0ce05f0a4c9f0f2332ed3b3070
commit dc71d37d8140ce0ce05f0a4c9f0f2332ed3b3070
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Aug 12 07:13:25 2014 +0530
Remove IS_IN_libm
Replace with IS_IN_MODULE (libm). Generated code unchanged on x86_64.
diff --git a/include/math.h b/include/math.h
index cbbce59..4924784 100644
--- a/include/math.h
+++ b/include/math.h
@@ -6,7 +6,7 @@
/* Now define the internal interfaces. */
extern int __matherr (struct exception *__exc);
-# if !defined NOT_IN_libc || defined IS_IN_libm
+# if !defined NOT_IN_libc || IS_IN_MODULE (libm)
hidden_proto (__finite)
hidden_proto (__isinf)
hidden_proto (__isnan)
diff --git a/sysdeps/alpha/fpu/s_copysign.c b/sysdeps/alpha/fpu/s_copysign.c
index 13f5f1b..d153c32 100644
--- a/sysdeps/alpha/fpu/s_copysign.c
+++ b/sysdeps/alpha/fpu/s_copysign.c
@@ -30,7 +30,7 @@ weak_alias (__copysign, copysign)
strong_alias (__copysign, __copysignl)
weak_alias (__copysign, copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __copysign, copysignl, GLIBC_2_0);
# endif
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c b/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c
index a16a886..5b8fae2 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c
@@ -34,7 +34,7 @@ long double __copysignl(long double x, long double y)
return x;
}
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __copysignl, copysignl);
#else
long_double_symbol (libc, __copysignl, copysignl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_finitel.c b/sysdeps/ieee754/ldbl-128ibm/s_finitel.c
index 7b4655f..ad32b72 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_finitel.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_finitel.c
@@ -40,7 +40,7 @@ ___finitel (long double x)
}
hidden_ver (___finitel, __finitel)
weak_alias (___finitel, ____finitel)
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, ____finitel, finitel);
long_double_symbol (libm, ___finitel, __finitel);
#else
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_fmal.c b/sysdeps/ieee754/ldbl-128ibm/s_fmal.c
index 46dedf8..09a66fa 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_fmal.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_fmal.c
@@ -37,7 +37,7 @@ __fmal (long double x, long double y, long double z)
return (x * y) + z;
}
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __fmal, fmal);
#else
long_double_symbol (libc, __fmal, fmal);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c b/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c
index a644f92..a74c51c 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_frexpl.c
@@ -141,7 +141,7 @@ long double __frexpl(long double x, int *eptr)
*eptr = expon;
return x;
}
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __frexpl, frexpl);
#else
long_double_symbol (libc, __frexpl, frexpl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c b/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c
index 6a72822..87bb9ed 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c
@@ -33,7 +33,7 @@ ___isinfl (long double x)
return ~mask & (hx >> 62);
}
hidden_ver (___isinfl, __isinfl)
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
weak_alias (___isinfl, ____isinfl)
long_double_symbol (libc, ___isinfl, isinfl);
long_double_symbol (libc, ____isinfl, __isinfl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c b/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c
index d12f1d3..1f550a5 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c
@@ -39,7 +39,7 @@ ___isnanl (long double x)
return (int) (hx >> 63);
}
hidden_ver (___isnanl, __isnanl)
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
weak_alias (___isnanl, ____isnanl)
long_double_symbol (libc, ___isnanl, isnanl);
long_double_symbol (libc, ____isnanl, __isnanl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_modfl.c b/sysdeps/ieee754/ldbl-128ibm/s_modfl.c
index ed03ce2..f6637cc 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_modfl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_modfl.c
@@ -89,7 +89,7 @@ long double __modfl(long double x, long double *iptr)
}
}
}
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __modfl, modfl);
#else
long_double_symbol (libc, __modfl, modfl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c b/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c
index 161172d..218019c 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c
@@ -102,7 +102,7 @@ long double __scalbnl (long double x, int n)
x = ldbl_pack (xhi, xlo);
return x*twolm54;
}
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __scalbnl, scalbnl);
#else
long_double_symbol (libc, __scalbnl, scalbnl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c b/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c
index 6d25711..176263d 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_signbitl.c
@@ -31,7 +31,7 @@ ___signbitl (long double x)
EXTRACT_WORDS64 (e, xhi);
return e < 0;
}
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, ___signbitl, __signbitl);
#else
long_double_symbol (libc, ___signbitl, __signbitl);
diff --git a/sysdeps/ieee754/ldbl-64-128/s_copysignl.c b/sysdeps/ieee754/ldbl-64-128/s_copysignl.c
index 1319584..0e9d201 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_copysignl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_copysignl.c
@@ -2,7 +2,7 @@
#undef weak_alias
#define weak_alias(n,a)
#include <sysdeps/ieee754/ldbl-128/s_copysignl.c>
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __copysignl, copysignl);
#else
long_double_symbol (libc, __copysignl, copysignl);
diff --git a/sysdeps/ieee754/ldbl-64-128/s_finitel.c b/sysdeps/ieee754/ldbl-64-128/s_finitel.c
index 90717a1..88c9392 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_finitel.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_finitel.c
@@ -8,7 +8,7 @@
#undef __finitel
hidden_ver (___finitel, __finitel)
_weak_alias (___finitel, ____finitel)
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, ____finitel, finitel);
long_double_symbol (libm, ___finitel, __finitel);
#else
diff --git a/sysdeps/ieee754/ldbl-64-128/s_frexpl.c b/sysdeps/ieee754/ldbl-64-128/s_frexpl.c
index 685bbba..f5080f9 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_frexpl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_frexpl.c
@@ -2,7 +2,7 @@
#undef weak_alias
#define weak_alias(n,a)
#include <sysdeps/ieee754/ldbl-128/s_frexpl.c>
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __frexpl, frexpl);
#else
long_double_symbol (libc, __frexpl, frexpl);
diff --git a/sysdeps/ieee754/ldbl-64-128/s_isinfl.c b/sysdeps/ieee754/ldbl-64-128/s_isinfl.c
index e046032..68f6a5a 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_isinfl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_isinfl.c
@@ -1,5 +1,5 @@
#include <math_ldbl_opt.h>
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# undef weak_alias
# define weak_alias(n,a)
# undef hidden_def
@@ -7,7 +7,7 @@
# define __isinfl(arg) ___isinfl(arg)
#endif
#include <sysdeps/ieee754/ldbl-128/s_isinfl.c>
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# undef __isinfl
hidden_ver (___isinfl, __isinfl)
_weak_alias (___isinfl, ____isinfl)
diff --git a/sysdeps/ieee754/ldbl-64-128/s_isnanl.c b/sysdeps/ieee754/ldbl-64-128/s_isnanl.c
index 3673463..c528e29 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_isnanl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_isnanl.c
@@ -1,5 +1,5 @@
#include <math_ldbl_opt.h>
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# undef weak_alias
# define weak_alias(n,a)
# undef hidden_def
@@ -7,7 +7,7 @@
# define __isnanl(arg) ___isnanl(arg)
#endif
#include <sysdeps/ieee754/ldbl-128/s_isnanl.c>
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# undef __isnanl
hidden_ver (___isnanl, __isnanl)
_weak_alias (___isnanl, ____isnanl)
diff --git a/sysdeps/ieee754/ldbl-64-128/s_modfl.c b/sysdeps/ieee754/ldbl-64-128/s_modfl.c
index c17d669..14c6643 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_modfl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_modfl.c
@@ -2,7 +2,7 @@
#undef weak_alias
#define weak_alias(n,a)
#include <sysdeps/ieee754/ldbl-128/s_modfl.c>
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __modfl, modfl);
#else
long_double_symbol (libc, __modfl, modfl);
diff --git a/sysdeps/ieee754/ldbl-64-128/s_scalbnl.c b/sysdeps/ieee754/ldbl-64-128/s_scalbnl.c
index 78520e9..0f245d3 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_scalbnl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_scalbnl.c
@@ -2,7 +2,7 @@
#undef weak_alias
#define weak_alias(n,a)
#include <sysdeps/ieee754/ldbl-128/s_scalbnl.c>
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __scalbnl, scalbnl);
#else
long_double_symbol (libc, __scalbnl, scalbnl);
diff --git a/sysdeps/ieee754/ldbl-64-128/s_signbitl.c b/sysdeps/ieee754/ldbl-64-128/s_signbitl.c
index f66db2f..c45f6f2 100644
--- a/sysdeps/ieee754/ldbl-64-128/s_signbitl.c
+++ b/sysdeps/ieee754/ldbl-64-128/s_signbitl.c
@@ -4,7 +4,7 @@
#define __signbitl(arg) ___signbitl(arg)
#include <sysdeps/ieee754/ldbl-128/s_signbitl.c>
#undef __signbitl
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, ___signbitl, __signbitl);
#else
long_double_symbol (libc, ___signbitl, __signbitl);
diff --git a/sysdeps/ieee754/ldbl-64-128/w_scalblnl.c b/sysdeps/ieee754/ldbl-64-128/w_scalblnl.c
index fc6c4cf..51d92fd 100644
--- a/sysdeps/ieee754/ldbl-64-128/w_scalblnl.c
+++ b/sysdeps/ieee754/ldbl-64-128/w_scalblnl.c
@@ -20,7 +20,7 @@
#undef weak_alias
#define weak_alias(name, alias)
#include <math/w_scalblnl.c>
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __w_scalblnl, scalblnl);
#else
long_double_symbol (libc, __w_scalblnl, scalblnl);
diff --git a/sysdeps/ieee754/ldbl-opt/s_copysign.c b/sysdeps/ieee754/ldbl-opt/s_copysign.c
index 425e0ea..8410b6c 100644
--- a/sysdeps/ieee754/ldbl-opt/s_copysign.c
+++ b/sysdeps/ieee754/ldbl-opt/s_copysign.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_copysign.c>
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __copysign, copysignl, GLIBC_2_0);
# endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_finite.c b/sysdeps/ieee754/ldbl-opt/s_finite.c
index 897dbfd..fc5ece9 100644
--- a/sysdeps/ieee754/ldbl-opt/s_finite.c
+++ b/sysdeps/ieee754/ldbl-opt/s_finite.c
@@ -1,7 +1,7 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_finite.c>
weak_alias (__finite, ___finite)
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
compat_symbol (libm, __finite, __finitel, GLIBC_2_1);
# endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_frexp.c b/sysdeps/ieee754/ldbl-opt/s_frexp.c
index 59ce352..bbf3046 100644
--- a/sysdeps/ieee754/ldbl-opt/s_frexp.c
+++ b/sysdeps/ieee754/ldbl-opt/s_frexp.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_frexp.c>
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __frexp, frexpl, GLIBC_2_0);
# endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_isinf.c b/sysdeps/ieee754/ldbl-opt/s_isinf.c
index 401c8b1..4a92cd6 100644
--- a/sysdeps/ieee754/ldbl-opt/s_isinf.c
+++ b/sysdeps/ieee754/ldbl-opt/s_isinf.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_isinf.c>
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
diff --git a/sysdeps/ieee754/ldbl-opt/s_isnan.c b/sysdeps/ieee754/ldbl-opt/s_isnan.c
index 164b800..9a39cd8 100644
--- a/sysdeps/ieee754/ldbl-opt/s_isnan.c
+++ b/sysdeps/ieee754/ldbl-opt/s_isnan.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_isnan.c>
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/ieee754/ldbl-opt/s_ldexp.c b/sysdeps/ieee754/ldbl-opt/s_ldexp.c
index f0f6519..8861c77 100644
--- a/sysdeps/ieee754/ldbl-opt/s_ldexp.c
+++ b/sysdeps/ieee754/ldbl-opt/s_ldexp.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <math/s_ldexp.c>
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __ldexp, ldexpl, GLIBC_2_0);
# endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_ldexpl.c b/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
index d4636b9..b748f45 100644
--- a/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
+++ b/sysdeps/ieee754/ldbl-opt/s_ldexpl.c
@@ -2,7 +2,7 @@
#undef weak_alias
#define weak_alias(n,a)
#include <math/s_ldexpl.c>
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __ldexpl, ldexpl);
#else
long_double_symbol (libc, __ldexpl, ldexpl);
diff --git a/sysdeps/ieee754/ldbl-opt/s_modf.c b/sysdeps/ieee754/ldbl-opt/s_modf.c
index 2263811..19e1dc8 100644
--- a/sysdeps/ieee754/ldbl-opt/s_modf.c
+++ b/sysdeps/ieee754/ldbl-opt/s_modf.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_modf.c>
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __modf, modfl, GLIBC_2_0);
# endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_scalbln.c b/sysdeps/ieee754/ldbl-opt/s_scalbln.c
index 2398bba..c16c480 100644
--- a/sysdeps/ieee754/ldbl-opt/s_scalbln.c
+++ b/sysdeps/ieee754/ldbl-opt/s_scalbln.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_scalbln.c>
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
compat_symbol (libm, __scalbln, scalblnl, GLIBC_2_1);
#endif
diff --git a/sysdeps/ieee754/ldbl-opt/s_scalbn.c b/sysdeps/ieee754/ldbl-opt/s_scalbn.c
index 094735e..225b12f 100644
--- a/sysdeps/ieee754/ldbl-opt/s_scalbn.c
+++ b/sysdeps/ieee754/ldbl-opt/s_scalbn.c
@@ -1,6 +1,6 @@
#include <math_ldbl_opt.h>
#include <sysdeps/ieee754/dbl-64/s_scalbn.c>
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __scalbn, scalbnl, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/power5+/fpu/s_modf.c b/sysdeps/powerpc/power5+/fpu/s_modf.c
index 06da3ac..53e4954 100644
--- a/sysdeps/powerpc/power5+/fpu/s_modf.c
+++ b/sysdeps/powerpc/power5+/fpu/s_modf.c
@@ -49,7 +49,7 @@ weak_alias (__modf, modf)
strong_alias (__modf, __modfl)
weak_alias (__modf, modfl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __modf, modfl, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_copysign.S b/sysdeps/powerpc/powerpc32/fpu/s_copysign.S
index 0d172d7..9fd2101 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_copysign.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_copysign.S
@@ -50,7 +50,7 @@ strong_alias(__copysign,__copysignf)
weak_alias (__copysign,copysignl)
strong_alias(__copysign,__copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __copysign, copysignl, GLIBC_2_0)
# endif
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S b/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S
index ecfeafc..df5c220 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_copysignl.S
@@ -42,7 +42,7 @@ L(0): bgelr cr6
blr
END (__copysignl)
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __copysignl, copysignl)
#else
long_double_symbol (libc, __copysignl, copysignl)
diff --git a/sysdeps/powerpc/powerpc32/fpu/s_isnan.S b/sysdeps/powerpc/powerpc32/fpu/s_isnan.S
index d82a3c6..bdea057 100644
--- a/sysdeps/powerpc/powerpc32/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc32/fpu/s_isnan.S
@@ -48,7 +48,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysign.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysign.c
index 52df99d..5724b5f 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysign.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysign.c
@@ -42,7 +42,7 @@ weak_alias (__copysign, copysign)
weak_alias (__copysign,copysignl)
strong_alias(__copysign,__copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __copysign, copysignl, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_finite.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_finite.c
index c56e7ca..a0f8145 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_finite.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_finite.c
@@ -36,7 +36,7 @@ strong_alias (__finite, __finitel)
weak_alias (__finite, finitel)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, finite, finitel, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c
index 2f72c34..99c57bc 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c
@@ -36,7 +36,7 @@ strong_alias (__isinf, __isinfl)
weak_alias (__isinf, isinfl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0)
compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c
index 8f3666b..7416b52 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c
@@ -42,7 +42,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf.c
index 596b32c..8eaeefe 100644
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf.c
@@ -35,7 +35,7 @@ weak_alias (__modf, modf)
strong_alias (__modf, __modfl)
weak_alias (__modf, modfl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __modf, modfl, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S b/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S
index 99879a8..3af451c 100644
--- a/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S
@@ -52,7 +52,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc32/power6/fpu/s_copysign.S b/sysdeps/powerpc/powerpc32/power6/fpu/s_copysign.S
index d767dcb..6f1430e 100644
--- a/sysdeps/powerpc/powerpc32/power6/fpu/s_copysign.S
+++ b/sysdeps/powerpc/powerpc32/power6/fpu/s_copysign.S
@@ -47,7 +47,7 @@ strong_alias (__copysign, __copysignl)
weak_alias (__copysign, copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, copysign, copysignl, GLIBC_2_0)
# endif
diff --git a/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S b/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S
index 563e70a..2d1d37b 100644
--- a/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S
@@ -52,7 +52,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S b/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S
index 20e266b..6a0c1e1 100644
--- a/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S
+++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_finite.S
@@ -78,7 +78,7 @@ strong_alias (__finite, __finitel)
weak_alias (__finite, finitel)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, finite, finitel, GLIBC_2_0)
# endif
diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S b/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S
index 47d608a..3805a86 100644
--- a/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S
+++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S
@@ -77,7 +77,7 @@ strong_alias (__isinf, __isinfl)
weak_alias (__isinf, isinfl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S b/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S
index 9cb8284..598e7a5 100644
--- a/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S
@@ -82,7 +82,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c
index f3e6b3a..7ae3fe2 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c
@@ -42,7 +42,7 @@ weak_alias (__copysign, copysign)
weak_alias (__copysign,copysignl)
strong_alias(__copysign,__copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __copysign, copysignl, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c
index b9e908d..623526b 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c
@@ -39,7 +39,7 @@ strong_alias (__finite, __finitel)
weak_alias (__finite, finitel)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, finite, finitel, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c
index e349a06..b8b7db6 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c
@@ -39,7 +39,7 @@ strong_alias (__isinf, __isinfl)
weak_alias (__isinf, isinfl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0)
compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c
index 65a5ca0..fc83e5c 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c
@@ -48,7 +48,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c
index f416fa9..a5bf9b8 100644
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c
@@ -35,7 +35,7 @@ weak_alias (__modf, modf)
strong_alias (__modf, __modfl)
weak_alias (__modf, modfl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __modf, modfl, GLIBC_2_0);
# endif
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_copysign.S b/sysdeps/powerpc/powerpc64/fpu/s_copysign.S
index 49c793d..17c4cce 100644
--- a/sysdeps/powerpc/powerpc64/fpu/s_copysign.S
+++ b/sysdeps/powerpc/powerpc64/fpu/s_copysign.S
@@ -50,7 +50,7 @@ strong_alias(__copysign,__copysignf)
weak_alias (__copysign,copysignl)
strong_alias(__copysign,__copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
compat_symbol (libm, __copysign, copysignl, GLIBC_2_0)
# endif
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_copysignl.S b/sysdeps/powerpc/powerpc64/fpu/s_copysignl.S
index 39e180a..bc451eb 100644
--- a/sysdeps/powerpc/powerpc64/fpu/s_copysignl.S
+++ b/sysdeps/powerpc/powerpc64/fpu/s_copysignl.S
@@ -43,7 +43,7 @@ L(0):
blr
END (__copysignl)
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, __copysignl, copysignl)
#else
long_double_symbol (libc, __copysignl, copysignl)
diff --git a/sysdeps/powerpc/powerpc64/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/fpu/s_isnan.S
index 629dae6..1af5ed4 100644
--- a/sysdeps/powerpc/powerpc64/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc64/fpu/s_isnan.S
@@ -47,7 +47,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S
index 4ce6cf9..7a17349 100644
--- a/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S
@@ -51,7 +51,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S b/sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S
index e1ea089..5c9cedb 100644
--- a/sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S
+++ b/sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S
@@ -47,7 +47,7 @@ strong_alias (__copysign, __copysignl)
weak_alias (__copysign, copysignl)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, copysign, copysignl, GLIBC_2_0)
# endif
diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S
index 8a149b2..1601909 100644
--- a/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S
@@ -50,7 +50,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S
index 3172fe3..cd695dc 100644
--- a/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S
@@ -49,7 +49,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S b/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S
index 765d689..94697c3 100644
--- a/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S
+++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S
@@ -57,7 +57,7 @@ strong_alias (__finite, __finitef)
hidden_def (__finitef)
weak_alias (__finitef, finitef)
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, __finite, __finitel, GLIBC_2_0)
compat_symbol (libm, finite, finitel, GLIBC_2_0)
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S b/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S
index e102d4b..9d8a7dd 100644
--- a/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S
+++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S
@@ -61,7 +61,7 @@ strong_alias (__isinf, __isinfl)
weak_alias (__isinf, isinfl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S
index eabee71..da604c6 100644
--- a/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S
@@ -60,7 +60,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S b/sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S
index 2b27e7b..e759503 100644
--- a/sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S
+++ b/sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S
@@ -48,7 +48,7 @@ strong_alias (__finite, __finitef)
hidden_def (__finitef)
weak_alias (__finitef, finitef)
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)
compat_symbol (libm, __finite, __finitel, GLIBC_2_0)
compat_symbol (libm, finite, finitel, GLIBC_2_0)
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S b/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S
index d09b7fc..11f788e 100644
--- a/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S
+++ b/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S
@@ -58,7 +58,7 @@ strong_alias (__isinf, __isinfl)
weak_alias (__isinf, isinfl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0);
compat_symbol (libc, isinf, isinfl, GLIBC_2_0);
diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S
index cf119e5..73badc9 100644
--- a/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S
+++ b/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S
@@ -53,7 +53,7 @@ strong_alias (__isnan, __isnanl)
weak_alias (__isnan, isnanl)
#endif
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/sparc/sparc32/fpu/s_signbitl.S b/sysdeps/sparc/sparc32/fpu/s_signbitl.S
index 64813f1..46b236b 100644
--- a/sysdeps/sparc/sparc32/fpu/s_signbitl.S
+++ b/sysdeps/sparc/sparc32/fpu/s_signbitl.S
@@ -25,7 +25,7 @@ ENTRY (___signbitl)
srl %o1, 31, %o0
END (___signbitl)
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
long_double_symbol (libm, ___signbitl, __signbitl);
#else
long_double_symbol (libc, ___signbitl, __signbitl);
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S b/sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S
index f2e40b1..8b0102f 100644
--- a/sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S
+++ b/sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S
@@ -32,7 +32,7 @@ END (__isnan)
hidden_def (__isnan)
weak_alias (__isnan, isnan)
-#ifndef IS_IN_libm
+#if !IS_IN_MODULE (libm)
# if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0)
compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0);
compat_symbol (libc, isnan, isnanl, GLIBC_2_0);
diff --git a/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S b/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S
index c5fa62b..52aaeb6 100644
--- a/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S
+++ b/sysdeps/unix/sysv/linux/alpha/fraiseexcpt.S
@@ -46,7 +46,7 @@ ENTRY(__feraiseexcept)
END(__feraiseexcept)
cfi_endproc
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# include <shlib-compat.h>
# if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
strong_alias (__feraiseexcept, __old_feraiseexcept)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f748d284aa6f559a7c47b67474bff1cd5ecd69b6
commit f748d284aa6f559a7c47b67474bff1cd5ecd69b6
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon Aug 11 23:47:34 2014 +0530
Remove IS_IN_libpthread
Replace with IS_IN_MODULE (libpthread). Generated code unchanged on
x86_64.
diff --git a/nptl/lowlevellock.c b/nptl/lowlevellock.c
index e198af7..291112d 100644
--- a/nptl/lowlevellock.c
+++ b/nptl/lowlevellock.c
@@ -35,7 +35,7 @@ __lll_lock_wait_private (int *futex)
/* These functions don't get included in libc.so */
-#ifdef IS_IN_libpthread
+#if IS_IN_MODULE (libpthread)
void
__lll_lock_wait (int *futex, int private)
{
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index e916d11..359346b 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -238,7 +238,7 @@ extern int __pthread_debug attribute_hidden;
extern void __pthread_unwind (__pthread_unwind_buf_t *__buf)
__cleanup_fct_attribute __attribute ((__noreturn__))
-#if !defined SHARED && !defined IS_IN_libpthread
+#if !defined SHARED && !IS_IN_MODULE (libpthread)
weak_function
#endif
;
@@ -252,7 +252,7 @@ extern void __pthread_register_cancel (__pthread_unwind_buf_t *__buf)
__cleanup_fct_attribute;
extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
__cleanup_fct_attribute;
-#ifdef IS_IN_libpthread
+#if IS_IN_MODULE (libpthread)
hidden_proto (__pthread_unwind)
hidden_proto (__pthread_unwind_next)
hidden_proto (__pthread_register_cancel)
@@ -296,7 +296,7 @@ __do_cancel (void)
# define LIBC_CANCEL_HANDLED() \
__asm (".globl " __SYMBOL_PREFIX "__libc_enable_asynccancel"); \
__asm (".globl " __SYMBOL_PREFIX "__libc_disable_asynccancel")
-#elif defined IS_IN_libpthread
+#elif IS_IN_MODULE (libpthread)
# define LIBC_CANCEL_ASYNC() CANCEL_ASYNC ()
# define LIBC_CANCEL_RESET(val) CANCEL_RESET (val)
# define LIBC_CANCEL_HANDLED() \
@@ -341,7 +341,7 @@ extern int __make_stacks_executable (void **stack_endp)
/* longjmp handling. */
extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe);
-#ifdef IS_IN_libpthread
+#if IS_IN_MODULE (libpthread)
hidden_proto (__pthread_cleanup_upto)
#endif
@@ -486,7 +486,7 @@ extern int __pthread_enable_asynccancel (void) attribute_hidden;
extern void __pthread_disable_asynccancel (int oldtype)
internal_function attribute_hidden;
-#ifdef IS_IN_libpthread
+#if IS_IN_MODULE (libpthread)
hidden_proto (__pthread_mutex_init)
hidden_proto (__pthread_mutex_destroy)
hidden_proto (__pthread_mutex_lock)
@@ -525,7 +525,7 @@ extern int __librt_enable_asynccancel (void) attribute_hidden;
extern void __librt_disable_asynccancel (int oldtype)
internal_function attribute_hidden;
-#ifdef IS_IN_libpthread
+#if IS_IN_MODULE (libpthread)
/* Special versions which use non-exported functions. */
extern void __pthread_cleanup_push (struct _pthread_cleanup_buffer *buffer,
void (*routine) (void *), void *arg)
diff --git a/nptl_db/structs.def b/nptl_db/structs.def
index ec72ef1..f168a88 100644
--- a/nptl_db/structs.def
+++ b/nptl_db/structs.def
@@ -74,7 +74,7 @@ DB_STRUCT_FIELD (link_map, l_tls_modid)
DB_STRUCT_ARRAY_FIELD (dtv, dtv)
#define pointer_val pointer.val /* Field of anonymous struct in dtv_t. */
DB_STRUCT_FIELD (dtv_t, pointer_val)
-#if !defined IS_IN_libpthread || TLS_TCB_AT_TP
+#if !IS_IN_MODULE (libpthread) || TLS_TCB_AT_TP
DB_STRUCT_FIELD (pthread, dtvp)
#endif
diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index 4c41213..e9fba8b 100644
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -293,7 +293,7 @@
/* Pointer mangling support. */
#if (defined IS_IN_rtld || \
- (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread)))
+ (!defined SHARED && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))))
# ifdef __ASSEMBLER__
# define PTR_MANGLE_LOAD(guard, tmp) \
LDST_PCREL(ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local));
diff --git a/sysdeps/nptl/bits/libc-lock.h b/sysdeps/nptl/bits/libc-lock.h
index 532cf2c..909ee7a 100644
--- a/sysdeps/nptl/bits/libc-lock.h
+++ b/sysdeps/nptl/bits/libc-lock.h
@@ -26,7 +26,7 @@
/* Mutex type. */
#if defined _LIBC || defined _IO_MTSAFE_IO
-# if (defined NOT_IN_libc && !defined IS_IN_libpthread) || !defined _LIBC
+# if (defined NOT_IN_libc && !IS_IN_MODULE (libpthread)) || !defined _LIBC
typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t;
# else
typedef struct { int lock; int cnt; void *owner; } __libc_lock_recursive_t;
@@ -47,7 +47,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
/* Define an initialized recursive lock variable NAME with storage
class CLASS. */
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
# define __libc_lock_define_initialized_recursive(CLASS, NAME) \
CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER;
# define _LIBC_LOCK_RECURSIVE_INITIALIZER \
@@ -60,7 +60,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Initialize a recursive mutex. */
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
# define __libc_lock_init_recursive(NAME) \
((NAME) = (__libc_lock_recursive_t) _LIBC_LOCK_RECURSIVE_INITIALIZER, 0)
#else
@@ -78,7 +78,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Finalize recursive named lock. */
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
# define __libc_lock_fini_recursive(NAME) ((void) 0)
#else
# define __libc_lock_fini_recursive(NAME) \
@@ -86,7 +86,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Lock the recursive named lock variable. */
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
# define __libc_lock_lock_recursive(NAME) \
do { \
void *self = THREAD_SELF; \
@@ -103,7 +103,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Try to lock the recursive named lock variable. */
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
# define __libc_lock_trylock_recursive(NAME) \
({ \
int result = 0; \
@@ -128,7 +128,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Unlock the recursive named lock variable. */
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
/* We do no error checking here. */
# define __libc_lock_unlock_recursive(NAME) \
do { \
diff --git a/sysdeps/nptl/bits/libc-lockP.h b/sysdeps/nptl/bits/libc-lockP.h
index ec20271..70b4418 100644
--- a/sysdeps/nptl/bits/libc-lockP.h
+++ b/sysdeps/nptl/bits/libc-lockP.h
@@ -35,7 +35,7 @@
#include <pthread-functions.h>
/* Mutex type. */
-#if defined NOT_IN_libc && !defined IS_IN_libpthread
+#if defined NOT_IN_libc && !IS_IN_MODULE (libpthread)
typedef pthread_mutex_t __libc_lock_t;
#else
typedef int __libc_lock_t;
@@ -69,7 +69,7 @@ typedef pthread_key_t __libc_key_t;
initialized locks must be set to one due to the lack of normal
atomic operations.) */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
# if LLL_LOCK_INITIALIZER == 0
# define __libc_lock_define_initialized(CLASS,NAME) \
CLASS __libc_lock_t NAME;
@@ -125,7 +125,7 @@ typedef pthread_key_t __libc_key_t;
/* Initialize the named lock variable, leaving it in a consistent, unlocked
state. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
# define __libc_lock_init(NAME) ((NAME) = LLL_LOCK_INITIALIZER, 0)
#else
# define __libc_lock_init(NAME) \
@@ -144,7 +144,7 @@ typedef pthread_key_t __libc_key_t;
/* Finalize the named lock variable, which must be locked. It cannot be
used again until __libc_lock_init is called again on it. This must be
called on a lock variable before the containing storage is reused. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
# define __libc_lock_fini(NAME) ((void) 0)
#else
# define __libc_lock_fini(NAME) \
@@ -158,7 +158,7 @@ typedef pthread_key_t __libc_key_t;
#endif
/* Lock the named lock variable. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
# ifndef __libc_lock_lock
# define __libc_lock_lock(NAME) \
({ lll_lock (NAME, LLL_PRIVATE); 0; })
@@ -174,7 +174,7 @@ typedef pthread_key_t __libc_key_t;
__libc_ptf_call (__pthread_rwlock_wrlock, (&(NAME)), 0)
/* Try to lock the named lock variable. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
# ifndef __libc_lock_trylock
# define __libc_lock_trylock(NAME) \
lll_trylock (NAME)
@@ -193,7 +193,7 @@ typedef pthread_key_t __libc_key_t;
__libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0)
/* Unlock the named lock variable. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
# define __libc_lock_unlock(NAME) \
lll_unlock (NAME, LLL_PRIVATE)
#else
diff --git a/sysdeps/sparc/sparc32/lowlevellock.c b/sysdeps/sparc/sparc32/lowlevellock.c
index 8384281..2ea7983 100644
--- a/sysdeps/sparc/sparc32/lowlevellock.c
+++ b/sysdeps/sparc/sparc32/lowlevellock.c
@@ -37,7 +37,7 @@ __lll_lock_wait_private (int *futex)
/* These functions don't get included in libc.so */
-#ifdef IS_IN_libpthread
+#if IS_IN_MODULE (libpthread)
void
__lll_lock_wait (int *futex, int private)
{
diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h
index 17dad91..df60d09 100644
--- a/sysdeps/unix/alpha/sysdep.h
+++ b/sysdeps/unix/alpha/sysdep.h
@@ -373,7 +373,7 @@ __LABEL(name) \
# include <stdint.h>
# if (defined IS_IN_rtld \
|| (!defined SHARED && (!defined NOT_IN_libc \
- || defined IS_IN_libpthread)))
+ || IS_IN_MODULE (libpthread))))
extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
# define PTR_MANGLE(var) \
(var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
index 7786216..193ef31 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -81,7 +81,7 @@ ENTRY (name); \
# define UNDOCARGS_5 UNDOCARGS_3; ldp x3, x4, [sp, 32]
# define UNDOCARGS_6 UNDOCARGS_4; ldp x4, x5, [sp, 40]
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE bl __pthread_enable_asynccancel
# define CDISABLE bl __pthread_disable_asynccancel
# define __local_multiple_threads __pthread_multiple_threads
@@ -96,7 +96,7 @@ ENTRY (name); \
# error Unsupported library
# endif
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN_MODULE (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
index 84999f1..3c2c682 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
@@ -311,7 +311,7 @@
/* Pointer mangling is supported for AArch64. */
#if (defined IS_IN_rtld || \
(!defined SHARED && (!defined NOT_IN_libc \
- || defined IS_IN_libpthread)))
+ || IS_IN_MODULE (libpthread))))
# ifdef __ASSEMBLER__
# define PTR_MANGLE(dst, src, guard, tmp) \
LDST_PCREL (ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local)); \
diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
index 85936ee..3f4694c 100644
--- a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
/* ??? Assumes that nothing comes between PSEUDO and PSEUDO_END
besides "ret". */
@@ -113,7 +113,7 @@ __LABEL($multi_error) \
# define LOAD_ARGS_5 LOAD_ARGS_4; ldq a4, 40(sp)
# define LOAD_ARGS_6 LOAD_ARGS_5; ldq a5, 48(sp)
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define __local_enable_asynccancel __pthread_enable_asynccancel
# define __local_disable_asynccancel __pthread_disable_asynccancel
# define __local_multiple_threads __pthread_multiple_threads
@@ -136,7 +136,7 @@ __LABEL($multi_error) \
# define CDISABLE jsr ra, __local_disable_asynccancel; ldgp ra, 0(gp)
# endif
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN_MODULE (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
diff --git a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
index 5f96ce6..0273d77 100644
--- a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
/* NOTE: We do mark syscalls with unwind annotations, for the benefit of
cancellation; but they're really only accurate at the point of the
@@ -181,7 +181,7 @@
# define RESTORE_LR_6 \
RESTORE_LR_0
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE bl PLTJMP(__pthread_enable_asynccancel)
# define CDISABLE bl PLTJMP(__pthread_disable_asynccancel)
# define __local_multiple_threads __pthread_multiple_threads
@@ -196,7 +196,7 @@
# error Unsupported library
# endif
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN_MODULE (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
index a21290d..20d9ffe 100644
--- a/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# ifndef NO_ERROR
# define NO_ERROR -0x1000
@@ -204,7 +204,7 @@ L(pre_end): ASM_LINE_SEP \
# define POPARGS_6 POPARGS_5 ldw -56(%sr0,%sp), %r21 ASM_LINE_SEP \
.cfi_restore 21 ASM_LINE_SEP
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# ifdef PIC
# define CENABLE .import __pthread_enable_asynccancel,code ASM_LINE_SEP \
bl __pthread_enable_asynccancel,%r2 ASM_LINE_SEP
@@ -244,7 +244,7 @@ L(pre_end): ASM_LINE_SEP \
# error Unsupported library
# endif
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define __local_multiple_threads __pthread_multiple_threads
# elif !defined NOT_IN_libc
# define __local_multiple_threads __libc_multiple_threads
@@ -271,7 +271,7 @@ L(pre_end): ASM_LINE_SEP \
# define NO_CANCELLATION 1
#endif
-/* !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt) */
+/* !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt) */
#ifndef __ASSEMBLER__
# define RTLD_SINGLE_THREAD_P \
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index a4257ef..45e71d6 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -108,7 +108,7 @@
# define _POPCARGS_6 _POPCARGS_5; popl %ebp; \
cfi_adjust_cfa_offset (-4); cfi_restore (ebp);
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE call __pthread_enable_asynccancel;
# define CDISABLE call __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 57d5ea0..01fe854 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -34,7 +34,7 @@
#define SYS_ify(syscall_name) __NR_##syscall_name
#if defined USE_DL_SYSINFO \
- && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+ && (!defined NOT_IN_libc || IS_IN_MODULE (libpthread))
# define I386_USE_SYSENTER 1
#else
# undef I386_USE_SYSENTER
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
index 267d3de..6cd92e0 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
@@ -179,7 +179,7 @@ __GC_##name: \
# undef PSEUDO_END
# define PSEUDO_END(name) .endp
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE br.call.sptk.many b0 = __pthread_enable_asynccancel
# define CDISABLE br.call.sptk.many b0 = __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index 53b7e8e..1b9984a 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -62,7 +62,7 @@
#if defined USE_DL_SYSINFO \
&& (!defined NOT_IN_libc \
- || defined IS_IN_libpthread || IS_IN_MODULE (librt))
+ || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt))
# define IA64_USE_NEW_STUB
#else
# undef IA64_USE_NEW_STUB
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
index cc0c502..85f4334 100644
--- a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -100,7 +100,7 @@
# define PSEUDO_JMP(sym) jbsr sym
# endif
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel)
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h
index 878c66e..718a442 100644
--- a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# if !IS_IN_MODULE (librt) || !defined(PIC)
# define AC_STACK_SIZE 16 /* space for r15, async_cancel arg and 2 temp words */
@@ -102,7 +102,7 @@ L(pseudo_cancel): \
# define PSEUDO_JMP(sym) brlid r15, sym; addk r0, r0, r0
# endif
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel)
# define __local_multiple_threads __pthread_multiple_threads
@@ -118,7 +118,7 @@ L(pseudo_cancel): \
# endif
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN_MODULE (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
index 396fabe..41e6052 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
@@ -27,7 +27,7 @@
happen before any instructions. So we use cfi_same_value instead of
cfi_restore. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
#ifdef __PIC__
# undef PSEUDO
@@ -213,7 +213,7 @@
# define PSEUDO_JMP(sym) jal sym
# endif
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel)
# elif IS_IN_MODULE (librt)
diff --git a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
index e58b476..fb56c9f 100644
--- a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# ifdef __PIC__
# define PSEUDO_CPLOAD .cpload t9;
@@ -154,7 +154,7 @@
# define PSEUDO_JMP(sym) jal sym;
# endif
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel)
# elif IS_IN_MODULE (librt)
diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h
index 04352d4..7a1d2a2 100644
--- a/sysdeps/unix/sysv/linux/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/not-cancel.h
@@ -19,7 +19,7 @@
#include <sysdep.h>
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
extern int __open_nocancel (const char *, int, ...) attribute_hidden;
extern int __close_nocancel (int) attribute_hidden;
extern int __read_nocancel (int, void *, size_t) attribute_hidden;
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
index 338979b..1b10bc7 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
@@ -23,7 +23,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -81,7 +81,7 @@
# define DOCARGS_6 stw 8,40(1); DOCARGS_5
# define UNDOCARGS_6 lwz 8,40(1); UNDOCARGS_5
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE bl __pthread_enable_asynccancel@local
# define CDISABLE bl __pthread_disable_asynccancel@local
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
index 9012a2b..48bb7ec 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
@@ -23,7 +23,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# ifdef HAVE_ASM_GLOBAL_DOT_NAME
# define DASHDASHPFX(str) .__##str
@@ -99,7 +99,7 @@
# define DOCARGS_6 std 8,CANCEL_PARM_SAVE+40(1); DOCARGS_5
# define UNDOCARGS_6 ld 8,CANCEL_PARM_SAVE+40(1); UNDOCARGS_5
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# ifdef SHARED
# define CENABLE bl JUMPTARGET(__pthread_enable_asynccancel)
# define CDISABLE bl JUMPTARGET(__pthread_disable_asynccancel)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
index ed4393d..6b7c494 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -75,7 +75,7 @@ L(pseudo_check): \
.size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel; \
L(pseudo_end):
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE __pthread_enable_asynccancel
# define CDISABLE __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
index d7ae5fb..fc41beb 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -69,7 +69,7 @@ L(pseudo_check): \
.size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel; \
L(pseudo_end):
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE __pthread_enable_asynccancel
# define CDISABLE __pthread_disable_asynccancel
# define __local_multiple_threads __pthread_multiple_threads
@@ -111,7 +111,7 @@ L(pseudo_end):
#define LR7_6 lg %r7,56+160(%r15); \
cfi_restore (%r7);
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN_MODULE (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
diff --git a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
index 270e5ae..a0373bd 100644
--- a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# define _IMM12 #-12
# define _IMM16 #-16
@@ -105,7 +105,7 @@
# define LOAD_ARGS_5 LOAD_ARGS_4
# define LOAD_ARGS_6 LOAD_ARGS_5
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define __local_enable_asynccancel __pthread_enable_asynccancel
# define __local_disable_asynccancel __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
index 63a5342..a2395d9 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -68,7 +68,7 @@ __##syscall_name##_nocancel: \
restore %g0, %l1, %o0;
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE call __pthread_enable_asynccancel
# define CDISABLE call __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
index c263652..5cbb4d0 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -66,7 +66,7 @@ __##syscall_name##_nocancel: \
2: jmpl %i7 + 8, %g0; \
restore %g0, %l1, %o0;
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE call __pthread_enable_asynccancel
# define CDISABLE call __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h
index 73e8a66..d188c56 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
/* Allow hacking in some extra code if desired. */
#ifndef PSEUDO_EXTRA
@@ -117,7 +117,7 @@
# define STKSPACE (13 * REGSIZE)
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE jal __pthread_enable_asynccancel
# define CDISABLE jal __pthread_disable_asynccancel
# elif IS_IN_MODULE (librt)
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h
index a09f8a4..1ede20b 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep.h
@@ -45,7 +45,7 @@
#ifndef PIC
/* For static code, on error jump to __syscall_error directly. */
# define SYSCALL_ERROR_NAME __syscall_error
-#elif !defined NOT_IN_libc || defined IS_IN_libpthread
+#elif !defined NOT_IN_libc || IS_IN_MODULE (libpthread)
/* Use the internal name for libc/libpthread shared objects. */
# define SYSCALL_ERROR_NAME __GI___syscall_error
#else
diff --git a/sysdeps/unix/sysv/linux/tile/waitpid.S b/sysdeps/unix/sysv/linux/tile/waitpid.S
index d93c743..3bf7fe0 100644
--- a/sysdeps/unix/sysv/linux/tile/waitpid.S
+++ b/sysdeps/unix/sysv/linux/tile/waitpid.S
@@ -1,7 +1,7 @@
/*
extern pid_t __waitpid_nocancel (pid_t, int *, int) attribute_hidden;
*/
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
/* Call __NR_wait4, providing fourth argument (struct rusage *) as NULL. */
#define PSEUDO_EXTRA move r3, zero;
diff --git a/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/sysdeps/unix/sysv/linux/x86_64/cancellation.S
index 89fda5e..c53695e 100644
--- a/sysdeps/unix/sysv/linux/x86_64/cancellation.S
+++ b/sysdeps/unix/sysv/linux/x86_64/cancellation.S
@@ -21,7 +21,7 @@
#include <kernel-features.h>
#include "lowlevellock.h"
-#ifdef IS_IN_libpthread
+#if IS_IN_MODULE (libpthread)
# if defined SHARED && !defined NO_HIDDEN
# define __pthread_unwind __GI___pthread_unwind
# endif
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
index c41e56c..b9ab67c 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
+#if !defined NOT_IN_libc || IS_IN_MODULE (libpthread) || IS_IN_MODULE (librt)
/* The code to disable cancellation depends on the fact that the called
functions are special. They don't modify registers other than %rax
@@ -59,7 +59,7 @@
jae SYSCALL_ERROR_LABEL
-# ifdef IS_IN_libpthread
+# if IS_IN_MODULE (libpthread)
# define CENABLE call __pthread_enable_asynccancel;
# define CDISABLE call __pthread_disable_asynccancel;
# define __local_multiple_threads __pthread_multiple_threads
@@ -74,7 +74,7 @@
# error Unsupported library
# endif
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN_MODULE (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a5c788c61e6a4d5733dd1378a3d9d2b1d2c77c3f
commit a5c788c61e6a4d5733dd1378a3d9d2b1d2c77c3f
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon Aug 11 23:33:02 2014 +0530
Remove IS_IN_librt
Replace with IS_IN_MODULE (librt). Generated code unchanged on x86_64
diff --git a/include/mqueue.h b/include/mqueue.h
index 1ac4f13..7169bda 100644
--- a/include/mqueue.h
+++ b/include/mqueue.h
@@ -1,6 +1,6 @@
#include <rt/mqueue.h>
-#ifdef IS_IN_librt
+#if IS_IN_MODULE (librt)
hidden_proto (mq_timedsend)
hidden_proto (mq_timedreceive)
hidden_proto (mq_setattr)
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index d4415ba..e916d11 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -302,7 +302,7 @@ __do_cancel (void)
# define LIBC_CANCEL_HANDLED() \
__asm (".globl " __SYMBOL_PREFIX "__pthread_enable_asynccancel"); \
__asm (".globl " __SYMBOL_PREFIX "__pthread_disable_asynccancel")
-#elif defined IS_IN_librt
+#elif IS_IN_MODULE (librt)
# define LIBC_CANCEL_ASYNC() \
__librt_enable_asynccancel ()
# define LIBC_CANCEL_RESET(val) \
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
index 546ed7b..7786216 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -89,7 +89,7 @@ ENTRY (name); \
# define CENABLE bl __libc_enable_asynccancel
# define CDISABLE bl __libc_disable_asynccancel
# define __local_multiple_threads __libc_multiple_threads
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE bl __librt_enable_asynccancel
# define CDISABLE bl __librt_disable_asynccancel
# else
diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
index 69809bc..85936ee 100644
--- a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
/* ??? Assumes that nothing comes between PSEUDO and PSEUDO_END
besides "ret". */
@@ -121,7 +121,7 @@ __LABEL($multi_error) \
# define __local_enable_asynccancel __libc_enable_asynccancel
# define __local_disable_asynccancel __libc_disable_asynccancel
# define __local_multiple_threads __libc_multiple_threads
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define __local_enable_asynccancel __librt_enable_asynccancel
# define __local_disable_asynccancel __librt_disable_asynccancel
# else
diff --git a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
index a0a8696..5f96ce6 100644
--- a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
/* NOTE: We do mark syscalls with unwind annotations, for the benefit of
cancellation; but they're really only accurate at the point of the
@@ -189,7 +189,7 @@
# define CENABLE bl PLTJMP(__libc_enable_asynccancel)
# define CDISABLE bl PLTJMP(__libc_disable_asynccancel)
# define __local_multiple_threads __libc_multiple_threads
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE bl PLTJMP(__librt_enable_asynccancel)
# define CDISABLE bl PLTJMP(__librt_disable_asynccancel)
# else
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
index 6f1c9d7..a21290d 100644
--- a/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# ifndef NO_ERROR
# define NO_ERROR -0x1000
@@ -228,7 +228,7 @@ L(pre_end): ASM_LINE_SEP \
# define CDISABLE .import __libc_disable_asynccancel,code ASM_LINE_SEP \
bl __libc_disable_asynccancel,%r2 ASM_LINE_SEP
# endif
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# ifdef PIC
# define CENABLE .import __librt_enable_asynccancel,code ASM_LINE_SEP \
bl __librt_enable_asynccancel,%r2 ASM_LINE_SEP
@@ -248,7 +248,7 @@ L(pre_end): ASM_LINE_SEP \
# define __local_multiple_threads __pthread_multiple_threads
# elif !defined NOT_IN_libc
# define __local_multiple_threads __libc_multiple_threads
-# elif IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define __local_multiple_threads __librt_multiple_threads
# else
# error Unsupported library
@@ -271,7 +271,7 @@ L(pre_end): ASM_LINE_SEP \
# define NO_CANCELLATION 1
#endif
-/* !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt */
+/* !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt) */
#ifndef __ASSEMBLER__
# define RTLD_SINGLE_THREAD_P \
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index 4f4318d..a4257ef 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -114,7 +114,7 @@
# elif !defined NOT_IN_libc
# define CENABLE call __libc_enable_asynccancel;
# define CDISABLE call __libc_disable_asynccancel
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE call __librt_enable_asynccancel;
# define CDISABLE call __librt_disable_asynccancel
# else
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
index c44c484..267d3de 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# undef PSEUDO
@@ -185,7 +185,7 @@ __GC_##name: \
# elif !defined NOT_IN_libc
# define CENABLE br.call.sptk.many b0 = __libc_enable_asynccancel
# define CDISABLE br.call.sptk.many b0 = __libc_disable_asynccancel
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE br.call.sptk.many b0 = __librt_enable_asynccancel
# define CDISABLE br.call.sptk.many b0 = __librt_disable_asynccancel
# else
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index e0ec861..53b7e8e 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -62,7 +62,7 @@
#if defined USE_DL_SYSINFO \
&& (!defined NOT_IN_libc \
- || defined IS_IN_libpthread || defined IS_IN_librt)
+ || defined IS_IN_libpthread || IS_IN_MODULE (librt))
# define IA64_USE_NEW_STUB
#else
# undef IA64_USE_NEW_STUB
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
index 868ce56..cc0c502 100644
--- a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -106,7 +106,7 @@
# elif !defined NOT_IN_libc
# define CENABLE PSEUDO_JMP (__libc_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__libc_disable_asynccancel)
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE PSEUDO_JMP (__librt_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__librt_disable_asynccancel)
# else
diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h
index 0080d8d..878c66e 100644
--- a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h
@@ -21,9 +21,9 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
-# if !defined(IS_IN_librt) || !defined(PIC)
+# if !IS_IN_MODULE (librt) || !defined(PIC)
# define AC_STACK_SIZE 16 /* space for r15, async_cancel arg and 2 temp words */
# define AC_SET_GOT /* empty */
# define AC_RESTORE_GOT /* empty */
@@ -110,7 +110,7 @@ L(pseudo_cancel): \
# define CENABLE PSEUDO_JMP (__libc_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__libc_disable_asynccancel)
# define __local_multiple_threads __libc_multiple_threads
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE PSEUDO_JMP (__librt_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__librt_disable_asynccancel)
# else
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
index 341b9a0..396fabe 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
@@ -27,7 +27,7 @@
happen before any instructions. So we use cfi_same_value instead of
cfi_restore. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
#ifdef __PIC__
# undef PSEUDO
@@ -216,7 +216,7 @@
# ifdef IS_IN_libpthread
# define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel)
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE PSEUDO_JMP (__librt_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__librt_disable_asynccancel)
# else
diff --git a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
index 3666081..e58b476 100644
--- a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# ifdef __PIC__
# define PSEUDO_CPLOAD .cpload t9;
@@ -157,7 +157,7 @@
# ifdef IS_IN_libpthread
# define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel)
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE PSEUDO_JMP (__librt_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__librt_disable_asynccancel)
# else
diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h
index 14f5e8b..04352d4 100644
--- a/sysdeps/unix/sysv/linux/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/not-cancel.h
@@ -19,7 +19,7 @@
#include <sysdep.h>
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
extern int __open_nocancel (const char *, int, ...) attribute_hidden;
extern int __close_nocancel (int) attribute_hidden;
extern int __read_nocancel (int, void *, size_t) attribute_hidden;
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
index b6eedcb..338979b 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
@@ -23,7 +23,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -87,7 +87,7 @@
# elif !defined NOT_IN_libc
# define CENABLE bl __libc_enable_asynccancel@local
# define CDISABLE bl __libc_disable_asynccancel@local
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE bl __librt_enable_asynccancel@local
# define CDISABLE bl __librt_disable_asynccancel@local
# else
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
index 5807d9d..9012a2b 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
@@ -23,7 +23,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# ifdef HAVE_ASM_GLOBAL_DOT_NAME
# define DASHDASHPFX(str) .__##str
@@ -115,7 +115,7 @@
# define CENABLE bl JUMPTARGET(__libc_enable_asynccancel); nop
# define CDISABLE bl JUMPTARGET(__libc_disable_asynccancel); nop
# endif
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# ifdef SHARED
# define CENABLE bl JUMPTARGET(__librt_enable_asynccancel)
# define CDISABLE bl JUMPTARGET(__librt_disable_asynccancel)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
index 0eeefca..ed4393d 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -81,7 +81,7 @@ L(pseudo_end):
# elif !defined NOT_IN_libc
# define CENABLE __libc_enable_asynccancel
# define CDISABLE __libc_disable_asynccancel
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE __librt_enable_asynccancel
# define CDISABLE __librt_disable_asynccancel
# else
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
index b3560c8..d7ae5fb 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -77,7 +77,7 @@ L(pseudo_end):
# define CENABLE __libc_enable_asynccancel
# define CDISABLE __libc_disable_asynccancel
# define __local_multiple_threads __libc_multiple_threads
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE __librt_enable_asynccancel
# define CDISABLE __librt_disable_asynccancel
# else
diff --git a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
index 4278f25..270e5ae 100644
--- a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# define _IMM12 #-12
# define _IMM16 #-16
@@ -111,7 +111,7 @@
# elif !defined NOT_IN_libc
# define __local_enable_asynccancel __libc_enable_asynccancel
# define __local_disable_asynccancel __libc_disable_asynccancel
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define __local_enable_asynccancel __librt_enable_asynccancel
# define __local_disable_asynccancel __librt_disable_asynccancel
# else
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
index fd9968f..63a5342 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -74,7 +74,7 @@ __##syscall_name##_nocancel: \
# elif !defined NOT_IN_libc
# define CENABLE call __libc_enable_asynccancel
# define CDISABLE call __libc_disable_asynccancel
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE call __librt_enable_asynccancel
# define CDISABLE call __librt_disable_asynccancel
# else
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
index 4dad994..c263652 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -72,7 +72,7 @@ __##syscall_name##_nocancel: \
# elif !defined NOT_IN_libc
# define CENABLE call __libc_enable_asynccancel
# define CDISABLE call __libc_disable_asynccancel
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE call __librt_enable_asynccancel
# define CDISABLE call __librt_disable_asynccancel
# else
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h
index 2333338..73e8a66 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
/* Allow hacking in some extra code if desired. */
#ifndef PSEUDO_EXTRA
@@ -120,7 +120,7 @@
# ifdef IS_IN_libpthread
# define CENABLE jal __pthread_enable_asynccancel
# define CDISABLE jal __pthread_disable_asynccancel
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE jal __librt_enable_asynccancel
# define CDISABLE jal __librt_disable_asynccancel
# else
diff --git a/sysdeps/unix/sysv/linux/tile/waitpid.S b/sysdeps/unix/sysv/linux/tile/waitpid.S
index 9aa793e..d93c743 100644
--- a/sysdeps/unix/sysv/linux/tile/waitpid.S
+++ b/sysdeps/unix/sysv/linux/tile/waitpid.S
@@ -1,7 +1,7 @@
/*
extern pid_t __waitpid_nocancel (pid_t, int *, int) attribute_hidden;
*/
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
/* Call __NR_wait4, providing fourth argument (struct rusage *) as NULL. */
#define PSEUDO_EXTRA move r3, zero;
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
index 83cd25f..c41e56c 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN_MODULE (librt)
/* The code to disable cancellation depends on the fact that the called
functions are special. They don't modify registers other than %rax
@@ -67,7 +67,7 @@
# define CENABLE call __libc_enable_asynccancel;
# define CDISABLE call __libc_disable_asynccancel;
# define __local_multiple_threads __libc_multiple_threads
-# elif defined IS_IN_librt
+# elif IS_IN_MODULE (librt)
# define CENABLE call __librt_enable_asynccancel;
# define CDISABLE call __librt_disable_asynccancel;
# else
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=bb603b2470751347646c3a366aa5eb732ab6d206
commit bb603b2470751347646c3a366aa5eb732ab6d206
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon Aug 11 16:38:08 2014 +0530
Remove IS_IN_libdl
Replace with IS_IN_MODULE (libdl). No changes to generated code on
x86_64.
diff --git a/dlfcn/dladdr.c b/dlfcn/dladdr.c
index 922ca44..555d9dd 100644
--- a/dlfcn/dladdr.c
+++ b/dlfcn/dladdr.c
@@ -18,7 +18,7 @@
#include <dlfcn.h>
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN_MODULE (libdl)
int
dladdr (const void *address, Dl_info *info)
diff --git a/dlfcn/dladdr1.c b/dlfcn/dladdr1.c
index 0efc0dc..c3e6386 100644
--- a/dlfcn/dladdr1.c
+++ b/dlfcn/dladdr1.c
@@ -18,7 +18,7 @@
#include <dlfcn.h>
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN_MODULE (libdl)
int
dladdr1 (const void *address, Dl_info *info, void **extra, int flags)
diff --git a/dlfcn/dlclose.c b/dlfcn/dlclose.c
index ca55b5f..df8a340 100644
--- a/dlfcn/dlclose.c
+++ b/dlfcn/dlclose.c
@@ -19,7 +19,7 @@
#include <dlfcn.h>
#include <ldsodefs.h>
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN_MODULE (libdl)
int
dlclose (void *handle)
diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c
index 6dd47a7..5b3bc7d 100644
--- a/dlfcn/dlerror.c
+++ b/dlfcn/dlerror.c
@@ -25,7 +25,7 @@
#include <bits/libc-lock.h>
#include <ldsodefs.h>
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN_MODULE (libdl)
char *
dlerror (void)
diff --git a/dlfcn/dlinfo.c b/dlfcn/dlinfo.c
index 1876d9d..e38ce02 100644
--- a/dlfcn/dlinfo.c
+++ b/dlfcn/dlinfo.c
@@ -21,7 +21,7 @@
#include <ldsodefs.h>
#include <libintl.h>
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN_MODULE (libdl)
int
dlinfo (void *handle, int request, void *arg)
diff --git a/dlfcn/dlmopen.c b/dlfcn/dlmopen.c
index 115f6e9..52cf5a0 100644
--- a/dlfcn/dlmopen.c
+++ b/dlfcn/dlmopen.c
@@ -23,7 +23,7 @@
#include <unistd.h>
#include <ldsodefs.h>
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN_MODULE (libdl)
void *
dlmopen (Lmid_t nsid, const char *file, int mode)
diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c
index fa58c4c..aa75f61 100644
--- a/dlfcn/dlopen.c
+++ b/dlfcn/dlopen.c
@@ -22,7 +22,7 @@
#include <unistd.h>
#include <ldsodefs.h>
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN_MODULE (libdl)
void *
dlopen (const char *file, int mode)
diff --git a/dlfcn/dlsym.c b/dlfcn/dlsym.c
index 7bcc78d..554cc0b 100644
--- a/dlfcn/dlsym.c
+++ b/dlfcn/dlsym.c
@@ -21,7 +21,7 @@
#include <ldsodefs.h>
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN_MODULE (libdl)
void *
dlsym (void *handle, const char *name)
diff --git a/dlfcn/dlvsym.c b/dlfcn/dlvsym.c
index d7a766b..5b6df1b 100644
--- a/dlfcn/dlvsym.c
+++ b/dlfcn/dlvsym.c
@@ -21,7 +21,7 @@
#include <ldsodefs.h>
-#if !defined SHARED && defined IS_IN_libdl
+#if !defined SHARED && IS_IN_MODULE (libdl)
void *
weak_function
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=df58ee5251dd6268227721e58e008d2cc84f4bd3
commit df58ee5251dd6268227721e58e008d2cc84f4bd3
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon Aug 11 12:55:53 2014 +0530
Remove IS_IN_nscd
Replace with IS_IN_MODULE (nscd). Generated code unchanged on x86_64.
diff --git a/include/ifaddrs.h b/include/ifaddrs.h
index e1c6cac..7f9b23a 100644
--- a/include/ifaddrs.h
+++ b/include/ifaddrs.h
@@ -26,7 +26,7 @@ extern void __check_native (uint32_t a1_index, int *a1_native,
uint32_t a2_index, int *a2_native)
attribute_hidden;
-#ifdef IS_IN_nscd
+#if IS_IN_MODULE (nscd)
extern uint32_t __bump_nl_timestamp (void) attribute_hidden;
#endif
diff --git a/inet/check_pf.c b/inet/check_pf.c
index b2934f7..6b838c1 100644
--- a/inet/check_pf.c
+++ b/inet/check_pf.c
@@ -62,7 +62,7 @@ __free_in6ai (struct in6addrinfo *in6ai)
}
-#ifdef IS_IN_nscd
+#if IS_IN_MODULE (nscd)
uint32_t
__bump_nl_timestamp (void)
{
diff --git a/nscd/Makefile b/nscd/Makefile
index 9d173b3..082da9d 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -81,8 +81,7 @@ CFLAGS-nscd_initgroups.c = -fexceptions
# Override the definition of IN_MODULE inherited from CPPFLAGS-nonlib. We want
# to be called nscd and not just a generic nonlib.
-CPPFLAGS-nonlib += -DIS_IN_nscd=1 -D_FORTIFY_SOURCE=2 -UIN_MODULE \
- -DIN_MODULE=MODULE_nscd
+CPPFLAGS-nonlib += -D_FORTIFY_SOURCE=2 -UIN_MODULE -DIN_MODULE=MODULE_nscd
ifeq (yesyes,$(have-fpie)$(build-shared))
CFLAGS-nonlib += $(pie-ccflag)
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index c7fd9b0..c2a4c30 100644
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -65,7 +65,7 @@ static struct cached_data *cache;
__libc_lock_define_initialized (static, lock);
-#ifdef IS_IN_nscd
+#if IS_IN_MODULE (nscd)
static uint32_t nl_timestamp;
uint32_t
@@ -81,7 +81,7 @@ __bump_nl_timestamp (void)
static inline uint32_t
get_nl_timestamp (void)
{
-#ifdef IS_IN_nscd
+#if IS_IN_MODULE (nscd)
return nl_timestamp;
#elif defined USE_NSCD
return __nscd_get_nl_timestamp ();
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=435e1870cf726daf9897fd4c9cbfd95c4dafdc41
commit 435e1870cf726daf9897fd4c9cbfd95c4dafdc41
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon Aug 11 12:04:38 2014 +0530
Remove IS_IN_ldconfig
Replace it with IS_IN_MODULE (ldconfig). The generated code remains
unchanged on x86_64.
diff --git a/elf/Makefile b/elf/Makefile
index 1990195..fdee669 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -431,7 +431,7 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
- -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1
+ -D'SLIBDIR="$(slibdir)"'
CPPFLAGS-ldconfig += -UIN_MODULE -DIN_MODULE=MODULE_ldconfig
CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
CFLAGS-cache.c = $(SYSCONF-FLAGS)
diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c
index 6662a94..78031c9 100644
--- a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c
+++ b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c
@@ -1,4 +1,4 @@
-#ifdef IS_IN_ldconfig
+#if IS_IN_MODULE (ldconfig)
# include <sysdeps/i386/dl-procinfo.c>
#else
# include <sysdeps/generic/dl-procinfo.c>
diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h
index 3145520..f11fc77 100644
--- a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h
+++ b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h
@@ -1,4 +1,4 @@
-#ifdef IS_IN_ldconfig
+#if IS_IN_MODULE (ldconfig)
# include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
#else
# include <sysdeps/generic/dl-procinfo.h>
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c421d6ae6dc3a5213034f25fd9b884357d8453e4
commit c421d6ae6dc3a5213034f25fd9b884357d8453e4
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon Aug 11 11:59:52 2014 +0530
Remove IS_IN_libc
Replace it with IS_IN_MODULE (libc) and remove the one place that it
is defined in. The generated code remains unchanged on x86_64.
diff --git a/include/shlib-compat.h b/include/shlib-compat.h
index 2986fd9..1d2c48e 100644
--- a/include/shlib-compat.h
+++ b/include/shlib-compat.h
@@ -45,10 +45,6 @@
&& (!(ABI_##lib##_##obsoleted - 0) \
|| ((ABI_##lib##_##introduced - 0) < (ABI_##lib##_##obsoleted - 0))))
-# ifndef NOT_IN_libc
-# define IS_IN_libc 1
-# endif
-
/* That header also defines symbols like `VERSION_libm_GLIBC_2_1' to
the version set name to use for e.g. symbols first introduced into
libm in the GLIBC_2.1 version. Definitions of symbols with explicit
diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c
index 1da1a6f..c0452c3 100644
--- a/nss/nss_files/files-parse.c
+++ b/nss/nss_files/files-parse.c
@@ -73,7 +73,7 @@ struct parser_data
/* Export the line parser function so it can be used in nss_db. */
# define parser_stclass /* Global */
# define parse_line CONCAT(_nss_files_parse_,ENTNAME)
-# ifdef IS_IN_libc
+# if IS_IN_MODULE (libc)
/* We are defining one of the functions that actually lives in libc
because it is used to implement fget*ent and suchlike. */
# define nss_files_parse_hidden_def(name) libc_hidden_def (name)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b6b8905031edd4034572785ad15fd5be8fbf126b
commit b6b8905031edd4034572785ad15fd5be8fbf126b
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon Aug 11 11:51:16 2014 +0530
Define MODULE_nscd and MODULE_ldconfig
nscd and ldconfig objects are currently built as MODULE_nonlib, but
they need to be uniquely identified so that any IS_IN_nscd and
IS_IN_ldconfig checks can be replaced. Explcitly redefine IN_MODULE
as MODULE_nscd and MODULE_ldconfig respectively to achieve this.
The generated code is unchanged on x86_64.
diff --git a/elf/Makefile b/elf/Makefile
index 00986cb..1990195 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -432,6 +432,7 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
-D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1
+CPPFLAGS-ldconfig += -UIN_MODULE -DIN_MODULE=MODULE_ldconfig
CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
CFLAGS-cache.c = $(SYSCONF-FLAGS)
CFLAGS-rtld.c = $(SYSCONF-FLAGS)
diff --git a/include/libc-modules.h b/include/libc-modules.h
index 17377f2..c9905f5 100644
--- a/include/libc-modules.h
+++ b/include/libc-modules.h
@@ -28,6 +28,8 @@
#define MODULE_libnsl 30
#define MODULE_libpcprofile 31
#define MODULE_librpcsvc 32
+#define MODULE_nscd 33
+#define MODULE_ldconfig 34
/* Added to the core library modules, i.e. libc, libpthread, libnss_*, etc. */
#define MODULE_libs 1000
diff --git a/nscd/Makefile b/nscd/Makefile
index 639d87b..9d173b3 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -79,7 +79,10 @@ CFLAGS-nscd_gethst_r.c = -fexceptions
CFLAGS-nscd_getai.c = -fexceptions
CFLAGS-nscd_initgroups.c = -fexceptions
-CPPFLAGS-nonlib += -DIS_IN_nscd=1 -D_FORTIFY_SOURCE=2
+# Override the definition of IN_MODULE inherited from CPPFLAGS-nonlib. We want
+# to be called nscd and not just a generic nonlib.
+CPPFLAGS-nonlib += -DIS_IN_nscd=1 -D_FORTIFY_SOURCE=2 -UIN_MODULE \
+ -DIN_MODULE=MODULE_nscd
ifeq (yesyes,$(have-fpie)$(build-shared))
CFLAGS-nonlib += $(pie-ccflag)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fc3c16992c42acc866de23b0ed8aea1461721d8a
commit fc3c16992c42acc866de23b0ed8aea1461721d8a
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Sun Aug 10 10:01:32 2014 +0530
Remove NOT_IN_libc definition for pthread_atfork
pthread_atfork is already built in an extra-libs context, which gives
it NOT_IN_libc in its CPPFLAGS. Adding the same definition to CFLAGS
is pointless.
Verified that the code is unchanged on x86_64.
diff --git a/nptl/Makefile b/nptl/Makefile
index ab3080e..157fe62 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -139,8 +139,6 @@ libpthread-routines = nptl-init vars events version \
libpthread-shared-only-routines = version pt-allocrtsig unwind-forcedunwind
libpthread-static-only-routines = pthread_atfork
-CFLAGS-pthread_atfork.c = -DNOT_IN_libc
-
# Since cancellation handling is in large parts handled using exceptions
# we have to compile some files with exception handling enabled, some
# even with asynchronous unwind tables.
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ec12f0b44c46edcb6261e707db369b1f963ab24d
commit ec12f0b44c46edcb6261e707db369b1f963ab24d
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Sun Aug 10 09:57:14 2014 +0530
Define IN_MODULE for translation units that define NOT_IN_libc
Make sure that all instances where IS_IN_libc is defined also defines
IN_MODULE to facilitate removal NOT_IN_libc in future passes.
Verified that the generated code is unchanged on x86_64.
diff --git a/elf/Makefile b/elf/Makefile
index ef94746..00986cb 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -96,7 +96,7 @@ extra-objs += sotruss-lib.os sotruss-lib.so
install-others += $(inst_auditdir)/sotruss-lib.so
install-bin-script += sotruss
generated += sotruss
-CPPFLAGS-sotruss-lib = -DNOT_IN_libc
+CPPFLAGS-sotruss-lib = -DNOT_IN_libc -DIN_MODULE=MODULE_extramodules
$(objpfx)sotruss-lib.so: $(objpfx)sotruss-lib.os
$(build-module-asneeded)
$(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \
@@ -354,8 +354,9 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map)
mv -f $@.new $@
# interp.c exists just to get this string into the libraries.
-CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"' \
- -DNOT_IN_libc=1
+CFLAGS-interp.c = -D'RUNTIME_LINKER="$(rtlddir)/$(rtld-installed-name)"'
+
+CPPFLAGS-interp = -DNOT_IN_libc=1 -DIN_MODULE=MODULE_extramodules
$(objpfx)interp.os: $(common-objpfx)config.make
ifneq (ld.so,$(rtld-installed-name))
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f0784861dba45c886ccb97e41d3a2c4b94fb69d6
commit f0784861dba45c886ccb97e41d3a2c4b94fb69d6
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Sat Aug 9 17:45:48 2014 +0530
Fix -Wundef build warning in SHLIB_COMPAT macro
Make SHLIB_COMPAT use IS_IN_MODULE() instead of the IS_IN_* macro.
The source remains unchanged on x86_64 and i386.
diff --git a/include/shlib-compat.h b/include/shlib-compat.h
index fac0814..2986fd9 100644
--- a/include/shlib-compat.h
+++ b/include/shlib-compat.h
@@ -41,7 +41,7 @@
# define SHLIB_COMPAT(lib, introduced, obsoleted) \
_SHLIB_COMPAT (lib, introduced, obsoleted)
# define _SHLIB_COMPAT(lib, introduced, obsoleted) \
- ((IS_IN_##lib - 0) \
+ (IS_IN_MODULE (lib) \
&& (!(ABI_##lib##_##obsoleted - 0) \
|| ((ABI_##lib##_##introduced - 0) < (ABI_##lib##_##obsoleted - 0))))
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=23cbc0464047470f70c7d217b4c7ddd4fd6f9ed1
commit 23cbc0464047470f70c7d217b4c7ddd4fd6f9ed1
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Sun Aug 10 07:10:37 2014 +0530
Replace all uses of IN_LIB with *_MODULE_* macros
IN_LIB had two uses: to get the module name in stap and to define some
macros for libraries, i.e. all extra-libs and libc. I now designate a
module as a library by adding a constant MODULE_libs to the value of
the MODULE_* macro in extra-libs.mk and for MODULE_libc. The
MODULE_NAME (to replace IN_LIB in stap-probe.h) is defined depending
on the current value of IN_MODULE. I have conditionally defined these
only for modules that currently have probes. Any new probes may need
additions here if they're in a module that currently does not have
probes.
This change fixes a change in behaviour caused by adding systemtap
probes to lowlevellock.h. The addition of probes causes some non-libc
sources (like nscd, charmap-dir.c and so on) to include stap-probe.h.
stap-probe.h defines IN_LIB to an erroneous to catch cases where
IN_LIB may not have been defined for NOT_IN_libc cases. This breaks a
check in errno.h and netdb.h, which relies on IN_LIB not being defined
to differentiate between extra-libs and other modules. This behaviour
change causes a change in code, but it is limited to a few binaries
and none of the libraries:
iconv_prog
locale
localedef
nscd
diff --git a/elf/Makefile b/elf/Makefile
index 8158bca..ef94746 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -436,8 +436,8 @@ CFLAGS-cache.c = $(SYSCONF-FLAGS)
CFLAGS-rtld.c = $(SYSCONF-FLAGS)
CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
- -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld -UIN_MODULE \
- -DIN_MODULE=MODULE_rtld)
+ -DNOT_IN_libc=1 -DIS_IN_rtld=1 -UIN_MODULE \
+ -DIN_MODULE="MODULE_rtld + MODULE_libs")
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
generated += $(addsuffix .so,$(strip $(modules-names)))
diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index d372ab8..72df010 100644
--- a/elf/rtld-Rules
+++ b/elf/rtld-Rules
@@ -139,7 +139,7 @@ ifdef rtld-depfiles
endif
# This here is the whole point of all the shenanigans.
-rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld -UIN_MODULE \
- -DIN_MODULE=MODULE_rtld
+rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -UIN_MODULE \
+ -DIN_MODULE="MODULE_rtld + MODULE_libs"
endif
diff --git a/extra-lib.mk b/extra-lib.mk
index f7dd4cb..8d3a8c0 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -106,5 +106,5 @@ ifneq (,$(cpp-srcs-left))
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif
-CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib) \
- -UIN_MODULE -DIN_MODULE=MODULE_$(lib)
+CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -UIN_MODULE \
+ -DIN_MODULE="MODULE_$(lib) + MODULE_libs"
diff --git a/include/errno.h b/include/errno.h
index dbf2a61..502dd50 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -22,7 +22,7 @@
# define errno rtld_errno
extern int rtld_errno attribute_hidden;
-# elif !defined NOT_IN_libc || defined IN_LIB
+# elif IS_IN_MODULE_LIB
# include <tls.h>
@@ -34,7 +34,7 @@ extern int rtld_errno attribute_hidden;
# endif
extern __thread int errno attribute_tls_model_ie;
-# endif /* !NOT_IN_libc || IN_LIB */
+# endif
# define __set_errno(val) (errno = (val))
diff --git a/include/libc-modules.h b/include/libc-modules.h
index 89ad2b2..17377f2 100644
--- a/include/libc-modules.h
+++ b/include/libc-modules.h
@@ -29,6 +29,28 @@
#define MODULE_libpcprofile 31
#define MODULE_librpcsvc 32
+/* Added to the core library modules, i.e. libc, libpthread, libnss_*, etc. */
+#define MODULE_libs 1000
+
/* Catch-all for test modules and other binaries. */
#define MODULE_nonlib 98
#define MODULE_extramodules 99
+
+#define IS_IN_MODULE(mod) (IN_MODULE == MODULE_##mod \
+ || IN_MODULE == MODULE_##mod + MODULE_libs)
+
+#define IS_IN_MODULE_LIB (IN_MODULE > MODULE_libs)
+
+#if IS_IN_MODULE (libc)
+# define MODULE_NAME libc
+#elif IS_IN_MODULE (libpthread)
+# define MODULE_NAME libpthread
+#elif IS_IN_MODULE (rtld)
+# define MODULE_NAME rtld
+#elif IS_IN_MODULE (libm)
+# define MODULE_NAME libm
+#elif IS_IN_MODULE (libanl)
+# define MODULE_NAME libanl
+#elif IS_IN_MODULE (librt)
+# define MODULE_NAME librt
+#endif
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index 0110c18..bb86ad5 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -22,12 +22,6 @@
#include "libc-modules.h"
-#ifndef IN_MODULE
-# define IN_MODULE MODULE_libc
-#endif
-
-#define IS_IN_MODULE(lib) (IN_MODULE == MODULE_##lib)
-
/* This file's macros are included implicitly in the compilation of every
file in the C library by -imacros.
diff --git a/include/netdb.h b/include/netdb.h
index a7960eb..c1c867e 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -4,7 +4,7 @@
#ifndef _ISOMAC
/* Macros for accessing h_errno from inside libc. */
-# if !defined NOT_IN_libc || defined IN_LIB
+# if IS_IN_MODULE_LIB
# undef h_errno
# ifndef NOT_IN_libc
# define h_errno __libc_h_errno
@@ -12,7 +12,7 @@
# define h_errno h_errno /* For #ifndef h_errno tests. */
# endif
extern __thread int h_errno attribute_tls_model_ie;
-# endif /* !NOT_IN_libc || IN_LIB */
+# endif
# define __set_h_errno(x) (h_errno = (x))
libc_hidden_proto (hstrerror)
diff --git a/include/stap-probe.h b/include/stap-probe.h
index 688646c..072bfff 100644
--- a/include/stap-probe.h
+++ b/include/stap-probe.h
@@ -30,7 +30,7 @@
Systemtap's header defines the macros STAP_PROBE (provider, name) and
STAP_PROBEn (provider, name, arg1, ..., argn). For "provider" we paste
- in the IN_LIB name (libc, libpthread, etc.) automagically.
+ in the MODULE_NAME name (libc, libpthread, etc.) automagically.
The format of the arg parameters is discussed here:
@@ -40,20 +40,18 @@
architecture specific and can be found in the gdb and SystemTap
source code. */
-# ifndef NOT_IN_libc
-# define IN_LIB libc
-# elif !defined IN_LIB
+# ifndef MODULE_NAME
/* This is intentionally defined with extra unquoted commas in it so
that macro substitution will bomb out when it is used. We don't
just use #error here, so that this header can be included by
other headers that use LIBC_PROBE inside their own macros. We
only want such headers to fail to compile if those macros are
- actually used in a context where IN_LIB has not been defined. */
-# define IN_LIB ,,,missing -DIN_LIB=... -- not extra-lib.mk?,,,
+ actually used in a context where MODULE_NAME has not been defined. */
+# define MODULE_NAME ,,,missing MODULE_NAME ... -- not in libc-modules.h?,,,
# endif
# define LIBC_PROBE(name, n, ...) \
- LIBC_PROBE_1 (IN_LIB, name, n, ## __VA_ARGS__)
+ LIBC_PROBE_1 (MODULE_NAME, name, n, ## __VA_ARGS__)
# define LIBC_PROBE_1(lib, name, n, ...) \
STAP_PROBE##n (lib, name, ## __VA_ARGS__)
@@ -61,7 +59,7 @@
# define STAP_PROBE0 STAP_PROBE
# define LIBC_PROBE_ASM(name, template) \
- STAP_PROBE_ASM (IN_LIB, name, template)
+ STAP_PROBE_ASM (MODULE_NAME, name, template)
# define LIBC_PROBE_ASM_OPERANDS STAP_PROBE_ASM_OPERANDS
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9c988373cca3b3fe69c30ef1fb2683c77e4aa606
commit 9c988373cca3b3fe69c30ef1fb2683c77e4aa606
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Aug 12 07:35:37 2014 +0530
Implicit targets build for libc.so by default
Switch away from using ifndef to set IN_MODULE when it is not set.
Instead, always define IN_MODULE as MODULE_libc for implicit rules in
Makeconfig and then have module makefiles override the definition
using -UIN_MODULE and -DIN_MODULE=...
The generated code is unchanged on x86_64.
diff --git a/Makeconfig b/Makeconfig
index cef0f06..cd64cbc 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -817,7 +817,10 @@ libio-include = -I$(..)libio
# Note that we can't use -std=* in CPPFLAGS, because it overrides
# the implicit -lang-asm and breaks cpp behavior for .S files--notably
# it causes cpp to stop predefining __ASSEMBLER__.
+# All sources are assumed to be in libc.so sources, unless
+# overridden by CPPFLAGS.
CPPFLAGS = $(config-extra-cppflags) $(CPPUNDEFS) $(CPPFLAGS-config) \
+ -DIN_MODULE=MODULE_libc+MODULE_libs \
$($(subdir)-CPPFLAGS) \
$(+includes) $(defines) \
-include $(..)include/libc-symbols.h $(sysdep-CPPFLAGS) \
diff --git a/Makerules b/Makerules
index 7e4c16a..fd6498c 100644
--- a/Makerules
+++ b/Makerules
@@ -1162,7 +1162,7 @@ include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif
# The include magic above causes those files to use this variable for flags.
-CPPFLAGS-nonlib = -DNOT_IN_libc=1 -DIN_MODULE=MODULE_nonlib
+CPPFLAGS-nonlib = -DNOT_IN_libc=1 -UIN_MODULE -DIN_MODULE=MODULE_nonlib
ifeq ($(build-shared),yes)
diff --git a/elf/Makefile b/elf/Makefile
index 8c03131..8158bca 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -436,7 +436,8 @@ CFLAGS-cache.c = $(SYSCONF-FLAGS)
CFLAGS-rtld.c = $(SYSCONF-FLAGS)
CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
- -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld -DIN_MODULE=MODULE_rtld)
+ -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld -UIN_MODULE \
+ -DIN_MODULE=MODULE_rtld)
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
generated += $(addsuffix .so,$(strip $(modules-names)))
diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index b36173e..d372ab8 100644
--- a/elf/rtld-Rules
+++ b/elf/rtld-Rules
@@ -139,6 +139,7 @@ ifdef rtld-depfiles
endif
# This here is the whole point of all the shenanigans.
-rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld -DIN_MODULE=MODULE_rtld
+rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld -UIN_MODULE \
+ -DIN_MODULE=MODULE_rtld
endif
diff --git a/extra-lib.mk b/extra-lib.mk
index f4c7412..f7dd4cb 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -106,4 +106,5 @@ ifneq (,$(cpp-srcs-left))
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif
-CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib) -DIN_MODULE=MODULE_$(lib)
+CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib) \
+ -UIN_MODULE -DIN_MODULE=MODULE_$(lib)
diff --git a/extra-modules.mk b/extra-modules.mk
index 9aa2198..9070c2b 100644
--- a/extra-modules.mk
+++ b/extra-modules.mk
@@ -6,4 +6,4 @@
module := $(firstword $(extra-modules-left))
extra-modules-left := $(filter-out $(module),$(extra-modules-left))
-CPPFLAGS-$(module).c += -DNOT_IN_libc -DIN_MODULE=MODULE_extramodules
+CPPFLAGS-$(module).c += -DNOT_IN_libc -UIN_MODULE -DIN_MODULE=MODULE_extramodules
diff --git a/iconv/Makefile b/iconv/Makefile
index 387e8e0..5cb42f4 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -52,11 +52,14 @@ CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"'
CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"'
CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"'
-CPPFLAGS-iconv_charmap = -DNOT_IN_libc -DIN_MODULE=MODULE_iconv_programs
-CPPFLAGS-linereader = -DNOT_IN_libc -DIN_MODULE=MODULE_iconv_programs
-CPPFLAGS-strtab = -DNOT_IN_libc -DIN_MODULE=MODULE_iconv_programs
-CPPFLAGS-charmap = -DNOT_IN_libc -DIN_MODULE=MODULE_iconv_programs
-CPPFLAGS-charmap-dir = -DNOT_IN_libc -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-iconv_charmap = -DNOT_IN_libc -UIN_MODULE \
+ -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-linereader = -DNOT_IN_libc -UIN_MODULE \
+ -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-strtab = -DNOT_IN_libc -UIN_MODULE -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-charmap = -DNOT_IN_libc -UIN_MODULE -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-charmap-dir = -DNOT_IN_libc -UIN_MODULE \
+ -DIN_MODULE=MODULE_iconv_programs
ifeq ($(run-built-tests),yes)
xtests-special += $(objpfx)test-iconvconfig.out
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 8e96fac..60a1086 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -76,7 +76,7 @@ test-srcs := tst-table-from tst-table-to
endif
# No code here is in libc.so.
-CPPFLAGS += -DNOT_IN_libc -DIN_MODULE=MODULE_iconvdata
+CPPFLAGS += -DNOT_IN_libc -UIN_MODULE -DIN_MODULE=MODULE_iconvdata
libJIS-routines := jis0201 jis0208 jis0212
libKSC-routines := ksc5601
diff --git a/locale/Makefile b/locale/Makefile
index 38e1d25..d4720c8 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -89,7 +89,8 @@ CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
-DLOCSRCDIR='"$(i18ndir)/locales"' \
- -DNOT_IN_libc -DIN_MODULE=MODULE_locale_programs
+ -DNOT_IN_libc -UIN_MODULE \
+ -DIN_MODULE=MODULE_locale_programs
CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
diff --git a/malloc/Makefile b/malloc/Makefile
index 3a6dbed..b143127 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -48,7 +48,7 @@ extra-objs = mcheck-init.o libmcheck.a
# Include the cleanup handler.
aux := set-freeres thread-freeres
-CPPFLAGS-memusagestat = -DNOT_IN_libc -DIN_MODULE=MODULE_memusagestat
+CPPFLAGS-memusagestat = -DNOT_IN_libc -UIN_MODULE -DIN_MODULE=MODULE_memusagestat
# The Perl script to analyze the output of the mtrace functions.
ifneq ($(PERL),no)
diff --git a/nss/Makefile b/nss/Makefile
index c4fdaae..30f0a49 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -105,7 +105,8 @@ $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o)
$(inst_vardbdir)/Makefile: db-Makefile $(+force)
$(do-install)
-CPPFLAGS-nss_test1 = -DNOT_IN_libc=1 -DIN_MODULE=MODULE_extramodules
+CPPFLAGS-nss_test1 = -DNOT_IN_libc=1 -UIN_MODULE \
+ -DIN_MODULE=MODULE_extramodules
$(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps)
$(build-module)
ifdef libnss_test1.so-version
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 7c890aa..3be9ed5 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -145,7 +145,8 @@ LDFLAGS-tst-putenv = $(no-as-needed)
$(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os $(link-libc-deps)
$(build-module)
-CFLAGS-tst-putenvmod.c = -DNOT_IN_libc=1 -DIN_MODULE=MODULE_extramodules
+CFLAGS-tst-putenvmod.c = -DNOT_IN_libc=1 -UIN_MODULE \
+ -DIN_MODULE=MODULE_extramodules
$(objpfx)bug-getcontext: $(libm)
$(objpfx)tst-strtod-round: $(libm)
diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile
index 6facbf7..7e1a431 100644
--- a/sysdeps/gnu/Makefile
+++ b/sysdeps/gnu/Makefile
@@ -38,7 +38,8 @@ $(objpfx)errlist-compat.c: $(errlist-c) $(..)sysdeps/gnu/errlist-compat.awk \
endif
$(make-target-directory)
$(AWK) -v maxerr=`\
- $(CC) -S $(CPPFLAGS) $(CFLAGS) -DNOT_IN_libc -DIN_MODULE=MODULE_extramodules \
+ $(CC) -S $(CPPFLAGS) $(CFLAGS) -DNOT_IN_libc -UIN_MODULE \
+ -DIN_MODULE=MODULE_extramodules \
-DEMIT_ERR_MAX $< -o - \
| sed -n 's/^.*@@@[^0-9]*\([0-9]*\)[^0-9]*@@@.*$$/\1/p'` \
-f $(..)sysdeps/gnu/errlist-compat.awk \
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index cae6d97..3c450d0 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -178,7 +178,7 @@ ifeq ($(subdir),elf)
sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64 dl-opendir \
dl-fxstatat64
-CPPFLAGS-lddlibc4 += -DNOT_IN_libc -DIN_MODULE=MODULE_lddlibc4
+CPPFLAGS-lddlibc4 += -DNOT_IN_libc -UIN_MODULE -DIN_MODULE=MODULE_lddlibc4
others += pldd
install-bin += pldd
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fbcb7b38201a30d2c1cec21bd1f605d295e2dc05
commit fbcb7b38201a30d2c1cec21bd1f605d295e2dc05
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Sat Aug 9 17:38:53 2014 +0530
Add new macro IN_MODULE to identify module in which source is built
The current scheme to identify which module a translation unit is
built in depends on defining multiple macros IS_IN_* and also defining
NOT_IN_libc if we're building a non-libc module. In addition, there
is an IN_LIB macro that does effectively the same thing, but for
different modules (notably the systemtap probes). This macro scheme
unifies both ideas to use just one macro IN_MODULE and assign it a
value depending on the module it is being built into. Currently, if
the module is not defined, it defaults to MODULE_libc.
Patches that follow will remove uses of IS_IN_* with the
IS_IN_MODULE() macro. libc-symbols.h has been converted already to
give an example of how such a transition will look.
Verified that there are no relevant source changes. One source change
that will crop up repeatedly is that of nscd_stat, since it uses the
build timestamp as a constant in its logic.
diff --git a/Makerules b/Makerules
index 6b30e8c..7e4c16a 100644
--- a/Makerules
+++ b/Makerules
@@ -1162,7 +1162,7 @@ include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif
# The include magic above causes those files to use this variable for flags.
-CPPFLAGS-nonlib = -DNOT_IN_libc=1
+CPPFLAGS-nonlib = -DNOT_IN_libc=1 -DIN_MODULE=MODULE_nonlib
ifeq ($(build-shared),yes)
diff --git a/elf/Makefile b/elf/Makefile
index 25012cc..8c03131 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -436,7 +436,7 @@ CFLAGS-cache.c = $(SYSCONF-FLAGS)
CFLAGS-rtld.c = $(SYSCONF-FLAGS)
CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
- -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld)
+ -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld -DIN_MODULE=MODULE_rtld)
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
generated += $(addsuffix .so,$(strip $(modules-names)))
diff --git a/elf/rtld-Rules b/elf/rtld-Rules
index 0a5d6af..b36173e 100644
--- a/elf/rtld-Rules
+++ b/elf/rtld-Rules
@@ -139,6 +139,6 @@ ifdef rtld-depfiles
endif
# This here is the whole point of all the shenanigans.
-rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld
+rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld -DIN_MODULE=MODULE_rtld
endif
diff --git a/extra-lib.mk b/extra-lib.mk
index fd8812c..f4c7412 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -106,4 +106,4 @@ ifneq (,$(cpp-srcs-left))
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif
-CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib)
+CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib) -DIN_MODULE=MODULE_$(lib)
diff --git a/extra-modules.mk b/extra-modules.mk
index c7ed850..9aa2198 100644
--- a/extra-modules.mk
+++ b/extra-modules.mk
@@ -6,4 +6,4 @@
module := $(firstword $(extra-modules-left))
extra-modules-left := $(filter-out $(module),$(extra-modules-left))
-CPPFLAGS-$(module).c += -DNOT_IN_libc
+CPPFLAGS-$(module).c += -DNOT_IN_libc -DIN_MODULE=MODULE_extramodules
diff --git a/iconv/Makefile b/iconv/Makefile
index 48d17d7..387e8e0 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -52,11 +52,11 @@ CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"'
CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"'
CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"'
-CPPFLAGS-iconv_charmap = -DNOT_IN_libc
-CPPFLAGS-linereader = -DNOT_IN_libc
-CPPFLAGS-strtab = -DNOT_IN_libc
-CPPFLAGS-charmap = -DNOT_IN_libc
-CPPFLAGS-charmap-dir = -DNOT_IN_libc
+CPPFLAGS-iconv_charmap = -DNOT_IN_libc -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-linereader = -DNOT_IN_libc -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-strtab = -DNOT_IN_libc -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-charmap = -DNOT_IN_libc -DIN_MODULE=MODULE_iconv_programs
+CPPFLAGS-charmap-dir = -DNOT_IN_libc -DIN_MODULE=MODULE_iconv_programs
ifeq ($(run-built-tests),yes)
xtests-special += $(objpfx)test-iconvconfig.out
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 0a410a1..8e96fac 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -76,7 +76,7 @@ test-srcs := tst-table-from tst-table-to
endif
# No code here is in libc.so.
-CPPFLAGS += -DNOT_IN_libc
+CPPFLAGS += -DNOT_IN_libc -DIN_MODULE=MODULE_iconvdata
libJIS-routines := jis0201 jis0208 jis0212
libKSC-routines := ksc5601
diff --git a/include/libc-modules.h b/include/libc-modules.h
new file mode 100644
index 0000000..89ad2b2
--- /dev/null
+++ b/include/libc-modules.h
@@ -0,0 +1,34 @@
+#define MODULE_libc 1
+#define MODULE_libpthread 2
+#define MODULE_rtld 3
+#define MODULE_libdl 4
+#define MODULE_libm 5
+#define MODULE_iconv_programs 6
+#define MODULE_iconvdata 7
+#define MODULE_lddlibc4 8
+#define MODULE_locale_programs 9
+#define MODULE_memusagestat 10
+#define MODULE_libutil 12
+#define MODULE_libBrokenLocale 13
+#define MODULE_libmemusage 15
+#define MODULE_libresolv 16
+#define MODULE_libnss_db 17
+#define MODULE_libnss_files 18
+#define MODULE_libnss_dns 19
+#define MODULE_libnss_compat 20
+#define MODULE_libnss_hesiod 21
+#define MODULE_libnss_nis 22
+#define MODULE_libnss_nisplus 23
+#define MODULE_libanl 24
+#define MODULE_librt 25
+#define MODULE_libSegFault 26
+#define MODULE_libthread_db 27
+#define MODULE_libcidn 28
+#define MODULE_libcrypt 29
+#define MODULE_libnsl 30
+#define MODULE_libpcprofile 31
+#define MODULE_librpcsvc 32
+
+/* Catch-all for test modules and other binaries. */
+#define MODULE_nonlib 98
+#define MODULE_extramodules 99
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index d4ab1f3..0110c18 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -20,6 +20,14 @@
#ifndef _LIBC_SYMBOLS_H
#define _LIBC_SYMBOLS_H 1
+#include "libc-modules.h"
+
+#ifndef IN_MODULE
+# define IN_MODULE MODULE_libc
+#endif
+
+#define IS_IN_MODULE(lib) (IN_MODULE == MODULE_##lib)
+
/* This file's macros are included implicitly in the compilation of every
file in the C library by -imacros.
@@ -468,7 +476,7 @@ for linking")
If the function should be internal to multiple objects, say ld.so and
libc.so, the best way is to use:
- #if !defined NOT_IN_libc || defined IS_IN_rtld
+ #if IS_IN_MODULE (libc) || IS_IN_MODULE (rtld)
hidden_proto (foo)
#endif
@@ -584,7 +592,7 @@ for linking")
# define libc_hidden_data_ver(local, name)
#endif
-#ifdef IS_IN_rtld
+#if IS_IN_MODULE (rtld)
# define rtld_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define rtld_hidden_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs)
# define rtld_hidden_def(name) hidden_def (name)
@@ -604,7 +612,7 @@ for linking")
# define rtld_hidden_data_ver(local, name)
#endif
-#ifdef IS_IN_libm
+#if IS_IN_MODULE (libm)
# define libm_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libm_hidden_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs)
# define libm_hidden_def(name) hidden_def (name)
@@ -624,7 +632,7 @@ for linking")
# define libm_hidden_data_ver(local, name)
#endif
-#ifdef IS_IN_libresolv
+#if IS_IN_MODULE (libresolv)
# define libresolv_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libresolv_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@@ -645,7 +653,7 @@ for linking")
# define libresolv_hidden_data_ver(local, name)
#endif
-#ifdef IS_IN_librt
+#if IS_IN_MODULE (librt)
# define librt_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define librt_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@@ -666,7 +674,7 @@ for linking")
# define librt_hidden_data_ver(local, name)
#endif
-#ifdef IS_IN_libdl
+#if IS_IN_MODULE (libdl)
# define libdl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libdl_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@@ -687,7 +695,7 @@ for linking")
# define libdl_hidden_data_ver(local, name)
#endif
-#ifdef IS_IN_libnss_files
+#if IS_IN_MODULE (libnss_files)
# define libnss_files_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libnss_files_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@@ -708,7 +716,7 @@ for linking")
# define libnss_files_hidden_data_ver(local, name)
#endif
-#ifdef IS_IN_libnsl
+#if IS_IN_MODULE (libnsl)
# define libnsl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libnsl_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@@ -729,7 +737,7 @@ for linking")
# define libnsl_hidden_data_ver(local, name)
#endif
-#ifdef IS_IN_libnss_nisplus
+#if IS_IN_MODULE (libnss_nisplus)
# define libnss_nisplus_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libnss_nisplus_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@@ -758,7 +766,7 @@ for linking")
# define HIDDEN_BUILTIN_JUMPTARGET(name) HIDDEN_JUMPTARGET(name)
#endif
-#ifdef IS_IN_libutil
+#if IS_IN_MODULE (libutil)
# define libutil_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libutil_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
diff --git a/locale/Makefile b/locale/Makefile
index e4c3878..38e1d25 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -89,7 +89,7 @@ CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
-DLOCSRCDIR='"$(i18ndir)/locales"' \
- -DNOT_IN_libc
+ -DNOT_IN_libc -DIN_MODULE=MODULE_locale_programs
CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
diff --git a/malloc/Makefile b/malloc/Makefile
index 9e93523..3a6dbed 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -48,7 +48,7 @@ extra-objs = mcheck-init.o libmcheck.a
# Include the cleanup handler.
aux := set-freeres thread-freeres
-CPPFLAGS-memusagestat = -DNOT_IN_libc
+CPPFLAGS-memusagestat = -DNOT_IN_libc -DIN_MODULE=MODULE_memusagestat
# The Perl script to analyze the output of the mtrace functions.
ifneq ($(PERL),no)
diff --git a/nss/Makefile b/nss/Makefile
index 1fa7f1f..c4fdaae 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -105,7 +105,7 @@ $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o)
$(inst_vardbdir)/Makefile: db-Makefile $(+force)
$(do-install)
-CFLAGS-nss_test1.c = -DNOT_IN_libc=1
+CPPFLAGS-nss_test1 = -DNOT_IN_libc=1 -DIN_MODULE=MODULE_extramodules
$(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps)
$(build-module)
ifdef libnss_test1.so-version
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 9b2271b..7c890aa 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -145,7 +145,7 @@ LDFLAGS-tst-putenv = $(no-as-needed)
$(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os $(link-libc-deps)
$(build-module)
-CFLAGS-tst-putenvmod.c = -DNOT_IN_libc=1
+CFLAGS-tst-putenvmod.c = -DNOT_IN_libc=1 -DIN_MODULE=MODULE_extramodules
$(objpfx)bug-getcontext: $(libm)
$(objpfx)tst-strtod-round: $(libm)
diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile
index c05708d..6facbf7 100644
--- a/sysdeps/gnu/Makefile
+++ b/sysdeps/gnu/Makefile
@@ -38,7 +38,8 @@ $(objpfx)errlist-compat.c: $(errlist-c) $(..)sysdeps/gnu/errlist-compat.awk \
endif
$(make-target-directory)
$(AWK) -v maxerr=`\
- $(CC) -S $(CPPFLAGS) $(CFLAGS) -DNOT_IN_libc -DEMIT_ERR_MAX $< -o - \
+ $(CC) -S $(CPPFLAGS) $(CFLAGS) -DNOT_IN_libc -DIN_MODULE=MODULE_extramodules \
+ -DEMIT_ERR_MAX $< -o - \
| sed -n 's/^.*@@@[^0-9]*\([0-9]*\)[^0-9]*@@@.*$$/\1/p'` \
-f $(..)sysdeps/gnu/errlist-compat.awk \
$(wildcard $(sysdirs:=/Versions)) > $@T
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 9ad6d22..cae6d97 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -178,7 +178,7 @@ ifeq ($(subdir),elf)
sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64 dl-opendir \
dl-fxstatat64
-CPPFLAGS-lddlibc4 += -DNOT_IN_libc
+CPPFLAGS-lddlibc4 += -DNOT_IN_libc -DIN_MODULE=MODULE_lddlibc4
others += pldd
install-bin += pldd
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=767cfd776294548dc1e6962f647f821cb9612755
commit 767cfd776294548dc1e6962f647f821cb9612755
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Sat Aug 9 16:40:10 2014 +0530
Remove redundant CPPFLAGS for some programs
These programs get the NOT_IN_libc twice, once through the 'other'
target and another explicitly. Remove the explicitly added CPFLAG.
diff --git a/catgets/Makefile b/catgets/Makefile
index 4a03eba..008d7db 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -48,8 +48,6 @@ $(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o)
catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"'
-CPPFLAGS-gencat = -DNOT_IN_libc
-
generated += de.msg test1.cat test1.h test2.cat test2.h sample.SJIS.cat \
test-gencat.h
generated-dirs += de
diff --git a/iconv/Makefile b/iconv/Makefile
index 5de04a0..48d17d7 100644
--- a/iconv/Makefile
+++ b/iconv/Makefile
@@ -52,9 +52,7 @@ CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"'
CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"'
CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"'
-CPPFLAGS-iconv_prog = -DNOT_IN_libc
CPPFLAGS-iconv_charmap = -DNOT_IN_libc
-CPPFLAGS-iconvconfig = -DNOT_IN_libc
CPPFLAGS-linereader = -DNOT_IN_libc
CPPFLAGS-strtab = -DNOT_IN_libc
CPPFLAGS-charmap = -DNOT_IN_libc
diff --git a/timezone/Makefile b/timezone/Makefile
index 6e008bc..66b59ce 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -40,8 +40,6 @@ install-sbin := zic zdump
generated-dirs += testdata
-CPPFLAGS-zic = -DNOT_IN_libc
-
install-bin-script = tzselect
generated += tzselect
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b6da694b310a9fd7d33b2488990b742937f05f09
commit b6da694b310a9fd7d33b2488990b742937f05f09
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Sat Aug 9 14:48:27 2014 +0530
Remove unnecessary uses of NOT_IN_libc
If a IS_IN_* macro is defined, then NOT_IN_libc is always defined,
except obviously for IS_IN_libc. There's no need to check for both.
Verified on x86_64 and i686 that the source is unchanged.
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index 48edadc..d4ab1f3 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -584,7 +584,7 @@ for linking")
# define libc_hidden_data_ver(local, name)
#endif
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
# define rtld_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define rtld_hidden_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs)
# define rtld_hidden_def(name) hidden_def (name)
@@ -604,7 +604,7 @@ for linking")
# define rtld_hidden_data_ver(local, name)
#endif
-#if defined NOT_IN_libc && defined IS_IN_libm
+#ifdef IS_IN_libm
# define libm_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libm_hidden_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs)
# define libm_hidden_def(name) hidden_def (name)
@@ -624,7 +624,7 @@ for linking")
# define libm_hidden_data_ver(local, name)
#endif
-#if defined NOT_IN_libc && defined IS_IN_libresolv
+#ifdef IS_IN_libresolv
# define libresolv_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libresolv_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@@ -645,7 +645,7 @@ for linking")
# define libresolv_hidden_data_ver(local, name)
#endif
-#if defined NOT_IN_libc && defined IS_IN_librt
+#ifdef IS_IN_librt
# define librt_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define librt_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@@ -666,7 +666,7 @@ for linking")
# define librt_hidden_data_ver(local, name)
#endif
-#if defined NOT_IN_libc && defined IS_IN_libdl
+#ifdef IS_IN_libdl
# define libdl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libdl_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@@ -687,7 +687,7 @@ for linking")
# define libdl_hidden_data_ver(local, name)
#endif
-#if defined NOT_IN_libc && defined IS_IN_libnss_files
+#ifdef IS_IN_libnss_files
# define libnss_files_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libnss_files_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@@ -708,7 +708,7 @@ for linking")
# define libnss_files_hidden_data_ver(local, name)
#endif
-#if defined NOT_IN_libc && defined IS_IN_libnsl
+#ifdef IS_IN_libnsl
# define libnsl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libnsl_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@@ -729,7 +729,7 @@ for linking")
# define libnsl_hidden_data_ver(local, name)
#endif
-#if defined NOT_IN_libc && defined IS_IN_libnss_nisplus
+#ifdef IS_IN_libnss_nisplus
# define libnss_nisplus_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libnss_nisplus_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@@ -758,7 +758,7 @@ for linking")
# define HIDDEN_BUILTIN_JUMPTARGET(name) HIDDEN_JUMPTARGET(name)
#endif
-#if defined NOT_IN_libc && defined IS_IN_libutil
+#ifdef IS_IN_libutil
# define libutil_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libutil_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 4226473..d4415ba 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -252,7 +252,7 @@ extern void __pthread_register_cancel (__pthread_unwind_buf_t *__buf)
__cleanup_fct_attribute;
extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
__cleanup_fct_attribute;
-#if defined NOT_IN_libc && defined IS_IN_libpthread
+#ifdef IS_IN_libpthread
hidden_proto (__pthread_unwind)
hidden_proto (__pthread_unwind_next)
hidden_proto (__pthread_register_cancel)
@@ -296,13 +296,13 @@ __do_cancel (void)
# define LIBC_CANCEL_HANDLED() \
__asm (".globl " __SYMBOL_PREFIX "__libc_enable_asynccancel"); \
__asm (".globl " __SYMBOL_PREFIX "__libc_disable_asynccancel")
-#elif defined NOT_IN_libc && defined IS_IN_libpthread
+#elif defined IS_IN_libpthread
# define LIBC_CANCEL_ASYNC() CANCEL_ASYNC ()
# define LIBC_CANCEL_RESET(val) CANCEL_RESET (val)
# define LIBC_CANCEL_HANDLED() \
__asm (".globl " __SYMBOL_PREFIX "__pthread_enable_asynccancel"); \
__asm (".globl " __SYMBOL_PREFIX "__pthread_disable_asynccancel")
-#elif defined NOT_IN_libc && defined IS_IN_librt
+#elif defined IS_IN_librt
# define LIBC_CANCEL_ASYNC() \
__librt_enable_asynccancel ()
# define LIBC_CANCEL_RESET(val) \
@@ -341,7 +341,7 @@ extern int __make_stacks_executable (void **stack_endp)
/* longjmp handling. */
extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe);
-#if defined NOT_IN_libc && defined IS_IN_libpthread
+#ifdef IS_IN_libpthread
hidden_proto (__pthread_cleanup_upto)
#endif
@@ -486,7 +486,7 @@ extern int __pthread_enable_asynccancel (void) attribute_hidden;
extern void __pthread_disable_asynccancel (int oldtype)
internal_function attribute_hidden;
-#if defined NOT_IN_libc && defined IS_IN_libpthread
+#ifdef IS_IN_libpthread
hidden_proto (__pthread_mutex_init)
hidden_proto (__pthread_mutex_destroy)
hidden_proto (__pthread_mutex_lock)
diff --git a/sysdeps/aarch64/setjmp.S b/sysdeps/aarch64/setjmp.S
index fd39319..d548dd5 100644
--- a/sysdeps/aarch64/setjmp.S
+++ b/sysdeps/aarch64/setjmp.S
@@ -63,7 +63,7 @@ ENTRY (__sigsetjmp)
mov x2, sp
str x2, [x0, #JB_SP<<3]
#endif
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask */
mov w0, #0
RET
diff --git a/sysdeps/alpha/setjmp.S b/sysdeps/alpha/setjmp.S
index f79837c..840b560 100644
--- a/sysdeps/alpha/setjmp.S
+++ b/sysdeps/alpha/setjmp.S
@@ -86,7 +86,7 @@ $sigsetjmp_local:
ldq ra, 0(sp)
addq sp, 16, sp
ret
-#elif defined NOT_IN_libc && defined IS_IN_rtld
+#elif defined IS_IN_rtld
/* In ld.so we never save the signal mask. */
mov 0, v0
ret
diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index 84b07e1..4c41213 100644
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -292,8 +292,8 @@
#endif
/* Pointer mangling support. */
-#if (defined NOT_IN_libc && defined IS_IN_rtld) || \
- (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread))
+#if (defined IS_IN_rtld || \
+ (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread)))
# ifdef __ASSEMBLER__
# define PTR_MANGLE_LOAD(guard, tmp) \
LDST_PCREL(ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local));
diff --git a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S
index b7637de..7204ce0 100644
--- a/sysdeps/i386/setjmp.S
+++ b/sysdeps/i386/setjmp.S
@@ -46,7 +46,7 @@ ENTRY (__sigsetjmp)
movl %ecx, (JB_PC*4)(%eax)
movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
xorl %eax, %eax
ret
diff --git a/sysdeps/m68k/setjmp.c b/sysdeps/m68k/setjmp.c
index cf742ee..4ba50a1 100644
--- a/sysdeps/m68k/setjmp.c
+++ b/sysdeps/m68k/setjmp.c
@@ -57,7 +57,7 @@ __sigsetjmp (jmp_buf env, int savemask)
: : "m" (env[0].__jmpbuf[0].__fpregs[0]));
#endif
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
return 0;
#else
diff --git a/sysdeps/posix/getcwd.c b/sysdeps/posix/getcwd.c
index 61924d5..6201916 100644
--- a/sysdeps/posix/getcwd.c
+++ b/sysdeps/posix/getcwd.c
@@ -206,7 +206,7 @@ extern char *alloca ();
#ifdef __ASSUME_ATFCTS
# define __have_atfcts 1
-#elif defined NOT_IN_libc && defined IS_IN_rtld
+#elif defined IS_IN_rtld
static int __rtld_have_atfcts;
# define __have_atfcts __rtld_have_atfcts
#endif
diff --git a/sysdeps/powerpc/powerpc32/setjmp-common.S b/sysdeps/powerpc/powerpc32/setjmp-common.S
index dcdd336..681b540 100644
--- a/sysdeps/powerpc/powerpc32/setjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/setjmp-common.S
@@ -69,7 +69,7 @@ ENTRY (__sigsetjmp_symbol)
SAVE_GP (29)
SAVE_GP (30)
SAVE_GP (31)
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
li r3,0
blr
#else
diff --git a/sysdeps/powerpc/powerpc64/setjmp-common.S b/sysdeps/powerpc/powerpc64/setjmp-common.S
index c0c7713..704ee97 100644
--- a/sysdeps/powerpc/powerpc64/setjmp-common.S
+++ b/sysdeps/powerpc/powerpc64/setjmp-common.S
@@ -213,7 +213,7 @@ L(no_vmx):
#else
li r6,0
#endif
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
li r3,0
blr
#elif defined SHARED
diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp.S
index e940d71..3ebc813 100644
--- a/sysdeps/s390/s390-32/setjmp.S
+++ b/sysdeps/s390/s390-32/setjmp.S
@@ -65,7 +65,7 @@ ENTRY(__sigsetjmp)
#endif
std %f4,40(%r2)
std %f6,48(%r2)
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
lhi %r2,0
br %r14
diff --git a/sysdeps/s390/s390-64/setjmp.S b/sysdeps/s390/s390-64/setjmp.S
index 7cbb9e8..faa2784 100644
--- a/sysdeps/s390/s390-64/setjmp.S
+++ b/sysdeps/s390/s390-64/setjmp.S
@@ -71,7 +71,7 @@ ENTRY(__sigsetjmp)
std %f13,120(%r2)
std %f14,128(%r2)
std %f15,136(%r2)
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
lghi %r2,0
br %r14
diff --git a/sysdeps/sh/sh3/setjmp.S b/sysdeps/sh/sh3/setjmp.S
index e123e42..f3a8e6a 100644
--- a/sysdeps/sh/sh3/setjmp.S
+++ b/sysdeps/sh/sh3/setjmp.S
@@ -46,7 +46,7 @@ ENTRY (__sigsetjmp)
mov.l r9, @-r4
mov.l r8, @-r4
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
rts
mov #0, r0
diff --git a/sysdeps/sh/sh4/setjmp.S b/sysdeps/sh/sh4/setjmp.S
index d5ac02e..4bbd666 100644
--- a/sysdeps/sh/sh4/setjmp.S
+++ b/sysdeps/sh/sh4/setjmp.S
@@ -55,7 +55,7 @@ ENTRY (__sigsetjmp)
mov.l r9, @-r4
mov.l r8, @-r4
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
rts
mov #0, r0
diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h
index 0c40ca6..17dad91 100644
--- a/sysdeps/unix/alpha/sysdep.h
+++ b/sysdeps/unix/alpha/sysdep.h
@@ -349,7 +349,7 @@ __LABEL(name) \
we don't deoptimize things by placing the pointer check value there. */
#ifdef __ASSEMBLER__
-# if defined NOT_IN_libc && defined IS_IN_rtld
+# ifdef IS_IN_rtld
# define PTR_MANGLE(dst, src, tmp) \
ldah tmp, __pointer_chk_guard_local($29) !gprelhigh; \
ldq tmp, __pointer_chk_guard_local(tmp) !gprellow; \
@@ -371,8 +371,9 @@ __LABEL(name) \
# define PTR_DEMANGLE2(dst, tmp) PTR_MANGLE2(dst, dst, tmp)
#else
# include <stdint.h>
-# if (defined NOT_IN_libc && defined IS_IN_rtld) \
- || (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread))
+# if (defined IS_IN_rtld \
+ || (!defined SHARED && (!defined NOT_IN_libc \
+ || defined IS_IN_libpthread)))
extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
# define PTR_MANGLE(var) \
(var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
index 3f3c709..84999f1 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
@@ -309,8 +309,9 @@
#endif /* __ASSEMBLER__ */
/* Pointer mangling is supported for AArch64. */
-#if (defined NOT_IN_libc && defined IS_IN_rtld) || \
- (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread))
+#if (defined IS_IN_rtld || \
+ (!defined SHARED && (!defined NOT_IN_libc \
+ || defined IS_IN_libpthread)))
# ifdef __ASSEMBLER__
# define PTR_MANGLE(dst, src, guard, tmp) \
LDST_PCREL (ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local)); \
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 54f87c9..57d5ea0 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -519,7 +519,7 @@ asm (".L__X'%ebx = 1\n\t"
/* Pointer mangling support. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. Using a global variable
is too complicated here since we have no PC-relative addressing mode. */
diff --git a/sysdeps/unix/sysv/linux/ia64/setjmp.S b/sysdeps/unix/sysv/linux/ia64/setjmp.S
index c93fba5..f919a49 100644
--- a/sysdeps/unix/sysv/linux/ia64/setjmp.S
+++ b/sysdeps/unix/sysv/linux/ia64/setjmp.S
@@ -178,7 +178,7 @@ ENTRY(__sigsetjmp)
;;
st8.nta [r2]=r25 // ar.unat
st8.nta [r3]=in0 // &__jmp_buf
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
;;
#else
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index 4b73263..e0ec861 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -364,7 +364,7 @@
#endif /* not __ASSEMBLER__ */
/* Pointer mangling support. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
index 8feafb8..1a5e37a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
@@ -272,7 +272,7 @@
/* Pointer mangling support. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
index 9c45610..93e454e 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
@@ -282,7 +282,7 @@
/* Pointer mangling support. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
index 1c6191b..00919e3 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
@@ -366,7 +366,7 @@
_ret; })
/* Pointer mangling support. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
index 91fc275..d3bafca 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
@@ -372,7 +372,7 @@
_ret; })
/* Pointer mangling support. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.h b/sysdeps/unix/sysv/linux/sh/sysdep.h
index 41b2eea..3f68938 100644
--- a/sysdeps/unix/sysv/linux/sh/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sh/sysdep.h
@@ -338,7 +338,7 @@
#endif /* __ASSEMBLER__ */
/* Pointer mangling support. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. Using a global variable
is too complicated here since we have no PC-relative addressing mode. */
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
index 8b0d080..09ef2c9 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
@@ -125,7 +125,7 @@ ENTRY(name); \
#endif /* __ASSEMBLER__ */
/* Pointer mangling support. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
index 53df66e..a0f2305 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
@@ -140,7 +140,7 @@ ENTRY(name); \
#define STACK_BIAS 2047
/* Pointer mangling support. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h
index f2214f6..a09f8a4 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep.h
@@ -205,7 +205,7 @@
#endif /* not __ASSEMBLER__ */
/* Pointer mangling support. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
index f52690f..4a619da 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
@@ -393,7 +393,7 @@
/* Pointer mangling support. */
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
# ifdef __ASSEMBLER__
diff --git a/sysdeps/x86_64/setjmp.S b/sysdeps/x86_64/setjmp.S
index 78a7e81..4459212 100644
--- a/sysdeps/x86_64/setjmp.S
+++ b/sysdeps/x86_64/setjmp.S
@@ -54,7 +54,7 @@ ENTRY (__sigsetjmp)
#endif
movq %rax, (JB_PC*8)(%rdi)
-#if defined NOT_IN_libc && defined IS_IN_rtld
+#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
xorl %eax, %eax
retq
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources