PR10983: Give preference to tracepoints in trace/events/

In 2.6.32-rc7, there are two power.h tracepoints headers, and only the
one in trace/events/ is valid.  In general, we can expect that
trace/events/ has newer headers, so we should search those first.

* tapsets.cxx (tracepoint_builder::init_dw): Search /events/ first.

diff --git a/tapsets.cxx b/tapsets.cxx
index c972de5fe3a07ab179b16c654bf8305c8d0be830..7bae46154bcd242645935f9b25092f38829a98ff 100644 (file)
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -6313,10 +6313,10 @@ tracepoint_builder::init_dw(systemtap_session& s)
 
   glob_t trace_glob;
   string globs[] = {
-      "/include/trace/*.h",
       "/include/trace/events/*.h",
-      "/source/include/trace/*.h",
       "/source/include/trace/events/*.h",
+      "/include/trace/*.h",
+      "/source/include/trace/*.h",
   };
   for (unsigned z = 0; z < sizeof(globs) / sizeof(globs[0]); z++)
     {