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

Commit 13beeedf authored by Yi Kong's avatar Yi Kong
Browse files

Turn off Global ThinLTO for LP32 again 

LP32 has many subtle issues and less test coverage.

Bug: 290859519
Bug: 169004486
Test: presubmit
Change-Id: I33fcf1a08b9e7a905ba81030250a9578532da5a0
parent e61a0817

cc/cc_test.go

+3 −4
Original line number Diff line number Diff line
@@ -4979,7 +4979,6 @@ func TestIncludeDirectoryOrdering(t *testing.T) { 


	conly := []string{"-fPIC", "${config.CommonGlobalConlyflags}"}

	cppOnly := []string{"-fPIC", "${config.CommonGlobalCppflags}", "${config.DeviceGlobalCppflags}", "${config.ArmCppflags}"}

	ltoFlags := []string{"-flto=thin", "-fsplit-lto-unit"}



	cflags := []string{"-Werror", "-std=candcpp"}

	cstd := []string{"-std=gnu17", "-std=conly"}
@@ -5006,17 +5005,17 @@ func TestIncludeDirectoryOrdering(t *testing.T) { 
		{

			name:     "c",

			src:      "foo.c",

			expected: combineSlices(baseExpectedFlags, conly, expectedIncludes, cflags, ltoFlags, cstd, lastIncludes, []string{"${config.NoOverrideGlobalCflags}", "${config.NoOverrideExternalGlobalCflags}"}),

			expected: combineSlices(baseExpectedFlags, conly, expectedIncludes, cflags, cstd, lastIncludes, []string{"${config.NoOverrideGlobalCflags}", "${config.NoOverrideExternalGlobalCflags}"}),

		},

		{

			name:     "cc",

			src:      "foo.cc",

			expected: combineSlices(baseExpectedFlags, cppOnly, expectedIncludes, cflags, ltoFlags, cppstd, lastIncludes, []string{"${config.NoOverrideGlobalCflags}", "${config.NoOverrideExternalGlobalCflags}"}),

			expected: combineSlices(baseExpectedFlags, cppOnly, expectedIncludes, cflags, cppstd, lastIncludes, []string{"${config.NoOverrideGlobalCflags}", "${config.NoOverrideExternalGlobalCflags}"}),

		},

		{

			name:     "assemble",

			src:      "foo.s",

			expected: combineSlices(baseExpectedFlags, []string{"${config.CommonGlobalAsflags}"}, expectedIncludes, ltoFlags, lastIncludes),

			expected: combineSlices(baseExpectedFlags, []string{"${config.CommonGlobalAsflags}"}, expectedIncludes, lastIncludes),

		},

	}

cc/lto.go

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ func (lto *lto) begin(ctx BaseModuleContext) { 
	} else if ctx.Host() {

		// Performance and binary size are less important for host binaries.

		ltoDefault = false

	} else if ctx.Arch().ArchType.Multilib == "lib32" {

		// LP32 has many subtle issues and less test coverage.

		ltoDefault = false

	}



	// Then, determine the actual LTO mode to use. If different from `ltoDefault`, a variant needs