178 files changed, 327 insertions, 326 deletions
diff --git a/linkers/README b/linkers/README
index 95ed6a2..9327a15 100644
--- a/linkers/README
+++ b/linkers/README
@@ -1,18 +1,10 @@
-RTEMS Dynamic Loader Project
-============================
-Chris Johns <chrisj@rtems.org>
-
-RTEMS Linker
-------------
-
-This package contains the RTEMS linker used to create dynamically loadable
-applications.
+RTEMS Linkers.
+==============
 
-To build download and install waf (http://code.google.com/p/waf/). Then:
-
- $ waf configure build
+Chris Johns <chrisj@rtems.org>
 
-You will have a linker.
+This directory contains the RTEMS linkers and various tools to help managed
+them.
 
 License
 -------
diff --git a/linkers/wscript b/linkers/wscript
index 9ab4685..5dd151c 100644
--- a/linkers/wscript
+++ b/linkers/wscript
@@ -7,52 +7,17 @@ version_major = 1
 version_minor = 0
 version_revision = 0
 
-#
-# Waf system setup. Allow more than one build in the same tree.
-#
-top = '.'
-out = 'build-' + sys.platform
-
 def options(opt):
     opt.load("g++")
     opt.load("gcc")
-    opt.add_option('--rtems-version',
-                   default = '4.11',
-                   dest='rtems_version',
-                   help = 'Set the RTEMS version')
-    opt.add_option('--c-opts',
-                   default = '-O2',
-                   dest='c_opts',
-                   help = 'Set build options, default: -O2.')
-    opt.add_option('--show-commands',
-                   action = 'store_true',
-                   default = False,
-                   dest = 'show_commands',
-                   help = 'Print the commands as strings.')
 
 def configure(conf):
-    try:
-        conf.load("doxygen", tooldir = 'waf-tools')
-    except:
-        pass
     conf.load("g++")
     conf.load("gcc")
-    conf_libiberty(conf)
-    conf_libelf(conf)
-
-    conf.check(header_name='sys/wait.h',  features = 'c', mandatory = False)
-    conf.check_cc(function_name='kill', header_name="signal.h",
-                  features = 'c', mandatory = False)
-    conf.write_config_header('config.h')
 
     conf.env.C_OPTS = conf.options.c_opts.split(',')
     conf.env.RTEMS_VERSION = conf.options.rtems_version
-
-    if conf.options.show_commands:
-        show_commands = 'yes'
-    else:
-        show_commands = 'no'
-    conf.env.SHOW_COMMANDS = show_commands
+    conf.write_config_header('config.h')
 
 def build(bld):
     #
@@ -63,67 +28,24 @@ def build(bld):
             doxyfile = 'rtl-host.conf')
         return
 
-    if bld.env.SHOW_COMMANDS == 'yes':
-        output_command_line()
-
     #
-    # The include paths.
+    # The local configuration.
     #
-    bld.includes = ['elftoolchain/libelf', 'elftoolchain/common', 'libiberty']
-    if sys.platform == 'win32':
-        bld.includes += ['win32']
+    conf = {}
 
     #
     # Build flags.
     #
-    bld.warningflags = ['-Wall', '-Wextra', '-pedantic']
-    bld.optflags = bld.env.C_OPTS
-    bld.cflags = ['-pipe', '-g'] + bld.optflags
-    bld.cxxflags = ['-pipe', '-g'] + bld.optflags
-    bld.linkflags = ['-g']
-
-    #
-    # Create each of the modules as object files each with their own
-    # configurations.
-    #
-    bld_fastlz(bld)
-    bld_libelf(bld)
-    bld_libiberty(bld)
-
-    #
-    # RLD source.
-    #
-    rld_source = ['ConvertUTF.c',
-                  'pkgconfig.cpp',
-                  'rld-config.cpp',
-                  'rld-elf.cpp',
-                  'rld-files.cpp',
-                  'rld-cc.cpp',
-                  'rld-compression.cpp',
-                  'rld-outputter.cpp',
-                  'rld-path.cpp',
-                  'rld-process.cpp',
-                  'rld-resolver.cpp',
-                  'rld-rtems.cpp',
-                  'rld-symbols.cpp',
-                  'rld-rap.cpp',
-                  'rld.cpp']
-
-    #
-    # RTEMS Utilities.
-    #
-    rtems_utils = ['rtems-utils.cpp']
-
-    #
-    # RTL static library
-    #
-    bld.stlib(target = 'rld',
-              source = rld_source + rtems_utils,
-              defines = ['HAVE_CONFIG_H=1', 'RTEMS_VERSION=' + bld.env.RTEMS_VERSION],
-              includes = ['.'] + bld.includes,
-              cflags = bld.cflags + bld.warningflags,
-              cxxflags = bld.cxxflags + bld.warningflags,
-              linkflags = bld.linkflags)
+    rtemstoolkit = '../rtemstoolkit'
+    conf['includes'] = [rtemstoolkit,
+                        rtemstoolkit + '/elftoolchain/libelf',
+                        rtemstoolkit + '/elftoolchain/common',
+                        rtemstoolkit + '/libiberty']
+    conf['warningflags'] = ['-Wall', '-Wextra', '-pedantic']
+    conf['optflags'] = bld.env.C_OPTS
+    conf['cflags'] = ['-pipe', '-g'] + conf['optflags']
+    conf['cxxflags'] = ['-pipe', '-g'] + conf['optflags']
+    conf['linkflags'] = ['-g']
 
     #
     # The list of modules.
@@ -136,10 +58,10 @@ def build(bld):
     bld.program(target = 'rtems-ld',
                 source = ['rtems-ld.cpp'],
                 defines = ['HAVE_CONFIG_H=1', 'RTEMS_VERSION=' + bld.env.RTEMS_VERSION],
-                includes = ['.'] + bld.includes,
-                cflags = bld.cflags + bld.warningflags,
-                cxxflags = bld.cxxflags + bld.warningflags,
-                linkflags = bld.linkflags,
+                includes = ['.'] + conf['includes'],
+                cflags = conf['cflags'] + conf['warningflags'],
+                cxxflags = conf['cxxflags'] + conf['warningflags'],
+                linkflags = conf['linkflags'],
                 use = modules)
 
     #
@@ -148,10 +70,10 @@ def build(bld):
     bld.program(target = 'rtems-ra',
                 source = ['rtems-ra.cpp'],
                 defines = ['HAVE_CONFIG_H=1', 'RTEMS_VERSION=' + bld.env.RTEMS_VERSION],
-                includes = ['.'] + bld.includes,
-                cflags = bld.cflags + bld.warningflags,
-                cxxflags = bld.cxxflags + bld.warningflags,
-                linkflags = bld.linkflags,
+                includes = ['.'] + conf['includes'],
+                cflags = conf['cflags'] + conf['warningflags'],
+                cxxflags = conf['cxxflags'] + conf['warningflags'],
+                linkflags = conf['linkflags'],
                 use = modules)
 
     #
@@ -160,10 +82,10 @@ def build(bld):
     bld.program(target = 'rtems-tld',
                 source = ['rtems-tld.cpp'],
                 defines = ['HAVE_CONFIG_H=1', 'RTEMS_VERSION=' + bld.env.RTEMS_VERSION],
-                includes = ['.'] + bld.includes,
-                cflags = bld.cflags + bld.warningflags,
-                cxxflags = bld.cxxflags + bld.warningflags,
-                linkflags = bld.linkflags,
+                includes = ['.'] + conf['includes'],
+                cflags = conf['cflags'] + conf['warningflags'],
+                cxxflags = conf['cxxflags'] + conf['warningflags'],
+                linkflags = conf['linkflags'],
                 use = modules)
     bld.install_files('${PREFIX}/share/rtems/trace-linker',
                       ['rtems.ini', 'rtld-base.ini'])
@@ -174,10 +96,10 @@ def build(bld):
     bld.program(target = 'rtems-syms',
                 source = ['rtems-syms.cpp'],
                 defines = ['HAVE_CONFIG_H=1', 'RTEMS_VERSION=' + bld.env.RTEMS_VERSION],
-                includes = ['.'] + bld.includes,
-                cflags = bld.cflags + bld.warningflags,
-                cxxflags = bld.cxxflags + bld.warningflags,
-                linkflags = bld.linkflags,
+                includes = ['.'] + conf['includes'],
+                cflags = conf['cflags'] + conf['warningflags'],
+                cxxflags = conf['cxxflags'] + conf['warningflags'],
+                linkflags = conf['linkflags'],
                 use = modules)
 
     #
@@ -186,212 +108,11 @@ def build(bld):
     bld.program(target = 'rtems-rap',
                 source = ['rtems-rapper.cpp'],
                 defines = ['HAVE_CONFIG_H=1', 'RTEMS_VERSION=' + bld.env.RTEMS_VERSION],
-                includes = ['.'] + bld.includes,
-                cflags = bld.cflags + bld.warningflags,
-                cxxflags = bld.cxxflags + bld.warningflags,
-                linkflags = bld.linkflags,
+                includes = ['.'] + conf['includes'],
+                cflags = conf['cflags'] + conf['warningflags'],
+                cxxflags = conf['cxxflags'] + conf['warningflags'],
+                linkflags = conf['linkflags'],
                 use = modules)
 
-def rebuild(ctx):
-    import waflib.Options
-    waflib.Options.commands.extend(['clean', 'build'])
-
 def tags(ctx):
     ctx.exec_command('etags $(find . -name \*.[sSch])', shell = True)
