6 files changed, 94 insertions, 32 deletions

diff --git a/emulators/tme/files/patch-configure b/emulators/tme/files/patch-configure
deleted file mode 100644
index 2fb32d84ada6..000000000000
--- a/emulators/tme/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Sun May 15 03:26:11 2005
-+++ configure	Fri Feb  2 16:39:50 2007
-@@ -8890,7 +8890,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_have_isinff=yes
-+  ac_cv_have_isinff=no
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15113,7 +15113,7 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
-@@ -25853,7 +25853,7 @@
-   enable_warnings=yes
- fi;
- if test "x$enable_warnings" = "xyes" -a "x$GCC" = "xyes"; then
--  CFLAGS="${CFLAGS-} -Wundef -Wall -Werror"
-+  CFLAGS="${CFLAGS-} -Wundef -Wall"
-   CXXFLAGS="${CXXFLAGS-} -W"
- fi
- 
diff --git a/emulators/tme/files/patch-host__bsd__bsd-bpf.c b/emulators/tme/files/patch-host__bsd__bsd-bpf.c
new file mode 100644
index 000000000000..cbf3e8e6bc14
--- /dev/null
+++ b/emulators/tme/files/patch-host__bsd__bsd-bpf.c
@@ -0,0 +1,28 @@
+--- host/bsd/bsd-if.c.orig	2003-10-16 02:48:23.000000000 +0000
++++ host/bsd/bsd-if.c	2012-07-07 12:24:22.000000000 +0000
+@@ -71,14 +72,15 @@
+ 
+ /* this macro helps us size a struct ifreq: */
+ #ifdef HAVE_SOCKADDR_SA_LEN
+-#define SIZEOF_IFREQ(ifr) (sizeof(ifr->ifr_name) + ifr->ifr_addr.sa_len)
++#define SIZEOF_IFREQ(ifr) \
++( sizeof(ifr->ifr_name) + (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_ifru) ? ifr->ifr_addr.sa_len : sizeof(ifr->ifr_ifru)) )
+ #else  /* !HAVE_SOCKADDR_SA_LEN */
+ #define SIZEOF_IFREQ(ifr) (sizeof(ifr->ifr_name) + sizeof(struct sockaddr))
+ #endif /* !HAVE_SOCKADDR_SA_LEN */
+ 
+ /* this finds a network interface: */
+ int
+ tme_bsd_if_find(const char *ifr_name_user, struct ifreq **_ifreq, tme_uint8_t **_if_addr, unsigned int *_if_addr_size)
+ {
+   int saved_errno;
+   int dummy_fd;
+@@ -175,7 +192,7 @@
+     if (ifr_user == NULL
+ 	&& (ifr_name_user != NULL
+ 	    ? !strncmp(ifr->ifr_name, ifr_name_user, sizeof(ifr->ifr_name))
+-	    : !(ifr->ifr_flags & IFF_LOOPBACK))) {
++	    : !(saved_flags & IFF_LOOPBACK))) {
+       ifr_user = ifr;
+     }
+   }
diff --git a/emulators/tme/files/patch-ic__ieee754__iee754-misc-auto.sh b/emulators/tme/files/patch-ic__ieee754__iee754-misc-auto.sh
new file mode 100644
index 000000000000..f8807b65c848
--- /dev/null
+++ b/emulators/tme/files/patch-ic__ieee754__iee754-misc-auto.sh
@@ -0,0 +1,11 @@
+--- ic/ieee754/ieee754-misc-auto.sh.orig	2007-08-24 01:05:43.000000000 +0000
++++ ic/ieee754/ieee754-misc-auto.sh
+@@ -106,7 +106,7 @@ typedef float tme_ieee754_${precision}_b
+ #elif (TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN == TME_FLOAT_FORMAT_DOUBLE)
+ typedef double tme_ieee754_${precision}_builtin_t;
+ #define tme_float_value_ieee754_${precision}_builtin tme_float_value_double
+-#elif (TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN == TME_FLOAT_FORMAT_LONG_DOUBLE)
++#elif (defined(_TME_HAVE_LONG_DOUBLE) && (TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN == TME_FLOAT_FORMAT_LONG_DOUBLE))
+ typedef long double tme_ieee754_${precision}_builtin_t;
+ #define tme_float_value_ieee754_${precision}_builtin tme_float_value_long_double
+ #endif
diff --git a/emulators/tme/files/patch-ic__sparc__sparc-execute.c b/emulators/tme/files/patch-ic__sparc__sparc-execute.c
new file mode 100644
index 000000000000..ba0eaee0e2e5
--- /dev/null
+++ b/emulators/tme/files/patch-ic__sparc__sparc-execute.c
@@ -0,0 +1,11 @@
+--- ic/sparc/sparc-execute.c	2010-02-21 06:58:15.000000000 +0900
++++ ic/sparc/sparc-execute.c	2010-04-14 22:55:50.000000000 +0900
+@@ -612,7 +612,7 @@
+ 			    != pc_previous)) {
+       if (__tme_predict_true(((tme_sparc_ireg_t) (pc + sizeof(tme_uint32_t)))
+ 			     == ic->tme_sparc_ireg(TME_SPARC_IREG_PC_NEXT))) {
+-	tme_recode_thunk_off_t insns_thunk;
++	tme_recode_thunk_off_t insns_thunk = 0; /* XXX gcc -Wuninitialized */
+ 
+ 	/* if the current instruction TLB entry is not the invalid TLB
+ 	   entry, and there is an instructions thunk for this PC: */
diff --git a/emulators/tme/files/patch-libtme-module.c b/emulators/tme/files/patch-libtme-module.c
index 43c168c8370e..4d2c85fd4c03 100644
--- a/emulators/tme/files/patch-libtme-module.c
+++ b/emulators/tme/files/patch-libtme-module.c
@@ -1,6 +1,20 @@
---- libtme/module.c.orig	Wed Jan 26 13:59:24 2005
-+++ libtme/module.c	Sun Dec 17 19:11:37 2006
-@@ -107,13 +107,14 @@
+--- libtme/module.c.orig	2010-06-06 04:04:42.000000000 +0900
++++ libtme/module.c	2011-03-20 06:00:02.000000000 +0900
+@@ -62,11 +62,13 @@
+ #endif /* !lt_ptr_t */
+ #endif /* !lt_ptr */
+ 
++#if 0
+ /* similarly, the installed libltdl may be so recent that its ltdl.h
+    renames lt_preloaded_symbols with a macro, to a name different from
+    what our libtool script makes.  it's possible that the renaming
+    macro is meant to be undefined to handle this problem: */
+ #undef lt_preloaded_symbols
++#endif
+ 
+ /* types: */
+ struct tme_module {
+@@ -113,13 +115,14 @@
    FILE *modules_index;
  
    /* pass over the search path environment variables: */
diff --git a/emulators/tme/files/patch-machine__sun__sun-bwtwo.c b/emulators/tme/files/patch-machine__sun__sun-bwtwo.c
new file mode 100644
index 000000000000..0fc7aeef66f0
--- /dev/null
+++ b/emulators/tme/files/patch-machine__sun__sun-bwtwo.c
@@ -0,0 +1,27 @@
+--- machine/sun/sun-bwtwo.c.orig	2009-11-08 12:03:58.000000000 -0500
++++ machine/sun/sun-bwtwo.c	2011-10-06 20:52:30.000000000 -0400
+@@ -339,6 +339,7 @@
+ {
+   struct tme_sunbw2 *sunbw2;
+   int rc;
++  tme_uint16_t v;
+ 
+   /* start the sunbw2 structure: */
+   sunbw2 = tme_new0(struct tme_sunbw2, 1);
+@@ -365,12 +366,10 @@
+   case TME_SUNBW2_TYPE_OLD_ONBOARD:
+ 
+     /* set our initial CSR: */
+-    sunbw2->tme_sunbw2_csr
+-      = tme_htobe_u16(TME_SUNBW2_CSR_ENABLE_VIDEO
+-		      | (sunbw2->tme_sunbw2_sunfb.tme_sunfb_size == TME_SUNFB_SIZE_1024_1024
+-			 ? TME_SUNBW2_CSR_JUMPER_HIRES
+-			 : 0));
+-
++    v = TME_SUNBW2_CSR_ENABLE_VIDEO | (sunbw2->tme_sunbw2_sunfb.tme_sunfb_size
++				       == TME_SUNFB_SIZE_1024_1024
++				       ? TME_SUNBW2_CSR_JUMPER_HIRES : 0);
++    sunbw2->tme_sunbw2_csr = tme_htobe_u16(v);
+     break;
+   }
+