[qnx] Add all modified files missed in previous commit.

Author: kulidan

configure.in

@@ -175,6 +175,19 @@ case "$host" in
 		with_sigaltstack=no
 		use_sigposix=yes
 		;;
+	*-*-qnx*)
+		CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -D_QNX_SOURCE -D_REENTRANT -DUSE_MMAP"
+		libmono_cflags="-D_THREAD_SAFE -D_REENTRANT"
+		platform_win32=no
+		use_sigposix=yes
+		with_tls=pthread
+		libgc_threads=pthreads
+        with_sigaltstack=no 
+ 	    with_glib=embedded 
+ 	    disable_nls=yes 
+        parallel_mark=no
+		mono_cv_uscore=yes
+		;;
 	*-*-linux*)
 		platform_win32=no
 		CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
@@ -2203,6 +2216,15 @@ case "$host" in
 		jit_wanted=true
 		CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1 -D__ARM_EABI__"
 		;;
+	arm*-*-qnx*)
+		TARGET=ARM;
+		arch_target=arm;
+		ACCESS_UNALIGNED="no"
+		JIT_SUPPORTED=yes
+		jit_wanted=true
+		CPPFLAGS="$CPPFLAGS -O2 -marm -Wa,-march=armv7-a -march=armv7-a -Wa,-mfpu=neon -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a9 -ffunction-sections -fdata-sections -fno-strict-aliasing -DARM_FPU_VFP=1 -D__ARM_EABI__ -DHAVE_ARMV6"
+		LDFLAGS="$LDFLAGS -Wl,--rpath,app/native/Data/Managed -L${QNX_TARGET}/armle-v7/lib/gcc/4.6.3"
+		;;
 	arm*-linux*)
 		TARGET=ARM;
 		arch_target=arm;
@@ -2352,6 +2374,11 @@ case "$host" in
     	LIBC="libc.so"
 	INTL="libintl.so"
 	;;
+    *-*-*qnx*)
+    	LIBC="libc.so"
+	INTL="libintl.so"
+	soname_spec='${libname}${shared_ext}'
+	;;
     *-*-*linux*)
 	AC_PATH_X
 	AC_MSG_CHECKING(for the soname of libX11.so)

eglib/configure.ac

@@ -79,6 +79,7 @@ AM_CONDITIONAL(NEEDS_LIBGCC, test x$needs_libgcc = xyes)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(void *)
 AC_CHECK_FUNCS(strndup strlcpy getpwent_r strtok_r rewinddir)
+AM_CONDITIONAL(NEED_VASPRINTF, test x$have_vasprintf = x )
 if test "x$WANT_ICONV" = "x1"; then
     AC_CHECK_LIB(iconv, libiconv_open, LIBS="$LIBS -liconv")
 fi

eglib/src/Makefile.am

@@ -8,6 +8,14 @@ unix_files = \
 	gdate-unix.c  gdir-unix.c  gfile-unix.c  gmisc-unix.c	\
 	gmodule-unix.c gtimer-unix.c
 
+# some unices and windows do not have an implementation of vasprintf
+# used by eglib, use provided implementation instead
+if NEED_VASPRINTF
+vasprintf_files = vasprintf.c
+else
+vaprinttf_files = foo.c
+endif
+
 if PLATFORM_WIN32
 os_files = $(win_files)
 else
@@ -40,7 +48,8 @@ libeglib_la_SOURCES = \
 	gutf8.c		\
 	gunicode.c	\
 	unicode-data.h	\
-	$(os_files)
+	$(os_files)	\
+	$(vasprintf_files)
 
 libeglib_la_CFLAGS = -Wall -D_FORTIFY_SOURCE=2
 

libgc/configure.in

@@ -164,6 +164,13 @@ case "$THREADS" in
 	INCLUDES="$INCLUDES -pthread"
 	THREADDLLIBS="-lpthread -lrt"
 	;;
