Initial changes to get the debugger to compile on PS4

Author: Josh Peterson

mono/eglib/gpath.c

@@ -251,11 +251,13 @@ g_find_program_in_path (const gchar *program)
 
 		x = NULL;
 		probe_path = g_build_path (G_DIR_SEPARATOR_S, l, program, NULL);
+#if !defined(NO_HAVE_ACCESS)
 		if (access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
 			g_free (curdir);
 			g_free (p);
 			return probe_path;
 		}
+#endif
 		g_free (probe_path);
 
 #ifdef G_OS_WIN32
@@ -265,12 +267,14 @@ g_find_program_in_path (const gchar *program)
 			while (suffix_list[listx]) {
 				program_exe = g_strjoin(NULL,program,suffix_list[listx],NULL);
 				probe_path = g_build_path (G_DIR_SEPARATOR_S, l, program_exe, NULL);
+#if !defined(NO_HAVE_ACCESS)
 				if (access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
 					g_free (curdir);
 					g_free (p);
 					g_free (program_exe);
 					return probe_path;
 				}
+#endif
 				listx++;
 				g_free (probe_path);
 				g_free (program_exe);

mono/utils/dlmalloc.c

@@ -1214,7 +1214,7 @@ extern void*     sbrk(ptrdiff_t);
 #      define _SC_PAGE_SIZE _SC_PAGESIZE
 #    endif
 #  endif
-#  ifdef _SC_PAGE_SIZE
+#  if defined (HAVE_SYSCONF) && defined (_SC_PAGESIZE)
 #    define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
 #  else
 #    if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE)

mono/utils/mono-hwcap-x86.c

@@ -147,7 +147,7 @@ mono_hwcap_arch_init (void)
 		}
 	}
 
-#if defined(HAVE_UNISTD_H)
+#if defined(HAVE_UNISTD_H) && !defined(NO_HAVE_ACCESS)
 	mono_hwcap_x86_is_xen = !access ("/proc/xen", F_OK);
 #endif
 }

mono/utils/mono-membar.h

@@ -76,7 +76,25 @@ static inline void mono_memory_write_barrier (void)
 {
 	mono_memory_barrier ();
 }
-#else
+
+#elif defined(PLATFORM_UNITY) && defined(UNITY_USE_PLATFORM_STUBS)
+
+static inline void mono_memory_barrier (void)
+{
+	g_assert(0 && "This function is not yet implemented for the Unity platform.");
+}
+
+static inline void mono_memory_read_barrier (void)
+{
+	g_assert(0 && "This function is not yet implemented for the Unity platform.");
+}
+
+static inline void mono_memory_write_barrier (void)
+{
+	g_assert(0 && "This function is not yet implemented for the Unity platform.");
+}
+
+#else 
 #error "Don't know how to do memory barriers!"
 #endif
 

mono/utils/mono-proclib.c

@@ -32,8 +32,10 @@
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>
 #endif
+#ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
+#endif
 #if defined(__HAIKU__)
 #include <os/kernel/OS.h>
 #endif
