Changeset 31bf375 in rtems-tools

Timestamp:

Sep 5, 2014, 8:18:11 AM (6 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.10, 4.11, 5, master

Children:

b233be7

Parents:

7ccb670

Message:

Remove march/mcpu and add RTEMS BSP and cflags support.

Location:

linkers

Files:

• rtems-ld.cpp (modified) (7 diffs)
• rtems-tld.cpp (modified) (6 diffs)
• wscript (modified) (4 diffs)

linkers/rtems-ld.cpp

@@ -43 +43 @@
 #include <rld-process.h>
 #include <rld-resolver.h>
+#include <rld-rtems.h>
 
 #ifndef HAVE_KILL
@@ -74 +75 @@
   { "runtime-lib", required_argument,      NULL,           'P' },
   { "one-file",    no_argument,            NULL,           's' },
+  { "rtems",       required_argument,      NULL,           'r' },
+  { "rtems-bsp",   required_argument,      NULL,           'B' },
   { NULL,          0,                      NULL,            0 }
 };
@@ -118 +121 @@
             << " -s        : Include archive elf object files (also --one-file)" << std::endl
             << " -Wl,opts  : link compatible flags, ignored" << std::endl
+            << " -r path   : RTEMS path (also --rtems)" << std::endl
+            << " -B bsp    : RTEMS arch/bsp (also --rtems-bsp)" << std::endl
             << "Output Formats:" << std::endl
             << " rap     - RTEMS application (LZ77, single image)" << std::endl
@@ -193 +198 @@
     bool                 warnings = false;
     bool                 one_file = false;
+    bool                 arch_bsp_load = false;
 
     libpaths.push_back (".");
@@ -198 +204 @@
     while (true)
     {
-      int opt = ::getopt_long (argc, argv, "hvwVMnsSb:E:o:O:L:l:c:e:d:u:C:W:R:P:", rld_opts, NULL);
+      int opt = ::getopt_long (argc, argv, "hvwVMnsSb:E:o:O:L:l:c:e:d:u:C:W:R:P:r:B:", rld_opts, NULL);
       if (opt < 0)
         break;
@@ -306 +312 @@
           break;
 
+        case 'r':
+          rld::rtems::path = optarg;
+          break;
+
+        case 'B':
+          rld::rtems::arch_bsp = optarg;
+          arch_bsp_load = true;
+          break;
+
         case '?':
           usage (3);
@@ -336 +351 @@
         (output_type != "archive"))
       throw rld::error ("invalid output format", "options");
+
+    /*
+     * Load the arch/bsp value if provided.
+     */
+    if (arch_bsp_load)
+      rld::rtems::load_cc ();
 
     /*

linkers/rtems-tld.cpp

@@ -46 +46 @@
 #include <rld-config.h>
 #include <rld-process.h>
+#include <rld-rtems.h>
 
 #ifndef HAVE_KILL
@@ -738 +739 @@
   { "keep",        no_argument,            NULL,           'k' },
   { "exec-prefix", required_argument,      NULL,           'E' },
-  { "march",       required_argument,      NULL,           'a' },
-  { "mcpu",        required_argument,      NULL,           'c' },
+  { "cflags",      required_argument,      NULL,           'c' },
+  { "rtems",       required_argument,      NULL,           'r' },
+  { "rtems-bsp",   required_argument,      NULL,           'B' },
   { "config",      required_argument,      NULL,           'C' },
   { NULL,          0,                      NULL,            0 }
@@ -757 +759 @@
             << " -E prefix : the RTEMS tool prefix (also --exec-prefix)" << std::endl
             << " -c cflags : C compiler flags (also --cflags)" << std::endl
+            << " -r path   : RTEMS path (also --rtems)" << std::endl
+            << " -B bsp    : RTEMS arch/bsp (also --rtems-bsp)" << std::endl
             << " -C ini    : user configuration INI file (also --config)" << std::endl;
   ::exit (exit_code);
@@ -809 +813 @@
     std::string        trace = "tracer";
     bool               exec_prefix_set = false;
-#if HAVE_WARNINGS
-    bool               warnings = false;
-#endif
+    bool               arch_bsp_load = false;
 
     while (true)
     {
-      int opt = ::getopt_long (argc, argv, "hvwkVE:c:C:", rld_opts, NULL);
+      int opt = ::getopt_long (argc, argv, "hvwkVE:c:C:r:B:", rld_opts, NULL);
       if (opt < 0)
         break;
@@ -850 +852 @@
           break;
 
+        case 'r':
+          rld::rtems::path = optarg;
+          break;
+
+        case 'B':
+          rld::rtems::arch_bsp = optarg;
+          arch_bsp_load = true;
+          break;
+
         case 'C':
           configuration = optarg;
@@ -869 +880 @@
     if (rld::verbose ())
       std::cout << "RTEMS Trace Linker " << rld::version () << std::endl;
+
+    /*
+     * Load the arch/bsp value if provided.
+     */
+    if (arch_bsp_load)
+      rld::rtems::load_cc ();
 
     /*

linkers/wscript

@@ -95 +95 @@
     #
     rld_source = ['ConvertUTF.c',
+                  'pkgconfig.cpp',
                   'rld-config.cpp',
                   'rld-elf.cpp',
@@ -104 +105 @@
                   'rld-process.cpp',
                   'rld-resolver.cpp',
+                  'rld-rtems.cpp',
                   'rld-symbols.cpp',
                   'rld-rap.cpp',
@@ -133 +135 @@
     #
     bld.program(target = 'rtems-ld',
-                source = ['rtems-ld.cpp', 'pkgconfig.cpp'],
+                source = ['rtems-ld.cpp'],
                 defines = ['HAVE_CONFIG_H=1', 'RTEMS_VERSION=' + bld.env.RTEMS_VERSION],
                 includes = ['.'] + bld.includes,
@@ -145 +147 @@
     #
     bld.program(target = 'rtems-ra',
-                source = ['rtems-ra.cpp', 'pkgconfig.cpp'],
+                source = ['rtems-ra.cpp'],
                 defines = ['HAVE_CONFIG_H=1', 'RTEMS_VERSION=' + bld.env.RTEMS_VERSION],
                 includes = ['.'] + bld.includes,