Merge "Disable relocation_packer and migrate to SHT_RELR sections." am: 71bfb262b9

am: 6ad7e6a605

Change-Id: Ic0c3e14c3e1b3e91f45572134e45b9f865180d07

cc/config/arm64_device.go

@@ -33,6 +33,7 @@ var (
 		"-Wl,--fix-cortex-a53-843419",
 		"-fuse-ld=gold",
 		"-Wl,--icf=safe",
+		"-Wl,--experimental-use-relr",
 	}
 
 	arm64Cppflags = []string{}

cc/config/arm_device.go

@@ -37,6 +37,7 @@ var (
 		"-Wl,--icf=safe",
 		"-Wl,--hash-style=gnu",
 		"-Wl,-m,armelf",
+		"-Wl,--experimental-use-relr",
 	}
 
 	armArmCflags = []string{

cc/config/x86_64_device.go

@@ -30,6 +30,7 @@ var (
 
 	x86_64Ldflags = []string{
 		"-Wl,--hash-style=gnu",
+		"-Wl,--experimental-use-relr",
 	}
 
 	x86_64ArchVariantCflags = map[string][]string{

cc/relocation_packer.go

@@ -45,7 +45,14 @@ type relocationPacker struct {
 }
 
 func (p *relocationPacker) packingInit(ctx BaseModuleContext) {
-	enabled := true
+	// 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
+
 	// Relocation packer isn't available on Darwin yet
 	if runtime.GOOS == "darwin" {
 		enabled = false