mirror of
				https://github.com/yuzu-emu/unicorn.git
				synced 2025-11-04 14:14:57 +00:00 
			
		
		
		
	cleanup
This commit is contained in:
		
							parent
							
								
									8a5b12c6f9
								
							
						
					
					
						commit
						b9b82591a1
					
				
							
								
								
									
										11
									
								
								qemu/configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								qemu/configure
									
									
									
									
										vendored
									
									
								
							| 
						 | 
					@ -1156,14 +1156,6 @@ if test "$linux" = "yes" ; then
 | 
				
			||||||
  echo "CONFIG_LINUX=y" >> $config_host_mak
 | 
					  echo "CONFIG_LINUX=y" >> $config_host_mak
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if test "$darwin" = "yes" ; then
 | 
					 | 
				
			||||||
  echo "CONFIG_DARWIN=y" >> $config_host_mak
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
if test "$aix" = "yes" ; then
 | 
					 | 
				
			||||||
  echo "CONFIG_AIX=y" >> $config_host_mak
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
if test "$solaris" = "yes" ; then
 | 
					if test "$solaris" = "yes" ; then
 | 
				
			||||||
  echo "CONFIG_SOLARIS=y" >> $config_host_mak
 | 
					  echo "CONFIG_SOLARIS=y" >> $config_host_mak
 | 
				
			||||||
  echo "CONFIG_SOLARIS_VERSION=$solarisrev" >> $config_host_mak
 | 
					  echo "CONFIG_SOLARIS_VERSION=$solarisrev" >> $config_host_mak
 | 
				
			||||||
| 
						 | 
					@ -1171,9 +1163,6 @@ if test "$solaris" = "yes" ; then
 | 
				
			||||||
    echo "CONFIG_NEEDS_LIBSUNMATH=y" >> $config_host_mak
 | 
					    echo "CONFIG_NEEDS_LIBSUNMATH=y" >> $config_host_mak
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
if test "$haiku" = "yes" ; then
 | 
					 | 
				
			||||||
  echo "CONFIG_HAIKU=y" >> $config_host_mak
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
if test "$static" = "yes" ; then
 | 
					if test "$static" = "yes" ; then
 | 
				
			||||||
  echo "CONFIG_STATIC=y" >> $config_host_mak
 | 
					  echo "CONFIG_STATIC=y" >> $config_host_mak
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,13 +11,6 @@
 | 
				
			||||||
#include <sys/signal.h>
 | 
					#include <sys/signal.h>
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef _WIN32
 | 
					 | 
				
			||||||
#include <sys/wait.h>
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#define WIFEXITED(x)   1
 | 
					 | 
				
			||||||
#define WEXITSTATUS(x) (x)
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#include <sys/time.h>
 | 
					#include <sys/time.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10
 | 
					#if defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10
 | 
				
			||||||
| 
						 | 
					@ -107,67 +100,6 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align);
 | 
				
			||||||
void qemu_vfree(void *ptr);
 | 
					void qemu_vfree(void *ptr);
 | 
				
			||||||
void qemu_anon_ram_free(void *ptr, size_t size);
 | 
					void qemu_anon_ram_free(void *ptr, size_t size);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define QEMU_MADV_INVALID -1
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#if defined(CONFIG_MADVISE)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#define QEMU_MADV_WILLNEED  MADV_WILLNEED
 | 
					 | 
				
			||||||
#define QEMU_MADV_DONTNEED  MADV_DONTNEED
 | 
					 | 
				
			||||||
#ifdef MADV_DONTFORK
 | 
					 | 
				
			||||||
#define QEMU_MADV_DONTFORK  MADV_DONTFORK
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#define QEMU_MADV_DONTFORK  QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#ifdef MADV_MERGEABLE
 | 
					 | 
				
			||||||
#define QEMU_MADV_MERGEABLE MADV_MERGEABLE
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#ifdef MADV_UNMERGEABLE
 | 
					 | 
				
			||||||
