From 1bfb5b8e362f0c586a50c8f80ebf07bcb37f856d Mon Sep 17 00:00:00 2001
From: Mitch Phillips <31459023+hctim@users.noreply.github.com>
Date: Wed, 27 May 2020 09:38:44 -0700
Subject: [PATCH] Address Peter's comments.

---
 llvm/utils/gn/build/libs/pthread/BUILD.gn | 10 ++--------
 llvm/utils/gn/build/toolchain/BUILD.gn    |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/llvm/utils/gn/build/libs/pthread/BUILD.gn b/llvm/utils/gn/build/libs/pthread/BUILD.gn
index 95ff73211d69..374ae16500df 100644
--- a/llvm/utils/gn/build/libs/pthread/BUILD.gn
+++ b/llvm/utils/gn/build/libs/pthread/BUILD.gn
@@ -1,19 +1,13 @@
 import("//llvm/utils/gn/build/libs/pthread/enable.gni")
 
 config("pthread_config") {
-  visibility = [ ":pthread" ]
-  libs = [ "pthread" ]
-}
-
-config("pthread_link_time_config") {
   visibility = [ ":pthread" ]
   ldflags = [ "-pthread" ]
 }
 
 group("pthread") {
   # On Android, bionic has built-in support for pthreads.
-  if (llvm_enable_threads && current_os != "win" && current_os != "android") {
-    public_configs = [ ":pthread_config" ]
-    all_dependent_configs = [ ":pthread_link_time_config" ]
+  if (llvm_enable_threads && current_os != "win") {
+    all_dependent_configs = [ ":pthread_config" ]
   }
 }
diff --git a/llvm/utils/gn/build/toolchain/BUILD.gn b/llvm/utils/gn/build/toolchain/BUILD.gn
index 30d3ceaec659..04f4b3763c1e 100644
--- a/llvm/utils/gn/build/toolchain/BUILD.gn
+++ b/llvm/utils/gn/build/toolchain/BUILD.gn
@@ -88,7 +88,7 @@ template("unix_toolchain") {
       if (current_os == "mac") {
         command = "$ld {{ldflags}} -o $outfile {{inputs}} {{libs}}"
       } else {
-        command = "$ld {{ldflags}} -o $outfile -Wl,--start-group {{inputs}} {{libs}} -Wl,--end-group"
+        command = "$ld {{ldflags}} -o $outfile -Wl,--start-group {{libs}} {{inputs}} -Wl,--end-group"
       }
       description = "LINK $outfile"
       outputs = [ outfile ]