From ccf4f838873565926616f332825f971c96bcc735 Mon Sep 17 00:00:00 2001
From: Rahul Chaudhry <rahulchaudhry@google.com>
Date: Fri, 23 Mar 2018 19:02:56 +0000
Subject: [PATCH] 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
---
 cc/config/arm64_device.go  | 1 -
 cc/config/arm_device.go    | 1 -
 cc/config/x86_64_device.go | 1 -
 cc/relocation_packer.go    | 9 +--------
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go
index 146d00556..5bb7749a8 100644
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -33,7 +33,6 @@ var (
 		"-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 7e6d203d2..66b3b3829 100644
--- a/cc/config/arm_device.go
+++ b/cc/config/arm_device.go
@@ -37,7 +37,6 @@ var (
 		"-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 dea13fbad..12f3e6fa2 100644
--- a/cc/config/x86_64_device.go
+++ b/cc/config/x86_64_device.go
@@ -30,7 +30,6 @@ var (
 
 	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 824b538a8..500662365 100644
--- a/cc/relocation_packer.go
+++ b/cc/relocation_packer.go
@@ -45,14 +45,7 @@ type relocationPacker struct {
 }
 
 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