Merge branch 'pic-in-target-cc-options' into extern-var

Author: hlopko

test/lit.cfg

@@ -1055,7 +1055,8 @@ elif run_os in ['windows-msvc']:
     config.target_add_rpath = r''
 
     config.target_clang =                                                        \
-            ('clang++ -target %s %s -fobjc-runtime=ios-5.0' % (config.variant_triple, clang_mcp_opt))
+            ('clang++ -target %s %s %s -fobjc-runtime=ios-5.0' %                 \
+             (config.variant_triple, clang_mcp_opt, config.target_cc_options))
     config.target_ld =                                                           \
             ('%r -libpath:%s' % (config.link, os.path.join(test_resource_dir,    \
                                                            config.target_sdk_name)))
@@ -1107,14 +1108,14 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
       config.target_shared_library_prefix = 'lib'
       config.target_shared_library_suffix = ".so"
       config.target_sdk_name = "freebsd"
-      config.target_cc_options = "-fPIC"
+      config.target_cc_options = "-fPIE"
     elif run_os == 'openbsd':
       lit_config.note("Testing OpenBSD " + config.variant_triple)
       config.target_object_format = "elf"
       config.target_shared_library_prefix = 'lib'
       config.target_shared_library_suffix = ".so"
       config.target_sdk_name = "openbsd"
-      config.target_cc_options = "-fPIC"
+      config.target_cc_options = "-fPIE"
     elif kIsAndroid:
       lit_config.note("Testing Android " + config.variant_triple)
       config.target_object_format = "elf"
@@ -1124,14 +1125,14 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
       # Needed by several ParseableInterface/swift_build_sdk_interfaces tests on
       # Android
       config.environment['ANDROID_DATA'] = os.environ['ANDROID_DATA']
-      config.target_cc_options = "-fPIC"
+      config.target_cc_options = "-fPIE"
     else:
       lit_config.note("Testing Linux " + config.variant_triple)
       config.target_object_format = "elf"
       config.target_shared_library_prefix = 'lib'
       config.target_shared_library_suffix = ".so"
       config.target_sdk_name = "linux"
-      config.target_cc_options = "-fPIC"
+      config.target_cc_options = "-fPIE"
     config.target_runtime = "native"
     config.target_swift_autolink_extract = inferSwiftBinary("swift-autolink-extract")
 
@@ -1189,8 +1190,8 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
         '%s -emit-pcm -target %s' %
         (config.swiftc, config.variant_triple))
     config.target_clang = (
-        "clang++ -target %s %s -fobjc-runtime=ios-5.0" %
-        (config.variant_triple, clang_mcp_opt))
+        "clang++ -target %s %s %s -fobjc-runtime=ios-5.0" %
+        (config.variant_triple, clang_mcp_opt, config.target_cc_options))
     config.target_ld = "ld -L%r" % (make_path(test_resource_dir, config.target_sdk_name))
 elif run_os == 'linux-androideabi' or run_os == 'linux-android':
     # The module triple for Android ARMv7 seems to be canonicalized in LLVM
@@ -1319,7 +1320,7 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
         'clang++',
         '-target', config.variant_triple,
         clang_mcp_opt, android_include_system_paths_opt,
-        '-fobjc-runtime=ios-5.0'])
+        config.target_cc_options, '-fobjc-runtime=ios-5.0'])
     config.target_ld = ' '.join([
         tools_directory,
         '-L%s' % make_path(test_resource_dir, config.target_sdk_name)])