Merge branch 'feature/upstream' into develop

9 files changed, 0 insertions, 371 deletions

diff --git a/build-0.3/c/intel/c-d.make b/build-0.3/c/intel/c-d.make
deleted file mode 100644
index b4d6c80..0000000
--- a/build-0.3/c/intel/c-d.make
+++ /dev/null
@@ -1,58 +0,0 @@
-# file      : build/c/intel/c-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)/c/intel/configuration.make)
-
-# Make will try to build dependecies (since they are ultimately included
-# files) during configuartion phase without c_intel being discovered yet.
-# This is also why dependecies should be included with -include.
-#
-ifdef c_intel
-
-$(out_base)/%.o.d: c := $(c_intel)
-$(out_base)/%.o.d: cpp_options ?=
-
-#@@ This needs to be shared with c-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)/%.$(c_s_suffix)
-else
-$(out_base)/%.o.d: $(src_base)/%.$(c_s_suffix) | $$(dir $$@).
-endif
-	$(call message,,if test -f $@; then mv $@ $@.old; fi && \
-$(c) $(cpp_options) $(call expand-cpp-options,$^) $(c_pp_extra_options) \
-$(c_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)/%.$(c_s_suffix) | $$(dir $$@).
-	$(call message,,if test -f $@; then mv $@ $@.old; fi && \
-$(c) $(cpp_options) $(call expand-cpp-options,$^) $(c_pp_extra_options) \
-$(c_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.$(c_s_suffix).clean
-
-$(out_base)/%.o.d.$(c_s_suffix).clean:
-	$(call message,rm $$1,rm -f $$1,$(basename $(basename $@)))
-
-endif
diff --git a/build-0.3/c/intel/c-o.make b/build-0.3/c/intel/c-o.make
deleted file mode 100644
index e925b50..0000000
--- a/build-0.3/c/intel/c-o.make
+++ /dev/null
@@ -1,40 +0,0 @@
-# file      : build/c/intel/c-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)/c/intel/configuration.make)
-
-$(out_base)/%.o: c := $(c_intel)
-$(out_base)/%.o: c_options := $(c_intel_optimization_options) $(c_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)/%.$(c_s_suffix)
-else
-$(out_base)/%.o: $(src_base)/%.$(c_s_suffix) | $$(dir $$@).
-endif
-	$(call message,c $<,$(c) \
-$(cpp_options) $(call expand-cpp-options,$^) $(c_pp_extra_options) $(c_options) \
-$(c_pic_options) $(subst y,-fexceptions,$(filter y,$(c_exceptions))) $(c_extra_options) -o $@ -c $<)
-
-ifneq ($(out_base),$(src_base))
-
-$(out_base)/%.o: $(out_base)/%.$(c_s_suffix) | $$(dir $$@).
-	$(call message,c $<,$(c) \
-$(cpp_options) $(call expand-cpp-options,$^) $(c_pp_extra_options) $(c_options) \
-$(c_pic_options) $(subst y,-fexceptions,$(filter y,$(c_exceptions))) $(c_extra_options) -o $@ -c $<)
-
-endif
-
-.PHONY: $(out_base)/%.o.$(c_s_suffix).clean
-
-$(out_base)/%.o.$(c_s_suffix).clean:
-	$(call message,rm $$1,rm -f $$1,$(basename $(basename $@)))
diff --git a/build-0.3/c/intel/configuration-rules.make b/build-0.3/c/intel/configuration-rules.make
deleted file mode 100644
index 0132981..0000000
--- a/build-0.3/c/intel/configuration-rules.make
+++ /dev/null
@@ -1,15 +0,0 @@
-# file      : build/c/intel/configuration-rules.make
-# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/c/intel/configuration-dynamic.make: | $(dcf_root)/c/intel/.
-	$(call message,,$(bld_root)/c/intel/configure $@ $(c_optimize) \
-"$(c_extra_options)" "$(c_ld_extra_options)")
-
-ifndef %foreign%
-
-$(dcf_root)/.disfigure::
-	$(call message,rm $(dcf_root)/c/intel/configuration-dynamic.make,\
-rm -f $(dcf_root)/c/intel/configuration-dynamic.make)
-
-endif
diff --git a/build-0.3/c/intel/configuration-static.make b/build-0.3/c/intel/configuration-static.make
deleted file mode 100644
index c3e2d05..0000000
--- a/build-0.3/c/intel/configuration-static.make
+++ /dev/null
@@ -1,3 +0,0 @@
-# file      : build/c/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/c/intel/configuration.make b/build-0.3/c/intel/configuration.make
deleted file mode 100644
index 4e0ec1e..0000000
--- a/build-0.3/c/intel/configuration.make
+++ /dev/null
@@ -1,33 +0,0 @@
-# file      : build/c/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)/c/intel/configuration-rules.make,$(dcf_root))
-
-# Static configuration.
-#
-$(call include,$(bld_root)/c/intel/configuration-static.make)
-
-ifneq ($(bld_root),$(scf_root))
-$(call -include,$(scf_root)/c/intel/configuration-static.make)
-endif
-
-# Dynamic configuration.
-#
-c_intel :=
-c_intel_optimization_options :=
-
-$(call -include,$(dcf_root)/c/intel/configuration-dynamic.make)
-
-ifdef c_intel
-
-c_intel_debugging_options := $(if $(findstring y,$(c_debug)),-g)
-
-$(out_root)/%: c_intel_debugging_options := $(c_intel_debugging_options)
-$(out_root)/%: c_intel_optimization_options := $(c_intel_optimization_options)
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/build-0.3/c/intel/configure b/build-0.3/c/intel/configure
deleted file mode 100755
index e829cea..0000000
--- a/build-0.3/c/intel/configure
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/c/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  c_extra_options
-# $4  c_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/icc'."
-$echo
-
-c_intel=`read_path --command icc`
-
-# Pass c_extra_options and c_ld_extra_options since those can affect the
-# search paths (e.g., -m32) and target.
-#
-c_intel_libraries=`$c_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 "c_intel := $c_intel"                          > $1
-echo "c_intel_libraries := $c_intel_libraries"     >> $1
-echo "c_intel_optimization_options := $optimization" >> $1
diff --git a/build-0.3/c/intel/dep b/build-0.3/c/intel/dep
deleted file mode 100755
index ead761f..0000000
--- a/build-0.3/c/intel/dep
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/c/intel/dep
-# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-# Post-process generated dependency information.
-#
-# $1       current project's $(out_base)
-# $2 - $N  optional .cpp-options files
-
-out_base=$1
-shift
-
-files=$*
-
-#echo $out_base
-#echo $files
-
-script=
-
-function gen_script ()
-{
-  while [ "$1" ]; do
-    prefix=$1
-    shift
-
-    path=$1
-    shift
-
-    # Besides unresolved paths also replace default installation
-    # targets (/usr/include and /usr/local/include).
-    #
-    script="$script"\
-"s \\ $prefix \\ $path$prefix g;"\
-"s \\ /usr/include/$prefix \\ $path$prefix g;"\
-"s \\ /usr/local/include/$prefix \\ $path$prefix g;"\
-"s ^$prefix $path$prefix ;"\
-"s ^/usr/include/$prefix $path$prefix ;"\
-"s ^/usr/local/include/$prefix $path$prefix ;"
-  done
-}
-
-if [ "$files" ]; then
-  prefixes=`sed -e 's%^prefix: \(.*\)$%\1%' -e t -e d $files`
-  gen_script $prefixes
-fi
-
-# The last part of the script translates all file names that don't start
-# with / or . (that is, local generated files) to files in $out_base. Note
-# that it is assumed that such files are never installed and therefore there
-# is no way to get around the situation where this file is picket up from
-# some other place (e.g., /usr/include).
-#
-epilogue="s% \([^/. \\\\]\)% $out_base/\1%g;s%^\([^/. ].*:\)%$out_base/\1%"
-
-exec sed -e "$script$epilogue"
diff --git a/build-0.3/c/intel/o-e.make b/build-0.3/c/intel/o-e.make
deleted file mode 100644
index 0661ccc..0000000
--- a/build-0.3/c/intel/o-e.make
+++ /dev/null
@@ -1,38 +0,0 @@
-# file      : build/c/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)/c/intel/configuration.make)
-
-#@@ should it be lib%.so?
-#
-ifneq ($(c_extra_lib_paths),)
-vpath %.so $(c_extra_lib_paths)
-vpath %.a $(c_extra_lib_paths)
-endif
-
-ifneq ($(c_intel_libraries),)
-vpath %.so $(c_intel_libraries)
-vpath %.a $(c_intel_libraries)
-endif
-
-$(out_base)/%: ld := $(c_intel)
-$(out_base)/%: ld_options := $(c_intel_optimization_options) $(c_intel_debugging_options) $(c_ld_extra_options)
-
-$(out_base)/%: expand-l = $(if $(subst n,,$(c_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) \
-$(c_extra_options) $(ld_options) $(c_ld_extra_options) -o $@ \
-$(foreach f,$^,$(if $(patsubst %.l,,$f),$f,$(call expand-l,$f))) $(c_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/c/intel/o-l.make b/build-0.3/c/intel/o-l.make
deleted file mode 100644
index 0ad3085..0000000
--- a/build-0.3/c/intel/o-l.make
+++ /dev/null
@@ -1,70 +0,0 @@
-# file      : build/c/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)/c/intel/configuration.make)
-
-ifneq ($(c_extra_lib_paths),)
-vpath %.so $(c_extra_lib_paths)
-vpath %.a $(c_extra_lib_paths)
-endif
-
-ifneq ($(c_intel_libraries),)
-vpath %.so $(c_intel_libraries)
-vpath %.a $(c_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 := $(c_intel)
-$(out_base)/%.l: ld_options := $(c_intel_optimization_options) $(c_intel_debugging_options)
-$(out_base)/%.l: c_pic_options := -fPIC
-$(out_base)/%.l: comma_ := ,
-
-$(out_base)/%.l: expand-l = $(if $(subst n,,$(c_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 \
-$(c_extra_options) $(ld_options) $(c_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))) $(c_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