[Qemu-devel] [RFC PATCH 0/6] Generate config_h from config.mak

[Qemu-devel] [RFC PATCH 0/6] Generate config_h from config.mak

[quintela]

From: Juan Quintela <quintela@redhat.com>

Hi

This patches apply on top of my previous series.
I generate $target_dir/config.h from $target_dir/config.mak

ToDo:
- generate config-host.h from config-host.mak
- USE_NPTL -> can I rename it to CONFIG_USE_NPTL?
- TARGET_ABI_MIPS{O32,N32,N64}.  Rest of architectures use names like:
  TARGET_ABI_MIPSN32 -> TARGET_MIPSN32
  TARGET_ABI_MIPSN64 -> TARGET_MIPSN64
  not sure how to do the TARGET_ABI_MIPSO32
  This one is only to have coherent options names, rest of architectures have
  enough with TARGET_ARCH, TARGET_ARCH2, TARGET_BASE_ARCH, TARGET_$ARCH_NAME
  TARGET_$BASE_ARCH_NAME

- TARGET_ARCH2 -> can we rename it to TARGET_SUBARCH or something more
  descriptive
- do we want TARGET_BASE_ARCH defined for .h files?
- move all CPPFLAGS/CFLAGS/LDFLAGS/LIBS to configure and export only this 4
  variables (both for config.mak and config-host.mak).  I don't think that
  this only 4 vars will be enough, but I am sure that we can export less
  than we have now.
- remove rest of intelligence (also known as ifs) possible from Makefile*
  and moved it back to ./configure
- once previous steps are done, be able to configure the devices using this
  (or similar mechanism)

Comments?

Later, Juan.


Juan Quintela (6):
  simplify TARGET_BASE_ARCH generation
  simplify TARGET_ARCH2 generation
  simplify TARGET_ABI_DIR generation
  rename s/config_mak/config_host_mak/ and s/config_h/config_host_h/
  Refactor config_softfloat selection in another list
  Generate $target_dir/config.h from $target_dir/config.mak

 Makefile.target |   11 --
 configure       |  391 ++++++++++++++++++++++++++-----------------------------
 create_config   |   55 ++++++++
 3 files changed, 242 insertions(+), 215 deletions(-)
 create mode 100755 create_config

[Qemu-devel] [PATCH 1/6] simplify TARGET_BASE_ARCH generation

[quintela]

From: Juan Quintela <quintela@redhat.com>


Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target |    4 ----
 configure       |   33 ++++++++++++++++-----------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 6883c44..7e69a64 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -1,10 +1,6 @@
 include config.mak
 include $(SRC_PATH)/rules.mak

-ifndef TARGET_BASE_ARCH
-TARGET_BASE_ARCH:=$(TARGET_ARCH)
-endif
-
 TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
 VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
 CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
diff --git a/configure b/configure
index 695faae..9342e5c 100755
--- a/configure
+++ b/configure
@@ -1886,14 +1886,14 @@ echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
 gdb_xml_files=""

 TARGET_ARCH="$target_arch2"
+TARGET_BASE_ARCH=""

 case "$target_arch2" in
   i386)
     target_phys_bits=32
   ;;
   x86_64)
-    echo "TARGET_BASE_ARCH=i386" >> $config_mak
-    echo "#define TARGET_I386 1" >> $config_h
+    TARGET_BASE_ARCH=i386
     target_phys_bits=64
   ;;
   alpha)
@@ -1931,16 +1931,14 @@ case "$target_arch2" in
   mipsn32|mipsn32el)
     TARGET_ARCH=mipsn32
     echo "TARGET_ARCH2=$target_arch2" >> $config_mak
-    echo "TARGET_BASE_ARCH=mips" >> $config_mak
-    echo "#define TARGET_MIPS 1" >> $config_h
+    TARGET_BASE_ARCH=mips
     echo "#define TARGET_ABI_MIPSN32 1" >> $config_h
     target_phys_bits=64
   ;;
   mips64|mips64el)
     TARGET_ARCH=mips64
     echo "TARGET_ARCH2=$target_arch2" >> $config_mak
-    echo "TARGET_BASE_ARCH=mips" >> $config_mak
-    echo "#define TARGET_MIPS 1" >> $config_h
+    TARGET_BASE_ARCH=mips
     echo "#define TARGET_ABI_MIPSN64 1" >> $config_h
     target_phys_bits=64
   ;;
@@ -1949,25 +1947,22 @@ case "$target_arch2" in
     target_phys_bits=32
   ;;
   ppcemb)
-    echo "TARGET_BASE_ARCH=ppc" >> $config_mak
+    TARGET_BASE_ARCH=ppc
     echo "TARGET_ABI_DIR=ppc" >> $config_mak
-    echo "#define TARGET_PPC 1" >> $config_h
     gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
     target_phys_bits=64
   ;;
   ppc64)
-    echo "TARGET_BASE_ARCH=ppc" >> $config_mak
+    TARGET_BASE_ARCH=ppc
     echo "TARGET_ABI_DIR=ppc" >> $config_mak
-    echo "#define TARGET_PPC 1" >> $config_h
     gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
     target_phys_bits=64
   ;;
   ppc64abi32)
     TARGET_ARCH=ppc64
-    echo "TARGET_BASE_ARCH=ppc" >> $config_mak
+    TARGET_BASE_ARCH=ppc
     echo "TARGET_ABI_DIR=ppc" >> $config_mak
     echo "TARGET_ARCH2=ppc64abi32" >> $config_mak
-    echo "#define TARGET_PPC 1" >> $config_h
     echo "#define TARGET_ABI32 1" >> $config_h
     gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
     target_phys_bits=64
@@ -1983,17 +1978,15 @@ case "$target_arch2" in
     target_phys_bits=64
   ;;
   sparc64)
-    echo "TARGET_BASE_ARCH=sparc" >> $config_mak
-    echo "#define TARGET_SPARC 1" >> $config_h
+    TARGET_BASE_ARCH=sparc
     elfload32="yes"
     target_phys_bits=64
   ;;
   sparc32plus)
     TARGET_ARCH=sparc64
