[Qemu-commits] [COMMIT d80438a] We can wrap ARCH_CFLAGS/ARCH_LDFLAGS inCFLAGS/LDFLAGS at configure time

[Anthony Liguori]

From: Juan Quintela <address@hidden>

Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

diff --git a/Makefile b/Makefile
index d5a8ac0..dc95869 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,6 @@ endif
 
 VPATH=$(SRC_PATH):$(SRC_PATH)/hw
 
-
-CFLAGS +=  $(ARCH_CFLAGS)
-LDFLAGS +=  $(ARCH_LDFLAGS)
-
 CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
 CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 CPPFLAGS += -U_FORTIFY_SOURCE
diff --git a/Makefile.hw b/Makefile.hw
index e11dea1..17c73df 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -8,9 +8,6 @@ include $(SRC_PATH)/rules.mak
 
 VPATH=$(SRC_PATH):$(SRC_PATH)/hw
 
-CFLAGS += $(ARCH_CFLAGS)
-LDFLAGS += $(ARCH_LDFLAGS)
-
 CPPFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
 CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 CPPFLAGS+=-I$(SRC_PATH)/fpu
diff --git a/Makefile.target b/Makefile.target
index df7c0d5..6883c44 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -60,9 +60,6 @@ ifeq ($(ARCH),ia64)
 CFLAGS+=-mno-sdata
 endif
 
-CFLAGS+= $(ARCH_CFLAGS)
-LDFLAGS+= $(ARCH_LDFLAGS)
-
 CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 CPPFLAGS+=-U_FORTIFY_SOURCE
 LIBS+=-lm
diff --git a/configure b/configure
index 95ed3d0..416e532 100755
--- a/configure
+++ b/configure
@@ -1489,13 +1489,8 @@ echo "HOST_CC=$host_cc" >> $config_mak
 echo "AR=$ar" >> $config_mak
 echo "OBJCOPY=$objcopy" >> $config_mak
 echo "LD=$ld" >> $config_mak
-# XXX: only use CFLAGS and LDFLAGS ?  
-# XXX: should export HOST_CFLAGS and HOST_LDFLAGS for cross
-# compilation of dyngen tool (useful for win32 build on Linux host)
-echo "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak
-echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak
-echo "CFLAGS=$CFLAGS $OS_CFLAGS $EXTRA_CFLAGS" >> $config_mak
-echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $EXTRA_LDFLAGS" >> $config_mak
+echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_mak
+echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_mak
 echo "EXESUF=$EXESUF" >> $config_mak
 echo "PTHREADLIBS=$PTHREADLIBS" >> $config_mak
 echo "CLOCKLIBS=$CLOCKLIBS" >> $config_mak