34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
commit 320e1ecb16427b5769f0f5a097d80823ee1fb765
|
|
Author: David Smith <dsmith@redhat.com>
|
|
Date: Tue Jul 7 10:41:43 2015 -0500
|
|
|
|
Fixed BZ1240682 by fixing a rawhide compile problem.
|
|
|
|
* translate.cxx (translate_pass): Move the inclusion of runtime.h up
|
|
before the declaration of the module refresh mutex, to avoid compilation
|
|
problems on rawhide.
|
|
|
|
diff --git a/translate.cxx b/translate.cxx
|
|
index c8230f2..390a73e 100644
|
|
--- a/translate.cxx
|
|
+++ b/translate.cxx
|
|
@@ -7944,6 +7944,9 @@ translate_pass (systemtap_session& s)
|
|
// Emit systemtap_module_refresh() prototype so we can reference it
|
|
s.op->newline() << "static void systemtap_module_refresh (const char* modname);";
|
|
|
|
+ // Be sure to include runtime.h before any real code.
|
|
+ s.op->newline() << "#include \"runtime.h\"";
|
|
+
|
|
if (!s.runtime_usermode_p())
|
|
{
|
|
// When on-the-fly [dis]arming is used, module_refresh can be called from
|
|
@@ -7962,8 +7965,6 @@ translate_pass (systemtap_session& s)
|
|
s.op->newline() << "#endif";
|
|
}
|
|
|
|
- s.op->newline() << "#include \"runtime.h\"";
|
|
-
|
|
// Emit embeds ahead of time, in case they affect context layout
|
|
for (unsigned i=0; i<s.embeds.size(); i++)
|
|
{
|