+     *-*-qnx*)
+	AC_DEFINE(GC_QNX_THREADS)
+	if test "${enable_parallel_mark}" = yes; then
+	  AC_DEFINE(PARALLEL_MARK)
+	fi
+	AC_DEFINE(THREAD_LOCAL_ALLOC)
+	;;
       *)
 	AC_MSG_ERROR("Pthreads not supported by the GC on this platform.")
 	;;

libgc/include/gc_config_macros.h

@@ -42,7 +42,8 @@
 		             || defined(GC_SOLARIS_PTHREADS) \
 			     || defined(GC_HPUX_THREADS) \
 			     || defined(GC_AIX_THREADS) \
-			     || defined(GC_LINUX_THREADS))
+			     || defined(GC_LINUX_THREADS) \
+			     || defined(GC_QNX_THREADS))
 # define _REENTRANT
 	/* Better late than never.  This fails if system headers that	*/
 	/* depend on this were previously included.			*/
@@ -57,7 +58,8 @@
 	defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \
 	defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \
 	defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \
-        (defined(GC_WIN32_THREADS) && defined(__CYGWIN32__))
+        (defined(GC_WIN32_THREADS) && defined(__CYGWIN32__)) || \
+	defined(GC_QNX_THREADS)
 #   define GC_PTHREADS
 # endif
 
@@ -99,6 +101,10 @@
 #   define GC_AIX_THREADS
 #   define GC_PTHREADS
 # endif
+# if defined(__QNXNTO__)
+#   define GC_QNX_THREADS
+#   define GC_PTHREADS
+# endif
 #endif /* GC_THREADS */
 
 #if defined(GC_THREADS) && !defined(GC_PTHREADS) && \

libgc/include/private/gcconfig.h

@@ -64,10 +64,15 @@
 #   define DARWIN
 # endif
 
+/* And one for QNX: */
+# if defined(__QNXNTO__)
+#   define QNX
+# endif
+
 /* Determine the machine type: */
 # if defined(__arm__) || defined(__thumb__)
 #    define ARM32
-#    if !defined(LINUX) && !defined(NETBSD) && !defined(DARWIN)
+#    if !defined(LINUX) && !defined(NETBSD) && !defined(DARWIN) && !defined(QNX)
 #      define NOSYS
 #      define mach_type_known
 #    endif
@@ -370,6 +375,14 @@
 #   define OPENBSD
 #   define mach_type_known
 # endif
+# if defined(QNX) && (defined(i386) || defined(__i386__))
+#   define I386
+#   define mach_type_known
+# endif
+# if defined(QNX) && defined(__arm__)
+#   define ARM32
+#   define mach_type_known
+# endif
 # if defined(FREEBSD) && (defined(i386) || defined(__i386__))
 #   define I386
 #   define mach_type_known
@@ -1329,6 +1342,11 @@
 #       define STACKBOTTOM ((ptr_t)((word) __djgpp_stack_limit + _stklen))
 		/* This may not be right.  */
 #   endif
+#   ifdef QNX 
+#	define OS_TYPE "QNX"
+        extern int etext[];
+#       define DATASTART ((ptr_t)((((word) (etext)) + 0x1ff) & ~0x1ff))
+#   endif
 #   ifdef OPENBSD
 #	define OS_TYPE "OPENBSD"
 #   endif
@@ -1955,6 +1973,11 @@
 #         define USE_MUNMAP
 #     endif
 #   endif
+#   ifdef QNX 
+#	define OS_TYPE "QNX"
+        extern int etext[];
+#       define DATASTART ((ptr_t)((((word) (etext)) + 0x1ff) & ~0x1ff))
+#   endif
 #   ifdef NOSYS
       /* __data_start is usually defined in the target linker script.  */
       extern int __data_start[];

libgc/os_dep.c

@@ -64,6 +64,10 @@
 # include <ctype.h>
 #endif
 
+#if defined(__QNXNTO__)
+#include <fcntl.h>
+#endif
+
 /* Blatantly OS dependent routines, except for those that are related 	*/
 /* to dynamic loading.							*/
 
