diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-22 09:03:43 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-22 09:03:43 +0000 |
commit | 1dec7384d1629eb1b45252294c7e1a7009f148bc (patch) | |
tree | 01dcdf787c2c711658de6cd779cd39247b022ff1 | |
parent | 59c41661a7de1c4eab03023fa463792f7be0e944 (diff) |
* Makefile.in (probes.o): add -C to ignore #include in probes.d.
* probes.d: include vm_opts.h instead of vm_core.h.
* vm_opts.h (VM_COLLECT_USAGE_DETAILS): move definition from vm_core.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | probes.d | 2 | ||||
-rw-r--r-- | vm_core.h | 4 | ||||
-rw-r--r-- | vm_opts.h | 4 |
5 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Thu Nov 22 18:01:28 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * Makefile.in (probes.o): add -C to ignore #include in probes.d. + + * probes.d: include vm_opts.h instead of vm_core.h. + + * vm_opts.h (VM_COLLECT_USAGE_DETAILS): move definition from vm_core.h. + Thu Nov 22 17:45:17 2012 NARUSE, Yui <naruse@ruby-lang.org> * ext/nkf/nkf-utf8: Merge b0a6577a521d1bba5e19853f95d5c4b9be1072b5. diff --git a/Makefile.in b/Makefile.in index aae4d061ba..42cc95132e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -350,7 +350,7 @@ probes.@OBJEXT@: $(srcdir)/probes.d fi; \ touch "$$stamp" $(RM) $@ - $(Q) $(DTRACE) -G -s $(srcdir)/probes.d -o $@ $(DTRACE_DEPENDENT_OBJS) + $(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_DEPENDENT_OBJS) # DTrace static library hacks described here: # http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html @@ -1,4 +1,4 @@ -#include "vm_core.h" +#include "vm_opts.h" provider ruby { probe function__entry(const char *, const char *, const char *, int); @@ -14,10 +14,6 @@ #define RUBY_VM_THREAD_MODEL 2 -#ifndef VM_COLLECT_USAGE_DETAILS -#define VM_COLLECT_USAGE_DETAILS 0 -#endif - #include "ruby/ruby.h" #include "ruby/st.h" @@ -49,4 +49,8 @@ /* misc */ #define SUPPORT_JOKE 0 +#ifndef VM_COLLECT_USAGE_DETAILS +#define VM_COLLECT_USAGE_DETAILS 0 +#endif + #endif /* RUBY_VM_OPTS_H */ |