Merge commit 'e73aae6715ffb30d89bd300effbf5e3472ec38a6' into upstream-merge
commit582e398ee96113705fb9ab04190643fabb8bba38
authorAvi Kivity <avi@redhat.com>
Tue, 28 Jul 2009 17:23:14 +0000 (28 20:23 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 28 Jul 2009 17:23:14 +0000 (28 20:23 +0300)
tree27b31588dd254755785c2804aa25a16df38508de
parent7ce8409915bf388d2c2847039c260eb6b9fffcf5
parente73aae6715ffb30d89bd300effbf5e3472ec38a6
Merge commit 'e73aae6715ffb30d89bd300effbf5e3472ec38a6' into upstream-merge

* commit 'e73aae6715ffb30d89bd300effbf5e3472ec38a6':
  generate TARGET_<arch name> for config.h
  generate TARGET_ARCH for config.h

Conflicts:
configure

Signed-off-by: Avi Kivity <avi@redhat.com>
configure