Merge commit '91880d96a188ed88a1762b6648fb452b3eea845e' into upstream-merge

* commit '91880d96a188ed88a1762b6648fb452b3eea845e':
  Move generation of config-target.h to Makefile from configure

Conflicts:
	Makefile.target

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 0 insertions, 17 deletions

diff --git a/configure b/configure
index effbcf374..d1b2e5a70 100755
--- a/configure
+++ b/configure
@@ -2240,7 +2240,6 @@ fi
 for target in $target_list; do
 target_dir="$target"
 config_target_mak=$target_dir/config-target.mak
-config_target_h=$target_dir/config-target.h
 target_arch2=`echo $target | cut -d '-' -f 1`
 target_bigendian="no"
 case "$target_arch2" in
@@ -2275,10 +2274,6 @@ case "$target" in
     ;;
 esac
 
-#echo "Creating $config_target_mak, $config_target_h and $target_dir/Makefile"
-
-test -f $config_target_h && mv $config_target_h ${config_target_h}~
-
 mkdir -p $target_dir
 mkdir -p $target_dir/fpu
 mkdir -p $target_dir/tcg
@@ -2632,18 +2627,6 @@ fi
 echo "LDFLAGS+=$ldflags" >> $config_target_mak
 echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak
 
-echo "#include \"../config-host.h\"" > $config_target_h
-
-/bin/sh $source_path/create_config < $config_target_mak >> $config_target_h
-
-if test -f ${config_target_h}~ ; then
-  if cmp -s $config_target_h ${config_target_h}~ ; then
-    mv ${config_target_h}~ $config_target_h
-  else
-    rm ${config_target_h}~
-  fi
-fi
-
 done # for target in $targets
 
 # build tree in object directory if source path is different from current one