diff --git a/c_check b/c_check index 94b0bf36e..c4aa2d420 100644 --- a/c_check +++ b/c_check @@ -3,6 +3,7 @@ # Checking cross compile $hostos = `uname -s | sed -e s/\-.*//`; chop($hostos); $hostarch = `uname -m | sed -e s/i.86/x86/`;chop($hostarch); +$hostarch = "x86_64" if ($hostarch eq "amd64"); $binary = $ENV{"BINARY"}; diff --git a/f_check b/f_check index 90ae2fe97..5719faff1 100644 --- a/f_check +++ b/f_check @@ -16,6 +16,7 @@ $config = shift(@ARGV); $nofortran = 0; $compiler = join(" ", @ARGV); +$compiler_bin = shift(@ARGV); # f77 is too ambiguous $compiler = "" if $compiler eq "f77"; @@ -53,7 +54,7 @@ if ($compiler eq "") { } else { - $data = `which $compiler > /dev/null 2> /dev/null`; + $data = `which $compiler_bin > /dev/null 2> /dev/null`; $vendor = ""; if (!$?) { @@ -204,7 +205,7 @@ if ($compiler eq "") { } } -$data = `which $compiler > /dev/null 2> /dev/null`; +$data = `which $compiler_bin > /dev/null 2> /dev/null`; if (!$?) { diff --git a/kernel/x86_64/sgemm_kernel_16x4_sandy.S b/kernel/x86_64/sgemm_kernel_16x4_sandy.S index e6c4126b9..77c7e2f50 100644 --- a/kernel/x86_64/sgemm_kernel_16x4_sandy.S +++ b/kernel/x86_64/sgemm_kernel_16x4_sandy.S @@ -726,8 +726,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #if !defined(TRMMKERNEL) - vaddps (CO1), %xmm4,%xmm4 - vaddps 1 * SIZE(CO1), %xmm5,%xmm5 + vaddss (CO1), %xmm4,%xmm4 + vaddss 1 * SIZE(CO1), %xmm5,%xmm5 #endif @@ -756,7 +756,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #if !defined(TRMMKERNEL) - vaddps (CO1), %xmm4,%xmm4 + vaddss (CO1), %xmm4,%xmm4 #endif