1
0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-10 07:55:35 +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 a9c15626e1
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 *.slo
*.lo *.lo
*.o *.o
*.obj *.obj
*~
errs
*#
INSTALL
# Precompiled Headers
# Editor files #
################
*~
*#
# Precompiled Headers #
#######################
*.gch *.gch
*.pch *.pch
# Compiled Dynamic libraries # Compiled Dynamic libraries #
##############################
*.so *.so
*.dylib *.dylib
*.dll *.dll
# Fortran module files # Fortran module files #
########################
*.mod *.mod
# Compiled Static libraries # Compiled Static libraries #
#############################
*.lai *.lai
*.la *.la
*.a *.a
*.lib *.lib
# Executables # Executables #
###############
*.exe *.exe
*.out *.out
*.app *.app
# http://www.gnu.org/software/automake
# http://www.gnu.org/software/automake #
########################################
Makefile.in Makefile.in
Makefile Makefile
config.log config.log
config.status config.status
.deps .deps
# http://www.gnu.org/software/autoconf # http://www.gnu.org/software/autoconf #
########################################
/autom4te.cache autom4te.cache
/aclocal.m4 aclocal.m4
/compile compile
/configure configure
/depcomp depcomp
/install-sh install-sh
/missing missing
/stamp-h1 stamp-h1
/config.sub config.sub
/config.guess config.guess
/INSTALL INSTALL
# Packages # # Packages #
############ ############
@ -80,3 +89,12 @@ config.status
.Trashes .Trashes
ehthumbs.db ehthumbs.db
Thumbs.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; FILE *f;
/* Opcodes for xgetbv */ /* Opcodes for xgetbv */
__asm__(".byte 0x0f, 0x01, 0xd0" __asm__(".byte 0x0f, 0x01, 0xd0"
: "=a" (eax), "=d" (edx), : "=a" (eax), "=d" (edx)
: "c" (op)); : "c" (op));
f = fopen("conftest_xgetbv", "w"); if (!f) return 1; f = fopen("conftest_xgetbv", "w"); if (!f) return 1;
fprintf(f, "%x:%x\n", eax, edx); fprintf(f, "%x:%x\n", eax, edx);
@ -5470,7 +5470,7 @@ main ()
FILE *f; FILE *f;
/* Opcodes for xgetbv */ /* Opcodes for xgetbv */
__asm__(".byte 0x0f, 0x01, 0xd0" __asm__(".byte 0x0f, 0x01, 0xd0"
: "=a" (eax), "=d" (edx), : "=a" (eax), "=d" (edx)
: "c" (op)); : "c" (op));
f = fopen("conftest_xgetbv", "w"); if (!f) return 1; f = fopen("conftest_xgetbv", "w"); if (!f) return 1;
fprintf(f, "%x:%x\n", eax, edx); fprintf(f, "%x:%x\n", eax, edx);

View File

@ -20,10 +20,10 @@
#define GRID_COMMS_NONE 1 #define GRID_COMMS_NONE 1
/* GRID_DEFAULT_PRECISION is DOUBLE */ /* GRID_DEFAULT_PRECISION is DOUBLE */
#define GRID_DEFAULT_PRECISION_DOUBLE 1 /* #undef GRID_DEFAULT_PRECISION_DOUBLE */
/* GRID_DEFAULT_PRECISION is SINGLE */ /* GRID_DEFAULT_PRECISION is SINGLE */
/* #undef GRID_DEFAULT_PRECISION_SINGLE */ #define GRID_DEFAULT_PRECISION_SINGLE 1
/* Support Altivec instructions */ /* Support Altivec instructions */
/* #undef HAVE_ALTIVEC */ /* #undef HAVE_ALTIVEC */
@ -120,8 +120,8 @@
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
/* NEON ARMv7 Experimental support */ /* NEON ARMv8 Experimental support */
/* #undef NEONv7 */ /* #undef NEONv8 */
/* Name of package */ /* Name of package */
#define PACKAGE "grid" #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; FILE *f;
/* Opcodes for xgetbv */ /* Opcodes for xgetbv */
__asm__(".byte 0x0f, 0x01, 0xd0" __asm__(".byte 0x0f, 0x01, 0xd0"
: "=a" (eax), "=d" (edx), : "=a" (eax), "=d" (edx)
: "c" (op)); : "c" (op));
f = fopen("conftest_xgetbv", "w"); if (!f) return 1; f = fopen("conftest_xgetbv", "w"); if (!f) return 1;
fprintf(f, "%x:%x\n", eax, edx); fprintf(f, "%x:%x\n", eax, edx);