diff options
-rw-r--r-- | cpu2xxx.cfg | 24 | ||||
-rwxr-xr-x | spec2xxx-prepare | 9 |
2 files changed, 18 insertions, 15 deletions
diff --git a/cpu2xxx.cfg b/cpu2xxx.cfg index 3285d13..86813e0 100644 --- a/cpu2xxx.cfg +++ b/cpu2xxx.cfg @@ -41,22 +41,22 @@ F77 = @FORTRAN@ ##################################################################### default=default=default=default: -COPTIMIZE = @OPTIMIZE@ -CXXOPTIMIZE = @OPTIMIZE@ -FOPTIMIZE = @OPTIMIZE@ -F77OPTIMIZE = @OPTIMIZE@ +COPTIMIZE = -std=gnu89 -w @OPTIMIZE@ +CXXOPTIMIZE = -w @OPTIMIZE@ +FOPTIMIZE = -w @OPTIMIZE@ +F77OPTIMIZE = -w @OPTIMIZE@ default=default=O2=default: -COPTIMIZE = -O2 -fno-common @MCPU@ @MFPU@ @OPTIMIZE@ -CXXOPTIMIZE = -O2 -fno-common @MCPU@ @MFPU@ @OPTIMIZE@ -FOPTIMIZE = -O2 -fno-common @MCPU@ @MFPU@ @OPTIMIZE@ -F77OPTIMIZE = -O2 -fno-common @MCPU@ @MFPU@ @OPTIMIZE@ +COPTIMIZE = -O2 -fno-common -std=gnu89 -w @MCPU@ @MFPU@ @OPTIMIZE@ +CXXOPTIMIZE = -O2 -fno-common -w @MCPU@ @MFPU@ @OPTIMIZE@ +FOPTIMIZE = -O2 -fno-common -w @MCPU@ @MFPU@ @OPTIMIZE@ +F77OPTIMIZE = -O2 -fno-common -w @MCPU@ @MFPU@ @OPTIMIZE@ default=default=O3=default: -COPTIMIZE = -O3 -fno-common @MCPU@ @MFPU@ @OPTIMIZE@ -CXXOPTIMIZE = -O3 -fno-common @MCPU@ @MFPU@ @OPTIMIZE@ -FOPTIMIZE = -O3 -fno-common @MCPU@ @MFPU@ @OPTIMIZE@ -F77OPTIMIZE = -O3 -fno-common @MCPU@ @MFPU@ @OPTIMIZE@ +COPTIMIZE = -O3 -fno-common -std=gnu89 -ffast-math -w @MCPU@ @MFPU@ @OPTIMIZE@ +CXXOPTIMIZE = -O3 -fno-common -ffast-math -w @MCPU@ @MFPU@ @OPTIMIZE@ +FOPTIMIZE = -O3 -fno-common -ffast-math -w @MCPU@ @MFPU@ @OPTIMIZE@ +F77OPTIMIZE = -O3 -fno-common -ffast-math -w @MCPU@ @MFPU@ @OPTIMIZE@ default=peak=default=default: PASS1_CFLAGS = -fprofile-generate=@PROFILEDIR@/$(BENCHMARK) diff --git a/spec2xxx-prepare b/spec2xxx-prepare index 328893f..c87a184 100755 --- a/spec2xxx-prepare +++ b/spec2xxx-prepare @@ -28,8 +28,6 @@ spec=$(cd $spec; pwd) $local || sshfs $target:$spec $spec -base_cc_name=gcc -base_cxx_name=g++ for cc in gcc g++ gfortran clang clang++; do if [ "x`which $cc_prefix$cc`" = "x" ]; then continue @@ -37,6 +35,11 @@ for cc in gcc g++ gfortran clang clang++; do if [ "`echo $cc | grep clang`" != "" ]; then base_cc_name=clang base_cxx_name=clang++ + is_llvm='yes' + else + base_cc_name=gcc + base_cxx_name=g++ + is_llvm='no' fi cat > $spec/bin/ssh-$config-$cc <<EOF #!/bin/sh @@ -69,7 +72,7 @@ esac case "$hw_fpu" in *"neon"*"vfpv4"*) - if [ "`echo $base_cc_name | grep clang`" != "" ]; then + if [ "$is_llvm" = "yes" ]; then mfpu="-mfpu=neon" else mfpu="-mfpu=neon-vfpv4" |