-    echo "TARGET_BASE_ARCH=sparc" >> $config_mak
+    TARGET_BASE_ARCH=sparc
     echo "TARGET_ABI_DIR=sparc" >> $config_mak
     echo "TARGET_ARCH2=$target_arch2" >> $config_mak
-    echo "#define TARGET_SPARC 1" >> $config_h
     echo "#define TARGET_ABI32 1" >> $config_h
     target_phys_bits=64
   ;;
@@ -2006,7 +1999,13 @@ echo "TARGET_ARCH=$TARGET_ARCH" >> $config_mak
 echo "#define TARGET_ARCH \"$TARGET_ARCH\"" >> $config_h
 target_arch_name=`echo $TARGET_ARCH | tr '[:lower:]' '[:upper:]'`
 echo "#define TARGET_$target_arch_name 1" >> $config_h
-
+if [ "$TARGET_BASE_ARCH" = "" ]; then
+  TARGET_BASE_ARCH=$TARGET_ARCH
+else
+  target_base_arch_name=`echo $TARGET_BASE_ARCH | tr '[:lower:]' '[:upper:]'`
+  echo "#define TARGET_$target_base_arch_name 1" >> $config_h
+fi
+echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_mak
 if [ $target_phys_bits -lt $hostlongbits ] ; then
   target_phys_bits=$hostlongbits
 fi
-- 
1.6.2.5

[Qemu-devel] [PATCH 2/6] simplify TARGET_ARCH2 generation

[quintela]

From: Juan Quintela <quintela@redhat.com>


Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target |    4 ----
 configure       |   10 ++--------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 7e69a64..1f0a86d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -6,10 +6,6 @@ VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
 CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
 #CFLAGS+=-Werror
 LIBS=
-# user emulator name
-ifndef TARGET_ARCH2
-TARGET_ARCH2=$(TARGET_ARCH)
-endif

 ifdef CONFIG_USER_ONLY
 # user emulator name
diff --git a/configure b/configure
index 9342e5c..95bc639 100755
--- a/configure
+++ b/configure
@@ -1901,7 +1901,6 @@ case "$target_arch2" in
   ;;
   arm|armeb)
     TARGET_ARCH=arm
-    echo "TARGET_ARCH2=$target_arch2" >> $config_mak
     bflt="yes"
     target_nptl="yes"
     gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"
@@ -1921,23 +1920,20 @@ case "$target_arch2" in
     target_nptl="yes"
     target_phys_bits=32
   ;;
- mips|mipsel)
+  mips|mipsel)
     TARGET_ARCH=mips
-    echo "TARGET_ARCH2=$target_arch2" >> $config_mak
     echo "#define TARGET_ABI_MIPSO32 1" >> $config_h
     target_nptl="yes"
     target_phys_bits=64
   ;;
   mipsn32|mipsn32el)
     TARGET_ARCH=mipsn32
-    echo "TARGET_ARCH2=$target_arch2" >> $config_mak
     TARGET_BASE_ARCH=mips
     echo "#define TARGET_ABI_MIPSN32 1" >> $config_h
     target_phys_bits=64
   ;;
   mips64|mips64el)
     TARGET_ARCH=mips64
-    echo "TARGET_ARCH2=$target_arch2" >> $config_mak
     TARGET_BASE_ARCH=mips
     echo "#define TARGET_ABI_MIPSN64 1" >> $config_h
     target_phys_bits=64
@@ -1962,14 +1958,12 @@ case "$target_arch2" in
     TARGET_ARCH=ppc64
     TARGET_BASE_ARCH=ppc
     echo "TARGET_ABI_DIR=ppc" >> $config_mak
-    echo "TARGET_ARCH2=ppc64abi32" >> $config_mak
     echo "#define TARGET_ABI32 1" >> $config_h
     gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
     target_phys_bits=64
   ;;
   sh4|sh4eb)
     TARGET_ARCH=sh4
-    echo "TARGET_ARCH2=$target_arch2" >> $config_mak
     bflt="yes"
     target_nptl="yes"
     target_phys_bits=32
@@ -1986,7 +1980,6 @@ case "$target_arch2" in
     TARGET_ARCH=sparc64
     TARGET_BASE_ARCH=sparc
     echo "TARGET_ABI_DIR=sparc" >> $config_mak
-    echo "TARGET_ARCH2=$target_arch2" >> $config_mak
     echo "#define TARGET_ABI32 1" >> $config_h
     target_phys_bits=64
   ;;
@@ -1996,6 +1989,7 @@ case "$target_arch2" in
   ;;
 esac
 echo "TARGET_ARCH=$TARGET_ARCH" >> $config_mak
+echo "TARGET_ARCH2=$target_arch2" >> $config_mak
 echo "#define TARGET_ARCH \"$TARGET_ARCH\"" >> $config_h
 target_arch_name=`echo $TARGET_ARCH | tr '[:lower:]' '[:upper:]'`
 echo "#define TARGET_$target_arch_name 1" >> $config_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 3/6] simplify TARGET_ABI_DIR generation

[quintela]

From: Juan Quintela <quintela@redhat.com>


Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile.target |    3 ---
 configure       |   13 +++++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 1f0a86d..327b03b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -172,9 +172,6 @@ cpu-exec.o: CFLAGS += $(HELPER_CFLAGS)

 ifdef CONFIG_LINUX_USER

-ifndef TARGET_ABI_DIR
-  TARGET_ABI_DIR=$(TARGET_ARCH)
-endif
 VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
 CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)

diff --git a/configure b/configure
index 95bc639..bcdf109 100755
--- a/configure
+++ b/configure
@@ -1887,6 +1887,7 @@ gdb_xml_files=""

 TARGET_ARCH="$target_arch2"
 TARGET_BASE_ARCH=""
+TARGET_ABI_DIR=""

 case "$target_arch2" in
   i386)
@@ -1944,20 +1945,20 @@ case "$target_arch2" in
   ;;
   ppcemb)
     TARGET_BASE_ARCH=ppc
-    echo "TARGET_ABI_DIR=ppc" >> $config_mak
+    TARGET_ABI_DIR=ppc
     gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
     target_phys_bits=64
   ;;
   ppc64)
     TARGET_BASE_ARCH=ppc
