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