addressing commenrts from pull request

Author: dgrove-oss

src/Makefile.am

@@ -17,7 +17,6 @@ libdispatch_la_SOURCES=		\
 	queue.c					\
 	semaphore.c				\
 	source.c				\
-	stubs.c					\
 	time.c					\
 	transform.c				\
 	voucher.c				\
@@ -40,6 +39,8 @@ libdispatch_la_SOURCES=		\
 	shims/atomic_sfb.h		\
 	shims/getprogname.h		\
 	shims/hw_config.h		\
+	shims/linux_stubs.c		\
+	shims/linux_stubs.h		\
 	shims/perfmon.h			\
 	shims/time.h			\
 	shims/tsd.h				\

src/internal.h

@@ -82,7 +82,6 @@
 
 
 #include <os/object.h>
-#include "stubs_internal.h"
 #include <dispatch/time.h>
 #include <dispatch/object.h>
 #include <dispatch/queue.h>

src/io.c

@@ -388,13 +388,10 @@ dispatch_io_create_with_path(dispatch_io_type_t type, const char *path,
 		struct stat st;
 		_dispatch_io_syscall_switch_noerr(err,
 			(path_data->oflag & O_NOFOLLOW) == O_NOFOLLOW
-#ifdef __LINUX_PORT_HDD__						  
-					?
-					lstat(path_data->path, &st) : stat(path_data->path, &st),
-#else
-					|| (path_data->oflag & O_SYMLINK) == O_SYMLINK ?
-					lstat(path_data->path, &st) : stat(path_data->path, &st),
+#ifndef __linux__
+					|| (path_data->oflag & O_SYMLINK) == O_SYMLINK
 #endif						  
+					? lstat(path_data->path, &st) : stat(path_data->path, &st),
 			case 0:
 				err = _dispatch_io_validate_type(channel, st.st_mode);
 				break;
@@ -2069,7 +2066,7 @@ _dispatch_disk_perform(void *ctxt)
 static void
 _dispatch_operation_advise(dispatch_operation_t op, size_t chunk_size)
 {
-#ifdef __LINUX_PORT_HDD__
+#ifndef F_RDADVISE
   LINUX_PORT_ERROR();
 #else
 	int err;

src/shims.h

@@ -159,6 +159,10 @@ void __builtin_trap(void);
 #define DISPATCH_ATOMIC_UP 1
 #endif
 
+#ifdef __linux__
+#include "shims/linux_stubs.h"
+#endif
+
 #include "shims/atomic.h"
 #include "shims/atomic_sfb.h"
 #include "shims/tsd.h"