Makefile: remove the NO_R_TO_GCC_LINKER flag

diff --git a/trace2.h b/trace2.h
index 894bfca7e0453ba5307912e4e5414a968808724f..f189ef5984f0e2e699a1a2a7a0e8fd93e5e0281c 100644 (file)
--- a/trace2.h
+++ b/trace2.h
@@ -257,7 +257,7 @@ void trace2_def_repo_fl(const char *file, int line, struct repository *repo);
  * on this thread.
  */
 void trace2_region_enter_fl(const char *file, int line, const char *category,
-                           const char *label, const struct repository *repo);
+                           const char *label, const struct repository *repo, ...);
 
 #define trace2_region_enter(category, label, repo) \
        trace2_region_enter_fl(__FILE__, __LINE__, (category), (label), (repo))
@@ -297,7 +297,7 @@ void trace2_region_enter_printf(const char *category, const char *label,
  * in this nesting level.
  */
 void trace2_region_leave_fl(const char *file, int line, const char *category,
-                           const char *label, const struct repository *repo);
+                           const char *label, const struct repository *repo, ...);
 
 #define trace2_region_leave(category, label, repo) \
        trace2_region_leave_fl(__FILE__, __LINE__, (category), (label), (repo))
@@ -391,13 +391,19 @@ void trace2_printf(const char *fmt, ...);
  * Optional platform-specific code to dump information about the
  * current and any parent process(es).  This is intended to allow
  * post-processors to know who spawned this git instance and anything
- * else the platform may be able to tell us about the current process.
+ * else that the platform may be able to tell us about the current process.
  */
+
+enum trace2_process_info_reason {
+       TRACE2_PROCESS_INFO_STARTUP,
+       TRACE2_PROCESS_INFO_EXIT,
+};
+
 #if defined(GIT_WINDOWS_NATIVE)
-void trace2_collect_process_info(void);
+void trace2_collect_process_info(enum trace2_process_info_reason reason);
 #else
-#define trace2_collect_process_info() \
-       do {                          \
+#define trace2_collect_process_info(reason) \
+       do {                                \
        } while (0)
 #endif