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

Commit fa742ba0 authored by Juan Yescas's avatar Juan Yescas Committed by Automerger Merge Worker
Browse files

Merge changes from topic "16k-emulator-x86-64" into main am: cd347013 am:... 

Merge changes from topic "16k-emulator-x86-64" into main am: cd347013 am: bd0c819d am: d639dc84

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2825165



Change-Id: I9800c43f1ade8b3f0a5aa47a1a64b0b5694979de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 975d4d70 d639dc84

cc/config/x86_64_device.go

+17 −2
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ var ( 
		"-Wl,--hash-style=gnu",

	}



	X86_64Lldflags = x86_64Ldflags



	x86_64ArchVariantCflags = map[string][]string{

		"": []string{

			"-march=x86-64",
@@ -94,10 +96,23 @@ func init() { 
	exportedVars.ExportStringListStaticVariable("X86_64ToolchainLdflags", []string{"-m64"})



	exportedVars.ExportStringListStaticVariable("X86_64Ldflags", x86_64Ldflags)

	exportedVars.ExportStringListStaticVariable("X86_64Lldflags", x86_64Ldflags)

	exportedVars.ExportStringList("X86_64Lldflags", X86_64Lldflags)

	pctx.VariableFunc("X86_64Lldflags", func(ctx android.PackageVarContext) string {

		maxPageSizeFlag := "-Wl,-z,max-page-size=" + ctx.Config().MaxPageSizeSupported()

		flags := append(X86_64Lldflags, maxPageSizeFlag)

		return strings.Join(flags, " ")

	})



	// Clang cflags

	exportedVars.ExportStringListStaticVariable("X86_64Cflags", x86_64Cflags)

	exportedVars.ExportStringList("X86_64Cflags", x86_64Cflags)

	pctx.VariableFunc("X86_64Cflags", func(ctx android.PackageVarContext) string {

		flags := x86_64Cflags

		if ctx.Config().PageSizeAgnostic() {

			flags = append(flags, "-D__BIONIC_NO_PAGE_SIZE_MACRO")

		}

		return strings.Join(flags, " ")

	})



	exportedVars.ExportStringListStaticVariable("X86_64Cppflags", x86_64Cppflags)



	// Yasm flags