-    echo "TARGET_ABI_DIR=ppc" >> $config_mak
+    TARGET_ABI_DIR=ppc
     gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
     target_phys_bits=64
   ;;
   ppc64abi32)
     TARGET_ARCH=ppc64
     TARGET_BASE_ARCH=ppc
-    echo "TARGET_ABI_DIR=ppc" >> $config_mak
+    TARGET_ABI_DIR=ppc
     echo "#define TARGET_ABI32 1" >> $config_h
     gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
     target_phys_bits=64
@@ -1979,7 +1980,7 @@ case "$target_arch2" in
   sparc32plus)
     TARGET_ARCH=sparc64
     TARGET_BASE_ARCH=sparc
-    echo "TARGET_ABI_DIR=sparc" >> $config_mak
+    TARGET_ABI_DIR=sparc
     echo "#define TARGET_ABI32 1" >> $config_h
     target_phys_bits=64
   ;;
@@ -2000,6 +2001,10 @@ else
   echo "#define TARGET_$target_base_arch_name 1" >> $config_h
 fi
 echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_mak
+if [ "$TARGET_ABI_DIR" = "" ]; then
+  TARGET_ABI_DIR=$TARGET_ARCH
+fi
+echo "TARGET_ABI_DIR=$TARGET_ABI_DIR" >> $config_mak
 if [ $target_phys_bits -lt $hostlongbits ] ; then
   target_phys_bits=$hostlongbits
 fi
-- 
1.6.2.5

[Qemu-devel] [PATCH 4/6] rename s/config_mak/config_host_mak/ and s/config_h/config_host_h/

[quintela]

From: Juan Quintela <quintela@redhat.com>


Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 configure |  308 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 153 insertions(+), 155 deletions(-)

diff --git a/configure b/configure
index bcdf109..f0b3b6c 100755
--- a/configure
+++ b/configure
@@ -1456,38 +1456,38 @@ fi
 #if test "$sdl_static" = "no"; then
 #  echo "WARNING: cannot compile statically with SDL - qemu-fast won't have a graphical output"
 #fi
-config_mak="config-host.mak"
-config_h="config-host.h"
-
-#echo "Creating $config_mak and $config_h"
-
-test -f $config_h && mv $config_h ${config_h}~
-
-echo "# Automatically generated by configure - do not modify" > $config_mak
-printf "# Configured with:" >> $config_mak
-printf " '%s'" "$0" "$@" >> $config_mak
-echo >> $config_mak
-echo "/* Automatically generated by configure - do not modify */" > $config_h
-
-echo "prefix=$prefix" >> $config_mak
-echo "bindir=\${prefix}$binsuffix" >> $config_mak
-echo "mandir=\${prefix}$mansuffix" >> $config_mak
-echo "datadir=\${prefix}$datasuffix" >> $config_mak
-echo "docdir=\${prefix}$docsuffix" >> $config_mak
-echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h
-echo "MAKE=$make" >> $config_mak
-echo "INSTALL=$install" >> $config_mak
-echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_mak
-echo "INSTALL_DATA=$install -m0644 -p" >> $config_mak
-echo "INSTALL_PROG=$install -m0755 -p" >> $config_mak
-echo "CC=$cc" >> $config_mak
-echo "HOST_CC=$host_cc" >> $config_mak
-echo "AR=$ar" >> $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
+config_host_mak="config-host.mak"
+config_host_h="config-host.h"
+
+#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
+echo >> $config_host_mak
+echo "/* Automatically generated by configure - do not modify */" > $config_host_h
+
+echo "prefix=$prefix" >> $config_host_mak
+echo "bindir=\${prefix}$binsuffix" >> $config_host_mak
+echo "mandir=\${prefix}$mansuffix" >> $config_host_mak
+echo "datadir=\${prefix}$datasuffix" >> $config_host_mak
+echo "docdir=\${prefix}$docsuffix" >> $config_host_mak
+echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_host_h
+echo "MAKE=$make" >> $config_host_mak
+echo "INSTALL=$install" >> $config_host_mak
+echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak
+echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak
+echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
+echo "CC=$cc" >> $config_host_mak
+echo "HOST_CC=$host_cc" >> $config_host_mak
+echo "AR=$ar" >> $config_host_mak
+echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_host_mak
+echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_host_mak
+echo "EXESUF=$EXESUF" >> $config_host_mak
+echo "PTHREADLIBS=$PTHREADLIBS" >> $config_host_mak
+echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak
 case "$cpu" in
   i386|x86_64|alpha|cris|hppa|ia64|m68k|microbaze|mips|mips64|ppc|ppc64|s390|sparc|sparc64)
     ARCH=$cpu
@@ -1500,39 +1500,39 @@ case "$cpu" in
     exit 1
   ;;
 esac
-echo "ARCH=$ARCH" >> $config_mak
+echo "ARCH=$ARCH" >> $config_host_mak
 arch_name=`echo $ARCH | tr '[:lower:]' '[:upper:]'`
-echo "#define HOST_$arch_name 1" >> $config_h
+echo "#define HOST_$arch_name 1" >> $config_host_h

 if test "$debug_tcg" = "yes" ; then
-  echo "#define DEBUG_TCG 1" >> $config_h
+  echo "#define DEBUG_TCG 1" >> $config_host_h
 fi
 if test "$debug" = "yes" ; then
-  echo "#define DEBUG_EXEC 1" >> $config_h
+  echo "#define DEBUG_EXEC 1" >> $config_host_h
 fi
 if test "$sparse" = "yes" ; then
-  echo "CC      := REAL_CC=\"\$(CC)\" cgcc"       >> $config_mak
-  echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc"  >> $config_mak
-  echo "CFLAGS  += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_mak
+  echo "CC      := REAL_CC=\"\$(CC)\" cgcc"       >> $config_host_mak
+  echo "HOST_CC := REAL_CC=\"\$(HOST_CC)\" cgcc"  >> $config_host_mak
+  echo "CFLAGS  += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
 fi
 if test "$strip_opt" = "yes" ; then
-  echo "STRIP_OPT=-s" >> $config_mak
+  echo "STRIP_OPT=-s" >> $config_host_mak
 fi
 if test "$bigendian" = "yes" ; then
