---

yaml
---
r: 349350
b: refs/heads/master-next
c: 266f22f
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 4b43e8c60819d0fc1b06a7f21bc79af7c309f656
+refs/heads/master-next: 266f22fef107904568f18462caa29148596bbcab
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/IRGen/IRGenModule.cpp

@@ -1168,7 +1168,13 @@ void IRGenModule::emitAutolinkInfo() {
     }
     auto EntriesConstant = llvm::ConstantDataArray::getString(
         LLVMContext, EntriesString, /*AddNull=*/false);
-
+    // Mark the swift1_autolink_entries section with the SHF_EXCLUDE attribute
+    // to get the linker to drop it in the final linked binary.
+    // LLVM doesn't provide an interface to specify section attributs in the IR
+    // so we pass the attribute with inline assembly.
+    if (TargetInfo.OutputObjectFormat == llvm::Triple::ELF)
+      Module.appendModuleInlineAsm(".section .swift1_autolink_entries,"
+                                   "\"0x80000000\"");
     auto var =
         new llvm::GlobalVariable(*getModule(), EntriesConstant->getType(), true,
                                  llvm::GlobalValue::PrivateLinkage,

branches/master-next/stdlib/public/runtime/ImageInspectionELF.h

@@ -19,6 +19,8 @@
 #ifndef SWIFT_RUNTIME_IMAGEINSPECTIONELF_H
 #define SWIFT_RUNTIME_IMAGEINSPECTIONELF_H
 
+#define SWIFT_REFLECTION_METADATA_ELF_NOTE_MAGIC_STRING "swift_reflection_metadata_magic_string"
+
 #if defined(__ELF__)
 
 #include "../SwiftShims/Visibility.h"
@@ -54,6 +56,8 @@ struct MetadataSections {
   Range swift5_assocty;
   Range swift5_replace;
   Range swift5_replac2;
+  Range swift5_builtin;
+  Range swift5_capture;
 };
 } // namespace swift
 

branches/master-next/stdlib/public/runtime/SwiftRT-ELF.cpp

@@ -34,6 +34,8 @@ DECLARE_SWIFT_SECTION(swift5_fieldmd)
 DECLARE_SWIFT_SECTION(swift5_assocty)
 DECLARE_SWIFT_SECTION(swift5_replace)
 DECLARE_SWIFT_SECTION(swift5_replac2)
+DECLARE_SWIFT_SECTION(swift5_builtin)
+DECLARE_SWIFT_SECTION(swift5_capture)
 }
 
 #undef DECLARE_SWIFT_SECTION
@@ -65,10 +67,22 @@ static void swift_image_constructor() {
       SWIFT_SECTION_RANGE(swift5_assocty),
       SWIFT_SECTION_RANGE(swift5_replace),
       SWIFT_SECTION_RANGE(swift5_replac2),
+      SWIFT_SECTION_RANGE(swift5_builtin),
+      SWIFT_SECTION_RANGE(swift5_capture),
   };
 
 #undef SWIFT_SECTION_RANGE
 
   swift_addNewDSOImage(&sections);
 }
 
+__asm__(".section \".note.swift_reflection_metadata\", \"aw\"");
+
+static __attribute__((__used__))
+__attribute__((__section__(".note.swift_reflection_metadata")))
+__attribute__((__aligned__(1)))
+struct {
+  const char MagicString[sizeof(SWIFT_REFLECTION_METADATA_ELF_NOTE_MAGIC_STRING)];
+  const swift::MetadataSections *Sections;
+} __attribute__((__packed__))
+Note = {SWIFT_REFLECTION_METADATA_ELF_NOTE_MAGIC_STRING, &sections};

branches/master-next/test/IRGen/ELF-remove-autolink-section.swift

@@ -0,0 +1,17 @@
+// RUN: %swiftc_driver -emit-ir %s -o - | %FileCheck %s -check-prefix ELF
+
+// Check that the swift auto link section is available in the object file.
+// RUN: %swiftc_driver -c %s -o %t
+// RUN: llvm-readelf %t -S | %FileCheck %s -check-prefix SECTION
+
+// Checks that the swift auto link section is removed from the final binary.
+// RUN: %swiftc_driver  -emit-executable %s -o %t
+// RUN: llvm-readelf %t -S | %FileCheck %s -check-prefix NOSECTION
+
+// REQUIRES: OS=linux-gnu
+
+print("Hi from Swift!")
+
+// ELF: module asm ".section .swift1_autolink_entries,\220x80000000\22"
+// SECTION: .swift1_autolink_entries
+// NOSECTION-NOT: .swift1_autolink_entries