From 6ee7126f7c9cdccce9ad686b0348e3850134ec41 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 3 Aug 2009 14:46:47 +0200 Subject: [PATCH] Move alpha CFLAGS target to configure Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori Message-Id: --- Makefile.target | 5 ----- configure | 9 ++++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.target b/Makefile.target index 39a373fbdb..eaf35c57d1 100644 --- a/Makefile.target +++ b/Makefile.target @@ -23,11 +23,6 @@ ifeq ($(subst ppc64,ppc,$(ARCH))$(TARGET_BASE_ARCH),ppcppc) translate.o: QEMU_CFLAGS := $(QEMU_CFLAGS) $(call cc-option, $(QEMU_CFLAGS), -fno-unit-at-a-time,) endif -ifeq ($(ARCH),alpha) -# Ensure there's only a single GP -QEMU_CFLAGS+=-msmall-data -endif - ifeq ($(ARCH),ia64) QEMU_CFLAGS+=-mno-sdata endif diff --git a/configure b/configure index 1c0a317ece..e098068b99 100755 --- a/configure +++ b/configure @@ -2072,8 +2072,15 @@ fi cflags="" ldflags="" -linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/\$(ARCH).ld" +case "$ARCH" in +alpha) + # Ensure there's only a single GP + cflags="-msmall-data $cflags" +;; +esac + +linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/\$(ARCH).ld" if test "$target_linux_user" = "yes" -o "$target_bsd_user" = "yes" ; then case "$ARCH" in i386)