-  echo "WORDS_BIGENDIAN=yes" >> $config_mak
-  echo "#define WORDS_BIGENDIAN 1" >> $config_h
+  echo "WORDS_BIGENDIAN=yes" >> $config_host_mak
+  echo "#define WORDS_BIGENDIAN 1" >> $config_host_h
 fi
-echo "#define HOST_LONG_BITS $hostlongbits" >> $config_h
+echo "#define HOST_LONG_BITS $hostlongbits" >> $config_host_h
 if test "$mingw32" = "yes" ; then
-  echo "CONFIG_WIN32=y" >> $config_mak
-  echo "#define CONFIG_WIN32 1" >> $config_h
+  echo "CONFIG_WIN32=y" >> $config_host_mak
+  echo "#define CONFIG_WIN32 1" >> $config_host_h
 else
   cat > $TMPC << EOF
 #include <byteswap.h>
 int main(void) { return bswap_32(0); }
 EOF
   if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
-    echo "#define HAVE_BYTESWAP_H 1" >> $config_h
+    echo "#define HAVE_BYTESWAP_H 1" >> $config_host_h
   fi
   cat > $TMPC << EOF
 #include <sys/endian.h>
@@ -1541,106 +1541,106 @@ EOF
 int main(void) { return bswap32(0); }
 EOF
   if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
-    echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h
+    echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_host_h
   fi
 fi

 if [ "$openbsd" = "yes" ] ; then
-  echo "#define ENOTSUP 4096" >> $config_h
+  echo "#define ENOTSUP 4096" >> $config_host_h
 fi

 if test "$darwin" = "yes" ; then
-  echo "CONFIG_DARWIN=y" >> $config_mak
-  echo "#define CONFIG_DARWIN 1" >> $config_h
+  echo "CONFIG_DARWIN=y" >> $config_host_mak
+  echo "#define CONFIG_DARWIN 1" >> $config_host_h
 fi

 if test "$aix" = "yes" ; then
-  echo "CONFIG_AIX=y" >> $config_mak
-  echo "#define CONFIG_AIX 1" >> $config_h
+  echo "CONFIG_AIX=y" >> $config_host_mak
+  echo "#define CONFIG_AIX 1" >> $config_host_h
 fi

 if test "$solaris" = "yes" ; then
-  echo "CONFIG_SOLARIS=y" >> $config_mak
-  echo "#define HOST_SOLARIS $solarisrev" >> $config_h
+  echo "CONFIG_SOLARIS=y" >> $config_host_mak
+  echo "#define HOST_SOLARIS $solarisrev" >> $config_host_h
   if test "$needs_libsunmath" = "yes" ; then
-    echo "NEEDS_LIBSUNMATH=yes" >> $config_mak
-    echo "#define NEEDS_LIBSUNMATH 1" >> $config_h
+    echo "NEEDS_LIBSUNMATH=yes" >> $config_host_mak
+    echo "#define NEEDS_LIBSUNMATH 1" >> $config_host_h
   fi
 fi
 if test -n "$sparc_cpu"; then
-  echo "CONFIG__sparc_${sparc_cpu}__=y" >> $config_mak
-  echo "#define __sparc_${sparc_cpu}__ 1" >> $config_h
+  echo "CONFIG__sparc_${sparc_cpu}__=y" >> $config_host_mak
+  echo "#define __sparc_${sparc_cpu}__ 1" >> $config_host_h
 fi
 if test "$gprof" = "yes" ; then
-  echo "TARGET_GPROF=yes" >> $config_mak
-  echo "#define HAVE_GPROF 1" >> $config_h
+  echo "TARGET_GPROF=yes" >> $config_host_mak
+  echo "#define HAVE_GPROF 1" >> $config_host_h
 fi
 if test "$static" = "yes" ; then
-  echo "CONFIG_STATIC=y" >> $config_mak
-  echo "#define CONFIG_STATIC 1" >> $config_h
+  echo "CONFIG_STATIC=y" >> $config_host_mak
+  echo "#define CONFIG_STATIC 1" >> $config_host_h
 fi
 if test $profiler = "yes" ; then
-  echo "#define CONFIG_PROFILER 1" >> $config_h
+  echo "#define CONFIG_PROFILER 1" >> $config_host_h
 fi
 if test "$slirp" = "yes" ; then
-  echo "CONFIG_SLIRP=y" >> $config_mak
-  echo "#define CONFIG_SLIRP 1" >> $config_h
+  echo "CONFIG_SLIRP=y" >> $config_host_mak
+  echo "#define CONFIG_SLIRP 1" >> $config_host_h
 fi
 if test "$vde" = "yes" ; then
-  echo "CONFIG_VDE=y" >> $config_mak
-  echo "#define CONFIG_VDE 1" >> $config_h
-  echo "VDE_LIBS=-lvdeplug" >> $config_mak
+  echo "CONFIG_VDE=y" >> $config_host_mak
+  echo "#define CONFIG_VDE 1" >> $config_host_h
+  echo "VDE_LIBS=-lvdeplug" >> $config_host_mak
 fi
 for card in $audio_card_list; do
     def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'`
-    echo "$def=y" >> $config_mak
-    echo "#define $def 1" >> $config_h
+    echo "$def=y" >> $config_host_mak
+    echo "#define $def 1" >> $config_host_h
 done
-echo "#define AUDIO_DRIVERS \\" >> $config_h
+echo "#define AUDIO_DRIVERS \\" >> $config_host_h
 for drv in $audio_drv_list; do
-    echo "    &${drv}_audio_driver, \\" >>$config_h
+    echo "    &${drv}_audio_driver, \\" >>$config_host_h
     def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
-    echo "$def=y" >> $config_mak
+    echo "$def=y" >> $config_host_mak
     if test "$drv" = "fmod"; then
-        echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak
-        echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
+        echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_host_mak
+        echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_host_mak
     elif test "$drv" = "oss"; then
-        echo "CONFIG_OSS_LIB=$oss_lib" >> $config_mak
+        echo "CONFIG_OSS_LIB=$oss_lib" >> $config_host_mak
     fi
 done
-echo "" >>$config_h
+echo "" >>$config_host_h
 if test "$mixemu" = "yes" ; then
