View | Details | Raw Unified | Return to bug 1773
Collapse All | Expand All

(-)a/model/cooja-loader-factory.cc (+2 lines)
 Lines 374-379    Link Here 
374
{
374
{
375
  NS_LOG_FUNCTION (this << module << symbol);
375
  NS_LOG_FUNCTION (this << module << symbol);
376
  void *p = dlsym (module, symbol.c_str ());
376
  void *p = dlsym (module, symbol.c_str ());
377
  if (!p)
378
    NS_LOG_WARN (dlerror());
377
  return p;
379
  return p;
378
}
380
}
379
381
(-)a/model/dce-manager.cc (-1 / +1 lines)
 Lines 258-264    Link Here 
258
      line += exeFullPath;
258
      line += exeFullPath;
259
      line += "'.";
259
      line += "'.";
260
      AppendStatusFile (current->process->pid, current->process->nodeId, line);
260
      AppendStatusFile (current->process->pid, current->process->nodeId, line);
261
      NS_ASSERT_MSG (!main, line.c_str ());
261
      NS_ASSERT_MSG (main, line.c_str ());
262
    }
262
    }
263
  else
263
  else
264
    {
264
    {
(-)a/model/dlm-loader-factory.cc (+2 lines)
 Lines 106-111    Link Here 
106
{
106
{
107
  NS_LOG_FUNCTION (this << module << symbol);
107
  NS_LOG_FUNCTION (this << module << symbol);
108
  void *p = dlsym (module, symbol.c_str ());
108
  void *p = dlsym (module, symbol.c_str ());
109
  if (!p)
110
    NS_LOG_WARN (dlerror());
109
  return p;
111
  return p;
110
}
112
}
111
113
(-)a/model/libc-ns3.h (-1 / +2 lines)
 Lines 388-394    Link Here 
388
DCE_WITH_ALIAS (pthread_once)
388
DCE_WITH_ALIAS (pthread_once)
389
DCE (pthread_getspecific)
389
DCE (pthread_getspecific)
390
DCE (pthread_setspecific)
390
DCE (pthread_setspecific)
391
DCE (pthread_key_create)
391
//DCE (pthread_key_create)
392
DCE_WITH_ALIAS (pthread_key_create)
392
DCE (pthread_key_delete)
393
DCE (pthread_key_delete)
393
DCE (pthread_mutex_destroy)
394
DCE (pthread_mutex_destroy)
394
DCE (pthread_mutex_init)
395
DCE (pthread_mutex_init)
(-)a/model/libc.cc (-2 / +5 lines)
 Lines 19-35    Link Here 
19
#define NATIVE_WITH_ALIAS DCE_WITH_ALIAS
19
#define NATIVE_WITH_ALIAS DCE_WITH_ALIAS
20
#define NATIVE_WITH_ALIAS2 DCE_WITH_ALIAS2
20
#define NATIVE_WITH_ALIAS2 DCE_WITH_ALIAS2
21
21
22
#define GCC_BT_NUM_ARGS 72
23
//#define GCC_BT_NUM_ARGS 128
24
22
#define GCC_BUILTIN_APPLY(export_symbol, func_to_call) \
25
#define GCC_BUILTIN_APPLY(export_symbol, func_to_call) \
23
  void export_symbol (...) { \
26
  void export_symbol (...) { \
24
    void *args =  __builtin_apply_args (); \
27
    void *args =  __builtin_apply_args (); \
25
    void *result = __builtin_apply (g_libc.func_to_call ## _fn, args, 128); \
28
    void *result = __builtin_apply (g_libc.func_to_call ## _fn, args, GCC_BT_NUM_ARGS); \
26
    __builtin_return (result); \
29
    __builtin_return (result); \
27
  }
30
  }
28
31
29
#define GCC_BUILTIN_APPLYT(rtype, export_symbol, func_to_call) \
32
#define GCC_BUILTIN_APPLYT(rtype, export_symbol, func_to_call) \
30
  rtype export_symbol (...) { \
33
  rtype export_symbol (...) { \
31
    void *args =  __builtin_apply_args (); \
34
    void *args =  __builtin_apply_args (); \
32
    void *result = __builtin_apply ((void (*) (...)) g_libc.func_to_call ## _fn, args, 128); \
35
    void *result = __builtin_apply ((void (*) (...)) g_libc.func_to_call ## _fn, args, GCC_BT_NUM_ARGS); \
33
    __builtin_return (result); \
36
    __builtin_return (result); \
34
  }
37
  }
35
38
(-)a/wscript (-1 / +1 lines)
 Lines 199-205    Link Here 
199
    debug_dl = []
199
    debug_dl = []
200
    d['cxxflags'] = d.get('cxxflags', []) + ['-fpie'] + mcmodel + nofortify
200
    d['cxxflags'] = d.get('cxxflags', []) + ['-fpie'] + mcmodel + nofortify
201
    d['cflags'] = d.get('cflags', []) + ['-fpie'] + mcmodel + nofortify
201
    d['cflags'] = d.get('cflags', []) + ['-fpie'] + mcmodel + nofortify
202
    d['linkflags'] = d.get('linkflags', []) + ['-pie'] + ['-lrt'] + debug_dl
202
    d['linkflags'] = d.get('linkflags', []) + ['-pie'] + ['-lrt'] + ['-rdynamic'] + debug_dl
203
    return d
203
    return d
204
204
205
def build_dce_tests(module, bld):
205
def build_dce_tests(module, bld):
(-)a/wutils.py (-2 / +2 lines)
 Lines 120-128    Link Here 
120
    else:
120
    else:
121
        pymoddir = ""
121
        pymoddir = ""
122
    import glob
122
    import glob
123
    pyns3dir = glob.glob(bld.env.NS3_DIR + '/lib/python*/site-packages')
123
    pyns3dir = glob.glob(bld.env.NS3_DIR + '/lib*/python*/site-packages')
124
    if len(pyns3dir) is not 0:
124
    if len(pyns3dir) is not 0:
125
        pyvizdir = pyns3dir[0]
125
        pyvizdir = pyns3dir[1]
126
    else:
126
    else:
127
        pyvizdir = ''
127
        pyvizdir = ''
128
    if 'PYTHONPATH' in proc_env:
128
    if 'PYTHONPATH' in proc_env:

Return to bug 1773