update copyright date to 2013

[dpdk.git] / mk / toolchain / gcc / rte.toolchain-compat.mk

diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk
index 4e65122..9043628 100644 (file)
--- a/mk/toolchain/gcc/rte.toolchain-compat.mk
+++ b/mk/toolchain/gcc/rte.toolchain-compat.mk
@@ -1,6 +1,6 @@
 #   BSD LICENSE
 # 
-#   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+#   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
 #   All rights reserved.
 # 
 #   Redistribution and use in source and binary forms, with or without 
@@ -29,7 +29,6 @@
 #   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
 #   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # 
-#  version: DPDK.L.1.2.3-3
 
 #
 # CPUID-related options
@@ -40,7 +39,7 @@
 
 #find out GCC version
 
-GCC_MAJOR_VERSION = $(shell gcc -dumpversion | cut -f1 -d.)
+GCC_MAJOR_VERSION = $(shell $(CC) -dumpversion | cut -f1 -d.)
 
 # if GCC is not 4.x
 ifneq ($(GCC_MAJOR_VERSION),4)
@@ -49,7 +48,7 @@ $(warning You are not using GCC 4.x. This is neither supported, nor tested.)
 
 
 else
-       GCC_MINOR_VERSION = $(shell gcc -dumpversion | cut -f2 -d.)
+       GCC_MINOR_VERSION = $(shell $(CC) -dumpversion | cut -f2 -d.)
 
 # GCC graceful degradation
 # GCC 4.2.x - added support for generic target
@@ -59,7 +58,7 @@ else
 # GCC 4.6.x - added support for corei7, corei7-avx
 # GCC 4.7.x - added support for fsgsbase, rdrnd, f16c, core-avx-i, core-avx2
 
-       ifeq ($(shell test $(GCC_MINOR_VERSION) -lt 7 && echo 1), 1)
+       ifeq ($(shell test $(GCC_MINOR_VERSION) -le 7 && echo 1), 1)
                MACHINE_CFLAGS := $(patsubst -march=core-avx-i,-march=corei7-avx,$(MACHINE_CFLAGS))
                MACHINE_CFLAGS := $(patsubst -march=core-avx2,-march=corei7-avx,$(MACHINE_CFLAGS))
        endif
@@ -72,6 +71,12 @@ else
        endif
        ifeq ($(shell test $(GCC_MINOR_VERSION) -lt 4 && echo 1), 1)
                MACHINE_CFLAGS := $(filter-out -mavx -mpclmul -maes,$(MACHINE_CFLAGS))
+               ifneq ($(findstring SSE4_2, $(CPUFLAGS)),)
+                       MACHINE_CFLAGS += -msse4.2
+               endif
+               ifneq ($(findstring SSE4_1, $(CPUFLAGS)),)
+                       MACHINE_CFLAGS += -msse4.1
+               endif
        endif
        ifeq ($(shell test $(GCC_MINOR_VERSION) -lt 3 && echo 1), 1)
                MACHINE_CFLAGS := $(filter-out -msse% -mssse%,$(MACHINE_CFLAGS))