-  echo "CONFIG_MIXEMU=y" >> $config_mak
-  echo "#define CONFIG_MIXEMU 1" >> $config_h
+  echo "CONFIG_MIXEMU=y" >> $config_host_mak
+  echo "#define CONFIG_MIXEMU 1" >> $config_host_h
 fi
 if test "$vnc_tls" = "yes" ; then
-  echo "CONFIG_VNC_TLS=y" >> $config_mak
-  echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_mak
-  echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
-  echo "#define CONFIG_VNC_TLS 1" >> $config_h
+  echo "CONFIG_VNC_TLS=y" >> $config_host_mak
+  echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
+  echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak
+  echo "#define CONFIG_VNC_TLS 1" >> $config_host_h
 fi
 if test "$vnc_sasl" = "yes" ; then
-  echo "CONFIG_VNC_SASL=y" >> $config_mak
-  echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_mak
-  echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak
-  echo "#define CONFIG_VNC_SASL 1" >> $config_h
+  echo "CONFIG_VNC_SASL=y" >> $config_host_mak
+  echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak
+  echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_host_mak
+  echo "#define CONFIG_VNC_SASL 1" >> $config_host_h
 fi
 if test "$fnmatch" = "yes" ; then
-  echo "#define HAVE_FNMATCH_H 1" >> $config_h
+  echo "#define HAVE_FNMATCH_H 1" >> $config_host_h
 fi
 qemu_version=`head $source_path/VERSION`
-echo "VERSION=$qemu_version" >>$config_mak
-echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
+echo "VERSION=$qemu_version" >>$config_host_mak
+echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_host_h

-echo "#define QEMU_PKGVERSION \"$pkgversion\"" >> $config_h
+echo "#define QEMU_PKGVERSION \"$pkgversion\"" >> $config_host_h

-echo "SRC_PATH=$source_path" >> $config_mak
+echo "SRC_PATH=$source_path" >> $config_host_mak
 if [ "$source_path_used" = "yes" ]; then
-  echo "VPATH=$source_path" >> $config_mak
+  echo "VPATH=$source_path" >> $config_host_mak
 fi
-echo "TARGET_DIRS=$target_list" >> $config_mak
+echo "TARGET_DIRS=$target_list" >> $config_host_mak
 if [ "$build_docs" = "yes" ] ; then
-  echo "BUILD_DOCS=yes" >> $config_mak
+  echo "BUILD_DOCS=yes" >> $config_host_mak
 fi
 if test "$static" = "yes"; then
   sdl1=$sdl_static
@@ -1648,109 +1648,109 @@ else
   sdl1=$sdl
 fi
 if test "$sdl1" = "yes" ; then
-  echo "#define CONFIG_SDL 1" >> $config_h
-  echo "CONFIG_SDL=y" >> $config_mak
+  echo "#define CONFIG_SDL 1" >> $config_host_h
+  echo "CONFIG_SDL=y" >> $config_host_mak
   if test "$target_softmmu" = "no" -o "$static" = "yes"; then
-    echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
+    echo "SDL_LIBS=$sdl_static_libs" >> $config_host_mak
   elif test "$sdl_x11" = "yes" ; then
-    echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_mak
+    echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_host_mak
   else
-    echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak
+    echo "SDL_LIBS=`$sdl_config --libs`" >> $config_host_mak
   fi
   if [ "${aa}" = "yes" ] ; then
-    echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_mak
+    echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_host_mak
   else
-    echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak
+    echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_host_mak
   fi
 fi
 if test "$cocoa" = "yes" ; then
-  echo "#define CONFIG_COCOA 1" >> $config_h
-  echo "CONFIG_COCOA=y" >> $config_mak
+  echo "#define CONFIG_COCOA 1" >> $config_host_h
+  echo "CONFIG_COCOA=y" >> $config_host_mak
 fi
 if test "$curses" = "yes" ; then
-  echo "#define CONFIG_CURSES 1" >> $config_h
-  echo "CONFIG_CURSES=y" >> $config_mak
+  echo "#define CONFIG_CURSES 1" >> $config_host_h
+  echo "CONFIG_CURSES=y" >> $config_host_mak
   if test "$ncurses" = "yes" ; then
-    echo "CURSES_LIBS=-lncurses" >> $config_mak
+    echo "CURSES_LIBS=-lncurses" >> $config_host_mak
   else
-    echo "CURSES_LIBS=-lcurses" >> $config_mak
+    echo "CURSES_LIBS=-lcurses" >> $config_host_mak
   fi
 fi
 if test "$atfile" = "yes" ; then
-  echo "#define CONFIG_ATFILE 1" >> $config_h
+  echo "#define CONFIG_ATFILE 1" >> $config_host_h
 fi
 if test "$utimens" = "yes" ; then
-  echo "#define CONFIG_UTIMENSAT 1" >> $config_h
+  echo "#define CONFIG_UTIMENSAT 1" >> $config_host_h
 fi
 if test "$pipe2" = "yes" ; then
-  echo "#define CONFIG_PIPE2 1" >> $config_h
+  echo "#define CONFIG_PIPE2 1" >> $config_host_h
 fi
 if test "$splice" = "yes" ; then
-  echo "#define CONFIG_SPLICE 1" >> $config_h
+  echo "#define CONFIG_SPLICE 1" >> $config_host_h
 fi
 if test "$inotify" = "yes" ; then
-  echo "#define CONFIG_INOTIFY 1" >> $config_h
+  echo "#define CONFIG_INOTIFY 1" >> $config_host_h
 fi
 if test "$curl" = "yes" ; then
-  echo "CONFIG_CURL=y" >> $config_mak
-  echo "CURL_LIBS=$curl_libs" >> $config_mak
-  echo "#define CONFIG_CURL 1" >> $config_h
+  echo "CONFIG_CURL=y" >> $config_host_mak
+  echo "CURL_LIBS=$curl_libs" >> $config_host_mak
+  echo "#define CONFIG_CURL 1" >> $config_host_h
 fi
 if test "$brlapi" = "yes" ; then
