about summary refs log tree commit diff
path: root/Makeconfig
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-11-20 11:42:00 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-11-24 11:41:42 +0530
commit279bc5b3c384c09746fbadb2b68c6db9e833c064 (patch)
treee0f6a347b712368adaef58c3befa459d6c262117 /Makeconfig
parente0cfa51064489fdff85953bad1e0f3c42e093662 (diff)
downloadglibc-279bc5b3c384c09746fbadb2b68c6db9e833c064.tar.gz
glibc-279bc5b3c384c09746fbadb2b68c6db9e833c064.tar.xz
glibc-279bc5b3c384c09746fbadb2b68c6db9e833c064.zip
Use MODULE_NAME in stap-probe instead of IN_LIB
Define MODULE_NAME in the build command and define IN_MODULE using
MODULE_NAME.  Verified that the generated code is unchanged on x86_64.

	* Makeconfig (module-cppflags-real): Define MODULE_NAME
	instead of IN_MODULE.
	* include/libc-symbols.h (IN_MODULE): Define using
	MODULE_NAME.
	(PASTE_NAME, PASTE_NAME1): New macros.
	* include/stap-probe.h (LIBC_PROBE_1): Use MODULE_NAME instead
	of IN_LIB.
	(STAP_PROBE_ASM): Likewise.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makeconfig b/Makeconfig
index 1a26cc5568..bbf546072c 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -830,9 +830,9 @@ in-module = $(subst -,_,$(firstword $(libof-$(basename $(@F))) \
 				    libc))
 
 module-cppflags-real = -include $(common-objpfx)libc-modules.h \
-		       -DIN_MODULE=MODULE_$(in-module)
+		       -DMODULE_NAME=$(in-module)
 
-# We don't need libc-modules.h and the IN_MODULE definition for
+# We don't need libc-modules.h and the MODULE_NAME definition for
 # shlib-version.v.i.
 module-cppflags = $(if $(filter $(@F),$(skip-module-cppflags)), \
 		       ,$(module-cppflags-real))
@@ -1008,7 +1008,7 @@ postclean-generated += soversions.mk soversions.i \
 before-compile += $(common-objpfx)libc-modules.h
 ifeq ($(soversions.mk-done),t)
 # Generate a header with macro definitions for use with the IS_IN macro.
-# These are the possible values for the IN_MODULE macro defined when building
+# These are the possible values for the MODULE_NAME macro defined when building
 # sources, to identify which module the translation unit is going to be built
 # into.
 $(common-objpfx)libc-modules.h: $(common-objpfx)libc-modules.stmp; @: