Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87fd9dec authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Revert "Enable lld for windows" 

am: 61166dc0

Change-Id: Ib2088c56f593472c41efcf69ef0ae309db95cd9a
parents a9ff2022 61166dc0

cc/binary.go

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ func (binary *binaryDecorator) link(ctx ModuleContext, 


	TransformObjToDynamicBinary(ctx, objs.objFiles, sharedLibs, deps.StaticLibs,

		deps.LateStaticLibs, deps.WholeStaticLibs, linkerDeps, deps.CrtBegin, deps.CrtEnd, true,

		builderFlags, outputFile, nil)

		builderFlags, outputFile)



	objs.coverageFiles = append(objs.coverageFiles, deps.StaticLibObjs.coverageFiles...)

	objs.coverageFiles = append(objs.coverageFiles, deps.WholeStaticLibObjs.coverageFiles...)

cc/builder.go

+7 −13
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import ( 
	"strings"



	"github.com/google/blueprint"

	"github.com/google/blueprint/pathtools"



	"android/soong/android"

	"android/soong/cc/config"
@@ -596,7 +595,7 @@ func transformDarwinObjToStaticLib(ctx android.ModuleContext, objFiles android.P 
// and shared libraries, to a shared library (.so) or dynamic executable

func TransformObjToDynamicBinary(ctx android.ModuleContext,

	objFiles, sharedLibs, staticLibs, lateStaticLibs, wholeStaticLibs, deps android.Paths,

	crtBegin, crtEnd android.OptionalPath, groupLate bool, flags builderFlags, outputFile android.WritablePath, implicitOutputs android.WritablePaths) {

	crtBegin, crtEnd android.OptionalPath, groupLate bool, flags builderFlags, outputFile android.WritablePath) {



	ldCmd := "${config.ClangBin}/clang++"
@@ -633,11 +632,7 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext, 
	}



	for _, lib := range sharedLibs {

		libFile := lib.String()

		if ctx.Windows() {

			libFile = pathtools.ReplaceExtension(libFile, "a")

		}

		libFlagsList = append(libFlagsList, libFile)

		libFlagsList = append(libFlagsList, lib.String())

	}



	deps = append(deps, staticLibs...)
@@ -651,7 +646,6 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext, 
		Rule:        ld,

		Description: "link " + outputFile.Base(),

		Output:      outputFile,

		ImplicitOutputs: implicitOutputs,

		Inputs:      objFiles,

		Implicits:   deps,

		Args: map[string]string{

cc/library.go

+4 −13
Original line number Diff line number Diff line
@@ -357,10 +357,9 @@ func (library *libraryDecorator) linkerFlags(ctx ModuleContext, flags Flags) Fla 
				)

			}

		} else {

			f = append(f, "-shared")

			if !ctx.Windows() {

				f = append(f, "-Wl,-soname,"+libName+flags.Toolchain.ShlibSuffix())

			}

			f = append(f,

				"-shared",

				"-Wl,-soname,"+libName+flags.Toolchain.ShlibSuffix())

		}



		flags.LdFlags = append(f, flags.LdFlags...)
@@ -684,14 +683,6 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext, 
	outputFile := android.PathForModuleOut(ctx, fileName)

	ret := outputFile



	var implicitOutputs android.WritablePaths

	if ctx.Windows() {

		importLibraryPath := android.PathForModuleOut(ctx, pathtools.ReplaceExtension(fileName, "a"))



		flags.LdFlags = append(flags.LdFlags, "-Wl,--out-implib="+importLibraryPath.String())

		implicitOutputs = append(implicitOutputs, importLibraryPath)

	}



	builderFlags := flagsToBuilderFlags(flags)



	// Optimize out relinking against shared libraries whose interface hasn't changed by
@@ -743,7 +734,7 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext, 


	TransformObjToDynamicBinary(ctx, objs.objFiles, sharedLibs,

		deps.StaticLibs, deps.LateStaticLibs, deps.WholeStaticLibs,

		linkerDeps, deps.CrtBegin, deps.CrtEnd, false, builderFlags, outputFile, implicitOutputs)

		linkerDeps, deps.CrtBegin, deps.CrtEnd, false, builderFlags, outputFile)



	objs.coverageFiles = append(objs.coverageFiles, deps.StaticLibObjs.coverageFiles...)

	objs.coverageFiles = append(objs.coverageFiles, deps.WholeStaticLibObjs.coverageFiles...)

cc/linker.go

+6 −2
Original line number Diff line number Diff line
@@ -290,6 +290,10 @@ func (linker *baseLinker) useClangLld(ctx ModuleContext) bool { 
	if ctx.Darwin() {

		return false

	}

	// http://b/110800681 - lld cannot link Android's Windows modules yet.

	if ctx.Windows() {

		return false

	}

	if linker.Properties.Use_clang_lld != nil {

		return Bool(linker.Properties.Use_clang_lld)

	}
@@ -343,7 +347,7 @@ func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags { 
			// darwin defaults to treating undefined symbols as errors

			flags.LdFlags = append(flags.LdFlags, "-Wl,-undefined,dynamic_lookup")

		}

	} else if !ctx.Darwin() && !ctx.Windows() {

	} else if !ctx.Darwin() {

		flags.LdFlags = append(flags.LdFlags, "-Wl,--no-undefined")

	}
@@ -380,7 +384,7 @@ func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags { 


	flags.LdFlags = append(flags.LdFlags, proptools.NinjaAndShellEscapeList(linker.Properties.Ldflags)...)



	if ctx.Host() && !ctx.Windows() {

	if ctx.Host() {

		rpath_prefix := `\$$ORIGIN/`

		if ctx.Darwin() {

			rpath_prefix = "@loader_path/"