Merge branch 'feature/upstream' into develop

8 files changed, 0 insertions, 328 deletions

diff --git a/build-0.3/cxx/intel/configuration-rules.make b/build-0.3/cxx/intel/configuration-rules.make
deleted file mode 100644
index 873e08e..0000000
--- a/build-0.3/cxx/intel/configuration-rules.make
+++ /dev/null
@@ -1,15 +0,0 @@
-# file      : build/cxx/intel/configuration-rules.make
-# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/cxx/intel/configuration-dynamic.make: | $(dcf_root)/cxx/intel/.
-	$(call message,,$(bld_root)/cxx/intel/configure $@ $(cxx_optimize) \
-"$(cxx_extra_options)" "$(cxx_ld_extra_options)")
-
-ifndef %foreign%
-
-$(dcf_root)/.disfigure::
-	$(call message,rm $(dcf_root)/cxx/intel/configuration-dynamic.make,\
-rm -f $(dcf_root)/cxx/intel/configuration-dynamic.make)
-
-endif
diff --git a/build-0.3/cxx/intel/configuration-static.make b/build-0.3/cxx/intel/configuration-static.make
deleted file mode 100644
index 1db64f0..0000000
--- a/build-0.3/cxx/intel/configuration-static.make
+++ /dev/null
@@ -1,3 +0,0 @@
-# file      : build/cxx/intel/configuration-static.make
-# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
-# license   : GNU GPL v2; see accompanying LICENSE file
diff --git a/build-0.3/cxx/intel/configuration.make b/build-0.3/cxx/intel/configuration.make
deleted file mode 100644
index c6e6867..0000000
--- a/build-0.3/cxx/intel/configuration.make
+++ /dev/null
@@ -1,33 +0,0 @@
-# file      : build/cxx/intel/configuration.make
-# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(bld_root)/cxx/intel/configuration-rules.make,$(dcf_root))
-
-# Static configuration.
-#
-$(call include,$(bld_root)/cxx/intel/configuration-static.make)
-
-ifneq ($(bld_root),$(scf_root))
-$(call -include,$(scf_root)/cxx/intel/configuration-static.make)
-endif
-
-# Dynamic configuration.
-#
-cxx_intel :=
-cxx_intel_optimization_options :=
-
-$(call -include,$(dcf_root)/cxx/intel/configuration-dynamic.make)
-
-ifdef cxx_intel
-
-cxx_intel_debugging_options := $(if $(findstring y,$(cxx_debug)),-g)
-
-$(out_root)/%: cxx_intel_debugging_options := $(cxx_intel_debugging_options)
-$(out_root)/%: cxx_intel_optimization_options := $(cxx_intel_optimization_options)
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/build-0.3/cxx/intel/configure b/build-0.3/cxx/intel/configure
deleted file mode 100755
index 7f79dd8..0000000
--- a/build-0.3/cxx/intel/configure
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/cxx/intel/configure
-# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-# $1  out file
-# $2  optimize (y/n)
-# $3  cxx_extra_options
-# $4  cxx_ld_extra_options
-#
-# bld_root     - build root
-# project_name - project name
-#
-
-
-source $bld_root/dialog.bash
-
-$echo
-$echo
-$echo "configuring '$project_name'"
-$echo
-$echo
-
-$echo
-$echo "Please enter the icc binary you would like to use, for example "
-$echo "'/opt/intel_cc_80/bin/icpc'."
-$echo
-
-cxx_intel=`read_path --command icpc`
-
-# Determine the C++ standard. Intel C++ on GNU/Linux appears to use the
-# same option and values as GCC.
-#
-cxx_intel_standard=`echo "$3" | sed -e 's/.*-std=\([^ ]*\).*/\1/' -e t -e d`
-
-if [ -z "$cxx_intel_standard" ]; then
-  cxx_intel_standard="gnu++98"
-elif [ "$cxx_intel_standard" = "c++0x" ]; then
-  cxx_intel_standard="c++11"
-elif [ "$cxx_intel_standard" = "gnu++0x" ]; then
-  cxx_intel_standard="gnu++11"
-fi
-
-# Pass cxx_extra_options and cxx_ld_extra_options since those
-# can affect the search paths (e.g., -m32).
-#
-cxx_intel_libraries=`$cxx_intel $3 $4 -print-search-dirs | sed -e 's/libraries: =//p' -e d`
-
-# Intel optimizes by default.
-#
-optimization=-O0
-
-if [ "$2" == "y" ]; then
-
-  $echo
-  $echo "Please select the optimization level you would like to use:"
-  $echo
-  $echo "(1) -O1 [Enable optimizations.]"
-  $echo "(2) -O2 [Same as -O1.]"
-  $echo "(3) -O3 [As -O2 plus more aggressive optimizations that may not"
-  $echo "         improve performance for all programs.]"
-  $echo
-
-  optimization=`read_option "-O1 -O2 -O3" "-O2"`
-fi
-
-echo "cxx_intel := $cxx_intel"                          > $1
-echo "cxx_intel_libraries := $cxx_intel_libraries"     >> $1
-echo "cxx_intel_optimization_options := $optimization" >> $1
diff --git a/build-0.3/cxx/intel/cxx-d.make b/build-0.3/cxx/intel/cxx-d.make
deleted file mode 100644
index 7c4bba2..0000000
--- a/build-0.3/cxx/intel/cxx-d.make
+++ /dev/null
@@ -1,58 +0,0 @@
-# file      : build/cxx/intel/cxx-o.make
-# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(bld_root)/c/cpp-options.make,$(out_base))
-$(call include,$(bld_root)/cxx/intel/configuration.make)
-
-# Make will try to build dependecies (since they are ultimately included
-# files) during configuartion phase without cxx_intel being discovered yet.
-# This is also why dependecies should be included with -include.
-#
-ifdef cxx_intel
-
-$(out_base)/%.o.d: cxx := $(cxx_intel)
-$(out_base)/%.o.d: cpp_options ?=
-
-#@@ This needs to be shared with cxx-o.
-#
-#@@ wrong prefix
-#
-$(out_base)/%.o.d: expand-cpp-options-impl = \
-$(if $1,$(shell sed -e 's%include: \(.*\)%\1%' -e t -e d $1))
-
-$(out_base)/%.o.d: expand-cpp-options = \
-$(call expand-cpp-options-impl,$(filter %.cpp-options,$1))
-
-.PRECIOUS: $(out_base)/%.o.d
-
-ifeq ($(out_base),$(src_base))
-$(out_base)/%.o.d: $(src_base)/%.$(cxx_s_suffix)
-else
-$(out_base)/%.o.d: $(src_base)/%.$(cxx_s_suffix) | $$(dir $$@).
-endif
-	$(call message,,if test -f $@; then mv $@ $@.old; fi && \
-$(cxx) $(cpp_options) $(call expand-cpp-options,$^) $(cxx_pp_extra_options) \
-$(cxx_extra_options) -M -MG -MP -MQ $@ -MQ $(basename $@) $< | \
-$(bld_root)/c/intel/dep $(out_base) $(filter %.cpp-options,$^) >$@ && \
-if test -f $@.old; then if cmp -s $@ $@.old; then rm -f $@.old && false; \
-else rm -f $@.old && true; fi fi)
-
-ifneq ($(out_base),$(src_base))
-
-$(out_base)/%.o.d: $(out_base)/%.$(cxx_s_suffix) | $$(dir $$@).
-	$(call message,,if test -f $@; then mv $@ $@.old; fi && \
-$(cxx) $(cpp_options) $(call expand-cpp-options,$^) $(cxx_pp_extra_options) \
-$(cxx_extra_options) -M -MG -MP -MQ $@ -MQ $(basename $@) $< | \
-$(bld_root)/c/intel/dep $(out_base) $(filter %.cpp-options,$^) >$@ && \
-if test -f $@.old; then if cmp -s $@ $@.old; then rm -f $@.old && false; \
-else rm -f $@.old && true; fi fi)
-
-endif
-
-.PHONY: $(out_base)/%.o.d.$(cxx_s_suffix).clean
-
-$(out_base)/%.o.d.$(cxx_s_suffix).clean:
-	$(call message,rm $$1,rm -f $$1,$(basename $(basename $@)))
-
-endif
diff --git a/build-0.3/cxx/intel/cxx-o.make b/build-0.3/cxx/intel/cxx-o.make
deleted file mode 100644
index db34a85..0000000
--- a/build-0.3/cxx/intel/cxx-o.make
+++ /dev/null
@@ -1,40 +0,0 @@
-# file      : build/cxx/intel/cxx-o.make
-# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(bld_root)/c/cpp-options.make,$(out_base))
-$(call include,$(bld_root)/cxx/intel/configuration.make)
-
-$(out_base)/%.o: cxx := $(cxx_intel)
-$(out_base)/%.o: cxx_options := $(cxx_intel_optimization_options) $(cxx_intel_debugging_options)
-
-#@@ wrong prefix
-#
-$(out_base)/%.o: expand-cpp-options-impl = \
-$(if $1,$(shell sed -e 's%include: \(.*\)%\1%' -e t -e d $1))
-
-$(out_base)/%.o: expand-cpp-options = \
-$(call expand-cpp-options-impl,$(filter %.cpp-options,$1))
-
-ifeq ($(out_base),$(src_base))
-$(out_base)/%.o: $(src_base)/%.$(cxx_s_suffix)
-else
-$(out_base)/%.o: $(src_base)/%.$(cxx_s_suffix) | $$(dir $$@).
-endif
-	$(call message,c++ $<,$(cxx) \
-$(cpp_options) $(call expand-cpp-options,$^) $(cxx_pp_extra_options) \
-$(cxx_options) $(cxx_pic_options) $(cxx_extra_options) -o $@ -c $<)
-
-ifneq ($(out_base),$(src_base))
-
-$(out_base)/%.o: $(out_base)/%.$(cxx_s_suffix) | $$(dir $$@).
-	$(call message,c++ $<,$(cxx) \
-$(cpp_options) $(call expand-cpp-options,$^) $(cxx_pp_extra_options) \
-$(cxx_options) $(cxx_pic_options) $(cxx_extra_options) -o $@ -c $<)
-
-endif
-
-.PHONY: $(out_base)/%.o.$(cxx_s_suffix).clean
-
-$(out_base)/%.o.$(cxx_s_suffix).clean:
-	$(call message,rm $$1,rm -f $$1,$(basename $(basename $@)))
diff --git a/build-0.3/cxx/intel/o-e.make b/build-0.3/cxx/intel/o-e.make
deleted file mode 100644
index 5c11854..0000000
--- a/build-0.3/cxx/intel/o-e.make
+++ /dev/null
@@ -1,38 +0,0 @@
-# file      : build/cxx/intel/o-e.make
-# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include,$(bld_root)/cxx/intel/configuration.make)
-
-#@@ should it be lib%.so?
-#
-ifneq ($(cxx_extra_lib_paths),)
-vpath %.so $(cxx_extra_lib_paths)
-vpath %.a $(cxx_extra_lib_paths)
-endif
-
-ifneq ($(cxx_intel_libraries),)
-vpath %.so $(cxx_intel_libraries)
-vpath %.a $(cxx_intel_libraries)
-endif
-
-$(out_base)/%: ld := $(cxx_intel)
-$(out_base)/%: ld_options := $(cxx_intel_optimization_options) $(cxx_intel_debugging_options) $(cxx_ld_extra_options)
-
-$(out_base)/%: expand-l = $(if $(subst n,,$(cxx_rpath)),\
-$(shell sed -e 's%^rpath:\(.*\)%-Wl,-rpath,\1%' $1),\
-$(shell sed -e 's%^rpath:\(.*\)%%' $1))
-
-ifeq ($(out_base),$(src_base))
-$(out_base)/%: $(out_base)/%.o
-else
-$(out_base)/%: $(out_base)/%.o | $$(dir $$@).
-endif
-	$(call message,ld $@,$(ld) \
-$(cxx_extra_options) $(ld_options) $(cxx_ld_extra_options) -o $@ \
-$(foreach f,$^,$(if $(patsubst %.l,,$f),$f,$(call expand-l,$f))) $(cxx_extra_libs))
-
-.PHONY: $(out_base)/%.o.clean
-
-$(out_base)/%.o.clean:
-	$(call message,rm $(basename $(basename $@)),rm -f $(basename $@) $(basename $(basename $@)))
diff --git a/build-0.3/cxx/intel/o-l.make b/build-0.3/cxx/intel/o-l.make
deleted file mode 100644
index 0123687..0000000
--- a/build-0.3/cxx/intel/o-l.make
+++ /dev/null
@@ -1,71 +0,0 @@
-# file      : build/cxx/intel/o-l.make
-# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include,$(bld_root)/cxx/intel/configuration.make)
-
-ifneq ($(cxx_extra_lib_paths),)
-vpath %.so $(cxx_extra_lib_paths)
-vpath %.a $(cxx_extra_lib_paths)
-endif
-
-ifneq ($(cxx_intel_libraries),)
-vpath %.so $(cxx_intel_libraries)
-vpath %.a $(cxx_intel_libraries)
-endif
-
-ifdef ld_lib_type
-
-.PHONY: $(out_base)/%.l.o.clean
-
-ifeq ($(ld_lib_type),archive)
-
-$(out_base)/%.l: ar := $(ld_lib_ar)
-$(out_base)/%.l: ar_options ?= -rc
-
-$(out_base)/%.l: ranlib := $(ld_lib_ranlib)
-$(out_base)/%.l: ranlib_options ?=
-
-ifeq ($(out_base),$(src_base))
-$(out_base)/%.l:
-else
-$(out_base)/%.l: | $$(dir $$@).
-endif
-	$(call message,ar  $@,$(ar) $(ar_options) $(@D)/lib$(basename $(@F)).a $(filter %.o,$^))
-	$(call message,,$(ranlib) $(ranlib_options) $(@D)/lib$(basename $(@F)).a)
-	$(call message,,echo "$(@D)/lib$(basename $(@F)).a" >$@)
-	$(call message,,echo "$(patsubst %.l,`cat %.l`,$(filter %.a %.so %.l,$^))" | xargs -n 1 echo >>$@)
-
-$(out_base)/%.l.o.clean:
-	$(call message,rm $$1,rm -f $$1 $(@D)/$(patsubst %.l.o.clean,lib%.a,$(@F)),$(basename $(basename $@)))
-
-else
-
-$(out_base)/%.l: ld := $(cxx_intel)
-$(out_base)/%.l: ld_options := $(cxx_intel_optimization_options) $(cxx_intel_debugging_options)
-$(out_base)/%.l: c_pic_options := -fPIC
-$(out_base)/%.l: cxx_pic_options := -fPIC
-$(out_base)/%.l: comma_ := ,
-
-$(out_base)/%.l: expand-l = $(if $(subst n,,$(cxx_rpath)),\
-$(shell sed -e 's%^rpath:\(.*\)%-Wl,-rpath,\1%' $1),\
-$(shell sed -e 's%^rpath:\(.*\)%%' $1))
-
-ifeq ($(out_base),$(src_base))
-$(out_base)/%.l:
-else
-$(out_base)/%.l: | $$(dir $$@).
-endif
-	$(call message,ld  $@,$(ld) -shared \
-$(cxx_extra_options) $(ld_options) $(cxx_ld_extra_options) \
--o $(@D)/lib$(basename $(@F)).so -Wl$(comma_)-soname=lib$(basename $(@F)).so \
-$(foreach f,$^,$(if $(patsubst %.l,,$f),$f,$(call expand-l,$f))) $(cxx_extra_libs))
-	$(call message,,echo "$(@D)/lib$(basename $(@F)).so" >$@)
-	$(call message,,echo "rpath:$(@D)" >>$@)
-	$(call message,,echo "$(patsubst %.l,`cat %.l`,$(filter %.a %.so %.l,$^))" | xargs -n 1 echo >>$@)
-
-$(out_base)/%.l.o.clean:
-	$(call message,rm $$1,rm -f $$1 $(@D)/$(patsubst %.l.o.clean,lib%.so,$(@F)),$(basename $(basename $@)))
-
-endif
-endif