Merge "Revert "Disable relocation_packer and migrate to SHT_RELR sections."" am: fd5059ff10

am: c9e08d397c

Change-Id: I845618811532032f7d9193e954ecf750041f2aa6

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{}

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{

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{

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