Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b48fb839 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Defer to clang for `--hash-style`. 

We fixed the clang driver to "do the right thing" based on target api level years ago, but these manual workarounds predate that (or were copy & pasted from places that predated that). We don't need them any more.

See https://github.com/android/ndk/issues/2005 for more detail.

Change-Id: I995741b8606e389e8de8272f1cc532624516245a
parent 97409cd9

cc/config/arm64_device.go

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ var ( 
	}



	arm64Ldflags = []string{

		"-Wl,--hash-style=gnu",

		"-Wl,-z,separate-code",

		"-Wl,-z,separate-loadable-segments",

	}

cc/config/arm64_linux_host.go

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ var ( 
		"-Wl,-z,now",

		"-Wl,--build-id=md5",

		"-Wl,--fatal-warnings",

		"-Wl,--hash-style=gnu",

		"-Wl,--no-undefined-version",

	}

cc/config/arm_device.go

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ var ( 
  }



	armLdflags = []string{

		"-Wl,--hash-style=gnu",

		"-Wl,-m,armelf",

		// Revert this after b/322359235 is fixed

		"-Wl,-mllvm", "-Wl,-enable-shrink-wrap=false",

cc/config/riscv64_device.go

+0 −5
Original line number Diff line number Diff line
@@ -42,11 +42,6 @@ var ( 
	riscv64ArchVariantCflags = map[string][]string{}



	riscv64Ldflags = []string{

		// TODO: sysv hashes are the default for other architectures because gnu

		// hashes weren't supported until api level 23, but riscv64 didn't exist

		// back then, and could move today...

		// https://android.googlesource.com/platform/bionic/+/main/android-changes-for-ndk-developers.md#gnu-hashes-availible-in-api-level-23

		"-Wl,--hash-style=gnu",

		// This is already the driver's Android default, but duplicated here (and

		// above) for ease of experimentation with additional extensions.

		"-march=rv64gcv_zba_zbb_zbs",

cc/config/x86_64_device.go

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ var ( 
	x86_64Cppflags = []string{}



	x86_64Ldflags = []string{

		"-Wl,--hash-style=gnu",

		"-Wl,-z,separate-loadable-segments",

	}