Merge "Stop using `-Wl,-z,nocopyreloc`."
diff --git a/build/cmake/android.toolchain.cmake b/build/cmake/android.toolchain.cmake
index 8df8284..b808a32 100644
--- a/build/cmake/android.toolchain.cmake
+++ b/build/cmake/android.toolchain.cmake
@@ -452,9 +452,7 @@
-Wl,--build-id
-Wl,--warn-shared-textrel
-Wl,--fatal-warnings)
-list(APPEND ANDROID_LINKER_FLAGS_EXE
- -Wl,--gc-sections
- -Wl,-z,nocopyreloc)
+list(APPEND ANDROID_LINKER_FLAGS_EXE -Wl,--gc-sections)
# Debug and release flags.
list(APPEND ANDROID_COMPILER_FLAGS_DEBUG -O0)
diff --git a/build/core/default-build-commands.mk b/build/core/default-build-commands.mk
index f0ce68e..fd4d273 100644
--- a/build/core/default-build-commands.mk
+++ b/build/core/default-build-commands.mk
@@ -90,7 +90,6 @@
define cmd-build-executable
$(PRIVATE_CXX) \
-Wl,--gc-sections \
- -Wl,-z,nocopyreloc \
-Wl,-rpath-link=$(call host-path,$(PRIVATE_SYSROOT_API_LIB_DIR)) \
-Wl,-rpath-link=$(call host-path,$(TARGET_OUT)) \
$(PRIVATE_LINKER_OBJECTS_AND_LIBRARIES) \
diff --git a/build/tools/build-gdbserver.sh b/build/tools/build-gdbserver.sh
index a9e7dc2..ebb0d35 100755
--- a/build/tools/build-gdbserver.sh
+++ b/build/tools/build-gdbserver.sh
@@ -239,7 +239,7 @@
export AR="${TOOLCHAIN_PREFIX}ar" &&
export RANLIB="${TOOLCHAIN_PREFIX}ranlib" &&
export CFLAGS="-O2 $GDBSERVER_CFLAGS" &&
-export LDFLAGS="-static -Wl,-z,nocopyreloc -Wl,--no-undefined" &&
+export LDFLAGS="-static" &&
run $SRC_DIR/configure \
--build=x86_64-linux-gnu \
--host=$GDBSERVER_HOST \