@@ -519,7 +521,7 @@ get_user_hz (void)
 {
 	static int user_hz = 0;
 	if (user_hz == 0) {
-#ifdef _SC_CLK_TCK
+#if defined (_SC_CLK_TCK) && defined (HAVE_SYSCONF)
 		user_hz = sysconf (_SC_CLK_TCK);
 #endif
 		if (user_hz == 0)
@@ -761,7 +763,7 @@ mono_cpu_count (void)
  * [5] https://github.com/dotnet/coreclr/blob/7058273693db2555f127ce16e6b0c5b40fb04867/src/pal/src/misc/sysinfo.cpp#L148
  */
 
-#ifdef _SC_NPROCESSORS_CONF
+#if defined (_SC_NPROCESSORS_CONF) && defined (HAVE_SYSCONF)
 	{
 		int count = sysconf (_SC_NPROCESSORS_CONF);
 		if (count > 0)
@@ -778,7 +780,7 @@ mono_cpu_count (void)
 			return CPU_COUNT (&set);
 	}
 #endif
-#ifdef _SC_NPROCESSORS_ONLN
+#if defined (_SC_NPROCESSORS_ONLN) && defined (HAVE_SYSCONF)
 	{
 		int count = sysconf (_SC_NPROCESSORS_ONLN);
 		if (count > 0)
@@ -913,6 +915,7 @@ gint32
 mono_cpu_usage (MonoCpuUsageState *prev)
 {
 	gint32 cpu_usage = 0;
+#ifdef HAVE_GETRUSAGE
 	gint64 cpu_total_time;
 	gint64 cpu_busy_time;
 	struct rusage resource_usage;
@@ -940,7 +943,7 @@ mono_cpu_usage (MonoCpuUsageState *prev)
 
 	if (cpu_total_time > 0 && cpu_busy_time > 0)
 		cpu_usage = (gint32)(cpu_busy_time * 100 / cpu_total_time);
-
+#endif
 	return cpu_usage;
 }
 #endif /* !HOST_WIN32 */

mono/utils/networking-posix.c

@@ -36,8 +36,10 @@ get_address_from_sockaddr (struct sockaddr *sa)
 	switch (sa->sa_family) {
 	case AF_INET:
 		return &((struct sockaddr_in*)sa)->sin_addr;
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
 	case AF_INET6:
 		return &((struct sockaddr_in6*)sa)->sin6_addr;
+#endif
 	}
 	return NULL;
 }
@@ -92,9 +94,11 @@ mono_get_address_info (const char *hostname, int port, int flags, MonoAddressInf
 		if (cur->family == PF_INET) {
 			cur->address_len = sizeof (struct in_addr);
 			cur->address.v4 = ((struct sockaddr_in*)res->ai_addr)->sin_addr;
+#ifdef HAVE_STRUCT_SOCKADDR_IN6			
 		} else if (cur->family == PF_INET6) {
 			cur->address_len = sizeof (struct in6_addr);
 			cur->address.v6 = ((struct sockaddr_in6*)res->ai_addr)->sin6_addr;
+#endif
 		} else {
 			g_warning ("Cannot handle address family %d", cur->family);
 			res = res->ai_next;

mono/utils/networking.c

@@ -17,8 +17,10 @@ mono_address_size_for_family (int family)
 	switch (family) {
 	case AF_INET:
 		return sizeof (struct in_addr);
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
 	case AF_INET6:
 		return sizeof (struct in6_addr);
+#endif
 	}
 	return 0;
 }
@@ -53,6 +55,7 @@ mono_socket_address_init (MonoSocketAddress *sa, socklen_t *len, int family, con
 #if HAVE_SOCKADDR_IN_SIN_LEN
 		sa->v4.sin_len = sizeof (*len);
 #endif
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
 	} else if (family == AF_INET6) {
 		*len = sizeof (struct sockaddr_in6);
 
@@ -61,6 +64,7 @@ mono_socket_address_init (MonoSocketAddress *sa, socklen_t *len, int family, con
 		sa->v6.sin6_port = htons (port);
 #if HAVE_SOCKADDR_IN6_SIN_LEN
 		sa->v6.sin6_len = sizeof (*len);
+#endif
 #endif
 	} else {
 		g_error ("Cannot handle address family %d", family);

mono/utils/networking.h

@@ -54,7 +54,9 @@ struct _MonoAddressEntry {
 	int address_len;
 	union {
 		struct in_addr v4;
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
 		struct in6_addr v6;
+#endif
 	} address;
 	const char *canonical_name;
 	MonoAddressEntry *next;
@@ -67,15 +69,19 @@ typedef struct {
 
 typedef union {
 	struct sockaddr_in v4;
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
 	struct sockaddr_in6 v6;
+#endif
 	struct sockaddr addr;
 } MonoSocketAddress;
 
 typedef struct {
 	int family;
 	union {
 		struct in_addr v4;
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
 		struct in6_addr v6;
+#endif
 	} addr;
 } MonoAddress;