Using rtl-host in covor - some questions

[Krzysztof Mięsowicz]

2014-08-24 5:32 GMT+02:00 Chris Johns <chrisj at rtems.org>:

> On 23/08/2014 2:54 pm, Krzysztof Mięsowicz wrote:
>
>>
>> Where should I place this image? Is there any RTEMS ftp or something
>> like this where could I put it, or maybe should I just push it to some
>> Dropbox or sth and download it with RSB?
>>
>>
> There is ftp.rtems.org and that is where the image can be placed. Maybe a
> binary under rtems-tools.git. I am not sure.


> I need to add something like '%fetch' to the RSB to allow a configuration
> file the ability to do this.


A binary under rtems-tools repo is probably simpler for now - it could be
placed in the same directory as other coverage-related files from
rtems-testing repo like some css files, and configuration file introduced
by me.


>
>
>  Chris, should I move rtl-host repo into rtems-tools or wait for your
>> action?
>>
>
> There are a couple if issues to resolve. First is how to merge the commit
> history from the rtl-host repo into the rtems-tools repo. I would like the
> commit history to be present so the history of who has worked on the code
> is maintained. Second, what is the structure in the rtems-tools repo and
> how to we integrate the various bits under a waf build tree ?
>
>
About the structure - on my PC I copied rtl-host directory just into
rtems-tools directory, so tree output is as follows:

rtems-tools
├── doc
│   ├── asciidoc
│   └── images
├── rtemstoolkit
├── rtl-host
│   ├── build-linux2
│   ├── elftoolchain
│   ├── libiberty
│   ├── waf-tools
│   └── win32
├── tester
│   ├── config
│   ├── covoar
│   ├── rt
│   └── rtems
└── tools
    ├── 4.10
    ├── 4.11
    ├── 4.9
    └── libffi


Then, I was able to point from covoar/wscript to rtl-host/build-linux2 dir
where librld.a is placed, and link with this library. I think this is not
perfect solution, because rtl-host must be built independently before
covoar - but it works for now. You can find diff for covoar wscript
attached.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20140825/63a0155c/attachment-0002.html>
-------------- next part --------------
diff --git a/tester/covoar/wscript b/tester/covoar/wscript
index 88add6e..8cb33bf 100644
--- a/tester/covoar/wscript
+++ b/tester/covoar/wscript
@@ -46,6 +46,16 @@ APPNAME='covoar'
 top = '.'
 out = 'build'
 
+#
+# Paths to rtl-host
+#
+rtl_host_build_dir = "./../../rtl-host/build-linux2"
+rtl_host_dir = "./../../rtl-host"
+rtl_includes = ['../../rtl-host',
+				'../../rtl-host/elftoolchain/common',
+				'../../rtl-host/elftoolchain/libelf',
+				'../../rtl-host/libiberty']
+
 def options(opt):
     opt.load('compiler_cxx')
 
@@ -54,8 +64,12 @@ def configure(conf):
     conf.check_cc(function_name='open64', header_name="stdlib.h", mandatory = False)
     conf.check_cc(function_name='stat64', header_name="stdlib.h", mandatory = False)
     conf.write_config_header('covoar-config.h')
+    conf.env.STLIBPATH_RLD = conf.path.abspath() + '/../../rtl-host/build-linux2'
+    conf.env.STLIB_RLD = ['rld','iberty','elf']
+    #conf.env.append_value('STLIBPATH', [conf.path.abspath() + '/../../rtl-host/build-linux2'])
 
 def build(bld):
+
     bld.stlib(target = 'ccovoar',
               source = ['app_common.cc',
                         'ConfigFile.cc',
@@ -89,9 +103,15 @@ def build(bld):
                         'Target_lm32.cc',
                         'Target_m68k.cc',
                         'Target_powerpc.cc',
-                        'Target_sparc.cc'],
+                        'Target_sparc.cc',
+                        'SymbolSet.cpp',
+                        'SymbolSetReader.cpp'],
               cflags = ['-O2', '-g'],
-              includes = ['.'])
+              cxxflags = ['-std=c++11', '-O2', '-g'],
+#              libpath = rtl_host_build_dir,
+#              lib = 'rld',
+              includes = ['.',
+              './symbolGen'] + rtl_includes)
 
     bld.program(target = 'trace-converter',
                 source = ['TraceConverter.cc',
@@ -106,12 +126,12 @@ def build(bld):
 
     bld.program(target = 'covoar',
                 source = ['covoar.cc'],
-                use = 'ccovoar',
+                use = ['ccovoar','RLD'],
                 cflags = ['-O2', '-g'],
                 includes = ['.'])
 
     bld.program(target = 'covoar',
                 source = ['covoar.cc'],
-                use = 'ccovoar',
+                use = ['ccovoar','RLD'],
                 cflags = ['-O2', '-g'],
                 includes = ['.'])