diff options
| author | Santosh Puranik <santosh.puranik@in.ibm.com> | 2015-11-24 05:57:48 -0600 |
|---|---|---|
| committer | Gregory S. Still <stillgs@us.ibm.com> | 2015-12-07 07:30:04 -0600 |
| commit | 6c83004785b99fa088369ee7835e913fe9403ccb (patch) | |
| tree | 777f35fe0d49046859bd1a833f6e037edad7680d /sbe/image | |
| parent | 96658ed12b4187865f353248916101e1aaf814f8 (diff) | |
| download | talos-sbe-6c83004785b99fa088369ee7835e913fe9403ccb.tar.gz talos-sbe-6c83004785b99fa088369ee7835e913fe9403ccb.zip | |
Some changes for the new compiler
-- Compile out FFDC code that relies on std::shared_ptr and std::pair
-- Define some type traits used in FAPI2
-- Remove stdio.h inclusion from plat code
Change-Id: I5a9e156f654c87c54d26f2e4c99b924285cf981a
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22297
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Diffstat (limited to 'sbe/image')
| -rw-r--r-- | sbe/image/Makefile | 6 | ||||
| -rw-r--r-- | sbe/image/img_defs.mk | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sbe/image/Makefile b/sbe/image/Makefile index 01cbfa81..a5af22c9 100644 --- a/sbe/image/Makefile +++ b/sbe/image/Makefile @@ -117,13 +117,13 @@ ifndef FAPI2_TEST #create a linked ELF executable $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out: buildInfo $(LINK_OBJS) $(LINK_SCRIPT_SEEPROM) @echo ">>>>> Production Build <<<<<<" - $(LD) -e __system_reset -T$(LINK_SCRIPT_SEEPROM) -Map $(OBJDIR)/$(IMAGE_SEEPROM_NAME).map -Bstatic -o $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out $(OBJS) + $(LD) -e __system_reset -T$(LINK_SCRIPT_SEEPROM) -Map $(OBJDIR)/$(IMAGE_SEEPROM_NAME).map -Bstatic -o $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out $(OBJS) $(LIB_DIRS) -leabi -lmath else # This a special build of the SEEPROM image that includes the PK to allow for test threads to be used. # create a linked ELF executable $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out: buildInfo $(LINK_OBJS) $(LINK_SCRIPT_SEEPROM) @echo ">>>>> Special FAPI2 Test Build <<<<<<" - $(LD) -e __system_reset -T$(LINK_SCRIPT_SEEPROM) -Map $(OBJDIR)/$(IMAGE_SEEPROM_NAME).map -Bstatic -o $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out $(LIB_DIRS) $(OBJS) --start-group $(LLIBS) --end-group + $(LD) -e __system_reset -T$(LINK_SCRIPT_SEEPROM) -Map $(OBJDIR)/$(IMAGE_SEEPROM_NAME).map -Bstatic -o $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out $(LIB_DIRS) $(OBJS) --start-group $(LLIBS) -leabi -lmath --end-group endif @@ -140,7 +140,7 @@ $(OBJDIR)/$(IMAGE_SBE_NAME).bin $(OBJDIR)/$(IMAGE_SBE_NAME).dis: $(OBJDIR)/$(IMA # create a linked ELF executable $(OBJDIR)/$(IMAGE_SBE_NAME).out: buildInfo $(OBJDIR)/base_sbe_fixed.o $(LINK_OBJS) $(LINK_SCRIPT_SBE) - $(LD) -e __system_reset -T$(LINK_SCRIPT_SBE) -Map $(OBJDIR)/$(IMAGE_SBE_NAME).map -Bstatic -o $(OBJDIR)/$(IMAGE_SBE_NAME).out $(LIB_DIRS) $(OBJDIR)/base_sbe_fixed.o --start-group $(LLIBS) --end-group + $(LD) -e __system_reset -T$(LINK_SCRIPT_SBE) -Map $(OBJDIR)/$(IMAGE_SBE_NAME).map -Bstatic -o $(OBJDIR)/$(IMAGE_SBE_NAME).out $(LIB_DIRS) $(OBJDIR)/base_sbe_fixed.o --start-group $(LLIBS) -leabi -lmath --end-group # pass the link command file through the C preprocessor to evaluate macros and remove comments $(LINK_SCRIPT_SBE): linksbe.cmd diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk index 95536fbc..00d46b4f 100644 --- a/sbe/image/img_defs.mk +++ b/sbe/image/img_defs.mk @@ -120,8 +120,11 @@ ifndef CC_ROOT export CC_ROOT = ${CTEPATH}/tools/gcc405lin/prod endif +GCC-TOOL-PATH = $(CTEPATH)/tools/ppetools/prod + ifndef GCC-TOOL-PREFIX -GCC-TOOL-PREFIX = ${CC_ROOT}/usr/bin/powerpc-linux- +GCC-TOOL-PREFIX = $(GCC-TOOL-PATH)/bin/powerpc-eabi- +LIB_DIRS += -L$(GCC-TOOL-PATH)/libgcc endif ifndef BINUTILS-TOOL-PREFIX @@ -200,8 +203,7 @@ GCC-DEFS += -DPK_TRACE_SZ=$(PK_TRACE_SZ) endif DEFS += $(GCC-DEFS) -export LD_LIBRARY_PATH = /afs/awd.austin.ibm.com/proj/p3/cte/tools/gcc405lin/vol1/usr/lib - +export LD_LIBRARY_PATH=$(GCC-TOOL-PATH)/lib ############################################################################ @@ -216,6 +218,7 @@ INCLUDES += -I$(BASE_FAPI2_DIR)/include INCLUDES += -I$(PK_SRCDIR)/../include INCLUDES += -I$(PK_SRCDIR)/$(PPE_TYPE) INCLUDES += -I$(PK_SRCDIR)/../include +INCLUDES += -I$(PK_SRCDIR)/../include/std INCLUDES += -I$(PK_SRCDIR)/kernel INCLUDES += -I$(PK_SRCDIR)/ppe INCLUDES += -I$(PK_SRCDIR)/ppe42 |
