MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-03 01:46:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42 from harshavardhana/pr_out_make_gcc_mandatory_on_osx_since_clang_lacks_certain_gas_features

Browse Source
This commit is contained in:
Harshavardhana 2015-01-22 18:33:49 -08:00
commit d482c39341
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -1,6 +1,7 @@
#GOPATH := $(CURDIR)/tmp/gopath #GOPATH := $(CURDIR)/tmp/gopath
MAKE_OPTIONS := -s MAKE_OPTIONS := -s
ARCH := $(shell uname -s) ARCH := $(shell uname -s)
GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
all: getdeps install all: getdeps install
@ -19,7 +20,11 @@ build-utils:
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/sha1 @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/sha1
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/sha256 @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/sha256
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/sha512 @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/sha512
ifeq ($(ARCH), Linux) ifeq ($(ARCH), Darwin)
ifeq ($(GCCVERSIONGTEQ4), "1")
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/checksum/crc32c
endif
else
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/checksum/crc32c @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/checksum/crc32c
endif endif

2
checkdeps.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/usr/bin/env bash
echo -n "Checking if proper environment variables are set.. " echo -n "Checking if proper environment variables are set.. "

4
pkg/utils/checksum/crc32c/crc32c_amd64.S
View File

@ -454,22 +454,18 @@ full_block:
crc_array: crc_array:
i=128 i=128
.rept 128-1 .rept 128-1
#if !defined(__clang__)
.altmacro .altmacro
LABEL crc_ %i LABEL crc_ %i
.noaltmacro .noaltmacro
#endif
crc32q -i*8(block_0), crc_init crc32q -i*8(block_0), crc_init
crc32q -i*8(block_1), crc1 crc32q -i*8(block_1), crc1
crc32q -i*8(block_2), crc2 crc32q -i*8(block_2), crc2
i=(i-1) i=(i-1)
.endr .endr
#if !defined(__clang__)
.altmacro .altmacro
LABEL crc_ %i LABEL crc_ %i
.noaltmacro .noaltmacro
#endif
crc32q -i*8(block_0), crc_init crc32q -i*8(block_0), crc_init
crc32q -i*8(block_1), crc1 crc32q -i*8(block_1), crc1
# SKIP crc32 -i*8(block_2), crc2 ; Don't do this one yet # SKIP crc32 -i*8(block_2), crc2 ; Don't do this one yet