Skip to content

Commit

Permalink
Cleanup -fno-addrsig use.
Browse files Browse the repository at this point in the history
This is no longer necessary because we fixed the driver.

Test: ./checkbuild.py
Bug: android/ndk#884
Change-Id: I97682cbb6485cf5032079f21fa051a55888abd49
  • Loading branch information
DanAlbert committed Sep 24, 2019
1 parent 4bde918 commit f8f36fa
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 12 deletions.
3 changes: 0 additions & 3 deletions build/cmake/android.toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -477,9 +477,6 @@ if(ANDROID_ABI STREQUAL x86 AND ANDROID_PLATFORM_LEVEL LESS 24)
list(APPEND ANDROID_COMPILER_FLAGS -mstackrealign)
endif()

# TODO: Remove when https://github.com/android-ndk/ndk/issues/884 is fixed.
list(APPEND ANDROID_COMPILER_FLAGS -fno-addrsig)

list(APPEND ANDROID_COMPILER_FLAGS -D_FORTIFY_SOURCE=2)

# STL specific flags.
Expand Down
3 changes: 0 additions & 3 deletions build/core/default-build-commands.mk
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,6 @@ GLOBAL_CFLAGS += \
-Wno-invalid-command-line-argument \
-Wno-unused-command-line-argument \

# TODO: Remove when https://github.com/android-ndk/ndk/issues/884 is fixed.
GLOBAL_CFLAGS += -fno-addrsig

GLOBAL_CFLAGS += -D_FORTIFY_SOURCE=2

GLOBAL_LDFLAGS = \
Expand Down
3 changes: 0 additions & 3 deletions build/tools/make_standalone_toolchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,6 @@ def make_clang_scripts(install_dir, arch, api, windows):
if arch == 'i686' and api < 24:
flags += ' -mstackrealign'

# TODO: Remove when https://github.com/android-ndk/ndk/issues/884 is fixed.
flags += ' -fno-addrsig'

cxx_flags = str(flags)

clang_path = os.path.join(install_dir, 'bin/clang')
Expand Down
3 changes: 0 additions & 3 deletions ndk/checkbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -1787,9 +1787,6 @@ def write_clang_wrapper(install_dir: str, api: int, triple: str,
if triple.startswith('i686') and api < 24:
flags.append('-mstackrealign')

# TODO: Remove when https://github.com/android-ndk/ndk/issues/884 is fixed.
flags.append('-fno-addrsig')

# Write shell scripts even for Windows to support WSL and Cygwin.
write_clang_shell_script(wrapper_path, 'clang' + exe_suffix, flags)
write_clang_shell_script(wrapperxx_path, 'clang++' + exe_suffix, flags)
Expand Down

0 comments on commit f8f36fa

Please sign in to comment.