-  echo "CONFIG_BRLAPI=y" >> $config_mak
-  echo "#define CONFIG_BRLAPI 1" >> $config_h
-  echo "BRLAPI_LIBS=-lbrlapi" >> $config_mak
+  echo "CONFIG_BRLAPI=y" >> $config_host_mak
+  echo "#define CONFIG_BRLAPI 1" >> $config_host_h
+  echo "BRLAPI_LIBS=-lbrlapi" >> $config_host_mak
 fi
 if test "$bluez" = "yes" ; then
-  echo "CONFIG_BLUEZ=y" >> $config_mak
-  echo "CONFIG_BLUEZ_CFLAGS=$bluez_cflags" >> $config_mak
-  echo "CONFIG_BLUEZ_LIBS=$bluez_libs" >> $config_mak
-  echo "#define CONFIG_BLUEZ 1" >> $config_h
+  echo "CONFIG_BLUEZ=y" >> $config_host_mak
+  echo "CONFIG_BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak
+  echo "CONFIG_BLUEZ_LIBS=$bluez_libs" >> $config_host_mak
+  echo "#define CONFIG_BLUEZ 1" >> $config_host_h
 fi
 if test "$xen" = "yes" ; then
-  echo "XEN_LIBS=-lxenstore -lxenctrl -lxenguest" >> $config_mak
+  echo "XEN_LIBS=-lxenstore -lxenctrl -lxenguest" >> $config_host_mak
 fi
 if test "$aio" = "yes" ; then
-  echo "#define CONFIG_AIO 1" >> $config_h
-  echo "CONFIG_AIO=y" >> $config_mak
+  echo "#define CONFIG_AIO 1" >> $config_host_h
+  echo "CONFIG_AIO=y" >> $config_host_mak
 fi
 if test "$io_thread" = "yes" ; then
-  echo "CONFIG_IOTHREAD=y" >> $config_mak
-  echo "#define CONFIG_IOTHREAD 1" >> $config_h
+  echo "CONFIG_IOTHREAD=y" >> $config_host_mak
+  echo "#define CONFIG_IOTHREAD 1" >> $config_host_h
 fi
 if test "$blobs" = "yes" ; then
-  echo "INSTALL_BLOBS=yes" >> $config_mak
+  echo "INSTALL_BLOBS=yes" >> $config_host_mak
 fi
 if test "$iovec" = "yes" ; then
-  echo "#define HAVE_IOVEC 1" >> $config_h
+  echo "#define HAVE_IOVEC 1" >> $config_host_h
 fi
 if test "$preadv" = "yes" ; then
-  echo "#define HAVE_PREADV 1" >> $config_h
+  echo "#define HAVE_PREADV 1" >> $config_host_h
 fi
 if test "$fdt" = "yes" ; then
-  echo "#define HAVE_FDT 1" >> $config_h
-  echo "FDT_LIBS=-lfdt" >> $config_mak
+  echo "#define HAVE_FDT 1" >> $config_host_h
+  echo "FDT_LIBS=-lfdt" >> $config_host_mak
 fi

 # XXX: suppress that
 if [ "$bsd" = "yes" ] ; then
-  echo "#define O_LARGEFILE 0" >> $config_h
-  echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h
-  echo "#define HOST_BSD 1" >> $config_h
+  echo "#define O_LARGEFILE 0" >> $config_host_h
+  echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_host_h
+  echo "#define HOST_BSD 1" >> $config_host_h
 fi

-echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h
+echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_host_h

 # USB host support
 case "$usb" in
 linux)
-  echo "HOST_USB=linux" >> $config_mak
+  echo "HOST_USB=linux" >> $config_host_mak
 ;;
 bsd)
-  echo "HOST_USB=bsd" >> $config_mak
+  echo "HOST_USB=bsd" >> $config_host_mak
 ;;
 *)
-  echo "HOST_USB=stub" >> $config_mak
+  echo "HOST_USB=stub" >> $config_host_mak
 ;;
 esac

@@ -1769,16 +1769,16 @@ int main(void) { }
 EOF
 if check_linker_flags --whole-archive --no-whole-archive ; then
     # GNU ld
-    echo "ARLIBS_BEGIN=-Wl,--whole-archive" >> $config_mak
-    echo "ARLIBS_END=-Wl,--no-whole-archive" >> $config_mak
+    echo "ARLIBS_BEGIN=-Wl,--whole-archive" >> $config_host_mak
+    echo "ARLIBS_END=-Wl,--no-whole-archive" >> $config_host_mak
 elif check_linker_flags -z,allextract -z,defaultextract ; then
     # Solaris ld
-    echo "ARLIBS_BEGIN=-Wl,-z,allextract" >> $config_mak
-    echo "ARLIBS_END=-Wl,-z,defaultextract" >> $config_mak
+    echo "ARLIBS_BEGIN=-Wl,-z,allextract" >> $config_host_mak
+    echo "ARLIBS_END=-Wl,-z,defaultextract" >> $config_host_mak
 elif check_linker_flags -all_load ; then
     # Mac OS X
-    echo "ARLIBS_BEGIN=-all_load" >> $config_mak
-    echo "ARLIBS_END=" >> $config_mak
+    echo "ARLIBS_BEGIN=-all_load" >> $config_host_mak
+    echo "ARLIBS_END=" >> $config_host_mak
 else
     echo "Error: your linker does not support --whole-archive or -z."
     echo "Please report to qemu-devel@nongnu.org"
@@ -1787,7 +1787,7 @@ fi

 if test "$xen" = "yes" ;
     then
-    echo "CONFIG_XEN=y" >> $config_mak
+    echo "CONFIG_XEN=y" >> $config_host_mak
 fi

 tools=
@@ -1797,24 +1797,22 @@ if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
       tools="qemu-nbd\$(EXESUF) qemu-io\$(EXESUF) $tools"
   fi
 fi
-echo "TOOLS=$tools" >> $config_mak
+echo "TOOLS=$tools" >> $config_host_mak

 roms=
 if test "$cpu" = "i386" -o "$cpu" = "x86_64" ; then
   roms="pc-bios/optionrom"
 fi
-echo "ROMS=$roms" >> $config_mak
+echo "ROMS=$roms" >> $config_host_mak

