[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] x86/mm: override stored file names for multiply built sources
commit 1a771b7a0d5cbcd386744bd4bdd8e66dcfc096c8 Author: Jan Beulich <jbeulich@xxxxxxxx> AuthorDate: Tue Oct 27 11:44:52 2015 +0100 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Tue Oct 27 11:44:52 2015 +0100 x86/mm: override stored file names for multiply built sources To make it possible to tell apart the static symbols therein, use their object file names instead of their source ones. Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Acked-by: George Dunlap <george.dunlap@xxxxxxxxxx> --- xen/Rules.mk | 4 ++-- xen/arch/x86/mm/guest_walk.c | 3 +++ xen/arch/x86/mm/hap/guest_walk.c | 2 ++ xen/arch/x86/mm/shadow/multi.c | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index bf19d20..433dad3 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -42,10 +42,10 @@ ALL_OBJS-y += $(BASEDIR)/xsm/built_in.o ALL_OBJS-y += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o -CFLAGS += -fno-builtin -fno-common +CFLAGS += -nostdinc -fno-builtin -fno-common CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h -CFLAGS += -nostdinc +CFLAGS += '-D__OBJECT_FILE__="$@"' CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE CFLAGS-$(FLASK_ENABLE) += -DFLASK_ENABLE diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c index 773454d..ac28122 100644 --- a/xen/arch/x86/mm/guest_walk.c +++ b/xen/arch/x86/mm/guest_walk.c @@ -21,6 +21,9 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. */ +/* Allow uniquely identifying static symbols in the 3 generated objects. */ +asm(".file \"" __OBJECT_FILE__ "\""); + #include <xen/types.h> #include <xen/mm.h> #include <xen/paging.h> diff --git a/xen/arch/x86/mm/hap/guest_walk.c b/xen/arch/x86/mm/hap/guest_walk.c index 66f0010..11c1b35 100644 --- a/xen/arch/x86/mm/hap/guest_walk.c +++ b/xen/arch/x86/mm/hap/guest_walk.c @@ -18,6 +18,8 @@ * this program; If not, see <http://www.gnu.org/licenses/>. */ +/* Allow uniquely identifying static symbols in the 3 generated objects. */ +asm(".file \"" __OBJECT_FILE__ "\""); #include <xen/domain_page.h> #include <xen/paging.h> diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index b54835d..58f7e72 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -20,7 +20,9 @@ * along with this program; If not, see <http://www.gnu.org/licenses/>. */ -#include <xen/config.h> +/* Allow uniquely identifying static symbols in the 3 generated objects. */ +asm(".file \"" __OBJECT_FILE__ "\""); + #include <xen/types.h> #include <xen/mm.h> #include <xen/trace.h> -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |