diff options
| author | Elliott Hughes <enh@google.com> | 2019-11-06 19:07:48 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-06 19:07:48 -0800 |
| commit | 4119c4e689ad3481d37e827ab430047596c9e3e6 (patch) | |
| tree | abcf56d8550a444fdc67894e3bb8cc48a31276ef | |
| parent | 52d6f1015ab250f7e55a52830175f1723a3d4fa8 (diff) | |
| parent | 3e16696e3aff76a3f0e0e6898d37500c5e1a9816 (diff) | |
| download | bionic-4119c4e689ad3481d37e827ab430047596c9e3e6.tar.gz | |
Merge "Restore _FORTIFY_SOURCE in versioner." am: 03aa94c9a9
am: 3e16696e3a
Change-Id: Ie9b41bdaf95a6e1edff362b20a2249cc6b802757
| -rw-r--r-- | tools/versioner/src/Driver.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/versioner/src/Driver.cpp b/tools/versioner/src/Driver.cpp index d2c50a96b..bad63ad2d 100644 --- a/tools/versioner/src/Driver.cpp +++ b/tools/versioner/src/Driver.cpp @@ -126,14 +126,7 @@ static void generateTargetCC1Flags(llvm::IntrusiveRefCntPtr<llvm::vfs::FileSyste cmd.push_back("-DANDROID"); cmd.push_back("-D__ANDROID_API__="s + std::to_string(type.api_level)); - // FIXME: Re-enable FORTIFY properly once our clang in external/ is new enough - // to support diagnose_if without giving us syntax errors. -#if 0 cmd.push_back("-D_FORTIFY_SOURCE=2"); -#else - cmd.push_back("-D_FORTIFY_SOURCE=0"); - cmd.push_back("-D__BIONIC_DECLARE_FORTIFY_HELPERS"); -#endif cmd.push_back("-D_GNU_SOURCE"); cmd.push_back("-D_FILE_OFFSET_BITS="s + std::to_string(type.file_offset_bits)); |