diff options
author | sjg <sjg@FreeBSD.org> | 2013-09-05 20:18:59 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2013-09-05 20:18:59 +0000 |
commit | 62bb1062226d3ce6a2350808256a25508978352d (patch) | |
tree | 22b131dceb13c3df96da594fbaadb693504797c7 /gnu/usr.bin/cc | |
parent | 72ab90509b3a51ab361bf710338f2ef44a4e360d (diff) | |
parent | 04932445481c2cb89ff69a83b961bdef3d64757e (diff) | |
download | FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.zip FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.tar.gz |
Merge from head
Diffstat (limited to 'gnu/usr.bin/cc')
-rw-r--r-- | gnu/usr.bin/cc/f77/Makefile | 21 | ||||
-rw-r--r-- | gnu/usr.bin/cc/f771/Makefile | 34 | ||||
-rw-r--r-- | gnu/usr.bin/cc/f77doc/Makefile | 15 | ||||
-rw-r--r-- | gnu/usr.bin/cc/include/Makefile | 6 | ||||
-rw-r--r-- | gnu/usr.bin/cc/include/__wmmintrin_aes.h | 54 | ||||
-rw-r--r-- | gnu/usr.bin/cc/include/__wmmintrin_pclmul.h | 53 |
6 files changed, 111 insertions, 72 deletions
diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile deleted file mode 100644 index 9160391..0000000 --- a/gnu/usr.bin/cc/f77/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $FreeBSD$ - -.include "../Makefile.inc" -.include "../Makefile.fe" - -.PATH: ${GCCDIR}/f ${GCCDIR} - -PROG= f77 -SRCS= gcc.c g77spec.c - -CFLAGS+= -DFORTRAN_INIT=\"-lg2c\" -DFORTRAN_INIT_PROFILE=\"-lg2c_p\" - -DPADD= ${LIBCC_INT} -LDADD= ${LIBCC_INT} - -CLEANFILES= f77.1 - -f77.1: g77.1 - cat ${.ALLSRC} > ${.TARGET} - -.include <bsd.prog.mk> diff --git a/gnu/usr.bin/cc/f771/Makefile b/gnu/usr.bin/cc/f771/Makefile deleted file mode 100644 index 8d09092..0000000 --- a/gnu/usr.bin/cc/f771/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# $FreeBSD$ - -.include "${.CURDIR}/../Makefile.inc" - -.PATH: ${GCCDIR}/f ${GCCDIR} - -PROG= f771 -SRCS= bad.c bit.c bld.c com.c data.c equiv.c expr.c global.c implic.c info.c \ - intrin.c lab.c lex.c malloc.c name.c parse.c src.c st.c sta.c \ - stb.c stc.c std.c ste.c storag.c stp.c str.c sts.c stt.c stu.c stv.c \ - stw.c symbol.c target.c top.c type.c where.c main.c -BINDIR= /usr/libexec -NO_MAN= - -CFLAGS+= -I${GCCDIR}/f -I. - -DPADD= ${LIBCC_INT} -LDADD= ${LIBCC_INT} - -#----------------------------------------------------------------------- -# str-* gunk - -.for i in 1t 2t fo io nq op ot -.ORDER: str-$i.h str-$i.j -str-$i.j str-$i.h: str-$i.fin - ${.OBJDIR}/../cc_tools/fini ${GCCDIR}/f/str-$i.fin str-$i.j str-$i.h - -FINIHDRS+= str-$i.j str-$i.h -.endfor - -SRCS+= ${FINIHDRS:M*.h} -CLEANFILES+= ${FINIHDRS} - -.include <bsd.prog.mk> diff --git a/gnu/usr.bin/cc/f77doc/Makefile b/gnu/usr.bin/cc/f77doc/Makefile deleted file mode 100644 index 5e0808d..0000000 --- a/gnu/usr.bin/cc/f77doc/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $FreeBSD$ - -.include "../Makefile.inc" - -.PATH: ${GCCDIR}/f - -INFO= g77 - -MAKEINFOFLAGS+= -I ${GCCDIR}/f -I ${GCCDIR}/doc/include -MAKEINFOFLAGS+= -D "srcdir src/contrib" - -g77.info: g77.texi intdoc.texi ffe.texi invoke.texi news.texi bugs.texi \ - ../doc/include/gpl.texi ../doc/include/fdl.texi ../doc/include/funding.texi - -.include <bsd.info.mk> diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile index 357bac0..c48975e 100644 --- a/gnu/usr.bin/cc/include/Makefile +++ b/gnu/usr.bin/cc/include/Makefile @@ -6,10 +6,12 @@ INCSDIR=${INCLUDEDIR}/gcc/${GCCVER} -.PATH: ${GCCDIR}/config/${GCC_CPU} +.PATH: ${GCCDIR}/config/${GCC_CPU} ${.CURDIR}/../../../../contrib/llvm/tools/clang/lib/Headers .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" -INCS= emmintrin.h mmintrin.h pmmintrin.h tmmintrin.h xmmintrin.h mm_malloc.h +INCS= ammintrin.h emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h \ + tmmintrin.h xmmintrin.h mm_malloc.h +INCS+= wmmintrin.h __wmmintrin_aes.h __wmmintrin_pclmul.h .elif ${TARGET_ARCH} == "ia64" INCS= ia64intrin.h .elif ${TARGET_ARCH} == "arm" diff --git a/gnu/usr.bin/cc/include/__wmmintrin_aes.h b/gnu/usr.bin/cc/include/__wmmintrin_aes.h new file mode 100644 index 0000000..ff8a345 --- /dev/null +++ b/gnu/usr.bin/cc/include/__wmmintrin_aes.h @@ -0,0 +1,54 @@ +/*- + * Copyright 2013 John-Mark Gurney + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + * + */ + +#ifndef _WMMINTRIN_AES_H_ +#define _WMMINTRIN_AES_H_ + +#include <emmintrin.h> + +#define MAKE_AES(name) \ +static __inline__ __m128i __attribute__((__always_inline__, __nodebug__)) \ +_mm_## name ##_si128(__m128i __V, __m128i __R) \ +{ \ + __m128i v = __V; \ + \ + __asm__ (#name " %2, %0": "=x" (v): "0" (v), "xm" (__R)); \ + \ + return v; \ +} + +MAKE_AES(aesimc) +MAKE_AES(aesenc) +MAKE_AES(aesenclast) +MAKE_AES(aesdec) +MAKE_AES(aesdeclast) + +#undef MAKE_AES + +#endif /* _WMMINTRIN_AES_H_ */ diff --git a/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h b/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h new file mode 100644 index 0000000..5bebd81 --- /dev/null +++ b/gnu/usr.bin/cc/include/__wmmintrin_pclmul.h @@ -0,0 +1,53 @@ +/*- + * Copyright 2013 John-Mark Gurney + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + * + */ + +#ifndef _WMMINTRIN_PCLMUL_H_ +#define _WMMINTRIN_PCLMUL_H_ + +#include <emmintrin.h> + +/* + * c selects which parts of a and b to multiple: + * 0x00: a[ 63: 0] * b[ 63: 0] + * 0x01: a[127:64] * b[ 63: 0] + * 0x10: a[ 63: 0] * b[127:64] + * 0x11: a[127:64] * b[127:64] + */ +#define _mm_clmulepi64_si128(a, b, c) \ +({ \ + __m128i _a = (a); \ + __m128i _b = (b); \ + \ + __asm__("pclmulqdq %3, %2, %0": "=x" (_a): "0" (_a), "xm" (_b), \ + "i" (c)); \ + \ + _a; \ +}) + +#endif /* _WMMINTRIN_PCLMUL_H_ */ |