Reset some content to the merge-base with apple/stable/20190619

There was a bad `git merge -s ours` that changed content.  Resetting
content back to the merge base with:

```
$ git checkout \
    $(git merge-base origin/apple/stable/20190619 origin/swift/master) \
    -- llvm clang libcxx
$ git rm -rf clang/test/Driver/flang/flang.f90 \
             clang/test/Driver/flang/flang_ucase.F90
$ git checkout \
    $(git merge-base origin/apple/stable/20190619 origin/swift/master) \
    -- clang/test/Driver/flang/flang.f90 \
       clang/test/Driver/flang/flang_ucase.F90
```

The extra dance for flang is necessary because I'm not on a
case-sensitive filesystem.

For reference, the merge-base is
d07eb80.

As a side-effect, this effectively reverts
ac940f1 "[TextAPI] Arch&Platform to
Target".  I'll get the original from apple/stable/20190619 merged in
before pushing this.

Author: dexonsmith

clang/test/Driver/flang/flang.f90

@@ -253,24 +253,27 @@ def killProcessAndChildren(pid):
     TODO: Reimplement this without using psutil so we can
           remove our dependency on it.
     """
-    import psutil
-    try:
-        psutilProc = psutil.Process(pid)
-        # Handle the different psutil API versions
+    if platform.system() == 'AIX':
+        subprocess.call('kill -kill $(ps -o pid= -L{})'.format(pid), shell=True)
+    else:
+        import psutil
         try:
-            # psutil >= 2.x
-            children_iterator = psutilProc.children(recursive=True)
-        except AttributeError:
-            # psutil 1.x
-            children_iterator = psutilProc.get_children(recursive=True)
-        for child in children_iterator:
+            psutilProc = psutil.Process(pid)
+            # Handle the different psutil API versions
             try:
-                child.kill()
-            except psutil.NoSuchProcess:
-                pass
-        psutilProc.kill()
-    except psutil.NoSuchProcess:
-        pass
+                # psutil >= 2.x
+                children_iterator = psutilProc.children(recursive=True)
+            except AttributeError:
+                # psutil 1.x
+                children_iterator = psutilProc.get_children(recursive=True)
+            for child in children_iterator:
+                try:
+                    child.kill()
+                except psutil.NoSuchProcess:
+                    pass
+            psutilProc.kill()
+        except psutil.NoSuchProcess:
+            pass
 
 
 def executeCommandVerbose(cmd, *args, **kwargs):

clang/test/Driver/flang/flang_ucase.F90

@@ -86,6 +86,7 @@ set(LLVM_TOOLS_BINARY_DIR "@LLVM_CONFIG_TOOLS_BINARY_DIR@")
 set(LLVM_TOOLS_INSTALL_DIR "@LLVM_TOOLS_INSTALL_DIR@")
 set(LLVM_HAVE_OPT_VIEWER_MODULES @LLVM_HAVE_OPT_VIEWER_MODULES@)
 set(LLVM_CONFIGURATION_TYPES @CMAKE_CONFIGURATION_TYPES@)
+set(LLVM_ENABLE_SHARED_LIBS @BUILD_SHARED_LIBS@)
 
 if(NOT TARGET LLVMSupport)
   set(LLVM_EXPORTED_TARGETS "@LLVM_CONFIG_EXPORTS@")

libcxx/utils/libcxx/util.py

@@ -14,7 +14,6 @@
 #define LLVM_TEXTAPI_MACHO_ARCHITECTURE_H
 
 #include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Triple.h"
 #include "llvm/Support/raw_ostream.h"
 
 namespace llvm {
@@ -40,9 +39,6 @@ StringRef getArchitectureName(Architecture Arch);
 /// Convert an architecture slice to a CPU Type and Subtype pair.
 std::pair<uint32_t, uint32_t> getCPUTypeFromArchitecture(Architecture Arch);
 
-/// Convert a target to an architecture slice.
-Architecture mapToArchitecture(const llvm::Triple &Target);
-
 raw_ostream &operator<<(raw_ostream &OS, Architecture Arch);
 
 } // end namespace MachO.

llvm/cmake/modules/LLVMConfig.cmake.in

@@ -59,10 +59,6 @@ class ArchitectureSet {
 
   ArchSetType rawValue() const { return ArchSet; }
 
-  bool hasX86() const {
-    return has(AK_i386) || has(AK_x86_64) || has(AK_x86_64h);
-  }
-
   template <typename Ty>
   class arch_iterator
       : public std::iterator<std::forward_iterator_tag, Architecture, size_t> {