Build system cleanup

diff --git a/vm/Config.amd64 b/vm/Config.amd64
deleted file mode 100644 (file)
index d2c706c..0000000
--- a/vm/Config.amd64
+++ /dev/null
@@ -1,2 +0,0 @@
-BOOT_ARCH = amd64
-PLAF_DLL_OBJS += vm/cpu-amd64.o

diff --git a/vm/Config.freebsd.amd64 b/vm/Config.freebsd.amd64
deleted file mode 100644 (file)
index db6f9f3..0000000
--- a/vm/Config.freebsd.amd64
+++ /dev/null
@@ -1,2 +0,0 @@
-include vm/Config.freebsd
-include vm/Config.amd64

diff --git a/vm/Config.freebsd.x86 b/vm/Config.freebsd.x86
deleted file mode 100644 (file)
index 1273130..0000000
--- a/vm/Config.freebsd.x86
+++ /dev/null
@@ -1,2 +0,0 @@
-include vm/Config.freebsd
-include vm/Config.x86

diff --git a/vm/Config.freebsd.x86.32 b/vm/Config.freebsd.x86.32
new file mode 100644 (file)
index 0000000..1273130
--- /dev/null
+++ b/vm/Config.freebsd.x86.32
@@ -0,0 +1,2 @@
+include vm/Config.freebsd
+include vm/Config.x86

diff --git a/vm/Config.freebsd.x86.64 b/vm/Config.freebsd.x86.64
new file mode 100644 (file)
index 0000000..db6f9f3
--- /dev/null
+++ b/vm/Config.freebsd.x86.64
@@ -0,0 +1,2 @@
+include vm/Config.freebsd
+include vm/Config.amd64

diff --git a/vm/Config.linux.amd64 b/vm/Config.linux.amd64
deleted file mode 100644 (file)
index d7ae032..0000000
--- a/vm/Config.linux.amd64
+++ /dev/null
@@ -1,3 +0,0 @@
-include vm/Config.linux
-include vm/Config.amd64
-LIBPATH = -L/usr/X11R6/lib64 -L/usr/X11R6/lib

diff --git a/vm/Config.linux.x86 b/vm/Config.linux.x86
deleted file mode 100644 (file)
index 313b999..0000000
--- a/vm/Config.linux.x86
+++ /dev/null
@@ -1,2 +0,0 @@
-include vm/Config.linux
-include vm/Config.x86

diff --git a/vm/Config.linux.x86.32 b/vm/Config.linux.x86.32
new file mode 100644 (file)
index 0000000..313b999
--- /dev/null
+++ b/vm/Config.linux.x86.32
@@ -0,0 +1,2 @@
+include vm/Config.linux
+include vm/Config.x86

diff --git a/vm/Config.linux.x86.64 b/vm/Config.linux.x86.64
new file mode 100644 (file)
index 0000000..d7ae032
--- /dev/null
+++ b/vm/Config.linux.x86.64
@@ -0,0 +1,3 @@
+include vm/Config.linux
+include vm/Config.amd64
+LIBPATH = -L/usr/X11R6/lib64 -L/usr/X11R6/lib

diff --git a/vm/Config.macosx.x86 b/vm/Config.macosx.x86
deleted file mode 100644 (file)
index 27c47fc..0000000
--- a/vm/Config.macosx.x86
+++ /dev/null
@@ -1,2 +0,0 @@
-include vm/Config.macosx
-include vm/Config.x86

diff --git a/vm/Config.macosx.x86.32 b/vm/Config.macosx.x86.32
new file mode 100644 (file)
index 0000000..27c47fc
--- /dev/null
+++ b/vm/Config.macosx.x86.32
@@ -0,0 +1,2 @@
+include vm/Config.macosx
+include vm/Config.x86

diff --git a/vm/Config.openbsd.amd64 b/vm/Config.openbsd.amd64
deleted file mode 100644 (file)
index e895d34..0000000
--- a/vm/Config.openbsd.amd64
+++ /dev/null
@@ -1,2 +0,0 @@
-include vm/Config.openbsd
-include vm/Config.amd64

diff --git a/vm/Config.openbsd.x86 b/vm/Config.openbsd.x86
deleted file mode 100644 (file)
index 99cf991..0000000
--- a/vm/Config.openbsd.x86
+++ /dev/null
@@ -1,2 +0,0 @@
-include vm/Config.openbsd
-include vm/Config.x86

diff --git a/vm/Config.openbsd.x86.32 b/vm/Config.openbsd.x86.32
new file mode 100644 (file)
index 0000000..99cf991
--- /dev/null
+++ b/vm/Config.openbsd.x86.32
@@ -0,0 +1,2 @@
+include vm/Config.openbsd
+include vm/Config.x86

diff --git a/vm/Config.openbsd.x86.64 b/vm/Config.openbsd.x86.64
new file mode 100644 (file)
index 0000000..e895d34
--- /dev/null
+++ b/vm/Config.openbsd.x86.64
@@ -0,0 +1,2 @@
+include vm/Config.openbsd
+include vm/Config.amd64

diff --git a/vm/Config.solaris.amd64 b/vm/Config.solaris.amd64
deleted file mode 100644 (file)
index 58bd2b2..0000000
--- a/vm/Config.solaris.amd64
+++ /dev/null
@@ -1,2 +0,0 @@
-include vm/Config.solaris
-include vm/Config.amd64

diff --git a/vm/Config.solaris.x86 b/vm/Config.solaris.x86
deleted file mode 100644 (file)
index d839047..0000000
--- a/vm/Config.solaris.x86
+++ /dev/null
@@ -1,2 +0,0 @@
-include vm/Config.solaris
-include vm/Config.x86

diff --git a/vm/Config.solaris.x86.32 b/vm/Config.solaris.x86.32
new file mode 100644 (file)
index 0000000..d839047
--- /dev/null
+++ b/vm/Config.solaris.x86.32
@@ -0,0 +1,2 @@
+include vm/Config.solaris
+include vm/Config.x86

diff --git a/vm/Config.solaris.x86.64 b/vm/Config.solaris.x86.64
new file mode 100644 (file)
index 0000000..58bd2b2
--- /dev/null
+++ b/vm/Config.solaris.x86.64
@@ -0,0 +1,2 @@
+include vm/Config.solaris
+include vm/Config.amd64

diff --git a/vm/Config.windows.ce.x86 b/vm/Config.windows.ce.x86
deleted file mode 100644 (file)
index 0d1f776..0000000
--- a/vm/Config.windows.ce.x86
+++ /dev/null
@@ -1,2 +0,0 @@
-#CC = x86-wince-mingw32ce-gcc
-include vm/Config.windows.ce vm/Config.x86

diff --git a/vm/Config.windows.nt.x86 b/vm/Config.windows.nt.x86
deleted file mode 100644 (file)
index 8834332..0000000
--- a/vm/Config.windows.nt.x86
+++ /dev/null
@@ -1,7 +0,0 @@
-LIBS = -lm
-EXE_SUFFIX=-nt
-DLL_SUFFIX=-nt
-PLAF_DLL_OBJS += vm/os-windows-nt.o
-PLAF_EXE_OBJS += vm/resources.o
-PLAF_EXE_OBJS += vm/main-windows-nt.o
-include vm/Config.x86 vm/Config.windows

diff --git a/vm/Config.windows.nt.x86.32 b/vm/Config.windows.nt.x86.32
new file mode 100644 (file)
index 0000000..8834332
--- /dev/null
+++ b/vm/Config.windows.nt.x86.32
@@ -0,0 +1,7 @@
+LIBS = -lm
+EXE_SUFFIX=-nt
+DLL_SUFFIX=-nt
+PLAF_DLL_OBJS += vm/os-windows-nt.o
+PLAF_EXE_OBJS += vm/resources.o
+PLAF_EXE_OBJS += vm/main-windows-nt.o
+include vm/Config.x86 vm/Config.windows

diff --git a/vm/Config.x86 b/vm/Config.x86
deleted file mode 100644 (file)
index bd739d3..0000000
--- a/vm/Config.x86
+++ /dev/null
@@ -1,5 +0,0 @@
-BOOT_ARCH = x86
-PLAF_DLL_OBJS += vm/cpu-x86.o
-
-# gcc bug workaround
-CFLAGS += -fno-builtin-strlen -fno-builtin-strcat -mtune=pentium4

diff --git a/vm/Config.x86.32 b/vm/Config.x86.32
new file mode 100644 (file)
index 0000000..bbd26e8
--- /dev/null
+++ b/vm/Config.x86.32
@@ -0,0 +1,5 @@
+BOOT_ARCH = x86
+PLAF_DLL_OBJS += vm/cpu-x86.32.o
+
+# gcc bug workaround
+CFLAGS += -fno-builtin-strlen -fno-builtin-strcat -mtune=pentium4

diff --git a/vm/Config.x86.64 b/vm/Config.x86.64
new file mode 100644 (file)
index 0000000..9630e4a
--- /dev/null
+++ b/vm/Config.x86.64
@@ -0,0 +1,2 @@
+BOOT_ARCH = amd64
+PLAF_DLL_OBJS += vm/cpu-x86.64.o

diff --git a/vm/os-freebsd-x86.32.h b/vm/os-freebsd-x86.32.h
new file mode 100644 (file)
index 0000000..3429969
--- /dev/null
+++ b/vm/os-freebsd-x86.32.h
@@ -0,0 +1 @@
+#define UAP_PROGRAM_COUNTER(ucontext) (((ucontext_t *)(ucontext))->uc_mcontext.mc_eip)

diff --git a/vm/os-freebsd-x86.h b/vm/os-freebsd-x86.h
deleted file mode 100644 (file)
index 3429969..0000000
--- a/vm/os-freebsd-x86.h
+++ /dev/null
@@ -1 +0,0 @@
-#define UAP_PROGRAM_COUNTER(ucontext) (((ucontext_t *)(ucontext))->uc_mcontext.mc_eip)

diff --git a/vm/os-macosx-x86.32.h b/vm/os-macosx-x86.32.h
new file mode 100644 (file)
index 0000000..81ae617
--- /dev/null
+++ b/vm/os-macosx-x86.32.h
@@ -0,0 +1,16 @@
+#define MACH_EXC_STATE_TYPE i386_exception_state_t
+#define MACH_EXC_STATE_FLAVOR i386_EXCEPTION_STATE
+#define MACH_EXC_STATE_COUNT i386_EXCEPTION_STATE_COUNT
+#define MACH_THREAD_STATE_TYPE i386_thread_state_t
+#define MACH_THREAD_STATE_FLAVOR i386_THREAD_STATE
+#define MACH_THREAD_STATE_COUNT i386_THREAD_STATE_COUNT
+
+#if __DARWIN_UNIX03
+    #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__faultvaddr
+    #define MACH_STACK_POINTER(thr_state) (thr_state)->__esp
+    #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__eip
+#else
+    #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->faultvaddr
+    #define MACH_STACK_POINTER(thr_state) (thr_state)->esp
+    #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->eip
+#endif

diff --git a/vm/os-macosx-x86.h b/vm/os-macosx-x86.h
deleted file mode 100644 (file)
index 81ae617..0000000
--- a/vm/os-macosx-x86.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#define MACH_EXC_STATE_TYPE i386_exception_state_t
-#define MACH_EXC_STATE_FLAVOR i386_EXCEPTION_STATE
-#define MACH_EXC_STATE_COUNT i386_EXCEPTION_STATE_COUNT
-#define MACH_THREAD_STATE_TYPE i386_thread_state_t
-#define MACH_THREAD_STATE_FLAVOR i386_THREAD_STATE
-#define MACH_THREAD_STATE_COUNT i386_THREAD_STATE_COUNT
-
-#if __DARWIN_UNIX03
-    #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__faultvaddr
-    #define MACH_STACK_POINTER(thr_state) (thr_state)->__esp
-    #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__eip
-#else
-    #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->faultvaddr
-    #define MACH_STACK_POINTER(thr_state) (thr_state)->esp
-    #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->eip
-#endif

diff --git a/vm/os-openbsd-amd64.h b/vm/os-openbsd-amd64.h
deleted file mode 100644 (file)
index ff225c3..0000000
--- a/vm/os-openbsd-amd64.h
+++ /dev/null
@@ -1,7 +0,0 @@
-INLINE void *openbsd_stack_pointer(void *uap)
-{
-       ucontext_t *ucontext = (ucontext_t *)uap;
-       return (void *)ucontext->sc_rsp;
-}
-
-#define ucontext_stack_pointer openbsd_stack_pointer

diff --git a/vm/os-openbsd-x86.32.h b/vm/os-openbsd-x86.32.h
new file mode 100644 (file)
index 0000000..7e1e489
--- /dev/null
+++ b/vm/os-openbsd-x86.32.h
@@ -0,0 +1,7 @@
+INLINE void *openbsd_stack_pointer(void *uap)
+{
+       ucontext_t *ucontext = (ucontext_t *)uap;
+       return (void *)ucontext->sc_esp;
+}
+
+#define ucontext_stack_pointer openbsd_stack_pointer

diff --git a/vm/os-openbsd-x86.64.h b/vm/os-openbsd-x86.64.h
new file mode 100644 (file)
index 0000000..ff225c3
--- /dev/null
+++ b/vm/os-openbsd-x86.64.h
@@ -0,0 +1,7 @@
+INLINE void *openbsd_stack_pointer(void *uap)
+{
+       ucontext_t *ucontext = (ucontext_t *)uap;
+       return (void *)ucontext->sc_rsp;
+}
+
+#define ucontext_stack_pointer openbsd_stack_pointer

diff --git a/vm/os-openbsd-x86.h b/vm/os-openbsd-x86.h
deleted file mode 100644 (file)
index 7e1e489..0000000
--- a/vm/os-openbsd-x86.h
+++ /dev/null
@@ -1,7 +0,0 @@
-INLINE void *openbsd_stack_pointer(void *uap)
-{
-       ucontext_t *ucontext = (ucontext_t *)uap;
-       return (void *)ucontext->sc_esp;
-}
-
-#define ucontext_stack_pointer openbsd_stack_pointer