diff mbox

[56/81] Move alpha CFLAGS target to configure

Message ID a0bbe9208e2af42fdafc5e3bc474740e5477142c.1249301360.git.quintela@redhat.com
State Superseded
Headers show

Commit Message

Juan Quintela Aug. 3, 2009, 12:46 p.m. UTC 
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target |    5 -----
 configure       |    9 ++++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/Makefile.target b/Makefile.target
index cff80c7..d5d62cb 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 c658260..02a400a 100755
--- a/configure
+++ b/configure
@@ -2070,8 +2070,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)