For PR351:

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

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

diff --git a/lib/System/AIX/Program.cpp b/lib/System/AIX/Program.cpp
deleted file mode 100644 (file)
index 3646cfd..0000000
--- a/lib/System/AIX/Program.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- AIX/Program.cpp - AIX Program 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 Program class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "../Unix/Program.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only AIX specific code 
-//===          and must not be generic UNIX code (see ../Unix/Program.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/Cygwin/Program.cpp b/lib/System/Cygwin/Program.cpp
deleted file mode 100644 (file)
index a521e20..0000000
--- a/lib/System/Cygwin/Program.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- Cygwin/Program.cpp - Cygwin Program 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 Program class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "Unix/Program.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only Cygwin specific code 
-//===          and must not be generic UNIX code (see ../Unix/Program.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/Darwin/Program.cpp b/lib/System/Darwin/Program.cpp
deleted file mode 100644 (file)
index 8c829df..0000000
--- a/lib/System/Darwin/Program.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- Darwin/Program.cpp - Darwin Program Implementatino. ---- -*- 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 Program class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "../Unix/Program.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only Darwin specific code 
-//===          and must not be generic UNIX code (see ../Unix/Program.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/FreeBSD/Program.cpp b/lib/System/FreeBSD/Program.cpp
deleted file mode 100644 (file)
index 865e754..0000000
--- a/lib/System/FreeBSD/Program.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- FreeBSD/Program.cpp - FreeBSD Program 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 FreeBSD specific implementation of the Program class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "../Unix/Program.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only FreeBSD specific code 
-//===          and must not be generic UNIX code (see ../Unix/Program.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/Interix/Program.cpp b/lib/System/Interix/Program.cpp
deleted file mode 100644 (file)
index a8aca99..0000000
--- a/lib/System/Interix/Program.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- Interix/Program.cpp - Interix Program 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 Interix specific implementation of the Program class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "../Unix/Program.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only Interix specific code 
-//===          and must not be generic UNIX code (see ../Unix/Program.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/Linux/Program.cpp b/lib/System/Linux/Program.cpp
deleted file mode 100644 (file)
index 0dd29d2..0000000
--- a/lib/System/Linux/Program.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- Linux/Program.cpp - Linux Program 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 Program class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "../Unix/Program.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only Linux specific code 
-//===          and must not be generic UNIX code (see ../Unix/Program.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/Program.cpp b/lib/System/Program.cpp
index c1dd38f6fca6157dbcbfccadcf482b2389a33711..88a0084835536a747c4d667f509cac4a38e44444 100644 (file)
--- a/lib/System/Program.cpp
+++ b/lib/System/Program.cpp
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/System/Program.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/Program.cpp"
+#ifdef LLVM_ON_UNIX
+#include "Unix/Program.cpp"
+#endif
+#ifdef LLVM_ON_WIN32
+#include "Win32/Program.cpp"
+#endif
 
 // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab

diff --git a/lib/System/SunOS/Program.cpp b/lib/System/SunOS/Program.cpp
deleted file mode 100644 (file)
index 45ec6e1..0000000
--- a/lib/System/SunOS/Program.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//===- SunOS/Program.cpp - SunOS Program 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 Program class.
-//
-//===----------------------------------------------------------------------===//
-
-// Include the generic Unix implementation
-#include "../Unix/Program.cpp"
-
-//===----------------------------------------------------------------------===//
-//=== WARNING: Implementation here must contain only SunOS specific code 
-//===          and must not be generic UNIX code (see ../Unix/Program.cpp)
-//===----------------------------------------------------------------------===//
-
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab