From b77961497c542f46fa8bea4cd33007079852ca0b Mon Sep 17 00:00:00 2001 From: Sachin Gupta Date: Tue, 24 Jan 2017 04:14:18 -0600 Subject: Remove c++11 dependency Change-Id: I9a952e87521749fafa3beb2a905514719e5c6332 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35310 Reviewed-by: Sachin Gupta Tested-by: Jenkins Server Reviewed-by: RAJA DAS Reviewed-by: Shakeeb A. Pasha B K Tested-by: FSP CI Jenkins --- sb | 5 ++--- src/build/img_defs.mk | 2 +- src/build/utils/proc_sbe_fixed.H | 3 +-- src/test/framework/build-script | 6 +++--- src/tools/image/Makefile | 12 +++--------- src/tools/image/sbe_default_tool.c | 3 +-- src/tools/iplbuild/Makefile | 13 +++---------- 7 files changed, 14 insertions(+), 30 deletions(-) diff --git a/sb b/sb index 5dda9b61..7315f7ff 100755 --- a/sb +++ b/sb @@ -6,7 +6,7 @@ # # OpenPOWER sbe Project # -# Contributors Listed Below - COPYRIGHT 2016 +# Contributors Listed Below - COPYRIGHT 2016,2017 # [+] International Business Machines Corp. # # @@ -100,8 +100,7 @@ sb_workon() export SBE_INSIDE_WORKON=1 echo "Setting environment variables..." source ./env.bash - echo "Spawning new shell with devtoolset 2..." - scl enable devtoolset-2 bash + bash fi } diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk index c43f8e48..138fe31e 100644 --- a/src/build/img_defs.mk +++ b/src/build/img_defs.mk @@ -5,7 +5,7 @@ # # OpenPOWER sbe Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # diff --git a/src/build/utils/proc_sbe_fixed.H b/src/build/utils/proc_sbe_fixed.H index 6a85ab01..49bf1890 100644 --- a/src/build/utils/proc_sbe_fixed.H +++ b/src/build/utils/proc_sbe_fixed.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -67,7 +67,6 @@ #include "p9_sbe.H" #include "plat_target_parms.H" -#include "attribute_ids.H" #ifdef __ASSEMBLER__ .macro .proc_sbe_fixed_system diff --git a/src/test/framework/build-script b/src/test/framework/build-script index 3e6c6b2f..49eb170c 100755 --- a/src/test/framework/build-script +++ b/src/test/framework/build-script @@ -6,7 +6,7 @@ # # OpenPOWER sbe Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -40,10 +40,10 @@ source "$SBEROOT/src/test/framework/setup-env" # Build PIBMEM Image -scl enable devtoolset-2 " bash -c \"make install img=pibmem\"" || exit -1 +bash -c "make install img=pibmem" || exit -1 bash -c "rm -rf $SBEROOT/obj/sbefw" || exit -1 # Build SEEPROM Image -scl enable devtoolset-2 " bash -c \"make install\"" || exit -1 +bash -c "make install" || exit -1 # Create simics sandbox. create-sandbox > create-sandbox.log 2>&1 & diff --git a/src/tools/image/Makefile b/src/tools/image/Makefile index 58650875..11a7ba30 100644 --- a/src/tools/image/Makefile +++ b/src/tools/image/Makefile @@ -5,7 +5,7 @@ # # OpenPOWER sbe Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 # [+] International Business Machines Corp. # # @@ -51,14 +51,8 @@ else cut -d" " -f2 | cut -d. -f1) endif -GCC-RELEASE = 4.8.2 -GCC-VERSION = $(shell gcc -v 2>&1 | grep "$(GCC-RELEASE)") - -ifeq ($(GCC-VERSION),) -$(error wrong compiler version. Use $(GCC-RELEASE) compiler. Try: "scl enable devtoolset-2 bash") -else +CXXFLAGS = -nostdinc++ -fno-rtti -fno-threadsafe-statics -fno-strict-aliasing CXX = g++ -endif .PHONY : all utilities clean @@ -72,7 +66,7 @@ utilities: $(IMG_DIR)/sbe_default_tool CXXFLAGS+=-DFAPI2_NO_FFDC $(BASE_OBJDIR)/tools/image/%.o: %.c - $(CXX) -std=c++11 $(INCLUDES) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(INCLUDES) $(CXXFLAGS) -c -o $@ $< $(IMG_DIR)/sbe_default_tool: $(P9_XIP_BINDIR)/p9_xip_image.o $(BASE_OBJDIR)/tools/image/sbe_default_tool.o $(CXX) $(CXXFLAGS) ${INCLUDES} -o $@ $^ diff --git a/src/tools/image/sbe_default_tool.c b/src/tools/image/sbe_default_tool.c index 2600a365..d376ed7f 100644 --- a/src/tools/image/sbe_default_tool.c +++ b/src/tools/image/sbe_default_tool.c @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,7 +40,6 @@ #define __PPE__ -#include "fapi2.H" #include "proc_sbe_fixed.H" #include "p9_xip_image.h" diff --git a/src/tools/iplbuild/Makefile b/src/tools/iplbuild/Makefile index 1acb04a8..131de9ab 100644 --- a/src/tools/iplbuild/Makefile +++ b/src/tools/iplbuild/Makefile @@ -5,7 +5,8 @@ # # OpenPOWER sbe Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2017 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -38,15 +39,7 @@ ############################################################################ include img_defs.mk -GCC-RELEASE = 4.8.2 -GCC-VERSION = $(shell gcc -v 2>&1 | grep "$(GCC-RELEASE)") - - -ifeq ($(GCC-VERSION),) -$(error wrong compiler version. Use $(GCC-RELEASE) compiler. Try: "scl enable devtoolset-2 bash") -else CXX = g++ -endif export VPATH = $(P9_XIP_SRCDIR):$(IMAGEPROCS_SRCDIR):$(IMAGEPROCS_TOOL_DIR) export INCLUDES = -I$(P9_XIP_SRCDIR) \ @@ -66,7 +59,7 @@ objdir: utilities: $(IMG_DIR)/p9_ipl_build -CXXFLAGS =-DFAPI2_NO_FFDC -std=c++11 +CXXFLAGS =-DFAPI2_NO_FFDC $(P9_XIP_BINDIR)/%.o: %.c $(CXX) $(INCLUDES) $(CXXFLAGS) -c -o $@ $< -- cgit v1.2.1