diff options
| author | dim <dim@FreeBSD.org> | 2015-10-01 19:02:45 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-10-01 19:02:45 +0000 |
| commit | c88ca1c4064bdfc5aa9a040453a2bedcab5563cf (patch) | |
| tree | 65e063ba4063b01c208d44deddda2fe59ac5f224 /lib/libcompiler_rt | |
| parent | d3edc9664e05776279ed8ad8a20ad14cdd579030 (diff) | |
| parent | e6448d3ce04113fa55305f4d9b53a92f11189be6 (diff) | |
| download | FreeBSD-src-c88ca1c4064bdfc5aa9a040453a2bedcab5563cf.zip FreeBSD-src-c88ca1c4064bdfc5aa9a040453a2bedcab5563cf.tar.gz | |
Merge ^/head r288197 through r288456.
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 dae1624..86daee4 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 |
