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

Commit ec2f6cba authored by Yi Kong's avatar Yi Kong Committed by Gerrit Code Review
Browse files

Merge "Revert "Prevent clang from using the x18 register on arm64.""

parents c51ffaf1 8c3c0f50

cc/config/arm64_device.go

+0 −5
Original line number Diff line number Diff line
@@ -25,11 +25,6 @@ var ( 
	arm64Cflags = []string{

		// Help catch common 32/64-bit errors.

		"-Werror=implicit-function-declaration",



		// Prevent use of x18 register.

		// TODO(pcc): Remove this flag once we upgrade past LLVM r340889

		// which does this by default on Android.

		"-ffixed-x18",

	}



	arm64ArchVariantCflags = map[string][]string{

cc/lto.go

+0 −7
Original line number Diff line number Diff line
@@ -113,13 +113,6 @@ func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags { 
			flags.LdFlags = append(flags.LdFlags, "-Wl,-plugin-opt,-inline-threshold=0")

			flags.LdFlags = append(flags.LdFlags, "-Wl,-plugin-opt,-unroll-threshold=0")

		}



		if ctx.Arch().ArchType == android.Arm64 {

			// Prevent use of x18 register on arm64.

			// TODO(pcc): Remove this flag once we upgrade past LLVM r340889

			// which does this by default on Android.

			flags.LdFlags = append(flags.LdFlags, "-Wl,-plugin-opt,-mattr=+reserve-x18")

		}

	}

	return flags

}

cc/sanitize.go

+0 −7
Original line number Diff line number Diff line
@@ -471,13 +471,6 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { 
			diagSanitizers = append(diagSanitizers, "cfi")

		}



		if ctx.Arch().ArchType == android.Arm64 {

			// Prevent use of x18 register on arm64.

			// TODO(pcc): Remove this flag once we upgrade past LLVM r340889

			// which does this by default on Android.

			flags.LdFlags = append(flags.LdFlags, "-Wl,-plugin-opt,-mattr=+reserve-x18")

		}



		if ctx.staticBinary() {

			_, flags.CFlags = removeFromList("-fsanitize-cfi-cross-dso", flags.CFlags)

			_, flags.LdFlags = removeFromList("-fsanitize-cfi-cross-dso", flags.LdFlags)