Changeset 898fa13 in rtems-tools


Ignore:
Timestamp:
Oct 22, 2012, 2:11:04 PM (7 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, master
Children:
8f0740b
Parents:
8d1ab1f
Message:

Fix the verbose level.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • linkers/rld-resolver.cpp

    r8d1ab1f r898fa13  
    11/*
    2  * Copyright (c) 2011, Chris Johns <chrisj@rtems.org> 
     2 * Copyright (c) 2011, Chris Johns <chrisj@rtems.org>
    33 *
    44 * Permission to use, copy, modify, and/or distribute this software for any
    55 * purpose with or without fee is hereby granted, provided that the above
    66 * copyright notice and this permission notice appear in all copies.
    7  * 
     7 *
    88 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
    99 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
     
    4141    static void
    4242    resolve (rld::files::object_list& dependents,
    43              rld::files::cache&       cache, 
    44              rld::symbols::table&     base_symbols, 
    45              rld::symbols::table&     symbols, 
     43             rld::files::cache&       cache,
     44             rld::symbols::table&     base_symbols,
     45             rld::symbols::table&     symbols,
    4646             rld::files::object&      object)
    4747    {
     
    8484          esi = symbols.find (urs.name ());
    8585          if (esi == symbols.end ())
    86             throw rld::error ("symbol referenced in '" + object.name ().basename () + 
     86            throw rld::error ("symbol referenced in '" + object.name ().basename () +
    8787                              "' not found: " + urs.name (), "resolving");
    8888          base = false;
     
    9595          std::cout << "resolver:resolved : "
    9696                    << std::setw (nesting + 1) << ' '
    97                     << urs.name () 
     97                    << urs.name ()
    9898                    << " -> ";
    9999          if (es.object())
     
    123123           ++oli)
    124124        resolve (dependents, cache, base_symbols, symbols, *(*oli));
    125      
     125
    126126      --nesting;
    127127
     
    131131
    132132    void
    133     resolve (rld::files::object_list& dependents, 
    134              rld::files::cache&       cache, 
     133    resolve (rld::files::object_list& dependents,
     134             rld::files::cache&       cache,
    135135             rld::symbols::table&     base_symbols,
    136136             rld::symbols::table&     symbols,
     
    139139      rld::files::object_list objects;
    140140      cache.get_objects (objects);
    141        
     141
    142142      for (rld::files::object_list::iterator oi = objects.begin ();
    143143           oi != objects.end ();
     
    145145      {
    146146        rld::files::object& object = *(*oi);
    147         if (rld::verbose ())
    148           std::cout << "resolver:resolving: top: " 
     147        if (rld::verbose () >= RLD_VERBOSE_INFO)
     148          std::cout << "resolver:resolving: top: "
    149149                    << object.name ().basename () << std::endl;
    150150        resolve (dependents, cache, base_symbols, symbols, object);
Note: See TracChangeset for help on using the changeset viewer.