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

Commit d0500f10 authored by Matías Hernández's avatar Matías Hernández
Browse files

Revert "Use zstd to compress debug info in cc libraries" 

Revert submission 2788316

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main&target=panther-next-userdebug&lkgb=10981485&lkbb=10981536&fkbb=10981536, bug b/306625613

Reverted changes: /q/submissionid:2788316

Change-Id: Ice939d57214879416da06d7134c6a8b56eaf00e6
BUG: 306625613
parent 99d682ad

cc/config/arm64_linux_host.go

+0 −5
Original line number Diff line number Diff line
@@ -46,10 +46,6 @@ var ( 
		"-Wl,--no-undefined-version",

	}



	linuxCrossLldflags = append(linuxCrossLdflags,

		"-Wl,--compress-debug-sections=zstd",

	)



	// Embed the linker into host bionic binaries. This is needed to support host bionic,

	// as the linux kernel requires that the ELF interpreter referenced by PT_INTERP be

	// either an absolute path, or relative from CWD. To work around this, we extract
@@ -64,7 +60,6 @@ var ( 
func init() {

	exportedVars.ExportStringListStaticVariable("LinuxBionicArm64Cflags", linuxCrossCflags)

	exportedVars.ExportStringListStaticVariable("LinuxBionicArm64Ldflags", linuxCrossLdflags)

	exportedVars.ExportStringListStaticVariable("LinuxBionicArm64Lldflags", linuxCrossLldflags)

}



// toolchain config for ARM64 Linux CrossHost. Almost everything is the same as the ARM64 Android

cc/config/arm_linux_host.go

+2 −10
Original line number Diff line number Diff line
@@ -27,24 +27,16 @@ var ( 
		"-march=armv7a",

	}



	linuxArmLldflags = append(linuxArmLdflags,

		"-Wl,--compress-debug-sections=zstd",

	)



	linuxArm64Ldflags = []string{}



	linuxArm64Lldflags = append(linuxArm64Ldflags,

		"-Wl,--compress-debug-sections=zstd",

	)

)



func init() {

	exportedVars.ExportStringListStaticVariable("LinuxArmCflags", linuxArmCflags)

	exportedVars.ExportStringListStaticVariable("LinuxArm64Cflags", linuxArm64Cflags)

	exportedVars.ExportStringListStaticVariable("LinuxArmLdflags", linuxArmLdflags)

	exportedVars.ExportStringListStaticVariable("LinuxArmLldflags", linuxArmLldflags)

	exportedVars.ExportStringListStaticVariable("LinuxArmLldflags", linuxArmLdflags)

	exportedVars.ExportStringListStaticVariable("LinuxArm64Ldflags", linuxArm64Ldflags)

	exportedVars.ExportStringListStaticVariable("LinuxArm64Lldflags", linuxArm64Lldflags)

	exportedVars.ExportStringListStaticVariable("LinuxArm64Lldflags", linuxArm64Ldflags)



	exportedVars.ExportStringListStaticVariable("LinuxArmYasmFlags", []string{"-f elf32 -m arm"})

	exportedVars.ExportStringListStaticVariable("LinuxArm64YasmFlags", []string{"-f elf64 -m aarch64"})

cc/config/global.go

+1 −3
Original line number Diff line number Diff line
@@ -203,9 +203,7 @@ var ( 
		"-Wl,-mllvm,-regalloc-enable-advisor=release",

	}



	deviceGlobalLldflags = append(append(deviceGlobalLdflags, commonGlobalLldflags...),

		"-Wl,--compress-debug-sections=zstd",

	)

	deviceGlobalLldflags = append(deviceGlobalLdflags, commonGlobalLldflags...)



	hostGlobalCflags = []string{}

cc/config/x86_linux_bionic_host.go

+1 −5
Original line number Diff line number Diff line
@@ -53,10 +53,6 @@ var ( 
		"--gcc-toolchain=${LinuxBionicGccRoot}",

	}



	linuxBionicLldflags = append(linuxBionicLdflags,

		"-Wl,--compress-debug-sections=zstd",

	)



	// Embed the linker into host bionic binaries. This is needed to support host bionic,

	// as the linux kernel requires that the ELF interpreter referenced by PT_INTERP be

	// either an absolute path, or relative from CWD. To work around this, we extract
@@ -75,7 +71,7 @@ const ( 
func init() {

	exportedVars.ExportStringListStaticVariable("LinuxBionicCflags", linuxBionicCflags)

	exportedVars.ExportStringListStaticVariable("LinuxBionicLdflags", linuxBionicLdflags)

	exportedVars.ExportStringListStaticVariable("LinuxBionicLldflags", linuxBionicLldflags)

	exportedVars.ExportStringListStaticVariable("LinuxBionicLldflags", linuxBionicLdflags)



	// Use the device gcc toolchain for now

	exportedVars.ExportStringStaticVariable("LinuxBionicGccVersion", x86_64GccVersion)

cc/config/x86_linux_host.go

+1 −5
Original line number Diff line number Diff line
@@ -59,10 +59,6 @@ var ( 
		"--gcc-toolchain=${LinuxGccRoot}",

	}



	linuxLldflags = append(linuxLdflags,

		"-Wl,--compress-debug-sections=zstd",

	)



	linuxGlibcLdflags = []string{

		"--sysroot ${LinuxGccRoot}/sysroot",

	}
@@ -142,7 +138,7 @@ func init() { 


	exportedVars.ExportStringListStaticVariable("LinuxCflags", linuxCflags)

	exportedVars.ExportStringListStaticVariable("LinuxLdflags", linuxLdflags)

	exportedVars.ExportStringListStaticVariable("LinuxLldflags", linuxLldflags)

	exportedVars.ExportStringListStaticVariable("LinuxLldflags", linuxLdflags)

	exportedVars.ExportStringListStaticVariable("LinuxGlibcCflags", linuxGlibcCflags)

	exportedVars.ExportStringListStaticVariable("LinuxGlibcLdflags", linuxGlibcLdflags)

	exportedVars.ExportStringListStaticVariable("LinuxGlibcLldflags", linuxGlibcLdflags)