-if test -f ${config_h}~ ; then
-  if cmp -s $config_h ${config_h}~ ; then
-    mv ${config_h}~ $config_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_h}~
+    rm ${config_host_h}~
   fi
 fi

-config_host_mak=${config_mak}
-
 for target in $target_list; do
 target_dir="$target"
 config_mak=$target_dir/config.mak
-- 
1.6.2.5

[Qemu-devel] [PATCH 5/6] Refactor config_softfloat selection in another list

[quintela]

From: Juan Quintela <quintela@redhat.com>


Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 configure |   27 +++++++--------------------
 1 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/configure b/configure
index f0b3b6c..d4215d3 100755
--- a/configure
+++ b/configure
@@ -2062,26 +2062,13 @@ if test ! -z "$gdb_xml_files" ; then
 fi
 echo "TARGET_XML_FILES=$list" >> $config_mak

-if test "$target_arch2" = "arm" \
-     -o "$target_arch2" = "armeb" \
-     -o "$target_arch2" = "m68k" \
-     -o "$target_arch2" = "microblaze" \
-     -o "$target_arch2" = "mips" \
-     -o "$target_arch2" = "mipsel" \
-     -o "$target_arch2" = "mipsn32" \
-     -o "$target_arch2" = "mipsn32el" \
-     -o "$target_arch2" = "mips64" \
-     -o "$target_arch2" = "mips64el" \
-     -o "$target_arch2" = "ppc" \
-     -o "$target_arch2" = "ppc64" \
-     -o "$target_arch2" = "ppc64abi32" \
-     -o "$target_arch2" = "ppcemb" \
-     -o "$target_arch2" = "sparc" \
-     -o "$target_arch2" = "sparc64" \
-     -o "$target_arch2" = "sparc32plus"; then
-  echo "CONFIG_SOFTFLOAT=y" >> $config_mak
-  echo "#define CONFIG_SOFTFLOAT 1" >> $config_h
-fi
+case "$target_arch2" in
+  arm|armeb|m68k|microblaze|mips|mipsel|mipsn32|mipsn32el|mips64|mips64el|ppc|ppc64|ppc64abi32|ppcemb|sparc|sparc64|sparc32plus)
+    echo "CONFIG_SOFTFLOAT=y" >> $config_mak
+    echo "#define CONFIG_SOFTFLOAT 1" >> $config_h
+    ;;
+esac
+
 if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then
   echo "TARGET_HAS_BFLT=y" >> $config_mak
   echo "#define TARGET_HAS_BFLT 1" >> $config_h
-- 
1.6.2.5

[Qemu-devel] [PATCH 6/6] Generate $target_dir/config.h from $target_dir/config.mak

[quintela]

From: Juan Quintela <quintela@redhat.com>


Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 create_config |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 55 insertions(+), 0 deletions(-)
 create mode 100755 create_config

diff --git a/create_config b/create_config
new file mode 100755
index 0000000..cac0edb
--- /dev/null
+++ b/create_config
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+echo "/* Automatically generated by configure - do not modify */"
+echo "#include \"../config-host.h\""
+
+while read line; do
+
+case $line in
+ CONFIG_*=y) # configuration
+    name=${line%=*}
+    echo "#define $name 1"
+    ;;
+ CONFIG_*=*) # configuration
+    name=${line%=*}
+    value=${line#*=}
+    echo "#define $name $value"
+    ;;
+ TARGET_ARCH=*) # configuration
+    target_arch=${line#*=}
+    arch_name=`echo $target_arch | tr '[:lower:]' '[:upper:]'`
+    echo "#define TARGET_ARCH \"$target_arch\""
+    echo "#define TARGET_$arch_name 1"
+    ;;
+ TARGET_BASE_ARCH=*) # configuration
+    target_base_arch=${line#*=}
+    if [ "$target_base_arch" != "$target_arch" ]; then
+      base_arch_name=`echo $target_base_arch | tr '[:lower:]' '[:upper:]'`
+      echo "#define TARGET_$base_arch_name 1"
+    fi
+    ;;
+ TARGET_XML_FILES=*)
+    # do nothing
+    ;;
+ TARGET_ABI_DIR=*)
+    # do nothing
+    ;;
+ TARGET_ARCH2=*)
+    # do nothing
+    ;;
+ TARGET_*=y) # configuration
+    name=${line%=*}
+    echo "#define $name 1"
+    ;;
+ TARGET_*=*) # configuration
+    name=${line%=*}
+    value=${line#*=}
+    echo "#define $name $value"
+    ;;
+ USE_NPTL=y) # configuration
+    name=${line%=*}
+    echo "#define $name 1"
+    ;;
+esac
+
+done # read
-- 
1.6.2.5

[Qemu-devel] Re: [PATCH 6/6] Generate $target_dir/config.h from $target_dir/config.mak

[Juan Quintela]

THis patch is missing the configure changes, sorry.

diff --git a/configure b/configure
index d4215d3..cc782aa 100755
--- a/configure
+++ b/configure
@@ -1870,17 +1870,14 @@ ln -s $source_path/Makefile.target $target_dir/Makefile


 echo "# Automatically generated by configure - do not modify" > $config_mak
-echo "/* Automatically generated by configure - do not modify */" > $config_h
-

 echo "include ../config-host.mak" >> $config_mak
-echo "#include \"../config-host.h\"" >> $config_h

 bflt="no"
 elfload32="no"
 target_nptl="no"
 interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/g"`
-echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
+echo "CONFIG_QEMU_PREFIX=\"$interp_prefix1\"" >> $config_mak
 gdb_xml_files=""

 TARGET_ARCH="$target_arch2"
@@ -1921,20 +1918,20 @@ case "$target_arch2" in
   ;;
   mips|mipsel)
     TARGET_ARCH=mips
-    echo "#define TARGET_ABI_MIPSO32 1" >> $config_h
+    echo "TARGET_ABI_MIPSO32=y" >> $config_mak
     target_nptl="yes"
     target_phys_bits=64
   ;;
   mipsn32|mipsn32el)
     TARGET_ARCH=mipsn32
     TARGET_BASE_ARCH=mips
-    echo "#define TARGET_ABI_MIPSN32 1" >> $config_h
+    echo "TARGET_ABI_MIPSN32=y" >> $config_mak
     target_phys_bits=64
   ;;
   mips64|mips64el)
     TARGET_ARCH=mips64
     TARGET_BASE_ARCH=mips
-    echo "#define TARGET_ABI_MIPSN64 1" >> $config_h
+    echo "TARGET_ABI_MIPSN64=y" >> $config_mak
     target_phys_bits=64
   ;;
   ppc)
@@ -1957,7 +1954,7 @@ case "$target_arch2" in
     TARGET_ARCH=ppc64
     TARGET_BASE_ARCH=ppc
     TARGET_ABI_DIR=ppc
-    echo "#define TARGET_ABI32 1" >> $config_h
+    echo "TARGET_ABI32=y" >> $config_mak
     gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
     target_phys_bits=64
   ;;
@@ -1979,7 +1976,7 @@ case "$target_arch2" in
     TARGET_ARCH=sparc64
     TARGET_BASE_ARCH=sparc
     TARGET_ABI_DIR=sparc
-    echo "#define TARGET_ABI32 1" >> $config_h
+    echo "TARGET_ABI32=y" >> $config_mak
     target_phys_bits=64
   ;;
   *)
@@ -1989,14 +1986,9 @@ case "$target_arch2" in
 esac
 echo "TARGET_ARCH=$TARGET_ARCH" >> $config_mak
 echo "TARGET_ARCH2=$target_arch2" >> $config_mak
-echo "#define TARGET_ARCH \"$TARGET_ARCH\"" >> $config_h
-target_arch_name=`echo $TARGET_ARCH | tr '[:lower:]' '[:upper:]'`
-echo "#define TARGET_$target_arch_name 1" >> $config_h
+# TARGET_BASE_ARCH needs to be defined after TARGET_ARCH
 if [ "$TARGET_BASE_ARCH" = "" ]; then
   TARGET_BASE_ARCH=$TARGET_ARCH
-else
-  target_base_arch_name=`echo $TARGET_BASE_ARCH | tr '[:lower:]' '[:upper:]'`
-  echo "#define TARGET_$target_base_arch_name 1" >> $config_h
 fi
 echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_mak
 if [ "$TARGET_ABI_DIR" = "" ]; then
@@ -2010,12 +2002,10 @@ case "$target_arch2" in
   i386|x86_64)
     if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
       echo "CONFIG_XEN=y" >> $config_mak
-      echo "#define CONFIG_XEN 1" >> $config_h
     fi
     if test $kqemu = "yes" -a "$target_softmmu" = "yes"
     then
       echo "CONFIG_KQEMU=y" >> $config_mak
-      echo "#define CONFIG_KQEMU 1" >> $config_h
     fi
 esac
 case "$target_arch2" in
@@ -2028,31 +2018,25 @@ case "$target_arch2" in
       \( "$target_arch2" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
       echo "CONFIG_KVM=y" >> $config_mak
       echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
-      echo "#define CONFIG_KVM 1" >> $config_h
     fi
 esac
 echo "HWLIB=../libhw$target_phys_bits/libqemuhw$target_phys_bits.a" >> $config_mak
-echo "#define TARGET_PHYS_ADDR_BITS $target_phys_bits" >> $config_h
+echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_mak
 echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
 if test "$target_bigendian" = "yes" ; then
-  echo "TARGET_WORDS_BIGENDIAN=yes" >> $config_mak
-  echo "#define TARGET_WORDS_BIGENDIAN 1" >> $config_h
+  echo "TARGET_WORDS_BIGENDIAN=y" >> $config_mak
 fi
 if test "$target_softmmu" = "yes" ; then
   echo "CONFIG_SOFTMMU=y" >> $config_mak
-  echo "#define CONFIG_SOFTMMU 1" >> $config_h
 fi
 if test "$target_user_only" = "yes" ; then
   echo "CONFIG_USER_ONLY=y" >> $config_mak
-  echo "#define CONFIG_USER_ONLY 1" >> $config_h
 fi
 if test "$target_linux_user" = "yes" ; then
   echo "CONFIG_LINUX_USER=y" >> $config_mak
-  echo "#define CONFIG_LINUX_USER 1" >> $config_h
 fi
 if test "$target_darwin_user" = "yes" ; then
   echo "CONFIG_DARWIN_USER=y" >> $config_mak
-  echo "#define CONFIG_DARWIN_USER 1" >> $config_h
 fi
 list=""
 if test ! -z "$gdb_xml_files" ; then
@@ -2065,28 +2049,26 @@ echo "TARGET_XML_FILES=$list" >> $config_mak
 case "$target_arch2" in
   arm|armeb|m68k|microblaze|mips|mipsel|mipsn32|mipsn32el|mips64|mips64el|ppc|ppc64|ppc64abi32|ppcemb|sparc|sparc64|sparc32plus)
     echo "CONFIG_SOFTFLOAT=y" >> $config_mak
-    echo "#define CONFIG_SOFTFLOAT 1" >> $config_h
     ;;
 esac

 if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then
   echo "TARGET_HAS_BFLT=y" >> $config_mak
-  echo "#define TARGET_HAS_BFLT 1" >> $config_h
 fi
 if test "$target_user_only" = "yes" \
         -a "$nptl" = "yes" -a "$target_nptl" = "yes"; then
-  echo "#define USE_NPTL 1" >> $config_h
+  echo "USE_NPTL=y" >> $config_mak
 fi
 # 32 bit ELF loader in addition to native 64 bit loader?
 if test "$target_user_only" = "yes" -a "$elfload32" = "yes"; then
   echo "TARGET_HAS_ELFLOAD32=y" >> $config_mak
-  echo "#define TARGET_HAS_ELFLOAD32 1" >> $config_h
 fi
 if test "$target_bsd_user" = "yes" ; then
   echo "CONFIG_BSD_USER=y" >> $config_mak
-  echo "#define CONFIG_BSD_USER 1" >> $config_h
 fi

+$source_path/create_config < $config_mak > $config_h
+
 test -f ${config_h}~ && cmp -s $config_h ${config_h}~ && mv ${config_h}~ $config_h

 done # for target in $targets