Merge pull request #9504 from practicalswift/gardening-20170511

[gardening] Fix duplicate include. Add copyright notice. Fix typo.

Author: DougGregor

benchmark/scripts/compare_perf_tests.py

@@ -75,7 +75,7 @@ def push(x):
     # (name, min value, max value, mean value, max_rss)
     def values(self):
         return (self.name, str(self.min), str(self.max), str(int(self.mean)),
-                str(self.max_rss) if self.max_rss else '—')
+                str(self.max_rss) if self.max_rss else '-')
 
 
 class ResultComparison:

stdlib/public/core/ThreadLocalStorage.swift

@@ -1,3 +1,14 @@
+//===--- ThreadLocalStorage.swift -----------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
 import SwiftShims
 
 // For testing purposes, a thread-safe counter to guarantee that destructors get

stdlib/public/runtime/Exclusivity.cpp

@@ -39,7 +39,6 @@
 
 #if SWIFT_EXCLUSIVITY_USE_PTHREAD_SPECIFIC
 #include <pthread.h>
-#include <stdio.h>
 #endif
 
 // Pick a return-address strategy