From db6920d372ccc8d8c57d0844f14f0748293f36a0 Mon Sep 17 00:00:00 2001
From: lchristina26 <leah@wolfssl.com>
Date: Thu, 12 Nov 2015 13:33:47 -0700
Subject: [PATCH] updates for vxworks compatibility

---
 examples/server/server.c     | 4 +++-
 wolfssl/test.h               | 2 +-
 wolfssl/wolfcrypt/settings.h | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/examples/server/server.c b/examples/server/server.c
index c13c21d50..9b16ec412 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -314,7 +314,9 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
     fdOpenSession(Task_self());
 #endif
 
-#ifndef WOLFSSL_VXWORKS
+#ifdef WOLFSSL_VXWORKS
+    useAnyAddr = 1;
+#else
     while ((ch = mygetopt(argc, argv, "?dbstnNufrRawPIp:v:l:A:c:k:Z:S:oO:D:L:ieB:"))
                          != -1) {
         switch (ch) {
diff --git a/wolfssl/test.h b/wolfssl/test.h
index 8549f0f7a..ef59a6419 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -503,7 +503,7 @@ static INLINE void build_addr(SOCKADDR_IN_T* addr, const char* peer,
         #elif defined(WOLFSSL_TIRTOS)
             struct hostent* entry = DNSGetHostByName(peer);
         #elif defined(WOLFSSL_VXWORKS)
-            struct hostent* entry = (struct hostent*)hostGetByName(peer);
+            struct hostent* entry = (struct hostent*)hostGetByName((char*)peer);
         #else
             struct hostent* entry = gethostbyname(peer);
         #endif
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 8fd9d629f..d89b64303 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -305,6 +305,10 @@
 
 
 #ifdef WOLFSSL_VXWORKS
+    /* VxWorks simulator incorrectly detects building for i386 */
+    #ifdef VXWORKS_SIM
+        #define TFM_NO_ASM
+    #endif
     #define WOLFSSL_HAVE_MIN
     #define USE_FAST_MATH
     #define TFM_TIMING_RESISTANT