Revert "Disable relocation_packer and migrate to SHT_RELR sections."
This reverts commit fa00dfda13
.
Reason for revert: New Build Breakages in git_pi-dev-plus-aosp-without-vendor/aosp_walleye-userdebug and git_pi-dev-plus-aosp/aosp_crosshatch-userdebug
Change-Id: Iec9e695cccc3f206df67f0c01cfd4c2c3023dcec
This commit is contained in:
@@ -33,7 +33,6 @@ var (
|
|||||||
"-Wl,--fix-cortex-a53-843419",
|
"-Wl,--fix-cortex-a53-843419",
|
||||||
"-fuse-ld=gold",
|
"-fuse-ld=gold",
|
||||||
"-Wl,--icf=safe",
|
"-Wl,--icf=safe",
|
||||||
"-Wl,--experimental-use-relr",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
arm64Cppflags = []string{}
|
arm64Cppflags = []string{}
|
||||||
|
@@ -37,7 +37,6 @@ var (
|
|||||||
"-Wl,--icf=safe",
|
"-Wl,--icf=safe",
|
||||||
"-Wl,--hash-style=gnu",
|
"-Wl,--hash-style=gnu",
|
||||||
"-Wl,-m,armelf",
|
"-Wl,-m,armelf",
|
||||||
"-Wl,--experimental-use-relr",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
armArmCflags = []string{
|
armArmCflags = []string{
|
||||||
|
@@ -30,7 +30,6 @@ var (
|
|||||||
|
|
||||||
x86_64Ldflags = []string{
|
x86_64Ldflags = []string{
|
||||||
"-Wl,--hash-style=gnu",
|
"-Wl,--hash-style=gnu",
|
||||||
"-Wl,--experimental-use-relr",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
x86_64ArchVariantCflags = map[string][]string{
|
x86_64ArchVariantCflags = map[string][]string{
|
||||||
|
@@ -45,14 +45,7 @@ type relocationPacker struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *relocationPacker) packingInit(ctx BaseModuleContext) {
|
func (p *relocationPacker) packingInit(ctx BaseModuleContext) {
|
||||||
// Disable relocation_packer and migrate to SHT_RELR sections.
|
enabled := true
|
||||||
//
|
|
||||||
// Proposal for adding SHT_RELR sections in generic-abi is at
|
|
||||||
// https://groups.google.com/forum/#!topic/generic-abi/bX460iggiKg
|
|
||||||
//
|
|
||||||
// TODO: Remove relocation_packer and associated build logic.
|
|
||||||
enabled := false
|
|
||||||
|
|
||||||
// Relocation packer isn't available on Darwin yet
|
// Relocation packer isn't available on Darwin yet
|
||||||
if runtime.GOOS == "darwin" {
|
if runtime.GOOS == "darwin" {
|
||||||
enabled = false
|
enabled = false
|
||||||
|
Reference in New Issue
Block a user