@@ -1028,7 +1032,8 @@ void *GC_set_stackbottom = NULL;
 ptr_t GC_get_stack_base()
 {
 #   if defined(HEURISTIC1) || defined(HEURISTIC2) || \
-       defined(LINUX_STACKBOTTOM) || defined(FREEBSD_STACKBOTTOM)
+       defined(LINUX_STACKBOTTOM) || defined(FREEBSD_STACKBOTTOM) || \
+       defined(QNX)
     word dummy;
     ptr_t result;
 #   endif

libgc/pthread_stop_world.c

@@ -21,6 +21,10 @@
 #include "include/libgc-mono-debugger.h"
 #endif
 
+#ifdef __QNXNTO__
+#define SA_RESTART 0 
+#endif
+
 #if DEBUG_THREADS
 
 #ifndef NSIG

libgc/pthread_support.c

@@ -68,7 +68,8 @@
 
 # if (defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) || \
       defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS)) || \
-      defined(GC_NETBSD_THREADS) && !defined(USE_PTHREAD_SPECIFIC)
+      defined(GC_NETBSD_THREADS) && !defined(USE_PTHREAD_SPECIFIC) || \
+      defined(GC_QNX_THREADS) 
 #   define USE_PTHREAD_SPECIFIC
 # endif
 
@@ -1037,7 +1038,7 @@ void GC_thr_init()
 #       if defined(GC_HPUX_THREADS)
 	  GC_nprocs = pthread_num_processors_np();
 #       endif
-#	if defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS)
+#	if defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) || defined(GC_QNX_THREADS)
 	  GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN);
 	  if (GC_nprocs <= 0) GC_nprocs = 1;
 #	endif

mono/dis/dis-cil.c

@@ -25,6 +25,7 @@
 
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
+#ifndef __QNXNTO__
 int isinf (double);
 int
 isinf (double num)
@@ -40,6 +41,7 @@ isinf (double num)
 
 	return 0;
 }
+#endif
 #else
 #error "Don't know how to implement isinf for this platform."
 #endif

mono/dis/dump.c

@@ -24,8 +24,10 @@
 #ifndef HAVE_ISINF
 
 #ifdef HAVE_IEEEFP_H
+#ifndef __QNXNTO__
 extern int isinf (double);
 #endif
+#endif
 
 #endif
 

mono/io-layer/misc.c

@@ -12,6 +12,9 @@
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef __QNXNTO__
+#include <time.h>
+#endif
 
 #include "misc-private.h"
 

mono/io-layer/processes.c

@@ -35,6 +35,10 @@
 #include <sys/resource.h>
 #endif
 
+#ifdef __QNXNTO__
+#include <sys/netmgr.h>
+#endif
+
 #if defined(PLATFORM_MACOSX) || defined(__OpenBSD__)
 #include <sys/proc.h>
 #include <sys/sysctl.h>
@@ -1886,7 +1890,11 @@ static GSList *load_modules (void)
 		mod->address_end = GINT_TO_POINTER (sec->addr+sec->size);
 		mod->perms = g_strdup ("r--p");
 		mod->address_offset = 0;
+#ifndef __QNXNTO__
 		mod->device = makedev (0, 0);
+#else
+		mod->device = makedev (ND_LOCAL_NODE, 0, 0);
+#endif
 		mod->inode = (ino_t) i;
 		mod->filename = g_strdup (name); 
 
@@ -2052,7 +2060,11 @@ static GSList *load_modules (FILE *fp)
 			continue;
 		}
 
+#ifndef __QNXNTO__
 		device = makedev ((int)maj_dev, (int)min_dev);
