diff --git a/openair1/EMOS/DUMP/Makefile b/openair1/EMOS/DUMP/Makefile index 8e072036a1..cd8bec5885 100644 --- a/openair1/EMOS/DUMP/Makefile +++ b/openair1/EMOS/DUMP/Makefile @@ -2,29 +2,17 @@ SRC = emos_dump.c dump_size.c OBJ = emos_dump.o dump_size.o -CFLAGS = $(shell rtai-config --lxrt-cflags) +CFLAGS += $(shell rtai-config --lxrt-cflags) LDFLAGS = $(shell rtai-config --lxrt-ldflags) -lpthread -llxrt -lm -lgps -lforms -CFLAGS += -I$(OPENAIR1_DIR) -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES +CFLAGS += -m32 -I$(OPENAIR1_DIR) -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES -CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 -CFLAGS += -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -g -ggdb -rdynamic $(CPUFLAGS) +CFLAGS += -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 CFLAGS += -DOPENAIR_LTE -DENABLE_FXP -DOPENAIR1 #-DDLSCH_THREAD -DULSCH_THREAD CFLAGS += -DEMOS -DEXMIMO -GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g') -ifeq "$(GCCVERSION)" "4.4.3" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.5.2" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.6.1" - CFLAGS += -Wno-packed-bitfield-compat -endif - all: emos_dump dump_size $(OBJ): %.o : %.c diff --git a/openair1/EMOS/GUI/src/Makefile.am b/openair1/EMOS/GUI/src/Makefile.am index 2a5a26215e..279534da4a 100644 --- a/openair1/EMOS/GUI/src/Makefile.am +++ b/openair1/EMOS/GUI/src/Makefile.am @@ -1,3 +1,4 @@ +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = $(OPENAIR1_DIR) bin_PROGRAMS = emos_gui emos_gui_SOURCES = emos_gui.c emos_gui_forms.c emos_callbacks.c \ @@ -9,7 +10,7 @@ INCLUDES = -I$(TOP_DIR) -I/usr/realtime/include -I/usr/include/X11 $(all_include # the library search path. emos_gui_LDFLAGS = $(all_libraries) noinst_HEADERS = emos_gui.h emos_gui_forms.h matrix_util.h -AM_CFLAGS = -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DEMOS -DNODE_RG -DCBMIMO1 -DPHY_CONTEXT -msse2 -mmmx -msse +AM_CFLAGS = -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DEMOS -DNODE_RG -DCBMIMO1 -DPHY_CONTEXT emos_gui_LDADD = -L/usr/lib -L/usr/local/lib -L/usr/realtime/lib\ -L/usr/X11R6/lib -lm -lforms -llxrt -lpthread -lX11 -lXpm -lgps diff --git a/openair1/EMOS/LTE/GUI/Makefile b/openair1/EMOS/LTE/GUI/Makefile index 9c1b57b829..a3374efa5b 100644 --- a/openair1/EMOS/LTE/GUI/Makefile +++ b/openair1/EMOS/LTE/GUI/Makefile @@ -1,7 +1,6 @@ +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = $(OPENAIR1_DIR) -CC = gcc - bin_PROGRAMS = emos_gui #emos_gui_SOURCES = emos_gui.c emos_gui_forms.c $(TOP_DIR)/PHY/CONFIG/openair_configure.c $(TOP_DIR)/PHY/CONFIG/openair_readconfigfile.c FFT.c matrix_util.c @@ -15,9 +14,7 @@ $(TOP_DIR)/PHY/CONFIG/openair_configure.o $(TOP_DIR)/PHY/CONFIG/openair_readconf INCLUDES = -I$(TOP_DIR) -I/usr/realtime/include -I/usr/include/X11 # the library search path. -CFLAGS = -g -Wall -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing\ - -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DEMOS -DNODE_RG -DCBMIMO1 -DPHY_CONTEXT -DOPENAIR_LTE\ - -mmmx -msse -msse2 -mssse3 +CFLAGS += -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DEMOS -DNODE_RG -DCBMIMO1 -DPHY_CONTEXT -DOPENAIR_LTE emos_gui_LDADD = -L/usr/lib -L/usr/local/lib -L/usr/realtime/lib -L/usr/X11R6/lib -lm -lforms -llxrt -lpthread -lX11 -lXpm -lgps all: emos_gui diff --git a/openair1/EMOS/LTE/IMPORT_FILTER/Makefile b/openair1/EMOS/LTE/IMPORT_FILTER/Makefile index 9853f45254..a0484e92ea 100644 --- a/openair1/EMOS/LTE/IMPORT_FILTER/Makefile +++ b/openair1/EMOS/LTE/IMPORT_FILTER/Makefile @@ -1,28 +1,17 @@ +include $(OPENAIR_HOME)/common/utils/Makefile.inc SRC = dump_size.c #CFLAGS = $(shell rtai-config --lxrt-cflags) #LDFLAGS = $(shell rtai-config --lxrt-ldflags) -lpthread -lm -lgps -lforms #-llxrt -CFLAGS += -I$(OPENAIR1_DIR) -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES +CFLAGS += -m32 -I$(OPENAIR1_DIR) -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES -CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 -CFLAGS += -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -g -ggdb -rdynamic $(CPUFLAGS) +CFLAGS += -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 CFLAGS += -DOPENAIR_LTE -DENABLE_FXP -DOPENAIR1 #-DDLSCH_THREAD -DULSCH_THREAD CFLAGS += -DEMOS -DEXMIMO -DNO_RTAI -GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g') -ifeq "$(GCCVERSION)" "4.4.3" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.5.2" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.6.1" - CFLAGS += -Wno-packed-bitfield-compat -endif - ifeq ($(EMOS_CHANNEL),1) CFLAGS += -DEMOS_CHANNEL endif diff --git a/openair1/EMOS/SIM/Makefile b/openair1/EMOS/SIM/Makefile index ec3d8cbd69..ff1e2c4718 100755 --- a/openair1/EMOS/SIM/Makefile +++ b/openair1/EMOS/SIM/Makefile @@ -1,4 +1,4 @@ -CC = gcc +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR =../.. PHY_DIR =../../PHY @@ -14,7 +14,7 @@ PHY_MAC_INTERFACE_DIR =../MAC_INTERFACE SCHED_DIR =../SCHED -CFLAGS = -DEMOS -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DNB_ANTENNAS_TXRX=2 -DMAX_MODULES=1 -DPHY_CONTEXT=1 -g -mtune=pentium4 -msse2 -mmmx -msse2 -O -funroll-loops -I/usr/realtime/include/ +CFLAGS += -DEMOS -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DNB_ANTENNAS_TXRX=2 -DMAX_MODULES=1 -DPHY_CONTEXT=1 -I/usr/realtime/include/ #-DICC ifdef DEBUGPHY diff --git a/openair1/PHY/CODING/TESTBENCH/Makefile b/openair1/PHY/CODING/TESTBENCH/Makefile index ac9905ed23..f90747cbef 100644 --- a/openair1/PHY/CODING/TESTBENCH/Makefile +++ b/openair1/PHY/CODING/TESTBENCH/Makefile @@ -1,10 +1,4 @@ -CC = gcc - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -mssse3 -msse4 -#CPUFLAGS += $(shell if [ -z $(SSE3PROC)]; then echo "" ; else echo "-mssse3"; fi) -#CPUFLAGS += $(shell if [ -z $(SSE4PROC)]; then echo "" ; else echo "-msse4"; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc COMMON_UTILS_DIR = $(OPENAIR_HOME)/common/utils TOP_DIR = $(OPENAIR1_DIR) @@ -13,7 +7,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS += -Wall -O2 -DNODE_RG -DUSER_MODE -DPC_TARGET -DNO_UL_REF -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DOPENAIR_LTE -g $(CPUFLAGS) +CFLAGS += -DNODE_RG -DUSER_MODE -DPC_TARGET -DNO_UL_REF -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DOPENAIR_LTE ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES @@ -25,22 +19,6 @@ ifeq ($(turbo_flag),1) CFLAGS += -DTURBO_S endif -GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g') - -ifeq "$(GCCVERSION)" "4.4.0-4)" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.4.3" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.5.2" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.6.1" - CFLAGS += -Wno-packed-bitfield-compat -endif - -include $(COMMON_UTILS_DIR)/Makefile.inc include $(TOP_DIR)/PHY/Makefile.inc #include $(TOP_DIR)/SCHED/Makefile.inc SCHED_OBJS = $(TOP_DIR)/SCHED/phy_procedures_lte_common.o diff --git a/openair1/SIMULATION/LOLA_DaF_D42/Makefile b/openair1/SIMULATION/LOLA_DaF_D42/Makefile index 689491b6a5..bcde5c4bb6 100644 --- a/openair1/SIMULATION/LOLA_DaF_D42/Makefile +++ b/openair1/SIMULATION/LOLA_DaF_D42/Makefile @@ -1,33 +1,15 @@ -#CC = $(shell if [ $(OSTYPE) = "cygwin" ]; then echo "gcc-4"; else echo "gcc"; fi) -#CC = gcc-4.3 - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 #-msse4 -#CPUFLAGS += $(shell if [ -z $(SSE3PROC) ]; then echo "" ; else echo "-mssse3"; fi) -#CPUFLAGS += $(shell if [ -z $(SSE4PROC) ]; then echo "" ; else echo "-msse4"; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = $(OPENAIR1_DIR) OPENAIR1_TOP = $(OPENAIR1_DIR) OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -Wall -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -g -ggdb -rdynamic $(CPUFLAGS) # -Wno-packed-bitfield-compat +CFLAGS += -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 # -Wno-packed-bitfield-compat LFLAGS = -lm -lblas -lrt -GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g') -ifeq "$(GCCVERSION)" "4.4.3" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.5.2" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.6.1" - CFLAGS += -Wno-packed-bitfield-compat -endif - -CFLAGS += -DOPENAIR_LTE -DOFDMA_ULSCH #-DIFFT_FPGA -DIFFT_FPGA_UE +CFLAGS += -m32 -DOPENAIR_LTE -DOFDMA_ULSCH #-DIFFT_FPGA -DIFFT_FPGA_UE #CFLAGS += -DTBS_FIX CFLAGS += -DCELLULAR diff --git a/openair1/SIMULATION/LTE_CONECT_RELAY/Makefile b/openair1/SIMULATION/LTE_CONECT_RELAY/Makefile index 8abeea43ff..604d99fd03 100644 --- a/openair1/SIMULATION/LTE_CONECT_RELAY/Makefile +++ b/openair1/SIMULATION/LTE_CONECT_RELAY/Makefile @@ -1,33 +1,15 @@ -#CC = $(shell if [ $(OSTYPE) = "cygwin" ]; then echo "gcc-4"; else echo "gcc"; fi) -#CC = gcc-4.3 - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 #-msse4 -#CPUFLAGS += $(shell if [ -z $(SSE3PROC) ]; then echo "" ; else echo "-mssse3"; fi) -#CPUFLAGS += $(shell if [ -z $(SSE4PROC) ]; then echo "" ; else echo "-msse4"; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = $(OPENAIR1_DIR) OPENAIR1_TOP = $(OPENAIR1_DIR) OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -O2 -Wall -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -g -ggdb -rdynamic $(CPUFLAGS) -DMALLOC_CHECK_=1 # -Wno-packed-bitfield-compat +CFLAGS += -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -rdynamic -DMALLOC_CHECK_=1 # -Wno-packed-bitfield-compat LFLAGS = -lm -lblas -lxml2 -lrt -GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g') -ifeq "$(GCCVERSION)" "4.4.3" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.5.2" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.6.1" - CFLAGS += -Wno-packed-bitfield-compat -endif - -CFLAGS += -DOPENAIR_LTE #-DOFDMA_ULSCH #-DIFFT_FPGA -DIFFT_FPGA_UE +CFLAGS += -m32 -DOPENAIR_LTE #-DOFDMA_ULSCH #-DIFFT_FPGA -DIFFT_FPGA_UE #CFLAGS += -DTBS_FIX CFLAGS += -DCELLULAR diff --git a/openair1/SIMULATION/LTE_DIVERSITY_VIA_RELAYS/Makefile b/openair1/SIMULATION/LTE_DIVERSITY_VIA_RELAYS/Makefile index b9a446f152..ee24ff9c23 100644 --- a/openair1/SIMULATION/LTE_DIVERSITY_VIA_RELAYS/Makefile +++ b/openair1/SIMULATION/LTE_DIVERSITY_VIA_RELAYS/Makefile @@ -1,17 +1,8 @@ -CC = $(shell if [ $$OSTYPE = "cygwin" ] ; then echo "gcc-4"; else echo "gcc"; fi) -#CC = gcc - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 #-mssse3 -msse4 -CPUFLAGS += $(shell if [ -z $(SSE3PROC)]; then echo "" ; else echo "-mssse3"; fi) -CPUFLAGS += $(shell if [ -z $(SSE4PROC)]; then echo "" ; else echo "-msse4"; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = ../.. -CFLAGS = -Wall -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -DPHY_CONTEXT=1 -g -ggdb $(CPUFLAGS) - -#CFLAGS = -Wall -Wno-packed-bitfield-compat -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -DPHY_CONTEXT=1 -g -ggdb $(CPUFLAGS) +CFLAGS += -m32 -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -DPHY_CONTEXT=1 CFLAGS += -DOPENAIR_LTE -DOFDMA_ULSCH #-DIFFT_FPGA #-O2 CFLAGS += -DTBS_FIX @@ -38,8 +29,6 @@ endif CFLAGS += -I$(OPENAIR2_DIR) -I$(OPENAIR3_DIR)/MESH -I$(OPENAIR2_DIR)/COMMON -I$(OPENAIR2_DIR)/LAYER2/RLC -I$(OPENAIR2_DIR)/UTIL/MEM -I$(OPENAIR2_DIR)/UTIL/MATH -I$(OPENAIR2_DIR)/UTIL/LISTS -I$(OPENAIR2_DIR)/LAYER2/RLC/AM -I$(OPENAIR2_DIR)/LAYER2/RLC/UM_v6.1.0_LITE -I$(OPENAIR2_DIR)/LAYER2/RLC/TM -I$(OPENAIR2_DIR)/UTIL/TIMER - - PHY_OBJS = $(TOP_DIR)/PHY/LTE_TRANSPORT/pss.o PHY_OBJS += $(TOP_DIR)/PHY/LTE_TRANSPORT/pilots.o PHY_OBJS += $(TOP_DIR)/PHY/LTE_TRANSPORT/dlsch_coding.o diff --git a/openair1/SIMULATION/LTE_FEMTO/Makefile b/openair1/SIMULATION/LTE_FEMTO/Makefile index 62549d5e26..b2f66a5f28 100644 --- a/openair1/SIMULATION/LTE_FEMTO/Makefile +++ b/openair1/SIMULATION/LTE_FEMTO/Makefile @@ -1,11 +1,11 @@ -CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 -msse4.1 +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = $(OPENAIR1_DIR) OPENAIR1_TOP = $(OPENAIR1_DIR) OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -Wall -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -g -ggdb -rdynamic $(CPUFLAGS) -DMALLOC_CHECK_=1 # -Wno-packed-bitfield-compat -O2 +CFLAGS += -m32 -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -DMALLOC_CHECK_=1 # -Wno-packed-bitfield-compat -O2 CFLAGS += -DNEW_FFT @@ -15,17 +15,6 @@ ifdef GPIB LFLAGS += -lgpib endif -GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g') -ifeq "$(GCCVERSION)" "4.4.3" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.5.2" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.6.1" - CFLAGS += -Wno-packed-bitfield-compat -endif - CFLAGS += -DOPENAIR_LTE #-DOFDMA_ULSCH #-DIFFT_FPGA -DIFFT_FPGA_UE #CFLAGS += -DTBS_FIX CFLAGS += -DCELLULAR @@ -113,8 +102,6 @@ CFLAGS += $(L2_incl) -I$(ASN1_MSG_INC) -I$(TOP_DIR) -I$(OPENAIR3) $(UTIL_incl) #STATS_OBJS += $(TOP_DIR)/ARCH/CBMIMO1/DEVICE_DRIVER/cbmimo1_proc.o -#LAYER2_OBJ += $(OPENAIR2_DIR)/LAYER2/MAC/rar_tools.o -#LAYER2_OBJ = $(OPENAIR2_DIR)/LAYER2/MAC/lte_transport_init.o OBJ = $(PHY_OBJS) $(SIMULATION_OBJS) $(TOOLS_OBJS) $(SCHED_OBJS) $(LAYER2_OBJ) $(LOG_OBJS) ifdef GPIB diff --git a/openair1/SIMULATION/LTE_MUMIMO/Makefile b/openair1/SIMULATION/LTE_MUMIMO/Makefile index 979a1e2f65..5630fa16d2 100644 --- a/openair1/SIMULATION/LTE_MUMIMO/Makefile +++ b/openair1/SIMULATION/LTE_MUMIMO/Makefile @@ -1,17 +1,9 @@ -CC = $(shell if [ $$OSTYPE = "cygwin" ] ; then echo "gcc-4"; else echo "gcc"; fi) -#CC = gcc-4 - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 #-mssse3 -msse4 -CPUFLAGS += $(shell if [ -z $(SSE3PROC) ]; then echo "" ; else echo "-mssse3"; fi) -CPUFLAGS += $(shell if [ -z $(SSE4PROC) ]; then echo "" ; else echo "-msse4"; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = ../.. -#CFLAGS = -O2 -Wall -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -DPHY_CONTEXT=1 -g -ggdb $(CPUFLAGS) -CFLAGS = -Wall -Wno-packed-bitfield-compat -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -DPHY_CONTEXT=1 -g -ggdb $(CPUFLAGS) +CFLAGS += -m32 -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -DPHY_CONTEXT=1 CFLAGS += -DOPENAIR_LTE -DOFDMA_ULSCH #-DIFFT_FPGA -DIFFT_FPGA_UE CFLAGS += -DTBS_FIX diff --git a/openair1/SIMULATION/LTE_PHY/Makefile b/openair1/SIMULATION/LTE_PHY/Makefile index be43ff4c84..1f3f8f8e3c 100644 --- a/openair1/SIMULATION/LTE_PHY/Makefile +++ b/openair1/SIMULATION/LTE_PHY/Makefile @@ -1,8 +1,4 @@ -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -mssse3 -msse4.1 -#CPUFLAGS += $(shell if [ -z $(SSE3PROC) ]; then echo "" ; else echo "-mssse3"; fi) -#CPUFLAGS += $(shell if [ -z $(SSE4PROC) ]; then echo "" ; else echo "-msse4"; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc COMMON_UTILS_DIR = $(OPENAIR_HOME)/common/utils TOP_DIR = $(OPENAIR1_DIR) @@ -10,7 +6,7 @@ OPENAIR1_TOP = $(OPENAIR1_DIR) OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -O2 -g -ggdb -Wno-strict-aliasing -rdynamic -DMAX_NUM_CCs=1 -Wall -DPHYSIM -DNODE_RG -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 $(CPUFLAGS) -DMALLOC_CHECK_=1 -DENABLE_VCD_FIFO # -Wno-packed-bitfield-compat +CFLAGS += -DMAX_NUM_CCs=1 -Wall -DPHYSIM -DNODE_RG -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -DMALLOC_CHECK_=1 -DENABLE_VCD_FIFO # -Wno-packed-bitfield-compat # DCI Debug @@ -34,12 +30,6 @@ ifdef GPIB LFLAGS += -lgpib endif -# Check if GCC version is greater or equal to 4.4 -GCCVERSIONGTEQ44 := $(shell expr `gcc -dumpversion | cut -f1,2 -d. --output-delimiter=""` \>= 44) -ifeq "$(GCCVERSIONGTEQ44)" "1" - CFLAGS += -Wno-packed-bitfield-compat -endif - CFLAGS += -DOPENAIR_LTE #-DOFDMA_ULSCH #-DIFFT_FPGA -DIFFT_FPGA_UE #CFLAGS += -DTBS_FIX CFLAGS += -DCELLULAR diff --git a/openair1/SIMULATION/LTE_PHY_L2/Makefile b/openair1/SIMULATION/LTE_PHY_L2/Makefile index e0fc4f8976..96cd65c22c 100644 --- a/openair1/SIMULATION/LTE_PHY_L2/Makefile +++ b/openair1/SIMULATION/LTE_PHY_L2/Makefile @@ -1,19 +1,11 @@ -CC = $(shell if [ $$OSTYPE = "cygwin" ] ; then echo "gcc-4"; else echo "gcc"; fi) -#CC = gcc-4.3 - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 #-mssse3 -msse4 -CPUFLAGS += $(shell if [ -z $$SSE3PROC]; then echo "" ; else echo "-mssse3"; fi) -CPUFLAGS += $(shell if [ -z $$SSE4PROC]; then echo "" ; else echo "-msse4"; fi) - +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = ../.. OPENAIR1_TOP = ../.. OPENAIR2_TOP = ../../../openair2 OPENAIR3_TOP = ../../../openair3 OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -Wall -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat +CFLAGS += -m32 -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat ASN1_MSG_INC = ../../../openair2/RRC/LITE/MESSAGES diff --git a/openair1/SIMULATION/LTE_RECIPROCITY/Makefile b/openair1/SIMULATION/LTE_RECIPROCITY/Makefile index 9a49023581..c47675fdad 100644 --- a/openair1/SIMULATION/LTE_RECIPROCITY/Makefile +++ b/openair1/SIMULATION/LTE_RECIPROCITY/Makefile @@ -1,29 +1,14 @@ -#CC = $(shell if [ $(OSTYPE) = "cygwin" ]; then echo "gcc-4"; else echo "gcc"; fi) -#CC = gcc-4.3 - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 #-msse4 -#CPUFLAGS += $(shell if [ -z $(SSE3PROC) ]; then echo "" ; else echo "-mssse3"; fi) -#CPUFLAGS += $(shell if [ -z $(SSE4PROC) ]; then echo "" ; else echo "-msse4"; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = $(OPENAIR1_DIR) OPENAIR1_TOP = $(OPENAIR1_DIR) OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -O2 -Wall -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -g -ggdb -rdynamic $(CPUFLAGS) # -Wno-packed-bitfield-compat +CFLAGS += -m32 -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 LFLAGS = -lm -lblas -GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g') -ifeq "$(GCCVERSION)" "4.4.3" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.5.2" - CFLAGS += -Wno-packed-bitfield-compat -endif - CFLAGS += -DOPENAIR_LTE #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE #CFLAGS += -DTBS_FIX CFLAGS += -DCELLULAR diff --git a/openair1/SIMULATION/LTE_RELAY/Makefile b/openair1/SIMULATION/LTE_RELAY/Makefile index fc956ac290..0d21a7ca7b 100644 --- a/openair1/SIMULATION/LTE_RELAY/Makefile +++ b/openair1/SIMULATION/LTE_RELAY/Makefile @@ -1,29 +1,13 @@ -#CC = $(shell if [ $(OSTYPE) = "cygwin" ]; then echo "gcc-4"; else echo "gcc"; fi) -#CC = gcc-4.3 - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 #-msse4 -#CPUFLAGS += $(shell if [ -z $(SSE3PROC) ]; then echo "" ; else echo "-mssse3"; fi) -#CPUFLAGS += $(shell if [ -z $(SSE4PROC) ]; then echo "" ; else echo "-msse4"; fi) - +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = $(OPENAIR1_DIR) OPENAIR1_TOP = $(OPENAIR1_DIR) OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -Wall -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -g -ggdb -rdynamic $(CPUFLAGS) # -Wno-packed-bitfield-compat +CFLAGS += -m32 -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 LFLAGS = -lm -lblas -GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g') -ifeq "$(GCCVERSION)" "4.4.3" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.5.2" - CFLAGS += -Wno-packed-bitfield-compat -endif - CFLAGS += -DOPENAIR_LTE #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE #CFLAGS += -DTBS_FIX CFLAGS += -DCELLULAR diff --git a/openair1/SIMULATION/RF/Makefile b/openair1/SIMULATION/RF/Makefile index 427268aa81..052970d0d6 100644 --- a/openair1/SIMULATION/RF/Makefile +++ b/openair1/SIMULATION/RF/Makefile @@ -1,5 +1,6 @@ +include $(OPENAIR_HOME)/common/utils/Makefile.inc OBJS = rf.o ../../PHY/TOOLS/file_output.o ../TOOLS/rangen_double.o -CFLAGS = -DRF_MAIN -DUSER_MODE -DDEBUG_PHY -g -msse2 -mmmx -msse +CFLAGS += -DRF_MAIN -DUSER_MODE -DDEBUG_PHY all: $(OBJS) gcc -o rf $(OBJS) -lm diff --git a/openair1/USERSPACE_TOOLS/MATLAB/Makefile b/openair1/USERSPACE_TOOLS/MATLAB/Makefile index d7eea1d88e..a832798014 100644 --- a/openair1/USERSPACE_TOOLS/MATLAB/Makefile +++ b/openair1/USERSPACE_TOOLS/MATLAB/Makefile @@ -1,18 +1,13 @@ +include $(OPENAIR_HOME)/common/utils/Makefile.inc #include $(OPENAIR1_DIR)/SIMULATION/LTE_PHY/Makefile -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -mssse3 -msse4.1 -#CPUFLAGS += $(shell if [ -z $(SSE3PROC) ]; then echo "" ; else echo "-mssse3"; fi) -#CPUFLAGS += $(shell if [ -z $(SSE4PROC) ]; then echo "" ; else echo "-msse4"; fi) - COMMON_UTILS_DIR = $(OPENAIR_HOME)/common/utils TOP_DIR = $(OPENAIR1_DIR) OPENAIR1_TOP = $(OPENAIR1_DIR) OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -g -ggdb -Wno-strict-aliasing -rdynamic -DMAX_NUM_CCs=1 -Wall -DPHYSIM -DNODE_RG -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 $(CPUFLAGS) -DMALLOC_CHECK_=1 -DENABLE_VCD_FIFO # -Wno-packed-bitfield-compat +CFLAGS += -DMAX_NUM_CCs=1 -Wall -DPHYSIM -DNODE_RG -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -DMALLOC_CHECK_=1 -DENABLE_VCD_FIFO CFLAGS += -DOPENAIR_LTE -DNO_RRM -DOPENAIR1 #-DPHY_ABSTRACTION #-DOPENAIR2 @@ -31,7 +26,7 @@ ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES CFLAGS += $(L2_incl) -I$(ASN1_MSG_INC) -I$(TOP_DIR) -I$(OPENAIR2_DIR) -I$(OPENAIR3) $(UTIL_incl) $(UTILS_incl) -CFLAGS += -DMEX -fPIC -g +CFLAGS += -DMEX -fPIC CFLAGS += -I/opt/MATLAB/R2014a/extern/include/ # Set mex extension, can be determined with mexext function in Matlab diff --git a/openair1/USERSPACE_TOOLS/OPENAIR_RF/Makefile b/openair1/USERSPACE_TOOLS/OPENAIR_RF/Makefile index 08db92e1ff..71bce12294 100755 --- a/openair1/USERSPACE_TOOLS/OPENAIR_RF/Makefile +++ b/openair1/USERSPACE_TOOLS/OPENAIR_RF/Makefile @@ -1,10 +1,10 @@ -CCC = gcc +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = ../.. OPENAIR2_DIR = ../../../openair2 OPENAIR2_TOP = $(OPENAIR2_DIR) -CFLAGS = -Wall -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DMAX_MODULES=1 -DPHY_CONTEXT=1 -g -mtune=pentium4 -mmmx -msse2 -mssse3 -O -funroll-loops -I$(TOP_DIR) -I/usr/realtime/include/ -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES +CFLAGS += -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DMAX_MODULES=1 -DPHY_CONTEXT=1 -I$(TOP_DIR) -I/usr/realtime/include/ -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES #-DICC include $(OPENAIR2_DIR)/LAYER2/Makefile.inc diff --git a/openair1/USERSPACE_TOOLS/SCOPE/Makefile b/openair1/USERSPACE_TOOLS/SCOPE/Makefile index bc0f8bf5ce..a02ed10ee8 100755 --- a/openair1/USERSPACE_TOOLS/SCOPE/Makefile +++ b/openair1/USERSPACE_TOOLS/SCOPE/Makefile @@ -1,10 +1,10 @@ -CC = gcc +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = ../.. OPENAIR2_DIR = ../../../openair2 OPENAIR2_TOP = $(OPENAIR2_DIR) -CFLAGS = -Wall -g -ggdb -DNODE_RG -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DNB_ANTENNAS_TXRX=2 -DWIDENS_DLC -DPHY_CONTEXT -DPC_DSP -DPC_TARGET -DMAX_MODULES=1 -DCBMIMO1 -mtune=pentium4 -mmmx -msse2 -O -funroll-loops -fno-stack-check -I$(TOP_DIR) -I/usr/include/X11 -I/usr/X11R6/include -I/usr/realtime/include -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES +CFLAGS += -DNODE_RG -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DNB_ANTENNAS_TXRX=2 -DWIDENS_DLC -DPHY_CONTEXT -DPC_DSP -DPC_TARGET -DMAX_MODULES=1 -DCBMIMO1 -I$(TOP_DIR) -I/usr/include/X11 -I/usr/X11R6/include -I/usr/realtime/include -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES include $(OPENAIR2_DIR)/LAYER2/Makefile.inc CFLAGS += $(L2_incl) diff --git a/openair1/USERSPACE_TOOLS/SENSING/Makefile b/openair1/USERSPACE_TOOLS/SENSING/Makefile index 6207610c5b..ece36c3866 100644 --- a/openair1/USERSPACE_TOOLS/SENSING/Makefile +++ b/openair1/USERSPACE_TOOLS/SENSING/Makefile @@ -1,9 +1,8 @@ - -CC = gcc +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = ../.. -CFLAGS = -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS=2 -DNB_ANTENNAS_TX=2 -DDEBUG_PHY -DCBMIMO1 -mmmx -msse -msse2 -g -ggdb +CFLAGS += -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS=2 -DNB_ANTENNAS_TX=2 -DDEBUG_PHY -DCBMIMO1 # PHY Initialization routines OBJS =$(TOP_DIR)/PHY/INIT/init.o diff --git a/openair2/LAYER2/Makefile b/openair2/LAYER2/Makefile index 9cf80b0e9b..d703281df7 100644 --- a/openair2/LAYER2/Makefile +++ b/openair2/LAYER2/Makefile @@ -9,11 +9,9 @@ -CCC = gcc include $(OPENAIR_HOME)/common/utils/Makefile.inc KERNEL_ARCH=$(shell echo `uname -m`) -SET_REGPARM=$(shell if [ $(KERNEL_ARCH) = 'i686' ]; then echo true ; fi) SET_X64=$(shell if [ $(KERNEL_ARCH) = 'x86_64' ]; then echo true ; fi) ifdef RTAI # Get the RTAI variables @@ -21,7 +19,7 @@ CCC = $(shell rtai-config --cc) RTAI_SUBVERSION=$(shell rtai-config --version | sed -e 's/^..\(.\).*$$/\1/') IS_RTAI_SUBVERSION_LESS_THAN_FIVE=$(shell if [ $(RTAI_SUBVERSION) -lt 5 ] ; then echo true ; fi) -EXTRA_CFLAGS = $(shell rtai-config --module-cflags) -g -DRTAI_ENABLED -DPC_TARGET -Wall -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -I$(KERNEL_DIR)/build/include -I$(KERNEL_DIR)/build/include/asm/mach-default -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DNB_ANTENNAS_TXRX -DMAC_CONTEXT -I/usr/include -fno-stack-protector -mpreferred-stack-boundary=4 $(if $(IS_RTAI_SUBVERSION_LESS_THAN_FIVE),-DRTAI_ISNT_POSIX,) +EXTRA_CFLAGS = $(shell rtai-config --module-cflags) -DRTAI_ENABLED -DPC_TARGET -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -I$(KERNEL_DIR)/build/include -I$(KERNEL_DIR)/build/include/asm/mach-default -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DNB_ANTENNAS_TXRX -DMAC_CONTEXT -I/usr/include $(if $(IS_RTAI_SUBVERSION_LESS_THAN_FIVE),-DRTAI_ISNT_POSIX,) endif diff --git a/openair2/NAS/SIMU_CELLULAR/Makefile b/openair2/NAS/SIMU_CELLULAR/Makefile index 89882fc623..32feeae08b 100755 --- a/openair2/NAS/SIMU_CELLULAR/Makefile +++ b/openair2/NAS/SIMU_CELLULAR/Makefile @@ -19,8 +19,8 @@ ASN1_DIR = $(OPENAIR2_DIR) #GRAAL_DIR =$(UPDIR)/non_access_stratum/driver/nasmt #RRC_DIR =$(UPDIR)/access_stratum/l3/rrc -#CFLAGS = -Wall -g -DDEBUG_RRC_STATE -DUSER_MODE -DNODE_RG -DNODE_MT -CFLAGS = -Wall -mmmx -msse -msse2 -g -ggdb -std=gnu99 -I$(KERNEL_DIR) -DUSER_MODE -DNB_ANTENNAS_RX=1 +#CFLAGS += -Wall -g -DDEBUG_RRC_STATE -DUSER_MODE -DNODE_RG -DNODE_MT +CFLAGS += -std=gnu99 -I$(KERNEL_DIR) -DUSER_MODE -DNB_ANTENNAS_RX=1 ifdef CELL_RRM CFLAGS += -DNODE_RG diff --git a/openair2/RRC/CELLULAR/Makefile b/openair2/RRC/CELLULAR/Makefile index c8ca619060..ed2e73c874 100755 --- a/openair2/RRC/CELLULAR/Makefile +++ b/openair2/RRC/CELLULAR/Makefile @@ -1,4 +1,3 @@ -CCC = gcc include $(OPENAIR_HOME)/common/utils/Makefile.inc KERNEL_MAIN_TYPE=$(shell echo `uname -r | cut -d. -f-2 | tr "." "_"`) @@ -10,7 +9,7 @@ ifdef RTAI CCC = $(shell rtai-config --cc) RTAI_SUBVERSION=$(shell rtai-config --version | sed -e 's/^..\(.\).*$$/\1/') IS_RTAI_SUBVERSION_LESS_THAN_FIVE=$(shell if [ $(RTAI_SUBVERSION) -lt 5 ] ; then echo true ; fi) -CFLAGS = $(shell rtai-config --module-cflags) -march=pentium4 -DRTAI_ENABLED -DPC_TARGET -Wall -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -I$(KERNEL_DIR)/build/include -I$(KERNEL_DIR)/build/include/asm/mach-default $(if $(IS_RTAI_SUBVERSION_LESS_THAN_FIVE),-DRTAI_ISNT_POSIX,) +CFLAGS += $(shell rtai-config --module-cflags) -DRTAI_ENABLED -DPC_TARGET -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -I$(KERNEL_DIR)/build/include -I$(KERNEL_DIR)/build/include/asm/mach-default $(if $(IS_RTAI_SUBVERSION_LESS_THAN_FIVE),-DRTAI_ISNT_POSIX,) endif CCC=gcc #-------------------------------------------------------- diff --git a/openair2/UTIL/OCG/makefile b/openair2/UTIL/OCG/makefile index 24a7365c03..5fcf45837f 100644 --- a/openair2/UTIL/OCG/makefile +++ b/openair2/UTIL/OCG/makefile @@ -1,25 +1,16 @@ -CC= gcc +include $(OPENAIR_HOME)/common/utils/Makefile.inc LIB = -lxml2 -CC = $(shell if [ $$OSTYPE = "cygwin" ] ; then echo "gcc-4"; else echo "gcc"; fi) -#CC = gcc-4.3 - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 #-mssse3 -msse4 -CPUFLAGS += $(shell if [ -z $$SSE3PROC]; then echo "" ; else echo "-mssse3"; fi) -CPUFLAGS += $(shell if [ -z $$SSE4PROC]; then echo "" ; else echo "-msse4"; fi) - TOP_DIR = ../.. OPENAIR1_TOP = ../.. OPENAIR2_TOP = ../../../openair2 OPENAIR3_TOP = ../../../openair3 OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -Wall -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat +CFLAGS += -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat -CFLAGS += -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE +CFLAGS += -m32 -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE #CFLAGS += -DXFORMS diff --git a/openair2/UTIL/OMG/makefile b/openair2/UTIL/OMG/makefile index 45f4ed90f9..84cfc3a320 100644 --- a/openair2/UTIL/OMG/makefile +++ b/openair2/UTIL/OMG/makefile @@ -1,7 +1,6 @@ +include $(OPENAIR_TARGETS)/Makefile.common ifdef TEST_OMG -CC= gcc - OBJstatic = OMG.c common.c static.c OBJrwp = OMG.c common.c job.c rwp.c OBJrwalk = OMG.c common.c job.c rwalk.c @@ -10,7 +9,7 @@ OBJsumo = OMG.c common.c sumo.c client_traci_OMG.c socket_traci_OMG.c storage_tr OBJ = OMG.c common.c static.c job.c rwp.c rwalk.c trace.c sumo.c mobility_parser.c hashtable.c client_traci_OMG.c socket_traci_OMG.c storage_traci_OMG.c id_manager.c -CFLAGS += -DTEST_OMG +CFLAGS += -m32 -DTEST_OMG .PHONY: help staticOMG rwpOMG clean @@ -55,24 +54,13 @@ clean: else -CC= gcc - -CC = $(shell if [ $$OSTYPE = "cygwin" ] ; then echo "gcc-4"; else echo "gcc"; fi) -#CC = gcc-4.3 - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 #-mssse3 -msse4 -CPUFLAGS += $(shell if [ -z $$SSE3PROC]; then echo "" ; else echo "-mssse3"; fi) -CPUFLAGS += $(shell if [ -z $$SSE4PROC]; then echo "" ; else echo "-msse4"; fi) - TOP_DIR = ../.. OPENAIR1_TOP = ../.. OPENAIR2_TOP = ../../../openair2 OPENAIR3_TOP = ../../../openair3 OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -Wall -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat +CFLAGS += -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat CFLAGS += -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE diff --git a/openair2/UTIL/OMG/makefile_old b/openair2/UTIL/OMG/makefile_old index 45f4ed90f9..1f11fb518f 100644 --- a/openair2/UTIL/OMG/makefile_old +++ b/openair2/UTIL/OMG/makefile_old @@ -1,3 +1,4 @@ +include $(OPENAIR_TARGETS)/Makefile.common ifdef TEST_OMG CC= gcc @@ -10,7 +11,7 @@ OBJsumo = OMG.c common.c sumo.c client_traci_OMG.c socket_traci_OMG.c storage_tr OBJ = OMG.c common.c static.c job.c rwp.c rwalk.c trace.c sumo.c mobility_parser.c hashtable.c client_traci_OMG.c socket_traci_OMG.c storage_traci_OMG.c id_manager.c -CFLAGS += -DTEST_OMG +CFLAGS += -m32 -DTEST_OMG .PHONY: help staticOMG rwpOMG clean @@ -55,24 +56,13 @@ clean: else -CC= gcc - -CC = $(shell if [ $$OSTYPE = "cygwin" ] ; then echo "gcc-4"; else echo "gcc"; fi) -#CC = gcc-4.3 - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 #-mssse3 -msse4 -CPUFLAGS += $(shell if [ -z $$SSE3PROC]; then echo "" ; else echo "-mssse3"; fi) -CPUFLAGS += $(shell if [ -z $$SSE4PROC]; then echo "" ; else echo "-msse4"; fi) - TOP_DIR = ../.. OPENAIR1_TOP = ../.. OPENAIR2_TOP = ../../../openair2 OPENAIR3_TOP = ../../../openair3 OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -Wall -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat +CFLAGS += -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat CFLAGS += -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE diff --git a/openair3/MESH/RRM/Makefile b/openair3/MESH/RRM/Makefile index 12ab791bd0..ce6946cd2c 100644 --- a/openair3/MESH/RRM/Makefile +++ b/openair3/MESH/RRM/Makefile @@ -1,3 +1,4 @@ +include $(OPENAIR_HOME)/common/utils/Makefile.inc OSTYPE = $(shell uname -o ) #AAA: if rrc emulated remove comment from next line @@ -20,7 +21,7 @@ EMUL = $(CHEMIN)/EMUL VPATH = $(CHEMIN):$(EMUL):$(CHEMIN)/deps:$(CHEMIN)/obj INCLUDE = -I. -I$(OPENAIR2_RRC) -I$(OPENAIR3_RRM) -I$(INTERFACE) -I$(OPENAIR2_DIR) -I$(OPENAIR1_SENSING) -CFLAGS += -Wall -g $(INCLUDE) -DDEBUG -mmmx -msse -msse2 -std=gnu99 -DNOTRACE -DOPENAIR2_IN +CFLAGS += -std=gnu99 $(INCLUDE) -DDEBUG -DNOTRACE -DOPENAIR2_IN LDFLAGS = -lm -lforms -lX11 -L/usr/X11R6/lib -lXpm -lpthread ifeq ($(OSTYPE),Cygwin) diff --git a/openairITS/phy/SIMULATION/Makefile b/openairITS/phy/SIMULATION/Makefile index 1c78da1fe5..8f41bd9283 100644 --- a/openairITS/phy/SIMULATION/Makefile +++ b/openairITS/phy/SIMULATION/Makefile @@ -1,24 +1,11 @@ -#CC = $(shell if [ $(OSTYPE) = "cygwin" ]; then echo "gcc-4"; else echo "gcc"; fi) -CC = gcc +include $(OPENAIR_HOME)/common/utils/Makefile.inc -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 -msse4.1 -#CPUFLAGS += $(shell if [ -z $(SSE3PROC) ]; then echo "" ; else echo "-mssse3"; fi) -#CPUFLAGS += $(shell if [ -z $(SSE4PROC) ]; then echo "" ; else echo "-msse4"; fi) - -CFLAGS = -O2 -DEXECTIME -Wall -fno-common -mpreferred-stack-boundary=4 -fno-strict-aliasing -g -ggdb -rdynamic $(CPUFLAGS) -DMALLOC_CHECK_=1 # -Wno-packed-bitfield-compat +CFLAGS += -DEXECTIME -DMALLOC_CHECK_=1 CFLAGS += -I$(OPENAIR1_DIR) -DNO_OPENAIR1 -DUSER_MODE -I$(OPENAIRITS_DIR) -I$(OPENAIR2_DIR) -DNB_ANTENNAS_TX=1 -DNB_ANTENNAS_RX=2 LFLAGS = -lm -lblas -lxml2 -lrt -# Check if GCC version is greater or equal to 4.4 -GCCVERSIONGTEQ44 := $(shell expr `gcc -dumpversion | cut -f1,2 -d. --output-delimiter=""` \>= 44) -ifeq "$(GCCVERSIONGTEQ44)" "1" - CFLAGS += -Wno-packed-bitfield-compat -endif - ifdef DEBUG_PHY CFLAGS += -DDEBUG_PHY endif diff --git a/targets/RT/USER/Makefile b/targets/RT/USER/Makefile index 0c30ae62d0..89fc7f76b1 100644 --- a/targets/RT/USER/Makefile +++ b/targets/RT/USER/Makefile @@ -6,17 +6,6 @@ all: lte-softmodem rrh include $(OPENAIR_TARGETS)/Makefile.common -GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g') -ifeq "$(GCCVERSION)" "4.4.3" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.5.2" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.6.1" - CFLAGS += -Wno-packed-bitfield-compat -endif - KERNEL_VERSION=$(shell echo `uname -r | cut -d. -f-2`) KERNEL_TYPE=$(shell echo `uname -r | cut -d. -f-3 | cut -d- -f3`) LOWLATENCY_KERNEL=$(shell if [ $(KERNEL_TYPE) = "lowlatency" ]; then echo "1" ; else echo "0" ; fi) @@ -31,7 +20,6 @@ ifndef USRP USRP=0 endif -CFLAGS += -O2 CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/COMMON -I. ifndef OPENAIR2 @@ -108,11 +96,9 @@ include $(OPENAIR3_DIR)/RAL-LTE/Makefile.inc ifeq ($(USRP),1) include $(OPENAIR_TARGETS)/ARCH/USRP/USERSPACE/LIB/Makefile.inc -#CFLAGS += -I/opt/include/uhd -L/opt/lib -luhd -lpthread -lstdc++ -CFLAGS += -I/usr/include/uhd -L/usr/lib -luhd -lpthread -lstdc++ +CFLAGS += -I/opt/include/uhd -L/opt/lib -luhd -lpthread -lstdc++ CFLAGS += -DUSRP -#LDFLAGS += -L/opt/lib -luhd -lpthread -lstdc++ -LDFLAGS += -L/usr/lib/ -luhd -lpthread -lstdc++ +LDFLAGS += -L/opt/lib -luhd -lpthread -lstdc++ endif ifeq ($(ETHERNET),1) @@ -174,10 +160,7 @@ ifdef SMBV CFLAGS += -DSMBV endif -#CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 -msse4.1 -CPUFLAGS = -mmmx -msse -msse2 -mssse3 -msse4.1 -#CFLAGS += -fno-common -mpreferred-stack-boundary=4 -CFLAGS += -Wall -fno-strict-aliasing -DPHYSIM -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -rdynamic $(CPUFLAGS) # -Wno-packed-bitfield-compat +CFLAGS += -DPHYSIM -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 CFLAGS += -DOPENAIR_LTE -DENABLE_FXP -DOPENAIR1 -DDLSCH_THREAD #-DULSCH_THREAD diff --git a/targets/RT/USER/Makefile.agilent b/targets/RT/USER/Makefile.agilent index 6a1a4bec53..f31a3a4c22 100644 --- a/targets/RT/USER/Makefile.agilent +++ b/targets/RT/USER/Makefile.agilent @@ -2,20 +2,6 @@ include $(OPENAIR_TARGETS)/Makerules include $(OPENAIR_TARGETS)/Makefile.common -GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g') -ifeq "$(GCCVERSION)" "4.4.3" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.5.2" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.6.1" - CFLAGS += -Wno-packed-bitfield-compat -endif - -CFLAGS += -O2 -# Debug -CFLAGS += -g -ggdb CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS -DENABLE_VCD_FIFO -DEXMIMO_IOT SRC = lte-enb.c @@ -104,10 +90,7 @@ ifdef SMBV CFLAGS += -DSMBV endif -#CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 -msse4.1 -CPUFLAGS = -mmmx -msse -msse2 -mssse3 -msse4.1 -#CFLAGS += -fno-common -mpreferred-stack-boundary=4 -CFLAGS += -Wall -fno-strict-aliasing -DPHYSIM -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -rdynamic $(CPUFLAGS) # -Wno-packed-bitfield-compat +CFLAGS += -DPHYSIM -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 CFLAGS += -DOPENAIR_LTE -DENABLE_FXP -DOPENAIR1 -DDLSCH_THREAD #-DULSCH_THREAD #only for CBMIMO1 diff --git a/targets/SIMU/USER/Makefile b/targets/SIMU/USER/Makefile index 967e6d7c10..31d85fd17c 100644 --- a/targets/SIMU/USER/Makefile +++ b/targets/SIMU/USER/Makefile @@ -11,13 +11,6 @@ OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3_TOP = $(OPENAIR3_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CPUFLAGS = -mmmx -msse -msse2 -msse4.1 -march=native -# FORCE ssse3 for compilation of openair on User Mode Linux -CPUFLAGS += $(shell if grep --silent ssse3 /proc/cpuinfo ; then echo "-mssse3" ; else if grep --silent User\ Mode\ Linux /proc/cpuinfo ; then echo "-mssse3" ; else echo ""; fi; fi) -CPUFLAGS += $(shell if grep --silent -w sse4 /proc/cpuinfo ; then echo "-msse4" ; else echo ""; fi) -linux = $(shell if [ `uname` = "Linux" ] ; then echo "1" ; else echo "0" ; fi) -CFLAGS += -O2 - ifeq ($(DEBUG),1) CFLAGS += -g -ggdb -DDEBUG_PHY -DDEBUG_MEAS CFLAGS += -DRRC_MSG_PRINT @@ -31,7 +24,7 @@ CFLAGS += -DRRC_MSG_PRINT CFLAGS += -DPDCP_MSG_PRINT endif -CFLAGS += -Wstrict-prototypes -Wpointer-sign +CFLAGS += -Wpointer-sign CFLAGS += -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat # Check if GCC version is greater or equal to 4.4 @@ -175,8 +168,6 @@ ifdef OAI_NW_DRIVER_TYPE_ETHERNET CFLAGS+=-DOAI_NW_DRIVER_TYPE_ETHERNET endif -CFLAGS += $(shell if [ `uname -o` = "Cygwin" ] ; then echo "-DCYGWIN" ;fi) - CFLAGS += -DENABLE_FXP -DOAI_EMU -DENABLE_USE_CPU_EXECUTION_TIME ifndef DISABLE_XER_PRINT CFLAGS += -DXER_PRINT diff --git a/targets/TEST/AT_COMMANDS/Makefile b/targets/TEST/AT_COMMANDS/Makefile index eb6c10b36f..e75d5291b8 100755 --- a/targets/TEST/AT_COMMANDS/Makefile +++ b/targets/TEST/AT_COMMANDS/Makefile @@ -1,11 +1,4 @@ -CC = gcc - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 #-msse4 -CPUFLAGS += $(shell if [ -z $$SSE3PROC]; then echo "" ; else echo "-mssse3"; fi) -CPUFLAGS += $(shell if [ -z $$SSE4PROC]; then echo "" ; else echo "-msse4"; fi) -cygwin = $(shell if [ $$OSTYPE = "cygwin" ] ; then echo "1" ; else echo "0" ; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = $(OPENAIR1_DIR) OPENAIR1_TOP = $(OPENAIR1_DIR) @@ -13,7 +6,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3_TOP = $(OPENAIR3_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -Wall -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat +CFLAGS += -m32 -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES @@ -31,12 +24,10 @@ CFLAGS += -DNAS_NETLINK -DLINUX -DDEBUG_CONTROL endif CFLAGS += -DPHY_ABSTRACTION #-DEMIT_ASN_DEBUG=1 -CFLAGS += $(shell if [ $$OSTYPE = "cygwin" ] ; then echo "-DCYGWIN" ; fi) #include $(OPENAIR1_DIR)/PHY/Makefile.inc #include $(OPENAIR1_DIR)/SCHED/Makefile.inc - EXTRA_CFLAGS += -DOPENAIR2 EXTRA_CFLAGS += -DASSERT EXTRA_CFLAGS += -DNO_RRM @@ -81,10 +72,6 @@ L2_OBJS=$(addsuffix .o,$(basename $(SOURCES_L2))) $(PHY_INTERFACE_OBJS) $(MAC_OB L2_incl = -I$(OPENAIR2_TOP) -I$(COMMON_DIR) -I$(RLC_DIR) -I$(RLC_AM_DIR) -I$(RLC_UM_DIR) -I$(RLC_TM_DIR) -I$(PDCP_DIR) -I$(MEM_DIR) -I$(LIST_DIR) -I$(LOG_DIR) -I$(AT_DIR) -I$(MATH_DIR) -I$(TIMER_DIR) -I$(OPENAIR3)/MESH -I$(OPENAIR2_TOP)/RRC/MESH -I$(OPENAIR2_TOP)/RRC/MESH/MESSAGES -I$(OPENAIR3)/MESH/RRM -I$(OPT_DIR) - - - - ASN1_MSG_OBJS2 := $(foreach file, $(ASN1_MSG_OBJS), $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/$(file)) OBJ = $(PHY_OBJS) $(SIMULATION_OBJS) $(SCHED_OBJS) $(STATS_OBJS) $(ASN1_MSG_OBJS2) @@ -99,7 +86,6 @@ $(L2_OBJS) : %.o : %.c $(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 -I$(TOP_DIR) $(L2_incl) -I$(ASN1_MSG_INC) -o $@ $< testat : $(OBJ) $(L2_OBJS) oaisim.c - echo CYGWIN variable is $(cygwin) $(CC) oaisim.c -I$(TOP_DIR) $(L2_incl) -I$(ASN1_MSG_INC) -o testat $(CFLAGS) $(EXTRA_CFLAGS) $(OBJ) $(L2_OBJS) diff --git a/targets/TEST/PACKET_TRACER/Makefile b/targets/TEST/PACKET_TRACER/Makefile index b67d434b0f..c6678ed3b9 100755 --- a/targets/TEST/PACKET_TRACER/Makefile +++ b/targets/TEST/PACKET_TRACER/Makefile @@ -1,9 +1,4 @@ -CC = gcc - -CPUFLAGS = -mmmx -msse -msse2 -m32 #-msse4 -CPUFLAGS += $(shell if grep --silent ssse3 /proc/cpuinfo ; then echo "-mssse3" ; else echo ""; fi) -CPUFLAGS += $(shell if grep --silent sse4 /proc/cpuinfo ; then echo "-msse4" ; else echo ""; fi) -linux = $(shell if [ `uname` = "Linux" ] ; then echo "1" ; else echo "0" ; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = $(OPENAIR1_DIR) OPENAIR1_TOP = $(OPENAIR1_DIR) @@ -11,22 +6,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3_TOP = $(OPENAIR3_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -O2 -Wall -fno-strict-aliasing -DPHYSIM -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat - -GCCVERSION = $(shell gcc --version | grep ^gcc | sed 's/^.* //g') -ifeq "$(GCCVERSION)" "4.4.3" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.5.2" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.6.1" - CFLAGS += -Wno-packed-bitfield-compat -endif -ifeq "$(GCCVERSION)" "4.6.3" - CFLAGS += -Wno-packed-bitfield-compat -endif - +CFLAGS += -m32 -DPHYSIM -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -I/usr/include/X11 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES @@ -45,10 +25,8 @@ endif ifeq ($(linux),1) CFLAGS += -I/usr/include/libxml2 -L/usr/local/lib -I/usr/include/atlas -L/usr/X11R6/lib OCG_FLAG = 1 -cygwin=0 CFLAGS += -DLINUX else -cygwin=1 OCG_FLAG = 0 endif @@ -78,7 +56,6 @@ ifdef ADDCONF CFLAGS+=-DADDRCONF endif -CFLAGS += $(shell if [ `uname -o` = "Cygwin" ] ; then echo "-DCYGWIN" ;fi) ifdef TRAFFIC_TM5 CFLAGS += -DRLC_UM_TEST_TRAFFIC=1 -DFULL_BUFFER=1 @@ -127,7 +104,6 @@ all: pt printvars: @echo LINUX variable is $(linux) - @echo CYGWIN variable is $(cygwin) @echo rrc_cellular variable is $(rrc_cellular) @echo EXTRA_CFLAGS = $(EXTRA_CFLAGS) @echo OAI Config generator is $(OCG_FLAG) @@ -183,7 +159,6 @@ cleanasn1: rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc.generated print: - @echo $(cygwin) @echo $(OCG_FLAG) @echo $(CFLAGS) @echo $(EXTRA_CFLAGS) diff --git a/targets/TEST/PDCP/Makefile b/targets/TEST/PDCP/Makefile index b45d040e11..f11b044f1a 100755 --- a/targets/TEST/PDCP/Makefile +++ b/targets/TEST/PDCP/Makefile @@ -1,11 +1,4 @@ -CC = gcc - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 #-msse4 -CPUFLAGS += $(shell if [ -z $$SSE3PROC]; then echo "" ; else echo "-mssse3"; fi) -CPUFLAGS += $(shell if [ -z $$SSE4PROC]; then echo "" ; else echo "-msse4"; fi) -cygwin = $(shell if [ $$OSTYPE = "cygwin" ] ; then echo "1" ; else echo "0" ; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = $(OPENAIR1_DIR) OPENAIR1_TOP = $(OPENAIR1_DIR) @@ -15,7 +8,7 @@ OPENAIR3 = $(OPENAIR3_DIR) EXE_FILE_NAME = test_pdcp -CFLAGS = -Wall -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat +CFLAGS += -m32 -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES @@ -33,7 +26,6 @@ CFLAGS += -DNAS_NETLINK -DLINUX -DDEBUG_CONTROL endif CFLAGS += -DPHY_ABSTRACTION #-DEMIT_ASN_DEBUG=1 -CFLAGS += $(shell if [ $$OSTYPE = "cygwin" ] ; then echo "-DCYGWIN" ; fi) #include $(OPENAIR1_DIR)/PHY/Makefile.inc #include $(OPENAIR1_DIR)/SCHED/Makefile.inc @@ -95,7 +87,6 @@ $(L2_OBJS) : %.o : %.c $(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 -I$(TOP_DIR) $(L2_incl) -I$(ASN1_MSG_INC) -o $@ $< build_test_pdcp : $(OBJ) $(L2_OBJS) test_pdcp.c - echo CYGWIN variable is $(cygwin) $(CC) test_pdcp.c -I$(TOP_DIR) $(L2_incl) -I$(ASN1_MSG_INC) -o $(EXE_FILE_NAME) $(CFLAGS) $(EXTRA_CFLAGS) $(OBJ) $(L2_OBJS) -lm -lcurses clean: diff --git a/targets/TEST/PDCP/with_rlc/Makefile.data_bearer b/targets/TEST/PDCP/with_rlc/Makefile.data_bearer index af1a1504e9..41d99dbb00 100755 --- a/targets/TEST/PDCP/with_rlc/Makefile.data_bearer +++ b/targets/TEST/PDCP/with_rlc/Makefile.data_bearer @@ -1,11 +1,4 @@ -CC = gcc - -SSE3PROC = $(shell echo `grep ssse3 /proc/cpuinfo`) -SSE4PROC = $(shell echo `grep sse4 /proc/cpuinfo`) -CPUFLAGS = -mmmx -msse -msse2 -m32 -mssse3 #-msse4 -CPUFLAGS += $(shell if [ -z $$SSE3PROC]; then echo "" ; else echo "-mssse3"; fi) -CPUFLAGS += $(shell if [ -z $$SSE4PROC]; then echo "" ; else echo "-msse4"; fi) -cygwin = $(shell if [ $$OSTYPE = "cygwin" ] ; then echo "1" ; else echo "0" ; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc TOP_DIR = $(OPENAIR1_DIR) OPENAIR1_TOP = $(OPENAIR1_DIR) @@ -15,7 +8,7 @@ OPENAIR3 = $(OPENAIR3_DIR) EXE_FILE_NAME = test_pdcp_rlc -CFLAGS = -Wall -fno-strict-aliasing -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat +CFLAGS += -m32 -DPHYSIM -DNODE_RG -DUSER_MODE -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES @@ -33,7 +26,6 @@ CFLAGS += -DNAS_NETLINK -DLINUX -DDEBUG_CONTROL endif CFLAGS += -DPHY_ABSTRACTION #-DEMIT_ASN_DEBUG=1 -CFLAGS += $(shell if [ $$OSTYPE = "cygwin" ] ; then echo "-DCYGWIN" ; fi) #include $(OPENAIR1_DIR)/PHY/Makefile.inc #include $(OPENAIR1_DIR)/SCHED/Makefile.inc @@ -133,7 +125,6 @@ $(L2_OBJS) : %.o : %.c $(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 -I$(TOP_DIR) $(L2_incl) -I$(ASN1_MSG_INC) -o $@ $< build_test_pdcp_rlc : $(OBJ) $(L2_OBJS) test_pdcp_rlc.c - echo CYGWIN variable is $(cygwin) $(CC) test_pdcp_rlc.c -I$(TOP_DIR) $(L2_incl) -I$(ASN1_MSG_INC) -o $(EXE_FILE_NAME) $(CFLAGS) $(EXTRA_CFLAGS) $(OBJ) $(L2_OBJS) -lm -lcurses clean: diff --git a/targets/TEST/RLC_AM_V9.3.0/Makefile b/targets/TEST/RLC_AM_V9.3.0/Makefile index bfc91e83c8..7b8e8e867c 100755 --- a/targets/TEST/RLC_AM_V9.3.0/Makefile +++ b/targets/TEST/RLC_AM_V9.3.0/Makefile @@ -1,10 +1,4 @@ -CC = gcc - -CPUFLAGS = -mmmx -msse -msse2 -m32 #-msse4 -# FORCE ssse3 for compilation of openair on User Mode Linux -CPUFLAGS += $(shell if grep --silent ssse3 /proc/cpuinfo ; then echo "-mssse3" ; else if grep --silent User\ Mode\ Linux /proc/cpuinfo ; then echo "-mssse3" ; else echo ""; fi; fi) -CPUFLAGS += $(shell if grep --silent sse4 /proc/cpuinfo ; then echo "-msse4" ; else echo ""; fi) -linux = $(shell if [ `uname` = "Linux" ] ; then echo "1" ; else echo "0" ; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc NUM_CORES=$(shell cat /proc/cpuinfo | grep processor | wc -l) @@ -14,13 +8,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3_TOP = $(OPENAIR3_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -Wall -fno-strict-aliasing -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat - -# Check if GCC version is greater or equal to 4.4 -GCCVERSIONGTEQ44 := $(shell expr `gcc -dumpversion | cut -f1,2 -d. --output-delimiter=""` \>= 44) -ifeq "$(GCCVERSIONGTEQ44)" "1" - CFLAGS += -Wno-packed-bitfield-compat -endif +CFLAGS += -m32 -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -I/usr/include/X11 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES diff --git a/targets/TEST/RLC_UM_V9.3.0/Makefile b/targets/TEST/RLC_UM_V9.3.0/Makefile index 185a925d97..f466a55ba9 100755 --- a/targets/TEST/RLC_UM_V9.3.0/Makefile +++ b/targets/TEST/RLC_UM_V9.3.0/Makefile @@ -1,10 +1,4 @@ -CC = gcc - -CPUFLAGS = -mmmx -msse -msse2 -m32 #-msse4 -# FORCE ssse3 for compilation of openair on User Mode Linux -CPUFLAGS += $(shell if grep --silent ssse3 /proc/cpuinfo ; then echo "-mssse3" ; else if grep --silent User\ Mode\ Linux /proc/cpuinfo ; then echo "-mssse3" ; else echo ""; fi; fi) -CPUFLAGS += $(shell if grep --silent sse4 /proc/cpuinfo ; then echo "-msse4" ; else echo ""; fi) -linux = $(shell if [ `uname` = "Linux" ] ; then echo "1" ; else echo "0" ; fi) +include $(OPENAIR_HOME)/common/utils/Makefile.inc NUM_CORES=$(shell cat /proc/cpuinfo | grep processor | wc -l) @@ -14,13 +8,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR) OPENAIR3_TOP = $(OPENAIR3_DIR) OPENAIR3 = $(OPENAIR3_DIR) -CFLAGS = -Wall -fno-strict-aliasing -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat - -# Check if GCC version is greater or equal to 4.4 -GCCVERSIONGTEQ44 := $(shell expr `gcc -dumpversion | cut -f1,2 -d. --output-delimiter=""` \>= 44) -ifeq "$(GCCVERSIONGTEQ44)" "1" - CFLAGS += -Wno-packed-bitfield-compat -endif +CFLAGS += -m32 -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -I/usr/include/X11 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES @@ -49,14 +37,11 @@ endif ifeq ($(linux),1) CFLAGS += -I/usr/include/libxml2 -L/usr/local/lib -I/usr/include/atlas -L/usr/X11R6/lib OCG_FLAG = 1 -cygwin=0 CFLAGS += -DLINUX else -cygwin=1 OCG_FLAG = 0 endif - ifdef XFORMS CFLAGS += -DXFORMS endif @@ -124,8 +109,6 @@ ifdef OAI_NW_DRIVER_TYPE_ETHERNET CFLAGS+=-DOAI_NW_DRIVER_TYPE_ETHERNET endif -CFLAGS += $(shell if [ `uname -o` = "Cygwin" ] ; then echo "-DCYGWIN" ;fi) - CFLAGS += -DENABLE_FXP -DOAI_EMU -DENABLE_USE_CPU_EXECUTION_TIME ifneq ($(USE_MME), R8) @@ -202,7 +185,6 @@ $(L2_OBJS) : %.o : %.c $(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DMAC_CONTEXT=1 -DTEST_RLC_UM=1 -DPHY_CONTEXT=1 -I$(TOP_DIR) $(L2_incl) -I$(ASN1_MSG_INC) -o $@ $< testum : $(OBJ) $(L2_OBJS) oaisim.c - echo CYGWIN variable is $(cygwin) $(CC) oaisim.c -I$(TOP_DIR) $(L2_incl) -I$(ASN1_MSG_INC) -o testum $(CFLAGS) $(EXTRA_CFLAGS) $(OBJ) $(L2_OBJS) -lm -lrt