diff options
| author | Eric Christopher <echristo@gmail.com> | 2015-01-26 06:32:17 +0000 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2015-03-24 11:56:42 -0700 |
| commit | c0e98a363fd849c40ee8654336af128750d69f55 (patch) | |
| tree | 5b0e44c537014845b6cd3195ae3b9d9181903f94 | |
| parent | 90a48f851f1b8dd08fd91da8d0bdc430517fb856 (diff) | |
| download | llvm-c0e98a363fd849c40ee8654336af128750d69f55.tar.gz | |
[ndk][backport] Fix a problem where the AArch64 ELF assembler.
Fix a problem where the AArch64 ELF assembler was failing with
-no-exec-stack. This was due to it not deriving from the correct asm
info base class and missing the override for the exec stack section
query. Added another line to the noexec test line to make sure this
doesn't regress.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@227074 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.h | 3 | ||||
| -rw-r--r-- | test/MC/ELF/noexec.s | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.h b/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.h index 5d03c213c78..9b88de7dabb 100644 --- a/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.h +++ b/lib/Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.h @@ -15,6 +15,7 @@ #define LLVM_LIB_TARGET_AARCH64_MCTARGETDESC_AARCH64MCASMINFO_H #include "llvm/MC/MCAsmInfoDarwin.h" +#include "llvm/MC/MCAsmInfoELF.h" namespace llvm { class Target; @@ -27,7 +28,7 @@ struct AArch64MCAsmInfoDarwin : public MCAsmInfoDarwin { MCStreamer &Streamer) const override; }; -struct AArch64MCAsmInfoELF : public MCAsmInfo { +struct AArch64MCAsmInfoELF : public MCAsmInfoELF { explicit AArch64MCAsmInfoELF(StringRef TT); }; diff --git a/test/MC/ELF/noexec.s b/test/MC/ELF/noexec.s index 28f50cb7f69..1ff162073c7 100644 --- a/test/MC/ELF/noexec.s +++ b/test/MC/ELF/noexec.s @@ -1,4 +1,5 @@ // RUN: llvm-mc -no-exec-stack -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj -s -t | FileCheck %s +// RUN: llvm-mc -no-exec-stack -filetype=obj -triple aarch64-linux-gnu %s -o - | llvm-readobj -s -t | FileCheck %s // CHECK: Section { // CHECK: Index: 4 |