-
-#
-# Libelf module.
-#
-def conf_libelf(conf):
-    pass
-
-def bld_fastlz(bld):
-    bld(target = 'fastlz',
-        features = 'c',
-        source = 'fastlz.c',
-        cflags = bld.cflags,
-        defines = ['FASTLZ_LEVEL=1'])
-
-def bld_libelf(bld):
-    libelf = 'elftoolchain/libelf/'
-
-    #
-    # Work around the ${SRC} having Windows slashes which the MSYS m4 does not
-    # understand.
-    #
-    if sys.platform == 'win32':
-        m4_rule = 'type ${SRC} | m4 -D SRCDIR=../linkers/' + libelf[:-1] + '> ${TGT}"'
-        includes = ['win32']
-    else:
-        m4_rule = 'm4 -D SRCDIR=../linkers/' + libelf[:-1] + ' ${SRC} > ${TGT}'
-        includes = []
-
-    bld(target = 'libelf_convert.c', source = libelf + 'libelf_convert.m4', rule = m4_rule)
-    bld(target = 'libelf_fsize.c',   source = libelf + 'libelf_fsize.m4',   rule = m4_rule)
-    bld(target = 'libelf_msize.c',   source = libelf + 'libelf_msize.m4',   rule = m4_rule)
-
-    host_source = []
-
-    if sys.platform == 'linux2':
-        common = 'elftoolchain/common/'
-        bld(target = common + 'native-elf-format.h',
-            source = common + 'native-elf-format',
-            name = 'native-elf-format',
-            rule   = './${SRC} > ${TGT}')
-        bld.add_group ()
-    elif sys.platform == 'win32':
-        host_source += [libelf + 'mmap_win32.c']
-
-    bld.stlib(target = 'elf',
-              features = 'c',
-              uses = ['native-elf-format'],
-              includes = [bld.bldnode.abspath(), 'elftoolchain/libelf', 'elftoolchain/common'] + includes,
-              cflags = bld.cflags,
-              source =[libelf + 'elf.c',
-                       libelf + 'elf_begin.c',
-                       libelf + 'elf_cntl.c',
-                       libelf + 'elf_end.c',
-                       libelf + 'elf_errmsg.c',
-                       libelf + 'elf_errno.c',
-                       libelf + 'elf_data.c',
-                       libelf + 'elf_fill.c',
-                       libelf + 'elf_flag.c',
-                       libelf + 'elf_getarhdr.c',
-                       libelf + 'elf_getarsym.c',
-                       libelf + 'elf_getbase.c',
-                       libelf + 'elf_getident.c',
-                       libelf + 'elf_hash.c',
-                       libelf + 'elf_kind.c',
-                       libelf + 'elf_memory.c',
-                       libelf + 'elf_next.c',
-                       libelf + 'elf_rand.c',
-                       libelf + 'elf_rawfile.c',
-                       libelf + 'elf_phnum.c',
-                       libelf + 'elf_shnum.c',
-                       libelf + 'elf_shstrndx.c',
-                       libelf + 'elf_scn.c',
-                       libelf + 'elf_strptr.c',
-                       libelf + 'elf_update.c',
-                       libelf + 'elf_version.c',
-                       libelf + 'gelf_cap.c',
-                       libelf + 'gelf_checksum.c',
-                       libelf + 'gelf_dyn.c',
-                       libelf + 'gelf_ehdr.c',
-                       libelf + 'gelf_getclass.c',
-                       libelf + 'gelf_fsize.c',
-                       libelf + 'gelf_move.c',
-                       libelf + 'gelf_phdr.c',
-                       libelf + 'gelf_rel.c',
-                       libelf + 'gelf_rela.c',
-                       libelf + 'gelf_shdr.c',
-                       libelf + 'gelf_sym.c',
-                       libelf + 'gelf_syminfo.c',
-                       libelf + 'gelf_symshndx.c',
-                       libelf + 'gelf_xlate.c',
-                       libelf + 'libelf_align.c',
-                       libelf + 'libelf_allocate.c',
-                       libelf + 'libelf_ar.c',
-                       libelf + 'libelf_ar_util.c',
-                       libelf + 'libelf_checksum.c',
-                       libelf + 'libelf_data.c',
-                       libelf + 'libelf_ehdr.c',
-                       libelf + 'libelf_extended.c',
-                       libelf + 'libelf_phdr.c',
-                       libelf + 'libelf_shdr.c',
-                       libelf + 'libelf_xlate.c',
-                       'libelf_convert.c',
-                       'libelf_fsize.c',
-                       'libelf_msize.c'] + host_source)
-
-#
-# Libiberty module.
-#
-def conf_libiberty(conf):
-    conf.check(header_name='alloca.h',    features = 'c', mandatory = False)
-    conf.check(header_name='fcntl.h',     features = 'c', mandatory = False)
-    conf.check(header_name='process.h',   features = 'c', mandatory = False)
-    conf.check(header_name='stdlib.h',    features = 'c')
-    conf.check(header_name='string.h',    features = 'c')
-    conf.check(header_name='strings.h',   features = 'c', mandatory = False)
-    conf.check(header_name='sys/file.h',  features = 'c', mandatory = False)
-    conf.check(header_name='sys/stat.h',  features = 'c', mandatory = False)
-    conf.check(header_name='sys/time.h',  features = 'c', mandatory = False)
-    conf.check(header_name='sys/types.h', features = 'c', mandatory = False)
-    conf.check(header_name='sys/wait.h',  features = 'c', mandatory = False)
-    conf.check(header_name='unistd.h',    features = 'c', mandatory = False)
-    conf.check(header_name='vfork.h',     features = 'c', mandatory = False)
-
-    conf.check_cc(function_name='getrusage',
-                  header_name="sys/time.h sys/resource.h",
-                  features = 'c', mandatory = False)
-
-    conf.write_config_header('libiberty/config.h')
-
-def bld_libiberty(bld):
-    if sys.platform == 'win32':
-        pex_host = 'libiberty/pex-win32.c'
-    else:
-        pex_host = 'libiberty/pex-unix.c'
-    bld.stlib(target = 'iberty',
-              features = 'c',
-              includes = ['libiberty'],
-              cflags = bld.cflags,
-              defines = ['HAVE_CONFIG_H=1'],
-              source =['libiberty/concat.c',
-                       'libiberty/cplus-dem.c',
-                       'libiberty/cp-demangle.c',
-                       'libiberty/make-temp-file.c',
-                       'libiberty/mkstemps.c',
-                       'libiberty/safe-ctype.c',
-                       'libiberty/stpcpy.c',
-                       'libiberty/pex-common.c',
-                       'libiberty/pex-one.c',
-                       pex_host])
-
-#
-# From the demos. Use this to get the command to cut+paste to play.
-#
-def output_command_line():
-    # first, display strings, people like them
-    from waflib import Utils, Logs
-    from waflib.Context import Context
-    def exec_command(self, cmd, **kw):
-        subprocess = Utils.subprocess
-        kw['shell'] = isinstance(cmd, str)
-        if isinstance(cmd, str):
-            Logs.info('%s' % cmd)
-        else:
-            Logs.info('%s' % ' '.join(cmd)) # here is the change
-        Logs.debug('runner_env: kw=%s' % kw)
-        try:
-            if self.logger:
-                self.logger.info(cmd)
-                kw['stdout'] = kw['stderr'] = subprocess.PIPE
-                p = subprocess.Popen(cmd, **kw)
-                (out, err) = p.communicate()
-                if out:
-                    self.logger.debug('out: %s' % out.decode(sys.stdout.encoding or 'iso8859-1'))
-                if err:
-                    self.logger.error('err: %s' % err.decode(sys.stdout.encoding or 'iso8859-1'))
-                return p.returncode
-            else:
-                p = subprocess.Popen(cmd, **kw)
-                return p.wait()
-        except OSError:
-            return -1
-    Context.exec_command = exec_command
-
-    # Change the outputs for tasks too
-    from waflib.Task import Task
-    def display(self):
-        return '' # no output on empty strings
-
-    Task.__str__ = display
-
-#
-# The doxy command.
-#
-from waflib import Build
-class doxy(Build.BuildContext):
-    fun = 'build'
-    cmd = 'doxy'
diff --git a/linkers/ConvertUTF.c b/rtemstoolkit/ConvertUTF.c
index 9b3deeb..9b3deeb 100644
--- a/linkers/ConvertUTF.c
+++ b/rtemstoolkit/ConvertUTF.c
diff --git a/linkers/ConvertUTF.h b/rtemstoolkit/ConvertUTF.h
index 14d7b70..14d7b70 100644
--- a/linkers/ConvertUTF.h
+++ b/rtemstoolkit/ConvertUTF.h
diff --git a/linkers/SimpleIni.h b/rtemstoolkit/SimpleIni.h
index fd37c4b..fd37c4b 100644
--- a/linkers/SimpleIni.h
+++ b/rtemstoolkit/SimpleIni.h
diff --git a/linkers/elftoolchain/common/Makefile b/rtemstoolkit/elftoolchain/common/Makefile
index b7b5372..b7b5372 100644
--- a/linkers/elftoolchain/common/Makefile
+++ b/rtemstoolkit/elftoolchain/common/Makefile
diff --git a/linkers/elftoolchain/common/_elftc.h b/rtemstoolkit/elftoolchain/common/_elftc.h
index 9ee8db1..9ee8db1 100644
--- a/linkers/elftoolchain/common/_elftc.h
+++ b/rtemstoolkit/elftoolchain/common/_elftc.h
diff --git a/linkers/elftoolchain/common/elfdefinitions.h b/rtemstoolkit/elftoolchain/common/elfdefinitions.h
index 79b6e7f..79b6e7f 100644
--- a/linkers/elftoolchain/common/elfdefinitions.h
+++ b/rtemstoolkit/elftoolchain/common/elfdefinitions.h
diff --git a/linkers/elftoolchain/common/native-elf-format b/rtemstoolkit/elftoolchain/common/native-elf-format
index af70759..af70759 100755
--- a/linkers/elftoolchain/common/native-elf-format
+++ b/rtemstoolkit/elftoolchain/common/native-elf-format
diff --git a/linkers/elftoolchain/common/os.Linux.mk b/rtemstoolkit/elftoolchain/common/os.Linux.mk
index 2339e2a..2339e2a 100644
--- a/linkers/elftoolchain/common/os.Linux.mk
+++ b/rtemstoolkit/elftoolchain/common/os.Linux.mk
diff --git a/linkers/elftoolchain/common/uthash.h b/rtemstoolkit/elftoolchain/common/uthash.h
index 8428b9c..8428b9c 100644
--- a/linkers/elftoolchain/common/uthash.h
+++ b/rtemstoolkit/elftoolchain/common/uthash.h
diff --git a/linkers/elftoolchain/libelf/Makefile b/rtemstoolkit/elftoolchain/libelf/Makefile
index 41e902a..41e902a 100644
--- a/linkers/elftoolchain/libelf/Makefile
+++ b/rtemstoolkit/elftoolchain/libelf/Makefile
diff --git a/linkers/elftoolchain/libelf/Version.map b/rtemstoolkit/elftoolchain/libelf/Version.map
index 2c595ea..2c595ea 100644
--- a/linkers/elftoolchain/libelf/Version.map
+++ b/rtemstoolkit/elftoolchain/libelf/Version.map
diff --git a/linkers/elftoolchain/libelf/_libelf.h b/rtemstoolkit/elftoolchain/libelf/_libelf.h
index ef15642..ef15642 100644
--- a/linkers/elftoolchain/libelf/_libelf.h
+++ b/rtemstoolkit/elftoolchain/libelf/_libelf.h
diff --git a/linkers/elftoolchain/libelf/_libelf_ar.h b/rtemstoolkit/elftoolchain/libelf/_libelf_ar.h
index d6b15a7..d6b15a7 100644
--- a/linkers/elftoolchain/libelf/_libelf_ar.h
+++ b/rtemstoolkit/elftoolchain/libelf/_libelf_ar.h
diff --git a/linkers/elftoolchain/libelf/_libelf_config.h b/rtemstoolkit/elftoolchain/libelf/_libelf_config.h
index a318e70..a318e70 100644
--- a/linkers/elftoolchain/libelf/_libelf_config.h
+++ b/rtemstoolkit/elftoolchain/libelf/_libelf_config.h
diff --git a/linkers/elftoolchain/libelf/elf.3 b/rtemstoolkit/elftoolchain/libelf/elf.3
index 5d86f60..5d86f60 100644
--- a/linkers/elftoolchain/libelf/elf.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf.3
diff --git a/linkers/elftoolchain/libelf/elf.c b/rtemstoolkit/elftoolchain/libelf/elf.c
index e3ef7f3..e3ef7f3 100644
--- a/linkers/elftoolchain/libelf/elf.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf.c
diff --git a/linkers/elftoolchain/libelf/elf_begin.3 b/rtemstoolkit/elftoolchain/libelf/elf_begin.3
index 5a013a4..5a013a4 100644
--- a/linkers/elftoolchain/libelf/elf_begin.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_begin.3
diff --git a/linkers/elftoolchain/libelf/elf_begin.c b/rtemstoolkit/elftoolchain/libelf/elf_begin.c
index a6c9e4a..a6c9e4a 100644
--- a/linkers/elftoolchain/libelf/elf_begin.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_begin.c
diff --git a/linkers/elftoolchain/libelf/elf_cntl.3 b/rtemstoolkit/elftoolchain/libelf/elf_cntl.3
index 32649d1..32649d1 100644
--- a/linkers/elftoolchain/libelf/elf_cntl.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_cntl.3
diff --git a/linkers/elftoolchain/libelf/elf_cntl.c b/rtemstoolkit/elftoolchain/libelf/elf_cntl.c
index 2021917..2021917 100644
--- a/linkers/elftoolchain/libelf/elf_cntl.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_cntl.c
diff --git a/linkers/elftoolchain/libelf/elf_data.c b/rtemstoolkit/elftoolchain/libelf/elf_data.c
index 5ac6453..5ac6453 100644
--- a/linkers/elftoolchain/libelf/elf_data.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_data.c
diff --git a/linkers/elftoolchain/libelf/elf_end.3 b/rtemstoolkit/elftoolchain/libelf/elf_end.3
index 8649faa..8649faa 100644
--- a/linkers/elftoolchain/libelf/elf_end.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_end.3
diff --git a/linkers/elftoolchain/libelf/elf_end.c b/rtemstoolkit/elftoolchain/libelf/elf_end.c
index 136ed9a..136ed9a 100644
--- a/linkers/elftoolchain/libelf/elf_end.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_end.c
diff --git a/linkers/elftoolchain/libelf/elf_errmsg.3 b/rtemstoolkit/elftoolchain/libelf/elf_errmsg.3
index 822ba6a..822ba6a 100644
--- a/linkers/elftoolchain/libelf/elf_errmsg.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_errmsg.3
diff --git a/linkers/elftoolchain/libelf/elf_errmsg.c b/rtemstoolkit/elftoolchain/libelf/elf_errmsg.c
index 7a6e552..7a6e552 100644
--- a/linkers/elftoolchain/libelf/elf_errmsg.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_errmsg.c
diff --git a/linkers/elftoolchain/libelf/elf_errno.c b/rtemstoolkit/elftoolchain/libelf/elf_errno.c
index 95e91b9..95e91b9 100644
--- a/linkers/elftoolchain/libelf/elf_errno.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_errno.c
diff --git a/linkers/elftoolchain/libelf/elf_fill.3 b/rtemstoolkit/elftoolchain/libelf/elf_fill.3
index ab42a42..ab42a42 100644
--- a/linkers/elftoolchain/libelf/elf_fill.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_fill.3
diff --git a/linkers/elftoolchain/libelf/elf_fill.c b/rtemstoolkit/elftoolchain/libelf/elf_fill.c
index ac9e02e..ac9e02e 100644
--- a/linkers/elftoolchain/libelf/elf_fill.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_fill.c
diff --git a/linkers/elftoolchain/libelf/elf_flag.c b/rtemstoolkit/elftoolchain/libelf/elf_flag.c
index 9d31719..9d31719 100644
--- a/linkers/elftoolchain/libelf/elf_flag.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_flag.c
diff --git a/linkers/elftoolchain/libelf/elf_flagdata.3 b/rtemstoolkit/elftoolchain/libelf/elf_flagdata.3
index d4fd420..d4fd420 100644
--- a/linkers/elftoolchain/libelf/elf_flagdata.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_flagdata.3
diff --git a/linkers/elftoolchain/libelf/elf_getarhdr.3 b/rtemstoolkit/elftoolchain/libelf/elf_getarhdr.3
index 1aab71c..1aab71c 100644
--- a/linkers/elftoolchain/libelf/elf_getarhdr.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getarhdr.3
diff --git a/linkers/elftoolchain/libelf/elf_getarhdr.c b/rtemstoolkit/elftoolchain/libelf/elf_getarhdr.c
index 43ceafd..43ceafd 100644
--- a/linkers/elftoolchain/libelf/elf_getarhdr.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getarhdr.c
diff --git a/linkers/elftoolchain/libelf/elf_getarsym.3 b/rtemstoolkit/elftoolchain/libelf/elf_getarsym.3
index cda0511..cda0511 100644
--- a/linkers/elftoolchain/libelf/elf_getarsym.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getarsym.3
diff --git a/linkers/elftoolchain/libelf/elf_getarsym.c b/rtemstoolkit/elftoolchain/libelf/elf_getarsym.c
index 1852262..1852262 100644
--- a/linkers/elftoolchain/libelf/elf_getarsym.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getarsym.c
diff --git a/linkers/elftoolchain/libelf/elf_getbase.3 b/rtemstoolkit/elftoolchain/libelf/elf_getbase.3
index fa17353..fa17353 100644
--- a/linkers/elftoolchain/libelf/elf_getbase.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getbase.3
diff --git a/linkers/elftoolchain/libelf/elf_getbase.c b/rtemstoolkit/elftoolchain/libelf/elf_getbase.c
index 30058ca..30058ca 100644
--- a/linkers/elftoolchain/libelf/elf_getbase.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getbase.c
diff --git a/linkers/elftoolchain/libelf/elf_getdata.3 b/rtemstoolkit/elftoolchain/libelf/elf_getdata.3
index 8816a5a..8816a5a 100644
--- a/linkers/elftoolchain/libelf/elf_getdata.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getdata.3
diff --git a/linkers/elftoolchain/libelf/elf_getident.3 b/rtemstoolkit/elftoolchain/libelf/elf_getident.3
index 01d7f97..01d7f97 100644
--- a/linkers/elftoolchain/libelf/elf_getident.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getident.3
diff --git a/linkers/elftoolchain/libelf/elf_getident.c b/rtemstoolkit/elftoolchain/libelf/elf_getident.c
index c17f3a5..c17f3a5 100644
--- a/linkers/elftoolchain/libelf/elf_getident.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getident.c
diff --git a/linkers/elftoolchain/libelf/elf_getphdrnum.3 b/rtemstoolkit/elftoolchain/libelf/elf_getphdrnum.3
index f0fae5e..f0fae5e 100644
--- a/linkers/elftoolchain/libelf/elf_getphdrnum.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getphdrnum.3
diff --git a/linkers/elftoolchain/libelf/elf_getphnum.3 b/rtemstoolkit/elftoolchain/libelf/elf_getphnum.3
index 95c7540..95c7540 100644
--- a/linkers/elftoolchain/libelf/elf_getphnum.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getphnum.3
diff --git a/linkers/elftoolchain/libelf/elf_getscn.3 b/rtemstoolkit/elftoolchain/libelf/elf_getscn.3
index 0afe443..0afe443 100644
--- a/linkers/elftoolchain/libelf/elf_getscn.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getscn.3
diff --git a/linkers/elftoolchain/libelf/elf_getshdrnum.3 b/rtemstoolkit/elftoolchain/libelf/elf_getshdrnum.3
index e2bf354..e2bf354 100644
--- a/linkers/elftoolchain/libelf/elf_getshdrnum.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getshdrnum.3
diff --git a/linkers/elftoolchain/libelf/elf_getshdrstrndx.3 b/rtemstoolkit/elftoolchain/libelf/elf_getshdrstrndx.3
index b02e715..b02e715 100644
--- a/linkers/elftoolchain/libelf/elf_getshdrstrndx.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getshdrstrndx.3
diff --git a/linkers/elftoolchain/libelf/elf_getshnum.3 b/rtemstoolkit/elftoolchain/libelf/elf_getshnum.3
index 615aa71..615aa71 100644
--- a/linkers/elftoolchain/libelf/elf_getshnum.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getshnum.3
diff --git a/linkers/elftoolchain/libelf/elf_getshstrndx.3 b/rtemstoolkit/elftoolchain/libelf/elf_getshstrndx.3
index 71c6f95..71c6f95 100644
--- a/linkers/elftoolchain/libelf/elf_getshstrndx.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_getshstrndx.3
diff --git a/linkers/elftoolchain/libelf/elf_hash.3 b/rtemstoolkit/elftoolchain/libelf/elf_hash.3
index f099558..f099558 100644
--- a/linkers/elftoolchain/libelf/elf_hash.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_hash.3
diff --git a/linkers/elftoolchain/libelf/elf_hash.c b/rtemstoolkit/elftoolchain/libelf/elf_hash.c
index 12c764d..12c764d 100644
--- a/linkers/elftoolchain/libelf/elf_hash.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_hash.c
diff --git a/linkers/elftoolchain/libelf/elf_kind.3 b/rtemstoolkit/elftoolchain/libelf/elf_kind.3
index a5bbf9d..a5bbf9d 100644
--- a/linkers/elftoolchain/libelf/elf_kind.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_kind.3
diff --git a/linkers/elftoolchain/libelf/elf_kind.c b/rtemstoolkit/elftoolchain/libelf/elf_kind.c
index 0b4251a..0b4251a 100644
--- a/linkers/elftoolchain/libelf/elf_kind.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_kind.c
diff --git a/linkers/elftoolchain/libelf/elf_memory.3 b/rtemstoolkit/elftoolchain/libelf/elf_memory.3
index 2f9da44..2f9da44 100644
--- a/linkers/elftoolchain/libelf/elf_memory.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_memory.3
diff --git a/linkers/elftoolchain/libelf/elf_memory.c b/rtemstoolkit/elftoolchain/libelf/elf_memory.c
index 691beaf..691beaf 100644
--- a/linkers/elftoolchain/libelf/elf_memory.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_memory.c
diff --git a/linkers/elftoolchain/libelf/elf_next.3 b/rtemstoolkit/elftoolchain/libelf/elf_next.3
index 859d06c..859d06c 100644
--- a/linkers/elftoolchain/libelf/elf_next.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_next.3
diff --git a/linkers/elftoolchain/libelf/elf_next.c b/rtemstoolkit/elftoolchain/libelf/elf_next.c
index d6ca552..d6ca552 100644
--- a/linkers/elftoolchain/libelf/elf_next.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_next.c
diff --git a/linkers/elftoolchain/libelf/elf_phnum.c b/rtemstoolkit/elftoolchain/libelf/elf_phnum.c
index d63c490..d63c490 100644
--- a/linkers/elftoolchain/libelf/elf_phnum.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_phnum.c
diff --git a/linkers/elftoolchain/libelf/elf_rand.3 b/rtemstoolkit/elftoolchain/libelf/elf_rand.3
index e5affd6..e5affd6 100644
--- a/linkers/elftoolchain/libelf/elf_rand.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_rand.3
diff --git a/linkers/elftoolchain/libelf/elf_rand.c b/rtemstoolkit/elftoolchain/libelf/elf_rand.c
index 2e7328a..2e7328a 100644
--- a/linkers/elftoolchain/libelf/elf_rand.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_rand.c
diff --git a/linkers/elftoolchain/libelf/elf_rawfile.3 b/rtemstoolkit/elftoolchain/libelf/elf_rawfile.3
index a713b42..a713b42 100644
--- a/linkers/elftoolchain/libelf/elf_rawfile.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_rawfile.3
diff --git a/linkers/elftoolchain/libelf/elf_rawfile.c b/rtemstoolkit/elftoolchain/libelf/elf_rawfile.c
index 22a9f95..22a9f95 100644
--- a/linkers/elftoolchain/libelf/elf_rawfile.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_rawfile.c
diff --git a/linkers/elftoolchain/libelf/elf_scn.c b/rtemstoolkit/elftoolchain/libelf/elf_scn.c
index 80444fd..80444fd 100644
--- a/linkers/elftoolchain/libelf/elf_scn.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_scn.c
diff --git a/linkers/elftoolchain/libelf/elf_shnum.c b/rtemstoolkit/elftoolchain/libelf/elf_shnum.c
index 515027a..515027a 100644
--- a/linkers/elftoolchain/libelf/elf_shnum.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_shnum.c
diff --git a/linkers/elftoolchain/libelf/elf_shstrndx.c b/rtemstoolkit/elftoolchain/libelf/elf_shstrndx.c
index bac14b4..bac14b4 100644
--- a/linkers/elftoolchain/libelf/elf_shstrndx.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_shstrndx.c
diff --git a/linkers/elftoolchain/libelf/elf_strptr.3 b/rtemstoolkit/elftoolchain/libelf/elf_strptr.3
index 31e0f83..31e0f83 100644
--- a/linkers/elftoolchain/libelf/elf_strptr.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_strptr.3
diff --git a/linkers/elftoolchain/libelf/elf_strptr.c b/rtemstoolkit/elftoolchain/libelf/elf_strptr.c
index bfa39de..bfa39de 100644
--- a/linkers/elftoolchain/libelf/elf_strptr.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_strptr.c
diff --git a/linkers/elftoolchain/libelf/elf_types.m4 b/rtemstoolkit/elftoolchain/libelf/elf_types.m4
index 9e9680d..9e9680d 100644
--- a/linkers/elftoolchain/libelf/elf_types.m4
+++ b/rtemstoolkit/elftoolchain/libelf/elf_types.m4
diff --git a/linkers/elftoolchain/libelf/elf_update.3 b/rtemstoolkit/elftoolchain/libelf/elf_update.3
index 40a1e40..40a1e40 100644
--- a/linkers/elftoolchain/libelf/elf_update.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_update.3
diff --git a/linkers/elftoolchain/libelf/elf_update.c b/rtemstoolkit/elftoolchain/libelf/elf_update.c
index 9806131..9806131 100644
--- a/linkers/elftoolchain/libelf/elf_update.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_update.c
diff --git a/linkers/elftoolchain/libelf/elf_version.3 b/rtemstoolkit/elftoolchain/libelf/elf_version.3
index b09fb47..b09fb47 100644
--- a/linkers/elftoolchain/libelf/elf_version.3
+++ b/rtemstoolkit/elftoolchain/libelf/elf_version.3
diff --git a/linkers/elftoolchain/libelf/elf_version.c b/rtemstoolkit/elftoolchain/libelf/elf_version.c
index 48950f4..48950f4 100644
--- a/linkers/elftoolchain/libelf/elf_version.c
+++ b/rtemstoolkit/elftoolchain/libelf/elf_version.c
diff --git a/linkers/elftoolchain/libelf/gelf.3 b/rtemstoolkit/elftoolchain/libelf/gelf.3
index a5d68ce..a5d68ce 100644
--- a/linkers/elftoolchain/libelf/gelf.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf.3
diff --git a/linkers/elftoolchain/libelf/gelf.h b/rtemstoolkit/elftoolchain/libelf/gelf.h
index 0a7dc24..0a7dc24 100644
--- a/linkers/elftoolchain/libelf/gelf.h
+++ b/rtemstoolkit/elftoolchain/libelf/gelf.h
diff --git a/linkers/elftoolchain/libelf/gelf_cap.c b/rtemstoolkit/elftoolchain/libelf/gelf_cap.c
index af0b388..af0b388 100644
--- a/linkers/elftoolchain/libelf/gelf_cap.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_cap.c
diff --git a/linkers/elftoolchain/libelf/gelf_checksum.3 b/rtemstoolkit/elftoolchain/libelf/gelf_checksum.3
index e5f845f..e5f845f 100644
--- a/linkers/elftoolchain/libelf/gelf_checksum.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_checksum.3
diff --git a/linkers/elftoolchain/libelf/gelf_checksum.c b/rtemstoolkit/elftoolchain/libelf/gelf_checksum.c
index 30fbb97..30fbb97 100644
--- a/linkers/elftoolchain/libelf/gelf_checksum.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_checksum.c
diff --git a/linkers/elftoolchain/libelf/gelf_dyn.c b/rtemstoolkit/elftoolchain/libelf/gelf_dyn.c
index 6a2885c..6a2885c 100644
--- a/linkers/elftoolchain/libelf/gelf_dyn.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_dyn.c
diff --git a/linkers/elftoolchain/libelf/gelf_ehdr.c b/rtemstoolkit/elftoolchain/libelf/gelf_ehdr.c
index 37ccce8..37ccce8 100644
--- a/linkers/elftoolchain/libelf/gelf_ehdr.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_ehdr.c
diff --git a/linkers/elftoolchain/libelf/gelf_fsize.3 b/rtemstoolkit/elftoolchain/libelf/gelf_fsize.3
index ac7996f..ac7996f 100644
--- a/linkers/elftoolchain/libelf/gelf_fsize.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_fsize.3
diff --git a/linkers/elftoolchain/libelf/gelf_fsize.c b/rtemstoolkit/elftoolchain/libelf/gelf_fsize.c
index 0e38d14..0e38d14 100644
--- a/linkers/elftoolchain/libelf/gelf_fsize.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_fsize.c
diff --git a/linkers/elftoolchain/libelf/gelf_getcap.3 b/rtemstoolkit/elftoolchain/libelf/gelf_getcap.3
index ed8eb02..ed8eb02 100644
--- a/linkers/elftoolchain/libelf/gelf_getcap.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getcap.3
diff --git a/linkers/elftoolchain/libelf/gelf_getclass.3 b/rtemstoolkit/elftoolchain/libelf/gelf_getclass.3
index 3504569..3504569 100644
--- a/linkers/elftoolchain/libelf/gelf_getclass.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getclass.3
diff --git a/linkers/elftoolchain/libelf/gelf_getclass.c b/rtemstoolkit/elftoolchain/libelf/gelf_getclass.c
index 349a9cd..349a9cd 100644
--- a/linkers/elftoolchain/libelf/gelf_getclass.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getclass.c
diff --git a/linkers/elftoolchain/libelf/gelf_getdyn.3 b/rtemstoolkit/elftoolchain/libelf/gelf_getdyn.3
index f8c1778..f8c1778 100644
--- a/linkers/elftoolchain/libelf/gelf_getdyn.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getdyn.3
diff --git a/linkers/elftoolchain/libelf/gelf_getehdr.3 b/rtemstoolkit/elftoolchain/libelf/gelf_getehdr.3
index 56bdcd4..56bdcd4 100644
--- a/linkers/elftoolchain/libelf/gelf_getehdr.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getehdr.3
diff --git a/linkers/elftoolchain/libelf/gelf_getmove.3 b/rtemstoolkit/elftoolchain/libelf/gelf_getmove.3
index 871a040..871a040 100644
--- a/linkers/elftoolchain/libelf/gelf_getmove.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getmove.3
diff --git a/linkers/elftoolchain/libelf/gelf_getphdr.3 b/rtemstoolkit/elftoolchain/libelf/gelf_getphdr.3
index f2d38aa..f2d38aa 100644
--- a/linkers/elftoolchain/libelf/gelf_getphdr.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getphdr.3
diff --git a/linkers/elftoolchain/libelf/gelf_getrel.3 b/rtemstoolkit/elftoolchain/libelf/gelf_getrel.3
index c7566e6..c7566e6 100644
--- a/linkers/elftoolchain/libelf/gelf_getrel.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getrel.3
diff --git a/linkers/elftoolchain/libelf/gelf_getrela.3 b/rtemstoolkit/elftoolchain/libelf/gelf_getrela.3
index c77d52a..c77d52a 100644
--- a/linkers/elftoolchain/libelf/gelf_getrela.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getrela.3
diff --git a/linkers/elftoolchain/libelf/gelf_getshdr.3 b/rtemstoolkit/elftoolchain/libelf/gelf_getshdr.3
index e92d414..e92d414 100644
--- a/linkers/elftoolchain/libelf/gelf_getshdr.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getshdr.3
diff --git a/linkers/elftoolchain/libelf/gelf_getsym.3 b/rtemstoolkit/elftoolchain/libelf/gelf_getsym.3
index 98d886f..98d886f 100644
--- a/linkers/elftoolchain/libelf/gelf_getsym.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getsym.3
diff --git a/linkers/elftoolchain/libelf/gelf_getsyminfo.3 b/rtemstoolkit/elftoolchain/libelf/gelf_getsyminfo.3
index a1169f8..a1169f8 100644
--- a/linkers/elftoolchain/libelf/gelf_getsyminfo.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getsyminfo.3
diff --git a/linkers/elftoolchain/libelf/gelf_getsymshndx.3 b/rtemstoolkit/elftoolchain/libelf/gelf_getsymshndx.3
index b635aac..b635aac 100644
--- a/linkers/elftoolchain/libelf/gelf_getsymshndx.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_getsymshndx.3
diff --git a/linkers/elftoolchain/libelf/gelf_move.c b/rtemstoolkit/elftoolchain/libelf/gelf_move.c
index 753aba9..753aba9 100644
--- a/linkers/elftoolchain/libelf/gelf_move.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_move.c
diff --git a/linkers/elftoolchain/libelf/gelf_newehdr.3 b/rtemstoolkit/elftoolchain/libelf/gelf_newehdr.3
index 180fea9..180fea9 100644
--- a/linkers/elftoolchain/libelf/gelf_newehdr.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_newehdr.3
diff --git a/linkers/elftoolchain/libelf/gelf_newphdr.3 b/rtemstoolkit/elftoolchain/libelf/gelf_newphdr.3
index 931385e..931385e 100644
--- a/linkers/elftoolchain/libelf/gelf_newphdr.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_newphdr.3
diff --git a/linkers/elftoolchain/libelf/gelf_phdr.c b/rtemstoolkit/elftoolchain/libelf/gelf_phdr.c
index 47000d8..47000d8 100644
--- a/linkers/elftoolchain/libelf/gelf_phdr.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_phdr.c
diff --git a/linkers/elftoolchain/libelf/gelf_rel.c b/rtemstoolkit/elftoolchain/libelf/gelf_rel.c
index 7d0b6af..7d0b6af 100644
--- a/linkers/elftoolchain/libelf/gelf_rel.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_rel.c
diff --git a/linkers/elftoolchain/libelf/gelf_rela.c b/rtemstoolkit/elftoolchain/libelf/gelf_rela.c
index 722c1ad..722c1ad 100644
--- a/linkers/elftoolchain/libelf/gelf_rela.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_rela.c
diff --git a/linkers/elftoolchain/libelf/gelf_shdr.c b/rtemstoolkit/elftoolchain/libelf/gelf_shdr.c
index 47e56e9..47e56e9 100644
--- a/linkers/elftoolchain/libelf/gelf_shdr.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_shdr.c
diff --git a/linkers/elftoolchain/libelf/gelf_sym.c b/rtemstoolkit/elftoolchain/libelf/gelf_sym.c
index 3f84a17..3f84a17 100644
--- a/linkers/elftoolchain/libelf/gelf_sym.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_sym.c
diff --git a/linkers/elftoolchain/libelf/gelf_syminfo.c b/rtemstoolkit/elftoolchain/libelf/gelf_syminfo.c
index 2e8d9d8..2e8d9d8 100644
--- a/linkers/elftoolchain/libelf/gelf_syminfo.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_syminfo.c
diff --git a/linkers/elftoolchain/libelf/gelf_symshndx.c b/rtemstoolkit/elftoolchain/libelf/gelf_symshndx.c
index ab3549c..ab3549c 100644
--- a/linkers/elftoolchain/libelf/gelf_symshndx.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_symshndx.c
diff --git a/linkers/elftoolchain/libelf/gelf_update_ehdr.3 b/rtemstoolkit/elftoolchain/libelf/gelf_update_ehdr.3
index f5e041d..f5e041d 100644
--- a/linkers/elftoolchain/libelf/gelf_update_ehdr.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_update_ehdr.3
diff --git a/linkers/elftoolchain/libelf/gelf_xlate.c b/rtemstoolkit/elftoolchain/libelf/gelf_xlate.c
index 6cdf705..6cdf705 100644
--- a/linkers/elftoolchain/libelf/gelf_xlate.c
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_xlate.c
diff --git a/linkers/elftoolchain/libelf/gelf_xlatetof.3 b/rtemstoolkit/elftoolchain/libelf/gelf_xlatetof.3
index ca90002..ca90002 100644
--- a/linkers/elftoolchain/libelf/gelf_xlatetof.3
+++ b/rtemstoolkit/elftoolchain/libelf/gelf_xlatetof.3
diff --git a/linkers/elftoolchain/libelf/libelf.h b/rtemstoolkit/elftoolchain/libelf/libelf.h
index 60b0f1c..60b0f1c 100644
--- a/linkers/elftoolchain/libelf/libelf.h
+++ b/rtemstoolkit/elftoolchain/libelf/libelf.h
diff --git a/linkers/elftoolchain/libelf/libelf_align.c b/rtemstoolkit/elftoolchain/libelf/libelf_align.c
index 55a65f9..55a65f9 100644
--- a/linkers/elftoolchain/libelf/libelf_align.c
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_align.c
diff --git a/linkers/elftoolchain/libelf/libelf_allocate.c b/rtemstoolkit/elftoolchain/libelf/libelf_allocate.c
index a753e8e..a753e8e 100644
--- a/linkers/elftoolchain/libelf/libelf_allocate.c
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_allocate.c
diff --git a/linkers/elftoolchain/libelf/libelf_ar.c b/rtemstoolkit/elftoolchain/libelf/libelf_ar.c
index 14b383d..14b383d 100644
--- a/linkers/elftoolchain/libelf/libelf_ar.c
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_ar.c
diff --git a/linkers/elftoolchain/libelf/libelf_ar_util.c b/rtemstoolkit/elftoolchain/libelf/libelf_ar_util.c
index 7051fe8..7051fe8 100644
--- a/linkers/elftoolchain/libelf/libelf_ar_util.c
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_ar_util.c
diff --git a/linkers/elftoolchain/libelf/libelf_checksum.c b/rtemstoolkit/elftoolchain/libelf/libelf_checksum.c
index 0bece9a..0bece9a 100644
--- a/linkers/elftoolchain/libelf/libelf_checksum.c
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_checksum.c
diff --git a/linkers/elftoolchain/libelf/libelf_convert.m4 b/rtemstoolkit/elftoolchain/libelf/libelf_convert.m4
index 9b1679a..9b1679a 100644
--- a/linkers/elftoolchain/libelf/libelf_convert.m4
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_convert.m4
diff --git a/linkers/elftoolchain/libelf/libelf_data.c b/rtemstoolkit/elftoolchain/libelf/libelf_data.c
index 8044c74..8044c74 100644
--- a/linkers/elftoolchain/libelf/libelf_data.c
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_data.c
diff --git a/linkers/elftoolchain/libelf/libelf_ehdr.c b/rtemstoolkit/elftoolchain/libelf/libelf_ehdr.c
index affe541..affe541 100644
--- a/linkers/elftoolchain/libelf/libelf_ehdr.c
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_ehdr.c
diff --git a/linkers/elftoolchain/libelf/libelf_extended.c b/rtemstoolkit/elftoolchain/libelf/libelf_extended.c
index 10590bb..10590bb 100644
--- a/linkers/elftoolchain/libelf/libelf_extended.c
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_extended.c
diff --git a/linkers/elftoolchain/libelf/libelf_fsize.m4 b/rtemstoolkit/elftoolchain/libelf/libelf_fsize.m4
index 4829789..4829789 100644
--- a/linkers/elftoolchain/libelf/libelf_fsize.m4
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_fsize.m4
diff --git a/linkers/elftoolchain/libelf/libelf_msize.m4 b/rtemstoolkit/elftoolchain/libelf/libelf_msize.m4
index 95621fb..95621fb 100644
--- a/linkers/elftoolchain/libelf/libelf_msize.m4
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_msize.m4
diff --git a/linkers/elftoolchain/libelf/libelf_phdr.c b/rtemstoolkit/elftoolchain/libelf/libelf_phdr.c
index 5a5bb5f..5a5bb5f 100644
--- a/linkers/elftoolchain/libelf/libelf_phdr.c
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_phdr.c
diff --git a/linkers/elftoolchain/libelf/libelf_shdr.c b/rtemstoolkit/elftoolchain/libelf/libelf_shdr.c
index a696cef..a696cef 100644
--- a/linkers/elftoolchain/libelf/libelf_shdr.c
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_shdr.c
diff --git a/linkers/elftoolchain/libelf/libelf_xlate.c b/rtemstoolkit/elftoolchain/libelf/libelf_xlate.c
index ace4e09..ace4e09 100644
--- a/linkers/elftoolchain/libelf/libelf_xlate.c
+++ b/rtemstoolkit/elftoolchain/libelf/libelf_xlate.c
diff --git a/linkers/elftoolchain/libelf/mmap_win32.c b/rtemstoolkit/elftoolchain/libelf/mmap_win32.c
index f801fc6..f801fc6 100644
--- a/linkers/elftoolchain/libelf/mmap_win32.c
+++ b/rtemstoolkit/elftoolchain/libelf/mmap_win32.c
diff --git a/linkers/elftoolchain/libelf/os.FreeBSD.mk b/rtemstoolkit/elftoolchain/libelf/os.FreeBSD.mk
index 72834b7..72834b7 100644
--- a/linkers/elftoolchain/libelf/os.FreeBSD.mk
+++ b/rtemstoolkit/elftoolchain/libelf/os.FreeBSD.mk
diff --git a/linkers/elftoolchain/libelf/os.NetBSD.mk b/rtemstoolkit/elftoolchain/libelf/os.NetBSD.mk
index 96b8335..96b8335 100644
--- a/linkers/elftoolchain/libelf/os.NetBSD.mk
+++ b/rtemstoolkit/elftoolchain/libelf/os.NetBSD.mk
diff --git a/linkers/fastlz.c b/rtemstoolkit/fastlz.c
index 3c9d6f6..3c9d6f6 100644
--- a/linkers/fastlz.c
+++ b/rtemstoolkit/fastlz.c
diff --git a/linkers/fastlz.h b/rtemstoolkit/fastlz.h
index f87bc7b..f87bc7b 100644
--- a/linkers/fastlz.h
+++ b/rtemstoolkit/fastlz.h
diff --git a/linkers/libiberty/ansidecl.h b/rtemstoolkit/libiberty/ansidecl.h
index 86b0944..86b0944 100644
--- a/linkers/libiberty/ansidecl.h
+++ b/rtemstoolkit/libiberty/ansidecl.h
diff --git a/linkers/libiberty/concat.c b/rtemstoolkit/libiberty/concat.c
index 9779d56..9779d56 100644
--- a/linkers/libiberty/concat.c
+++ b/rtemstoolkit/libiberty/concat.c
diff --git a/linkers/libiberty/cp-demangle.c b/rtemstoolkit/libiberty/cp-demangle.c
index c590561..c590561 100644
--- a/linkers/libiberty/cp-demangle.c
+++ b/rtemstoolkit/libiberty/cp-demangle.c
diff --git a/linkers/libiberty/cp-demangle.h b/rtemstoolkit/libiberty/cp-demangle.h
index aad3743..aad3743 100644
--- a/linkers/libiberty/cp-demangle.h
+++ b/rtemstoolkit/libiberty/cp-demangle.h
diff --git a/linkers/libiberty/cplus-dem.c b/rtemstoolkit/libiberty/cplus-dem.c
index 6628514..6628514 100644
--- a/linkers/libiberty/cplus-dem.c
+++ b/rtemstoolkit/libiberty/cplus-dem.c
diff --git a/linkers/libiberty/demangle.h b/rtemstoolkit/libiberty/demangle.h
index 4b3565b..4b3565b 100644
--- a/linkers/libiberty/demangle.h
+++ b/rtemstoolkit/libiberty/demangle.h
diff --git a/linkers/libiberty/libiberty.h b/rtemstoolkit/libiberty/libiberty.h
index d2dfb1b..d2dfb1b 100644
--- a/linkers/libiberty/libiberty.h
+++ b/rtemstoolkit/libiberty/libiberty.h
diff --git a/linkers/libiberty/make-temp-file.c b/rtemstoolkit/libiberty/make-temp-file.c
index dc2fc1d..dc2fc1d 100644
--- a/linkers/libiberty/make-temp-file.c
+++ b/rtemstoolkit/libiberty/make-temp-file.c
diff --git a/linkers/libiberty/mkstemps.c b/rtemstoolkit/libiberty/mkstemps.c
index a0e68a7..a0e68a7 100644
--- a/linkers/libiberty/mkstemps.c
+++ b/rtemstoolkit/libiberty/mkstemps.c
diff --git a/linkers/libiberty/pex-common.c b/rtemstoolkit/libiberty/pex-common.c
index 6fd3fde..6fd3fde 100644
--- a/linkers/libiberty/pex-common.c
+++ b/rtemstoolkit/libiberty/pex-common.c
diff --git a/linkers/libiberty/pex-common.h b/rtemstoolkit/libiberty/pex-common.h
index af338e6..af338e6 100644
--- a/linkers/libiberty/pex-common.h
+++ b/rtemstoolkit/libiberty/pex-common.h
diff --git a/linkers/libiberty/pex-djgpp.c b/rtemstoolkit/libiberty/pex-djgpp.c
index 0721139..0721139 100644
--- a/linkers/libiberty/pex-djgpp.c
+++ b/rtemstoolkit/libiberty/pex-djgpp.c
diff --git a/linkers/libiberty/pex-msdos.c b/rtemstoolkit/libiberty/pex-msdos.c
index fa0f40a..fa0f40a 100644
--- a/linkers/libiberty/pex-msdos.c
+++ b/rtemstoolkit/libiberty/pex-msdos.c
diff --git a/linkers/libiberty/pex-one.c b/rtemstoolkit/libiberty/pex-one.c
index 696b8bc..696b8bc 100644
--- a/linkers/libiberty/pex-one.c
+++ b/rtemstoolkit/libiberty/pex-one.c
diff --git a/linkers/libiberty/pex-unix.c b/rtemstoolkit/libiberty/pex-unix.c
index 80a4770..80a4770 100644
--- a/linkers/libiberty/pex-unix.c
+++ b/rtemstoolkit/libiberty/pex-unix.c
diff --git a/linkers/libiberty/pex-win32.c b/rtemstoolkit/libiberty/pex-win32.c
index f1d47c7..f1d47c7 100644
--- a/linkers/libiberty/pex-win32.c
+++ b/rtemstoolkit/libiberty/pex-win32.c
diff --git a/linkers/libiberty/safe-ctype.c b/rtemstoolkit/libiberty/safe-ctype.c
index 0972b4b..0972b4b 100644
--- a/linkers/libiberty/safe-ctype.c
+++ b/rtemstoolkit/libiberty/safe-ctype.c
diff --git a/linkers/libiberty/safe-ctype.h b/rtemstoolkit/libiberty/safe-ctype.h
index 0266bf1..0266bf1 100644
--- a/linkers/libiberty/safe-ctype.h
+++ b/rtemstoolkit/libiberty/safe-ctype.h
diff --git a/linkers/libiberty/stpcpy.c b/rtemstoolkit/libiberty/stpcpy.c
index 57b32d1..57b32d1 100644
--- a/linkers/libiberty/stpcpy.c
+++ b/rtemstoolkit/libiberty/stpcpy.c
diff --git a/linkers/pkgconfig.cpp b/rtemstoolkit/pkgconfig.cpp
index 74edf59..74edf59 100644
--- a/linkers/pkgconfig.cpp
+++ b/rtemstoolkit/pkgconfig.cpp
diff --git a/linkers/pkgconfig.h b/rtemstoolkit/pkgconfig.h
index 57b1c3b..57b1c3b 100644
--- a/linkers/pkgconfig.h
+++ b/rtemstoolkit/pkgconfig.h
diff --git a/linkers/rld-cc.cpp b/rtemstoolkit/rld-cc.cpp
index a2b1be4..a2b1be4 100644
--- a/linkers/rld-cc.cpp
+++ b/rtemstoolkit/rld-cc.cpp
diff --git a/linkers/rld-cc.h b/rtemstoolkit/rld-cc.h
index 6c200d2..6c200d2 100644
--- a/linkers/rld-cc.h
+++ b/rtemstoolkit/rld-cc.h
diff --git a/linkers/rld-compression.cpp b/rtemstoolkit/rld-compression.cpp
index 2abeff1..2abeff1 100644
--- a/linkers/rld-compression.cpp
+++ b/rtemstoolkit/rld-compression.cpp
diff --git a/linkers/rld-compression.h b/rtemstoolkit/rld-compression.h
index 4710845..4710845 100644
--- a/linkers/rld-compression.h
+++ b/rtemstoolkit/rld-compression.h
diff --git a/linkers/rld-config.cpp b/rtemstoolkit/rld-config.cpp
index c106120..c106120 100644
--- a/linkers/rld-config.cpp
+++ b/rtemstoolkit/rld-config.cpp
diff --git a/linkers/rld-config.h b/rtemstoolkit/rld-config.h
index 4bcb964..4bcb964 100644
--- a/linkers/rld-config.h
+++ b/rtemstoolkit/rld-config.h
diff --git a/linkers/rld-elf-types.h b/rtemstoolkit/rld-elf-types.h
index c0da295..c0da295 100644
--- a/linkers/rld-elf-types.h
+++ b/rtemstoolkit/rld-elf-types.h
diff --git a/linkers/rld-elf.cpp b/rtemstoolkit/rld-elf.cpp
index 8b2ac5e..8b2ac5e 100644
--- a/linkers/rld-elf.cpp
+++ b/rtemstoolkit/rld-elf.cpp
diff --git a/linkers/rld-elf.h b/rtemstoolkit/rld-elf.h
index fffe036..fffe036 100644
--- a/linkers/rld-elf.h
+++ b/rtemstoolkit/rld-elf.h
diff --git a/linkers/rld-files.cpp b/rtemstoolkit/rld-files.cpp
index 03310e8..03310e8 100644
--- a/linkers/rld-files.cpp
+++ b/rtemstoolkit/rld-files.cpp
diff --git a/linkers/rld-files.h b/rtemstoolkit/rld-files.h
index 0c98cf1..0c98cf1 100644
--- a/linkers/rld-files.h
+++ b/rtemstoolkit/rld-files.h
diff --git a/linkers/rld-outputter.cpp b/rtemstoolkit/rld-outputter.cpp
index 600aedc..600aedc 100644
--- a/linkers/rld-outputter.cpp
+++ b/rtemstoolkit/rld-outputter.cpp
diff --git a/linkers/rld-outputter.h b/rtemstoolkit/rld-outputter.h
index 7fe52b2..7fe52b2 100644
--- a/linkers/rld-outputter.h
+++ b/rtemstoolkit/rld-outputter.h
diff --git a/linkers/rld-path.cpp b/rtemstoolkit/rld-path.cpp
index 1cdb586..1cdb586 100644
--- a/linkers/rld-path.cpp
+++ b/rtemstoolkit/rld-path.cpp
diff --git a/linkers/rld-path.h b/rtemstoolkit/rld-path.h
index d73c59b..d73c59b 100644
--- a/linkers/rld-path.h
+++ b/rtemstoolkit/rld-path.h
diff --git a/linkers/rld-process.cpp b/rtemstoolkit/rld-process.cpp
index bfd6734..bfd6734 100644
--- a/linkers/rld-process.cpp
+++ b/rtemstoolkit/rld-process.cpp
diff --git a/linkers/rld-process.h b/rtemstoolkit/rld-process.h
index ae89b15..ae89b15 100644
--- a/linkers/rld-process.h
+++ b/rtemstoolkit/rld-process.h
diff --git a/linkers/rld-rap.cpp b/rtemstoolkit/rld-rap.cpp
index 9b87279..9b87279 100644
--- a/linkers/rld-rap.cpp
+++ b/rtemstoolkit/rld-rap.cpp
diff --git a/linkers/rld-rap.h b/rtemstoolkit/rld-rap.h
index 19969e3..19969e3 100644
--- a/linkers/rld-rap.h
+++ b/rtemstoolkit/rld-rap.h
diff --git a/linkers/rld-resolver.cpp b/rtemstoolkit/rld-resolver.cpp
index d2a9f1e..d2a9f1e 100644
--- a/linkers/rld-resolver.cpp
+++ b/rtemstoolkit/rld-resolver.cpp
diff --git a/linkers/rld-resolver.h b/rtemstoolkit/rld-resolver.h
index 3771f18..3771f18 100644
--- a/linkers/rld-resolver.h
+++ b/rtemstoolkit/rld-resolver.h
diff --git a/linkers/rld-rtems.cpp b/rtemstoolkit/rld-rtems.cpp
index d85f845..d85f845 100644
--- a/linkers/rld-rtems.cpp
+++ b/rtemstoolkit/rld-rtems.cpp
diff --git a/linkers/rld-rtems.h b/rtemstoolkit/rld-rtems.h
index 04305ce..04305ce 100644
--- a/linkers/rld-rtems.h
+++ b/rtemstoolkit/rld-rtems.h
diff --git a/linkers/rld-symbols.cpp b/rtemstoolkit/rld-symbols.cpp
index 3464017..3464017 100644
--- a/linkers/rld-symbols.cpp
+++ b/rtemstoolkit/rld-symbols.cpp
diff --git a/linkers/rld-symbols.h b/rtemstoolkit/rld-symbols.h
index 5405d2f..5405d2f 100644
--- a/linkers/rld-symbols.h
+++ b/rtemstoolkit/rld-symbols.h
diff --git a/linkers/rld.cpp b/rtemstoolkit/rld.cpp
index c3368f9..c3368f9 100644
--- a/linkers/rld.cpp
+++ b/rtemstoolkit/rld.cpp
diff --git a/linkers/rld.h b/rtemstoolkit/rld.h
index 7bd940b..7bd940b 100644
--- a/linkers/rld.h
+++ b/rtemstoolkit/rld.h
diff --git a/linkers/rtems-utils.cpp b/rtemstoolkit/rtems-utils.cpp
index 8fda105..8fda105 100644
--- a/linkers/rtems-utils.cpp
+++ b/rtemstoolkit/rtems-utils.cpp
diff --git a/linkers/rtems-utils.h b/rtemstoolkit/rtems-utils.h
index 9918570..9918570 100644
--- a/linkers/rtems-utils.h
+++ b/rtemstoolkit/rtems-utils.h
diff --git a/rtemstoolkit/wscript b/rtemstoolkit/wscript
new file mode 100644
index 0000000..80d80ec
--- /dev/null
+++ b/rtemstoolkit/wscript
@@ -0,0 +1,261 @@
+#
+# RTEMS Toolkit build script.
+#
+import sys
+
+version_major = 1
+version_minor = 0
+version_revision = 0
+
+#
+# Waf system setup. Allow more than one build in the same tree.
+#
+top = '.'
+out = 'build-' + sys.platform
+
+def options(opt):
+    opt.load("g++")
+    opt.load("gcc")
+
+def configure(conf):
+    conf.load("g++")
+    conf.load("gcc")
+    conf_libiberty(conf)
+    conf_libelf(conf)
+
+    conf.check(header_name='sys/wait.h',  features = 'c', mandatory = False)
+    conf.check_cc(function_name='kill', header_name="signal.h",
+                  features = 'c', mandatory = False)
+    conf.write_config_header('config.h')
+
+def build(bld):
+    #
+    # The local configuration.
+    #
+    conf = {}
+
+    #
+    # The include paths.
+    #
+    conf['includes'] = ['elftoolchain/libelf', 'elftoolchain/common', 'libiberty']
+    if sys.platform == 'win32':
+        conf['includes'] += ['win32']
+
+    #
+    # Build flags.
+    #
+    conf['warningflags'] = ['-Wall', '-Wextra', '-pedantic']
+    conf['optflags'] = bld.env.C_OPTS
+    conf['cflags'] = ['-pipe', '-g'] + conf['optflags']
+    conf['cxxflags'] = ['-pipe', '-g'] + conf['optflags']
+    conf['linkflags'] = ['-g']
+
+    #
+    # Create each of the modules as object files each with their own
+    # configurations.
+    #
+    bld_fastlz(bld, conf)
+    bld_libelf(bld, conf)
+    bld_libiberty(bld, conf)
+
+    #
+    # RLD source.
+    #
+    rld_source = ['ConvertUTF.c',
+                  'pkgconfig.cpp',
+                  'rld-config.cpp',
+                  'rld-elf.cpp',
+                  'rld-files.cpp',
+                  'rld-cc.cpp',
+                  'rld-compression.cpp',
+                  'rld-outputter.cpp',
+                  'rld-path.cpp',
+                  'rld-process.cpp',
+                  'rld-resolver.cpp',
+                  'rld-rtems.cpp',
+                  'rld-symbols.cpp',
+                  'rld-rap.cpp',
+                  'rld.cpp']
+
+    #
+    # RTEMS Utilities.
+    #
+    rtems_utils = ['rtems-utils.cpp']
+
+    #
+    # RTL static library
+    #
+    bld.stlib(target = 'rld',
+              install_path = None,
+              source = rld_source + rtems_utils,
+              defines = ['HAVE_CONFIG_H=1', 'RTEMS_VERSION=' + bld.env.RTEMS_VERSION],
+              includes = ['.'] + conf['includes'],
+              cflags = conf['cflags'] + conf['warningflags'],
+              cxxflags = conf['cxxflags'] + conf['warningflags'],
+              linkflags = conf['linkflags'])
+
+def rebuild(ctx):
+    import waflib.Options
+    waflib.Options.commands.extend(['clean', 'build'])
+
+def tags(ctx):
+    ctx.exec_command('etags $(find . -name \*.[sSch])', shell = True)
+
+#
+# Libelf module.
+#
+def conf_libelf(conf):
+    pass
+
+def bld_fastlz(bld, conf):
+    bld(target = 'fastlz',
+        features = 'c',
+        source = 'fastlz.c',
+        cflags = conf['cflags'],
+        defines = ['FASTLZ_LEVEL=1'])
+
+def bld_libelf(bld, conf):
+    libelf = 'elftoolchain/libelf/'
+
+    #
+    # Work around the ${SRC} having Windows slashes which the MSYS m4 does not
+    # understand.
+    #
+    if sys.platform == 'win32':
+        m4_rule = 'type ${SRC} | m4 -D SRCDIR=../rtemstoolkit/' + libelf[:-1] + '> ${TGT}"'
+        includes = ['win32']
+    else:
+        m4_rule = 'm4 -D SRCDIR=../rtemstoolkit/' + libelf[:-1] + ' ${SRC} > ${TGT}'
+        includes = []
+
+    bld(target = 'libelf_convert.c', source = libelf + 'libelf_convert.m4', rule = m4_rule)
+    bld(target = 'libelf_fsize.c',   source = libelf + 'libelf_fsize.m4',   rule = m4_rule)
+    bld(target = 'libelf_msize.c',   source = libelf + 'libelf_msize.m4',   rule = m4_rule)
+
+    host_source = []
+
+    if sys.platform == 'linux2':
+        common = 'elftoolchain/common/'
+        bld(target = common + 'native-elf-format.h',
+            source = common + 'native-elf-format',
+            name = 'native-elf-format',
+            rule   = './${SRC} > ${TGT}')
+        bld.add_group ()
+    elif sys.platform == 'win32':
+        host_source += [libelf + 'mmap_win32.c']
+
+    bld.stlib(target = 'elf',
+              features = 'c',
+              install_path = None,
+              uses = ['native-elf-format'],
+              includes = [bld.bldnode.abspath(), 'elftoolchain/libelf', 'elftoolchain/common'] + includes,
+              cflags = conf['cflags'],
+              source =[libelf + 'elf.c',
+                       libelf + 'elf_begin.c',
+                       libelf + 'elf_cntl.c',
+                       libelf + 'elf_end.c',
+                       libelf + 'elf_errmsg.c',
+                       libelf + 'elf_errno.c',
+                       libelf + 'elf_data.c',
+                       libelf + 'elf_fill.c',
+                       libelf + 'elf_flag.c',
+                       libelf + 'elf_getarhdr.c',
+                       libelf + 'elf_getarsym.c',
+                       libelf + 'elf_getbase.c',
+                       libelf + 'elf_getident.c',
+                       libelf + 'elf_hash.c',
+                       libelf + 'elf_kind.c',
+                       libelf + 'elf_memory.c',
+                       libelf + 'elf_next.c',
+                       libelf + 'elf_rand.c',
+                       libelf + 'elf_rawfile.c',
+                       libelf + 'elf_phnum.c',
+                       libelf + 'elf_shnum.c',
+                       libelf + 'elf_shstrndx.c',
+                       libelf + 'elf_scn.c',
+                       libelf + 'elf_strptr.c',
+                       libelf + 'elf_update.c',
+                       libelf + 'elf_version.c',
+                       libelf + 'gelf_cap.c',
+                       libelf + 'gelf_checksum.c',
+                       libelf + 'gelf_dyn.c',
+                       libelf + 'gelf_ehdr.c',
+                       libelf + 'gelf_getclass.c',
+                       libelf + 'gelf_fsize.c',
+                       libelf + 'gelf_move.c',
+                       libelf + 'gelf_phdr.c',
+                       libelf + 'gelf_rel.c',
+                       libelf + 'gelf_rela.c',
+                       libelf + 'gelf_shdr.c',
+                       libelf + 'gelf_sym.c',
+                       libelf + 'gelf_syminfo.c',
+                       libelf + 'gelf_symshndx.c',
+                       libelf + 'gelf_xlate.c',
+                       libelf + 'libelf_align.c',
+                       libelf + 'libelf_allocate.c',
+                       libelf + 'libelf_ar.c',
+                       libelf + 'libelf_ar_util.c',
+                       libelf + 'libelf_checksum.c',
+                       libelf + 'libelf_data.c',
+                       libelf + 'libelf_ehdr.c',
+                       libelf + 'libelf_extended.c',
+                       libelf + 'libelf_phdr.c',
+                       libelf + 'libelf_shdr.c',
+                       libelf + 'libelf_xlate.c',
+                       'libelf_convert.c',
+                       'libelf_fsize.c',
+                       'libelf_msize.c'] + host_source)
+
+#
+# Libiberty module.
+#
+def conf_libiberty(conf):
+    conf.check(header_name='alloca.h',    features = 'c', mandatory = False)
+    conf.check(header_name='fcntl.h',     features = 'c', mandatory = False)
+    conf.check(header_name='process.h',   features = 'c', mandatory = False)
+    conf.check(header_name='stdlib.h',    features = 'c')
+    conf.check(header_name='string.h',    features = 'c')
+    conf.check(header_name='strings.h',   features = 'c', mandatory = False)
+    conf.check(header_name='sys/file.h',  features = 'c', mandatory = False)
+    conf.check(header_name='sys/stat.h',  features = 'c', mandatory = False)
+    conf.check(header_name='sys/time.h',  features = 'c', mandatory = False)
+    conf.check(header_name='sys/types.h', features = 'c', mandatory = False)
+    conf.check(header_name='sys/wait.h',  features = 'c', mandatory = False)
+    conf.check(header_name='unistd.h',    features = 'c', mandatory = False)
+    conf.check(header_name='vfork.h',     features = 'c', mandatory = False)
+
+    conf.check_cc(function_name='getrusage',
+                  header_name="sys/time.h sys/resource.h",
+                  features = 'c', mandatory = False)
+
+    conf.write_config_header('libiberty/config.h')
+
+def bld_libiberty(bld, conf):
+    if sys.platform == 'win32':
+        pex_host = 'libiberty/pex-win32.c'
+    else:
+        pex_host = 'libiberty/pex-unix.c'
+    bld.stlib(target = 'iberty',
+              features = 'c',
+              install_path = None,
+              includes = ['libiberty'],
+              cflags = conf['cflags'],
+              defines = ['HAVE_CONFIG_H=1'],
+              source =['libiberty/concat.c',
+                       'libiberty/cplus-dem.c',
+                       'libiberty/cp-demangle.c',
+                       'libiberty/make-temp-file.c',
+                       'libiberty/mkstemps.c',
+                       'libiberty/safe-ctype.c',
+                       'libiberty/stpcpy.c',
+                       'libiberty/pex-common.c',
+                       'libiberty/pex-one.c',
+                       pex_host])
+
+#
+# The doxy command.
+#
+from waflib import Build
+class doxy(Build.BuildContext):
+    fun = 'build'
+    cmd = 'doxy'
diff --git a/wscript b/wscript
index 8cefb93..edfa91f 100644
--- a/wscript
+++ b/wscript
@@ -28,7 +28,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-subdirs = ['linkers',
+subdirs = ['rtemstoolkit',
+           'linkers',
            'tester',
            'tools/gdb/python']
 
@@ -37,9 +38,23 @@ def recurse(ctx):
         ctx.recurse(sd)
 
 def options(ctx):
+    ctx.add_option('--rtems-version',
+                   default = '4.11',
+                   dest='rtems_version',
+                   help = 'Set the RTEMS version')
+    ctx.add_option('--c-opts',
+                   default = '-O2',
+                   dest='c_opts',
+                   help = 'Set build options, default: -O2.')
     recurse(ctx)
 
 def configure(ctx):
+    try:
+        ctx.load("doxygen", tooldir = 'waf-tools')
+    except:
+        pass
+    ctx.env.C_OPTS = ctx.options.c_opts.split(',')
+    ctx.env.RTEMS_VERSION = ctx.options.rtems_version
     recurse(ctx)
 
 def build(ctx):
@@ -50,3 +65,15 @@ def install(ctx):
 
 def clean(ctx):
     recurse(ctx)
+
+def rebuild(ctx):
+    import waflib.Options
+    waflib.Options.commands.extend(['clean', 'build'])
+
+#
+# The doxy command.
+#
+from waflib import Build
+class doxy(Build.BuildContext):
+    fun = 'build'
+    cmd = 'doxy'