+#else
+		device = makedev (ND_LOCAL_NODE, (int)maj_dev, (int)min_dev);
+#endif
 		if ((device == 0) &&
 		    (inode == 0)) {
 			continue;

mono/io-layer/shared.c

@@ -18,7 +18,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef HAVE_SYS_SEM_H
+#if defined(HAVE_SYS_SEM_H) && !defined(__QNXNTO__)
 #  include <sys/sem.h>
 #else
 #  define DISABLE_SHARED_HANDLES

mono/metadata/mono-config.c

@@ -31,6 +31,8 @@
 #define CONFIG_OS "netbsd"
 #elif defined(__OpenBSD__)
 #define CONFIG_OS "openbsd"
+#elif defined(__QNXNTO__)
+#define CONFIG_OS "QNX"
 #elif defined(__WIN32__)
 #define CONFIG_OS "windows"
 #elif defined(_IBMR2)

mono/mini/debugger-agent.c

@@ -49,6 +49,10 @@
 #define TARGET_WIN32
 #endif
 
+#ifdef __QNXNTO__
+#include <sys/select.h>
+#endif
+
 #ifdef HOST_WIN32
 #include <ws2tcpip.h>
 #ifdef __GNUC__

mono/mini/exceptions-arm.c

@@ -86,7 +86,7 @@ typedef struct ucontext {
  */
 
 #if !defined(MONO_CROSS_COMPILE)
-#if __APPLE__
+#if __APPLE__ || __QNXNTO__
 #define my_ucontext ucontext_t
 #else
 typedef struct my_ucontext {

mono/mini/mini-arm.c

@@ -688,6 +688,11 @@ mono_arch_regalloc_cost (MonoCompile *cfg, MonoMethodVar *vmv)
 #define __GNUC_PREREQ(maj, min) (0)
 #endif
 
+#if defined(__QNXNTO__)
+# include <sys/mman.h>
+# define CLEAR_CACHE(__beg, __end) msync(__beg, (__end) - (__beg), MS_INVALIDATE_ICACHE)
+#endif
+
 void
 mono_arch_flush_icache (guint8 *code, gint size)
 {
@@ -711,6 +716,8 @@ mono_arch_flush_icache (guint8 *code, gint size)
 		:	"r" (code), "r" (code + size), "r" (syscall)
 		:	"r0", "r1", "r7", "r2"
 		);
+#elif __QNXNTO__
+       CLEAR_CACHE(code, code + size);
 #else
 	__asm __volatile ("mov r0, %0\n"
 			"mov r1, %1\n"

mono/mini/mini-arm.h

@@ -197,6 +197,10 @@ typedef struct MonoCompileArch {
 	#define UCONTEXT_REG_PC(ctx) ((ctx)->uc_mcontext->__ss.__pc)
 	#define UCONTEXT_REG_SP(ctx) ((ctx)->uc_mcontext->__ss.__sp)
 	#define UCONTEXT_REG_R0(ctx) ((ctx)->uc_mcontext->__ss.__r[0])
+#elif __QNXNTO__
+    #define UCONTEXT_REG_PC(ctx) ((ctx)->uc_mcontext.cpu.gpr[ARM_REG_PC])
+    #define UCONTEXT_REG_SP(ctx) ((ctx)->uc_mcontext.cpu.gpr[ARM_REG_SP])
+    #define UCONTEXT_REG_R0(ctx) ((ctx)->uc_mcontext.cpu.gpr[ARM_REG_R0])
 #else
 	#define UCONTEXT_REG_PC(ctx) ((ctx)->sig_ctx.arm_pc)
 	#define UCONTEXT_REG_SP(ctx) ((ctx)->sig_ctx.arm_sp)

mono/mini/mini-x86.h

@@ -45,7 +45,7 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep);
 #endif /* PLATFORM_WIN32 */
 
 #if defined( __linux__) && !defined(ANDROID) || defined(__sun) || defined(__APPLE__) || defined(__NetBSD__) || \
-       defined(__FreeBSD__) || defined(__OpenBSD__)
+       defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__QNXNTO__)
 #define MONO_ARCH_USE_SIGACTION
 #endif
 

mono/mini/wapihandles.c

@@ -3,7 +3,7 @@
 
 #include "mini.h"
 
-#if defined(PLATFORM_WIN32) || !defined(HAVE_SYS_IPC_H) || !defined(HAVE_SYS_SEM_H)
+#if defined(PLATFORM_WIN32) || !defined(HAVE_SYS_IPC_H) || !defined(HAVE_SYS_SEM_H) || defined(__QNXNTO__)
 
 int mini_wapi_hps (int argc, char **argv)
 {