Commit-ID: 102ee3b2607800df76aae0278e6aa95fd464ef69 Gitweb: http://git.kernel.org/tip/102ee3b2607800df76aae0278e6aa95fd464ef69 Author: Matt Evans <matt@xxxxxxxxxx> AuthorDate: Fri, 9 Dec 2011 17:53:50 +1100 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Thu, 15 Dec 2011 08:32:27 +0200 kvm tools: Get correct 64-bit types on PPC64 and link appropriately kvmtool's types.h includes <asm/types.h>, which by default on PPC64 brings in int-l64.h; define __SANE_USERSPACE_TYPES__ to get LL64 types. This patch also adds CFLAGS to the final link, so that any -m64 is obeyed when linking, too. Signed-off-by: Matt Evans <matt@xxxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/Makefile | 2 +- tools/kvm/include/linux/types.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index 57009d5..554eb8a 100644 --- a/tools/kvm/Makefile +++ b/tools/kvm/Makefile @@ -231,7 +231,7 @@ KVMTOOLS-VERSION-FILE: $(PROGRAM): $(DEPS) $(OBJS) $(E) " LINK " $@ - $(Q) $(CC) $(OBJS) $(LIBS) -o $@ + $(Q) $(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $@ $(PROGRAM_ALIAS): $(PROGRAM) $(E) " LN " $@ diff --git a/tools/kvm/include/linux/types.h b/tools/kvm/include/linux/types.h index 357799c3..5e20f10 100644 --- a/tools/kvm/include/linux/types.h +++ b/tools/kvm/include/linux/types.h @@ -2,6 +2,7 @@ #define LINUX_TYPES_H #include <kvm/compiler.h> +#define __SANE_USERSPACE_TYPES__ /* For PPC64, to get LL64 types */ #include <asm/types.h> typedef __u64 u64; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|