#define QEMU_MADV_UNMERGEABLE MADV_UNMERGEABLE
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#define QEMU_MADV_UNMERGEABLE QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#ifdef MADV_DODUMP
 | 
					 | 
				
			||||||
#define QEMU_MADV_DODUMP MADV_DODUMP
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#define QEMU_MADV_DODUMP QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#ifdef MADV_DONTDUMP
 | 
					 | 
				
			||||||
#define QEMU_MADV_DONTDUMP MADV_DONTDUMP
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#ifdef MADV_HUGEPAGE
 | 
					 | 
				
			||||||
#define QEMU_MADV_HUGEPAGE MADV_HUGEPAGE
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#define QEMU_MADV_HUGEPAGE QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#elif defined(CONFIG_POSIX_MADVISE)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#define QEMU_MADV_WILLNEED  POSIX_MADV_WILLNEED
 | 
					 | 
				
			||||||
#define QEMU_MADV_DONTNEED  POSIX_MADV_DONTNEED
 | 
					 | 
				
			||||||
#define QEMU_MADV_DONTFORK  QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#define QEMU_MADV_UNMERGEABLE QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#define QEMU_MADV_DODUMP QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#define QEMU_MADV_HUGEPAGE  QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#else /* no-op */
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#define QEMU_MADV_WILLNEED  QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#define QEMU_MADV_DONTNEED  QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#define QEMU_MADV_DONTFORK  QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#define QEMU_MADV_MERGEABLE QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#define QEMU_MADV_UNMERGEABLE QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#define QEMU_MADV_DODUMP QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#define QEMU_MADV_DONTDUMP QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
#define QEMU_MADV_HUGEPAGE  QEMU_MADV_INVALID
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#if defined(__HAIKU__) && defined(__i386__)
 | 
					#if defined(__HAIKU__) && defined(__i386__)
 | 
				
			||||||
#define FMT_pid "%ld"
 | 
					#define FMT_pid "%ld"
 | 
				
			||||||
#elif defined(WIN64)
 | 
					#elif defined(WIN64)
 | 
				
			||||||
| 
						 | 
					@ -176,35 +108,6 @@ void qemu_anon_ram_free(void *ptr, size_t size);
 | 
				
			||||||
#define FMT_pid "%d"
 | 
					#define FMT_pid "%d"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef _WIN32
 | 
					 | 
				
			||||||
static inline void qemu_timersub(const struct timeval *val1,
 | 
					 | 
				
			||||||
                                 const struct timeval *val2,
 | 
					 | 
				
			||||||
                                 struct timeval *res)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    res->tv_sec = val1->tv_sec - val2->tv_sec;
 | 
					 | 
				
			||||||
    if (val1->tv_usec < val2->tv_usec) {
 | 
					 | 
				
			||||||
        res->tv_sec--;
 | 
					 | 
				
			||||||
        res->tv_usec = val1->tv_usec - val2->tv_usec + 1000 * 1000;
 | 
					 | 
				
			||||||
    } else {
 | 
					 | 
				
			||||||
        res->tv_usec = val1->tv_usec - val2->tv_usec;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#define qemu_timersub timersub
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void qemu_set_cloexec(int fd);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void qemu_set_version(const char *);
 | 
					 | 
				
			||||||
const char *qemu_get_version(void);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void fips_set_state(bool requested);
 | 
					 | 
				
			||||||
bool fips_get_state(void);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* Get the saved exec dir.
 | 
					 | 
				
			||||||
 * Caller needs to release the returned string by g_free() */
 | 
					 | 
				
			||||||
char *qemu_get_exec_dir(void);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * qemu_getauxval:
 | 
					 * qemu_getauxval:
 | 
				
			||||||
 * @type: the auxiliary vector key to lookup
 | 
					 * @type: the auxiliary vector key to lookup
 | 
				
			||||||
| 
						 | 
					@ -214,6 +117,4 @@ char *qemu_get_exec_dir(void);
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
unsigned long qemu_getauxval(unsigned long type);
 | 
					unsigned long qemu_getauxval(unsigned long type);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void qemu_set_tty_echo(int fd, bool echo);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue