[Qemu-devel] [PATCH 22/46] rename HAVE_MACHINE_BSWAP_H to CONFIG_MACHINE_BSWAP_H

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile.target      |   10 +++++-----
 bsd-user/syscall.c   |    6 +++---
 bswap.h              |    4 ++--
 configure            |    6 +++---
 linux-user/syscall.c |    6 +++---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 687648c..2955880 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -176,7 +176,7 @@ 
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)

 ifeq ($(ARCH),i386)
-ifdef TARGET_GPROF
+ifdef CONFIG_GPROF
 USE_I386_LD=y
 endif
 ifdef CONFIG_STATIC
@@ -250,7 +250,7 @@ endif
 endif

 # profiling code
-ifdef TARGET_GPROF
+ifdef CONFIG_GPROF
 LDFLAGS+=-p
 CFLAGS+=-p
 endif
@@ -319,7 +319,7 @@ VPATH+=:$(SRC_PATH)/bsd-user
 CPPFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH)

 ifeq ($(ARCH),i386)
-ifdef TARGET_GPROF
+ifdef CONFIG_GPROF
 USE_I386_LD=y
 endif
 ifdef CONFIG_STATIC
@@ -621,7 +621,7 @@ endif
 endif
 endif
 endif
-ifdef TARGET_GPROF
+ifdef CONFIG_GPROF
 vl.o: CFLAGS+=-p
 LDFLAGS+=-p
 endif
@@ -635,7 +635,7 @@ SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
 endif

 # profiling code
-ifdef TARGET_GPROF
+ifdef CONFIG_GPROF
 LDFLAGS+=-p
 main.o: CFLAGS+=-p
 endif
diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c
index 4f713f2..b1ae3c2 100644
--- a/bsd-user/syscall.c
+++ b/bsd-user/syscall.c
@@ -66,7 +66,7 @@ abi_long do_freebsd_syscall(void *cpu_env, int num, abi_long 
arg1,

     switch(num) {
     case TARGET_FREEBSD_NR_exit:
-#ifdef HAVE_GPROF
+#ifdef CONFIG_GPROF
         _mcleanup();
 #endif
         gdb_exit(cpu_env, arg1);
@@ -138,7 +138,7 @@ abi_long do_netbsd_syscall(void *cpu_env, int num, abi_long 
arg1,

     switch(num) {
     case TARGET_NETBSD_NR_exit:
-#ifdef HAVE_GPROF
+#ifdef CONFIG_GPROF
         _mcleanup();
 #endif
         gdb_exit(cpu_env, arg1);
@@ -210,7 +210,7 @@ abi_long do_openbsd_syscall(void *cpu_env, int num, 
abi_long arg1,

     switch(num) {
     case TARGET_OPENBSD_NR_exit:
-#ifdef HAVE_GPROF
+#ifdef CONFIG_GPROF
         _mcleanup();
 #endif
         gdb_exit(cpu_env, arg1);
diff --git a/bswap.h b/bswap.h
index 1dd357e..864bbeb 100644
--- a/bswap.h
+++ b/bswap.h
@@ -5,7 +5,7 @@

 #include <inttypes.h>

-#ifdef HAVE_MACHINE_BSWAP_H
+#ifdef CONFIG_MACHINE_BSWAP_H
 #include <sys/endian.h>
 #include <sys/types.h>
 #include <machine/bswap.h>
@@ -64,7 +64,7 @@ static inline uint64_t bswap64(uint64_t x)
     return bswap_64(x);
 }

-#endif /* ! HAVE_MACHINE_BSWAP_H */
+#endif /* ! CONFIG_MACHINE_BSWAP_H */

 static inline void bswap16s(uint16_t *s)
 {
diff --git a/configure b/configure
index 7a46c96..bb91fe1 100755
--- a/configure
+++ b/configure
@@ -1550,7 +1550,7 @@ 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_host_h
+    echo "#define CONFIG_MACHINE_BSWAP_H 1" >> $config_host_h
   fi
 fi

@@ -1582,8 +1582,8 @@ if test -n "$sparc_cpu"; then
   echo "#define __sparc_${sparc_cpu}__ 1" >> $config_host_h
 fi
 if test "$gprof" = "yes" ; then
-  echo "TARGET_GPROF=yes" >> $config_host_mak
-  echo "#define HAVE_GPROF 1" >> $config_host_h
+  echo "CONFIG_GPROF=y" >> $config_host_mak
+  echo "#define CONFIG_GPROF 1" >> $config_host_h
 fi
 if test "$static" = "yes" ; then
   echo "CONFIG_STATIC=y" >> $config_host_mak
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 7b57323..d9c083a 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -57,7 +57,7 @@
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <qemu-common.h>
-#ifdef HAVE_GPROF
+#ifdef CONFIG_GPROF
 #include <sys/gmon.h>
 #endif

@@ -4162,7 +4162,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
           pthread_exit(NULL);
       }
 #endif
-#ifdef HAVE_GPROF
+#ifdef CONFIG_GPROF
         _mcleanup();
 #endif
         gdb_exit(cpu_env, arg1);
@@ -5676,7 +5676,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
 #ifdef __NR_exit_group
         /* new thread calls */
     case TARGET_NR_exit_group:
-#ifdef HAVE_GPROF
+#ifdef CONFIG_GPROF
         _mcleanup();
 #endif
         gdb_exit(cpu_env, arg1);
-- 
1.6.2.5