diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-10-01 19:02:45 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-10-01 19:02:45 +0000 |
| commit | 65dcb5bcb1993631f47d8acc207904411e135758 (patch) | |
| tree | 65e063ba4063b01c208d44deddda2fe59ac5f224 /lib/libcompiler_rt | |
| parent | ba96f361ba1399631d6d10294aa380c3b408702a (diff) | |
| parent | 66917ca9d2bea3fa9c890412c55f4929bb63118b (diff) | |
| download | src-test-65dcb5bcb1993631f47d8acc207904411e135758.tar.gz src-test-65dcb5bcb1993631f47d8acc207904411e135758.zip | |
Merge ^/head r288197 through r288456.
Notes
Notes:
svn path=/projects/clang370-import/; revision=288457
Diffstat (limited to 'lib/libcompiler_rt')
| -rw-r--r-- | lib/libcompiler_rt/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index dae162425dff7..86daee4aabf0f 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -233,7 +233,7 @@ SYMLINKS+=libcompiler_rt_p.a ${LIBDIR}/libgcc_p.a .endif .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ - ${MACHINE_CPUARCH} == "powerpc" + ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_ARCH:Marmv6*} AFLAGS+=--noexecstack ACFLAGS+=-Wa,--noexecstack .endif |