Merge commit '9637443f852a3abb61c0c8f33c567ff87928e845' into upstream-merge
commitc19f8fac33971a05edc3d1d50e5daeedb286e519
authorAvi Kivity <avi@redhat.com>
Tue, 28 Jul 2009 17:09:52 +0000 (28 20:09 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 28 Jul 2009 17:09:52 +0000 (28 20:09 +0300)
tree30e7bd74a15f71d791db2399d5fd1c7f55c167c9
parent02cdfb2f27a3ccdd009a7bced64a40a798e5474f
parent9637443f852a3abb61c0c8f33c567ff87928e845
Merge commit '9637443f852a3abb61c0c8f33c567ff87928e845' into upstream-merge

* commit '9637443f852a3abb61c0c8f33c567ff87928e845':
  change ifdefs by obj-$(TARGET_BASE_ARCH)
  TARGET_ARCH2 is already known at configure time.

Conflicts:
Makefile.target

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