Revert "Disable relocation_packer and migrate to SHT_RELR sections."
This reverts commit fa00dfda13aaf8132bb6e3ae65e0e2adce9939a0.
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
diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go
index 146d005..5bb7749 100644
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -33,7 +33,6 @@
"-Wl,--fix-cortex-a53-843419",
"-fuse-ld=gold",
"-Wl,--icf=safe",
- "-Wl,--experimental-use-relr",
}
arm64Cppflags = []string{}
diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go
index 7e6d203..66b3b38 100644
--- a/cc/config/arm_device.go
+++ b/cc/config/arm_device.go
@@ -37,7 +37,6 @@
"-Wl,--icf=safe",
"-Wl,--hash-style=gnu",
"-Wl,-m,armelf",
- "-Wl,--experimental-use-relr",
}
armArmCflags = []string{
diff --git a/cc/config/x86_64_device.go b/cc/config/x86_64_device.go
index dea13fb..12f3e6f 100644
--- a/cc/config/x86_64_device.go
+++ b/cc/config/x86_64_device.go
@@ -30,7 +30,6 @@
x86_64Ldflags = []string{
"-Wl,--hash-style=gnu",
- "-Wl,--experimental-use-relr",
}
x86_64ArchVariantCflags = map[string][]string{
diff --git a/cc/relocation_packer.go b/cc/relocation_packer.go
index 824b538..5006623 100644
--- a/cc/relocation_packer.go
+++ b/cc/relocation_packer.go
@@ -45,14 +45,7 @@
}
func (p *relocationPacker) packingInit(ctx BaseModuleContext) {
- // Disable relocation_packer and migrate to SHT_RELR sections.
- //
- // 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
-
+ enabled := true
// Relocation packer isn't available on Darwin yet
if runtime.GOOS == "darwin" {
enabled = false