Merge commit '1215c6e7615897e4a0bfd6867b762a47fc34f37f' into upstream-merge

* commit '1215c6e7615897e4a0bfd6867b762a47fc34f37f':
  Move generation of config-host.h to Makefile from configure
  Don't include config-host.mak from inside config.mak
  CRIS: Update PR_EDA on TLB faults.
  Clean up test for qdev_init() failure
  Warn if value of qdev_init() isn't checked
  Make isa_create() terminate program on failure
  New qdev_init_nofail()
  Check return value of qdev_init()
  Make qdev_init() destroy the device on failure
  Unbreak USB autoconnect filters
  tcg: improve output log
  target-i386: fix ARPL
  configure and Makefile are not generated in qemu
  Don't use implicit rules for Makefile
  optionrom: create .PHONY variable
  add build-all to .PHONY rules
  optionrom: remove use of implicit RM variable
  AIOLIBS is not used anywhere
  qdev: move comment

Conflicts:
	Makefile

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

1 files changed, 1 insertions, 22 deletions

diff --git a/configure b/configure
index ff7e8b253..95eaaa251 100755
--- a/configure
+++ b/configure
@@ -1506,7 +1506,6 @@ fi
 
 ##########################################
 # linux-aio probe
-AIOLIBS=""
 
 if test "$linux_aio" != "no" ; then
   cat > $TMPC <<EOF
@@ -1957,13 +1956,8 @@ echo "-> Your SDL version is too old - please upgrade to have SDL support"
 fi
 
 config_host_mak="config-host.mak"
-config_host_h="config-host.h"
 config_host_ld="config-host.ld"
 
-#echo "Creating $config_host_mak and $config_host_h"
-
-test -f $config_host_h && mv $config_host_h ${config_host_h}~
-
 echo "# Automatically generated by configure - do not modify" > $config_host_mak
 printf "# Configured with:" >> $config_host_mak
 printf " '%s'" "$0" "$@" >> $config_host_mak
@@ -2231,18 +2225,6 @@ echo "LIBS+=$LIBS" >> $config_host_mak
 echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak
 echo "EXESUF=$EXESUF" >> $config_host_mak
 
-echo "/* Automatically generated by configure - do not modify */" > $config_host_h
-
-/bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
-
-if test -f ${config_host_h}~ ; then
-  if cmp -s $config_host_h ${config_host_h}~ ; then
-    mv ${config_host_h}~ $config_host_h
-  else
-    rm ${config_host_h}~
-  fi
-fi
-
 # generate list of library paths for linker script
 
 $ld --verbose -v 2> /dev/null | grep SEARCH_DIR > ${config_host_ld}
@@ -2314,8 +2296,6 @@ ln -s $source_path/Makefile.target $target_dir/Makefile
 
 echo "# Automatically generated by configure - do not modify" > $config_mak
 
-echo "include ../config-host.mak" >> $config_mak
-
 bflt="no"
 elfload32="no"
 target_nptl="no"
@@ -2652,8 +2632,7 @@ fi
 echo "LDFLAGS+=$ldflags" >> $config_mak
 echo "QEMU_CFLAGS+=$cflags" >> $config_mak
 
-echo "/* Automatically generated by configure - do not modify */" > $config_h
-echo "#include \"../config-host.h\"" >> $config_h
+echo "#include \"../config-host.h\"" > $config_h
 
 /bin/sh $source_path/create_config < $config_mak >> $config_h