For PR351:

* Consolidate implementation for Unix systems into Unix/MappedFile.cpp
* Avoid use of symbolic link to #include platform-specific implementation.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19151 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/System/AIX/MappedFile.cpp b/lib/System/AIX/MappedFile.cpp
deleted file mode 100644 (file)
index 946ebad..0000000
--- a/lib/System/AIX/MappedFile.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//===- AIX/MappedFile.cpp - AIX MappedFile Implementation --------*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the AIX specific implementation of the MappedFile concept.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic unix implementation
-#include "../Unix/MappedFile.cpp"
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/Cygwin/MappedFile.cpp b/lib/System/Cygwin/MappedFile.cpp
deleted file mode 100644 (file)
index 94338de..0000000
--- a/lib/System/Cygwin/MappedFile.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-//===- Cygwin/MappedFile.cpp - Cygwin MappedFile Implementation -*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the Cygwin specific implementation of the MappedFile
-// concept.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic unix implementation
-#include "Unix/MappedFile.cpp"
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/Darwin/MappedFile.cpp b/lib/System/Darwin/MappedFile.cpp
deleted file mode 100644 (file)
index c740a45..0000000
--- a/lib/System/Darwin/MappedFile.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-//===- Darwin/MappedFile.cpp - Darwin MappedFile Implementation -*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the Darwin specific implementation of the MappedFile
-// concept.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic unix implementation
-#include <sys/stat.h>
-#include "../Unix/MappedFile.cpp"
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/FreeBSD/MappedFile.cpp b/lib/System/FreeBSD/MappedFile.cpp
deleted file mode 100644 (file)
index 6d22f40..0000000
--- a/lib/System/FreeBSD/MappedFile.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===- FreeBSD/MappedFile.cpp - FreeBSD MappedFile Impl. --------*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the FreeBSD specific implementation of the MappedFile
-// concept.
-//
-//===----------------------------------------------------------------------===//
-
-#include <sys/stat.h>
-
-// Include the generic unix implementation
-#include "../Unix/MappedFile.cpp"
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/Interix/MappedFile.cpp b/lib/System/Interix/MappedFile.cpp
deleted file mode 100644 (file)
index 1600ea4..0000000
--- a/lib/System/Interix/MappedFile.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-//===- Interix/MappedFile.cpp - Interix MappedFile Impl. --------*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the Interix specific implementation of the MappedFile
-// concept.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic unix implementation
-#include "../Unix/MappedFile.cpp"
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/Linux/MappedFile.cpp b/lib/System/Linux/MappedFile.cpp
deleted file mode 100644 (file)
index d8fb35e..0000000
--- a/lib/System/Linux/MappedFile.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-//===- Linux/MappedFile.cpp - Linux MappedFile Implementation ---*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the Linux specific implementation of the MappedFile
-// concept.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic unix implementation
-#include "../Unix/MappedFile.cpp"
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/MappedFile.cpp b/lib/System/MappedFile.cpp
index 55e17012f3971f37ff9e3a23654cfdd566cc8f83..6c47fbdb831682e3c641b34183ef307aab29d6b2 100644 (file)
--- a/lib/System/MappedFile.cpp
+++ b/lib/System/MappedFile.cpp
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/System/MappedFile.h"
+#include "llvm/Config/config.h"
 
 namespace llvm {
 using namespace sys;
@@ -24,6 +25,11 @@ using namespace sys;
 }
 
 // Include the platform-specific parts of this class.
-#include "platform/MappedFile.cpp"
+#ifdef LLVM_ON_UNIX
+#include "Unix/MappedFile.cpp"
+#endif
+#ifdef LLVM_ON_WIN32
+#include "Win32/MappedFile.cpp"
+#endif
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/SunOS/MappedFile.cpp b/lib/System/SunOS/MappedFile.cpp
deleted file mode 100644 (file)
index a90f7ea..0000000
--- a/lib/System/SunOS/MappedFile.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-//===- SunOS/MappedFile.cpp - SunOS MappedFile Implementation ---*- C++ -*-===//
-// 
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
-//===----------------------------------------------------------------------===//
-//
-// This file provides the SunOS specific implementation of the MappedFile
-// concept.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic unix implementation
-#include <sys/stat.h>
-#include "../Unix/MappedFile.cpp"
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab