diff -Nru llvm-toolchain-3.7-3.7.1/debian/changelog llvm-toolchain-3.7-3.7.1/debian/changelog --- llvm-toolchain-3.7-3.7.1/debian/changelog 2016-03-07 10:27:33.000000000 +0000 +++ llvm-toolchain-3.7-3.7.1/debian/changelog 2016-04-18 16:19:46.000000000 +0000 @@ -1,3 +1,9 @@ +llvm-toolchain-3.7 (1:3.7.1-2ubuntu2) xenial; urgency=medium + + * Do not link executables with a linker version script. + + -- Matthias Klose Mon, 18 Apr 2016 18:19:10 +0200 + llvm-toolchain-3.7 (1:3.7.1-2ubuntu1) xenial; urgency=medium * Merge from Debian unstable. Remaining changes: diff -Nru llvm-toolchain-3.7-3.7.1/debian/patches/no-version-script-for-executables.diff llvm-toolchain-3.7-3.7.1/debian/patches/no-version-script-for-executables.diff --- llvm-toolchain-3.7-3.7.1/debian/patches/no-version-script-for-executables.diff 1970-01-01 00:00:00.000000000 +0000 +++ llvm-toolchain-3.7-3.7.1/debian/patches/no-version-script-for-executables.diff 2016-04-18 16:14:22.000000000 +0000 @@ -0,0 +1,28 @@ +Index: b/Makefile.rules +=================================================================== +--- a/Makefile.rules ++++ b/Makefile.rules +@@ -1411,12 +1411,13 @@ else + $(ToolBuildPath): $(ToolDir)/.dir + endif + ++COMMA = , + ifdef CODESIGN_TOOLS + TOOL_CODESIGN_IDENTITY ?= - + + $(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) + $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) +- $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ ++ $(Verb) $(filter-out -Wl$(COMMA)--version-script=%,$(Link)) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ + $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) + $(Echo) ======= Finished Linking $(BuildMode) Executable $(TOOLNAME) \ + $(StripWarnMsg) +@@ -1425,7 +1426,7 @@ $(ToolBuildPath): $(ObjectsO) $(ProjLibs + else + $(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) + $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) +- $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ ++ $(Verb) $(filter-out -Wl$(COMMA)--version-script=%,$(Link)) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ + $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) + $(Echo) ======= Finished Linking $(BuildMode) Executable $(TOOLNAME) \ + $(StripWarnMsg) diff -Nru llvm-toolchain-3.7-3.7.1/debian/patches/series llvm-toolchain-3.7-3.7.1/debian/patches/series --- llvm-toolchain-3.7-3.7.1/debian/patches/series 2016-03-07 08:54:14.000000000 +0000 +++ llvm-toolchain-3.7-3.7.1/debian/patches/series 2016-04-18 16:19:00.000000000 +0000 @@ -45,3 +45,4 @@ kfreebsd-build-fix.patch ubuntu-precise-compiler-rt.diff clang-apply-replacements.diff +no-version-script-for-executables.diff