1
0
mirror of https://github.com/paboyle/Grid.git synced 2024-12-25 04:15:26 +00:00

Merge remote-tracking branch 'upstream/master'

Conflicts:
	configure
This commit is contained in:
neo 2015-07-21 11:57:34 +09:00
commit 0ea846dcdc
5 changed files with 49 additions and 32 deletions

66
.gitignore vendored
View File

@ -1,56 +1,65 @@
# Compiled Object files
# Compiled Object files #
#########################
*.slo
*.lo
*.o
*.obj
*~
errs
*#
INSTALL
# Precompiled Headers
# Editor files #
################
*~
*#
# Precompiled Headers #
#######################
*.gch
*.pch
# Compiled Dynamic libraries
# Compiled Dynamic libraries #
##############################
*.so
*.dylib
*.dll
# Fortran module files
# Fortran module files #
########################
*.mod
# Compiled Static libraries
# Compiled Static libraries #
#############################
*.lai
*.la
*.a
*.lib
# Executables
# Executables #
###############
*.exe
*.out
*.app
# http://www.gnu.org/software/automake
# http://www.gnu.org/software/automake #
########################################
Makefile.in
Makefile
config.log
config.status
.deps
# http://www.gnu.org/software/autoconf
/autom4te.cache
/aclocal.m4
/compile
/configure
/depcomp
/install-sh
/missing
/stamp-h1
/config.sub
/config.guess
/INSTALL
# http://www.gnu.org/software/autoconf #
########################################
autom4te.cache
aclocal.m4
compile
configure
depcomp
install-sh
missing
stamp-h1
config.sub
config.guess
INSTALL
# Packages #
############
@ -80,3 +89,12 @@ config.status
.Trashes
ehthumbs.db
Thumbs.db
# build directory #
###################
build/*
# IDE related files #
#####################
*.xcodeproj/*
build.sh

View File

@ -1 +0,0 @@
/usr/share/automake-1.14/INSTALL

4
configure vendored
View File

@ -5068,7 +5068,7 @@ main ()
FILE *f;
/* Opcodes for xgetbv */
__asm__(".byte 0x0f, 0x01, 0xd0"
: "=a" (eax), "=d" (edx),
: "=a" (eax), "=d" (edx)
: "c" (op));
f = fopen("conftest_xgetbv", "w"); if (!f) return 1;
fprintf(f, "%x:%x\n", eax, edx);
@ -5470,7 +5470,7 @@ main ()
FILE *f;
/* Opcodes for xgetbv */
__asm__(".byte 0x0f, 0x01, 0xd0"
: "=a" (eax), "=d" (edx),
: "=a" (eax), "=d" (edx)
: "c" (op));
f = fopen("conftest_xgetbv", "w"); if (!f) return 1;
fprintf(f, "%x:%x\n", eax, edx);

View File

@ -20,10 +20,10 @@
#define GRID_COMMS_NONE 1
/* GRID_DEFAULT_PRECISION is DOUBLE */
#define GRID_DEFAULT_PRECISION_DOUBLE 1
/* #undef GRID_DEFAULT_PRECISION_DOUBLE */
/* GRID_DEFAULT_PRECISION is SINGLE */
/* #undef GRID_DEFAULT_PRECISION_SINGLE */
#define GRID_DEFAULT_PRECISION_SINGLE 1
/* Support Altivec instructions */
/* #undef HAVE_ALTIVEC */
@ -120,8 +120,8 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* NEON ARMv7 Experimental support */
/* #undef NEONv7 */
/* NEON ARMv8 Experimental support */
/* #undef NEONv8 */
/* Name of package */
#define PACKAGE "grid"

View File

@ -65,7 +65,7 @@ AC_CACHE_CHECK(for x86-AVX xgetbv $1 output, ax_cv_gcc_x86_avx_xgetbv_$1,
FILE *f;
/* Opcodes for xgetbv */
__asm__(".byte 0x0f, 0x01, 0xd0"
: "=a" (eax), "=d" (edx),
: "=a" (eax), "=d" (edx)
: "c" (op));
f = fopen("conftest_xgetbv", "w"); if (!f) return 1;
fprintf(f, "%x:%x\n", eax, edx);