]>
Commit | Line | Data |
---|---|---|
1 | --- utils/config.mlp.orig Mon Aug 17 05:00:36 1998 | |
2 | +++ utils/config.mlp Thu Sep 10 19:11:08 1998 | |
3 | @@ -49,3 +49,4 @@ | |
4 | let ext_obj = "%%EXT_OBJ%%" | |
5 | let ext_asm = "%%EXT_ASM%%" | |
6 | let ext_lib = "%%EXT_LIB%%" | |
7 | +let ext_prof = "%%EXT_PROF%%" | |
8 | --- utils/config.mli.orig Wed May 27 10:10:13 1998 | |
9 | +++ utils/config.mli Thu Sep 10 19:14:58 1998 | |
10 | @@ -73,3 +73,9 @@ | |
11 | (* Extension for assembler files, e.g. [.s] under Unix. *) | |
12 | val ext_lib: string | |
13 | (* Extension for library files, e.g. [.a] under Unix. *) | |
14 | +val ext_prof: string | |
15 | + (* [.p] For OSs that support gprof call graph profiling: | |
16 | + * an extra extension for obj/asm/lib files. | |
17 | + * The full extension would be created by adding both ext_prof | |
18 | + * and corresponding ext_obj/asm/lib extension, e.g. | |
19 | + * profiled version of name.a would be named name.p.a *) | |
20 | --- asmcomp/asmgen.ml.orig Mon Apr 27 11:16:44 1998 | |
21 | +++ asmcomp/asmgen.ml Thu Sep 10 19:23:26 1998 | |
22 | @@ -82,6 +82,8 @@ | |
23 | | Cdata dl -> Emit.data dl | |
24 | ||
25 | let compile_implementation prefixname (size, lam) = | |
26 | + let ext_asm = if !Clflags.gprofile then ext_prof ^ ext_asm else ext_asm in | |
27 | + let ext_obj = if !Clflags.gprofile then ext_prof ^ ext_obj else ext_obj in | |
28 | let asmfile = | |
29 | if !keep_asm_file | |
30 | then prefixname ^ ext_asm | |
31 | --- asmcomp/asmlibrarian.mli.orig Tue Apr 30 10:42:09 1996 | |
32 | +++ asmcomp/asmlibrarian.mli Thu Sep 10 20:08:16 1998 | |
33 | @@ -11,6 +11,10 @@ | |
34 | ||
35 | (* $Id$ *) | |
36 | ||
37 | +(* Get filename based on the gprofile flag *) | |
38 | + | |
39 | +val get_filename: string -> string -> string | |
40 | + | |
41 | (* Build libraries of .cmx files *) | |
42 | ||
43 | val create_archive: string list -> string -> unit | |
44 | --- asmcomp/asmlink.ml.orig Thu Aug 6 09:27:36 1998 | |
45 | +++ asmcomp/asmlink.ml Thu Sep 10 20:15:21 1998 | |
46 | @@ -173,7 +173,7 @@ | |
47 | let call_linker file_list startup_file = | |
48 | let libname = | |
49 | if !Clflags.gprofile | |
50 | - then "libasmrunp" ^ ext_lib | |
51 | + then "libasmrun" ^ ext_prof ^ ext_lib | |
52 | else "libasmrun" ^ ext_lib in | |
53 | let runtime_lib = | |
54 | try | |
55 | @@ -229,19 +229,18 @@ | |
56 | with Not_found -> | |
57 | fatal_error "Asmlink.object_file_name: not found" in | |
58 | if Filename.check_suffix file_name ".cmx" then | |
59 | - Filename.chop_suffix file_name ".cmx" ^ ext_obj | |
60 | + Asmlibrarian.get_filename (Filename.chop_suffix file_name ".cmx") ext_obj | |
61 | else if Filename.check_suffix file_name ".cmxa" then | |
62 | - Filename.chop_suffix file_name ".cmxa" ^ ext_lib | |
63 | + Asmlibrarian.get_filename (Filename.chop_suffix file_name ".cmxa") ext_lib | |
64 | else | |
65 | fatal_error "Asmlink.object_file_name: bad ext" | |
66 | ||
67 | (* Main entry point *) | |
68 | ||
69 | let link objfiles = | |
70 | - let objfiles = | |
71 | - if !Clflags.gprofile | |
72 | - then "stdlib.p.cmxa" :: (objfiles @ ["std_exit.p.cmx"]) | |
73 | - else "stdlib.cmxa" :: (objfiles @ ["std_exit.cmx"]) in | |
74 | + let ext_asm = if !Clflags.gprofile then ext_prof ^ ext_asm else ext_asm in | |
75 | + let ext_obj = if !Clflags.gprofile then ext_prof ^ ext_obj else ext_obj in | |
76 | + let objfiles = "stdlib.cmxa" :: (objfiles @ ["std_exit.cmx"]) in | |
77 | let units_tolink = List.fold_right scan_file objfiles [] in | |
78 | Array.iter remove_required Runtimedef.builtin_exceptions; | |
79 | if not (StringSet.is_empty !missing_globals) then | |
80 | --- asmcomp/asmlibrarian.ml.orig Thu Nov 7 05:55:00 1996 | |
81 | +++ asmcomp/asmlibrarian.ml Thu Sep 10 21:10:52 1998 | |
82 | @@ -23,6 +23,17 @@ | |
83 | ||
84 | exception Error of error | |
85 | ||
86 | +let get_filename basename ext = | |
87 | + if !Clflags.gprofile then begin | |
88 | + let profname = basename ^ ext_prof ^ ext in | |
89 | + if Sys.file_exists profname then profname else | |
90 | + let unprofname = basename ^ ext in | |
91 | + print_string "Warning: Profiled file "; | |
92 | + print_string profname; | |
93 | + print_string " not found, using the unprofiled one. The gprof call graph timing information would be inaccurate.\n"; | |
94 | + unprofname | |
95 | + end else basename ^ ext | |
96 | + | |
97 | let read_info name = | |
98 | let filename = | |
99 | try | |
100 | @@ -36,9 +47,10 @@ | |
101 | The linker, which is the only one that reads .cmxa files, does not | |
102 | need the approximation. *) | |
103 | info.ui_approx <- Clambda.Value_unknown; | |
104 | - (Filename.chop_suffix filename ".cmx" ^ ext_obj, (info, crc)) | |
105 | + (get_filename (Filename.chop_suffix filename ".cmx") ext_obj, (info, crc)) | |
106 | ||
107 | let create_archive file_list lib_name = | |
108 | + let ext_lib = if !Clflags.gprofile then ext_prof ^ ext_lib else ext_lib in | |
109 | let archive_name = Filename.chop_suffix lib_name ".cmxa" ^ ext_lib in | |
110 | let outchan = open_out_bin lib_name in | |
111 | try | |
112 | --- otherlibs/db/Makefile.orig Mon Feb 23 07:42:22 1998 | |
113 | +++ otherlibs/db/Makefile Thu Sep 10 21:33:18 1998 | |
114 | @@ -22,6 +22,7 @@ | |
115 | $(CAMLC) -a -o db.cma db.cmo | |
116 | ||
117 | db.cmxa: db.cmx | |
118 | + $(CAMLOPT) -p -a -o db.cmxa db.cmx | |
119 | $(CAMLOPT) -a -o db.cmxa db.cmx | |
120 | ||
121 | partialclean: | |
122 | @@ -36,7 +37,7 @@ | |
123 | cp db.cma db.cmi db.mli $(LIBDIR) | |
124 | ||
125 | installopt: | |
126 | - cp db.cmx db.cmxa db.a $(LIBDIR) | |
127 | + cp db.cmx db.cmxa db*.a $(LIBDIR) | |
128 | cd $(LIBDIR); $(RANLIB) db.a | |
129 | ||
130 | .SUFFIXES: .ml .mli .cmo .cmi .cmx | |
131 | @@ -48,6 +49,7 @@ | |
132 | $(CAMLC) -c $(COMPFLAGS) $< | |
133 | ||
134 | .ml.cmx: | |
135 | + $(CAMLOPT) -p -c $(COMPFLAGS) $< | |
136 | $(CAMLOPT) -c $(COMPFLAGS) $< | |
137 | ||
138 | depend: | |
139 | --- otherlibs/dbm/Makefile.orig Tue Apr 21 12:08:31 1998 | |
140 | +++ otherlibs/dbm/Makefile Thu Sep 10 21:36:00 1998 | |
141 | @@ -22,6 +22,7 @@ | |
142 | $(CAMLC) -a -o dbm.cma dbm.cmo | |
143 | ||
144 | dbm.cmxa: dbm.cmx | |
145 | + $(CAMLOPT) -p -a -o dbm.cmxa dbm.cmx | |
146 | $(CAMLOPT) -a -o dbm.cmxa dbm.cmx | |
147 | ||
148 | partialclean: | |
149 | @@ -36,7 +37,7 @@ | |
150 | cp dbm.cma dbm.cmi dbm.mli $(LIBDIR) | |
151 | ||
152 | installopt: | |
153 | - cp dbm.cmx dbm.cmxa dbm.a $(LIBDIR) | |
154 | + cp dbm.cmx dbm.cmxa dbm*.a $(LIBDIR) | |
155 | cd $(LIBDIR); $(RANLIB) dbm.a | |
156 | ||
157 | .SUFFIXES: .ml .mli .cmo .cmi .cmx | |
158 | @@ -48,6 +49,7 @@ | |
159 | $(CAMLC) -c $(COMPFLAGS) $< | |
160 | ||
161 | .ml.cmx: | |
162 | + $(CAMLOPT) -p -c $(COMPFLAGS) $< | |
163 | $(CAMLOPT) -c $(COMPFLAGS) $< | |
164 | ||
165 | depend: | |
166 | --- otherlibs/graph/Makefile.orig Tue Apr 21 12:08:41 1998 | |
167 | +++ otherlibs/graph/Makefile Thu Sep 10 21:38:44 1998 | |
168 | @@ -24,6 +24,7 @@ | |
169 | $(CAMLC) -a -o graphics.cma graphics.cmo | |
170 | ||
171 | graphics.cmxa: graphics.cmx | |
172 | + $(CAMLOPT) -p -a -o graphics.cmxa graphics.cmx | |
173 | $(CAMLOPT) -a -o graphics.cmxa graphics.cmx | |
174 | ||
175 | partialclean: | |
176 | @@ -38,7 +39,7 @@ | |
177 | cp graphics.cm[ia] graphics.mli $(LIBDIR) | |
178 | ||
179 | installopt: | |
180 | - cp graphics.cmxa graphics.a $(LIBDIR) | |
181 | + cp graphics.cmxa graphics*.a $(LIBDIR) | |
182 | cd $(LIBDIR); $(RANLIB) graphics.a | |
183 | ||
184 | .SUFFIXES: .ml .mli .cmo .cmi .cmx | |
185 | @@ -48,6 +49,7 @@ | |
186 | .ml.cmo: | |
187 | $(CAMLC) -c $< | |
188 | .ml.cmx: | |
189 | + $(CAMLOPT) -p -c $(COMPFLAGS) $< | |
190 | $(CAMLOPT) -c $(COMPFLAGS) $< | |
191 | ||
192 | depend: | |
193 | --- otherlibs/num/Makefile.orig Tue Apr 21 12:08:46 1998 | |
194 | +++ otherlibs/num/Makefile Thu Sep 10 21:39:10 1998 | |
195 | @@ -23,6 +23,7 @@ | |
196 | $(CAMLC) -a -o nums.cma $(CAMLOBJS) | |
197 | ||
198 | nums.cmxa: $(CAMLOBJS:.cmo=.cmx) | |
199 | + $(CAMLOPT) -p -a -o nums.cmxa $(CAMLOBJS:.cmo=.cmx) | |
200 | $(CAMLOPT) -a -o nums.cmxa $(CAMLOBJS:.cmo=.cmx) | |
201 | ||
202 | libnums.a: bignum/libbignum.a $(COBJS) | |
203 | @@ -41,7 +42,7 @@ | |
204 | cp nums.cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR) | |
205 | ||
206 | installopt: | |
207 | - cp $(CAMLOBJS:.cmo=.cmx) nums.cmxa nums.a $(LIBDIR) | |
208 | + cp $(CAMLOBJS:.cmo=.cmx) nums.cmxa nums*.a $(LIBDIR) | |
209 | cd $(LIBDIR); $(RANLIB) nums.a | |
210 | ||
211 | partialclean: | |
212 | @@ -61,6 +62,7 @@ | |
213 | $(CAMLC) -c $(COMPFLAGS) $< | |
214 | ||
215 | .ml.cmx: | |
216 | + $(CAMLOPT) -p -c $(COMPFLAGS) $< | |
217 | $(CAMLOPT) -c $(COMPFLAGS) $< | |
218 | ||
219 | nat_stubs.o: nat.h | |
220 | --- otherlibs/str/Makefile.orig Tue Apr 21 12:08:52 1998 | |
221 | +++ otherlibs/str/Makefile Thu Sep 10 21:39:47 1998 | |
222 | @@ -23,6 +23,7 @@ | |
223 | $(CAMLC) -a -o str.cma str.cmo | |
224 | ||
225 | str.cmxa: str.cmx | |
226 | + $(CAMLOPT) -p -a -o str.cmxa str.cmx | |
227 | $(CAMLOPT) -a -o str.cmxa str.cmx | |
228 | ||
229 | $(REGEXLIB)/regex.o: $(REGEXLIB)/regex.c $(REGEXLIB)/regex.h | |
230 | @@ -43,7 +44,7 @@ | |
231 | cp str.cma str.cmi str.mli $(LIBDIR) | |
232 | ||
233 | installopt: | |
234 | - cp str.cmx str.cmxa str.a $(LIBDIR) | |
235 | + cp str.cmx str.cmxa str*.a $(LIBDIR) | |
236 | cd $(LIBDIR); $(RANLIB) str.a | |
237 | ||
238 | .SUFFIXES: .ml .mli .cmo .cmi .cmx | |
239 | @@ -55,6 +56,7 @@ | |
240 | $(CAMLC) -c $(COMPFLAGS) $< | |
241 | ||
242 | .ml.cmx: | |
243 | + $(CAMLOPT) -p -c $(COMPFLAGS) $< | |
244 | $(CAMLOPT) -c $(COMPFLAGS) $< | |
245 | ||
246 | depend: | |
247 | --- otherlibs/threads/Makefile.orig Sat Aug 8 14:42:20 1998 | |
248 | +++ otherlibs/threads/Makefile Thu Sep 10 21:43:42 1998 | |
249 | @@ -70,6 +70,7 @@ | |
250 | $(CAMLC) -c $(COMPFLAGS) $< | |
251 | ||
252 | .ml.cmx: | |
253 | + $(CAMLOPT) -p -c $(COMPFLAGS) $< | |
254 | $(CAMLOPT) -c $(COMPFLAGS) $< | |
255 | ||
256 | depend: | |
257 | --- configure.orig Thu Aug 6 10:25:22 1998 | |
258 | +++ configure Fri Sep 11 15:37:38 1998 | |
259 | @@ -724,6 +724,8 @@ | |
260 | echo "OTHERLIBRARIES=$otherlibraries" >> Makefile | |
261 | echo "DEBUGGER=$debugger" >> Makefile | |
262 | ||
263 | +echo "EXT_PROF=.p" >> Makefile | |
264 | + | |
265 | rm -f tst hasgot.c | |
266 | rm -f ../m.h ../s.h ../Makefile | |
267 | mv m.h s.h Makefile .. | |
268 | --- otherlibs/systhreads/Makefile.orig Sat Aug 8 14:42:21 1998 | |
269 | +++ otherlibs/systhreads/Makefile Fri Sep 11 15:50:11 1998 | |
270 | @@ -5,6 +5,7 @@ | |
271 | ||
272 | BYTECODE_C_OBJS=posix_b.o | |
273 | NATIVECODE_C_OBJS=posix_n.o | |
274 | +PNATIVECODE_C_OBJS=$(NATIVECODE_C_OBJS:.o=$(EXT_PROF).o) | |
275 | ||
276 | THREAD_OBJS= thread.cmo mutex.cmo condition.cmo event.cmo threadUnix.cmo | |
277 | ||
278 | @@ -12,7 +13,7 @@ | |
279 | ||
280 | all: libthreads.a threads.cma | |
281 | ||
282 | -allopt: libthreadsnat.a threads.cmxa | |
283 | +allopt: libthreadsnat.a libthreadsnat$(EXT_PROF).a threads.cmxa | |
284 | ||
285 | libthreads.a: $(BYTECODE_C_OBJS) | |
286 | rm -f libthreads.a | |
287 | @@ -26,14 +27,23 @@ | |
288 | rm -f libthreadsnat.a | |
289 | ar rc libthreadsnat.a $(NATIVECODE_C_OBJS) | |
290 | ||
291 | +libthreadsnat$(EXT_PROF).a: $(PNATIVECODE_C_OBJS) | |
292 | + rm -f libthreadsnat$(EXT_PROF).a | |
293 | + ar rc libthreadsnat$(EXT_PROF).a $(PNATIVECODE_C_OBJS) | |
294 | + | |
295 | posix_n.o: posix.c | |
296 | $(NATIVECC) -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c posix.c | |
297 | mv posix.o posix_n.o | |
298 | ||
299 | +posix_n$(EXT_PROF).o: posix.c | |
300 | + $(NATIVECC) -p -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c posix.c | |
301 | + mv posix.o posix_n$(EXT_PROF).o | |
302 | + | |
303 | threads.cma: $(THREAD_OBJS) | |
304 | $(CAMLC) -a -o threads.cma $(THREAD_OBJS) | |
305 | ||
306 | threads.cmxa: $(THREAD_OBJS:.cmo=.cmx) | |
307 | + $(CAMLOPT) -p -a -o threads.cmxa $(THREAD_OBJS:.cmo=.cmx) | |
308 | $(CAMLOPT) -a -o threads.cmxa $(THREAD_OBJS:.cmo=.cmx) | |
309 | ||
310 | $(THREAD_OBJS:.cmo=.cmx): ../../ocamlopt | |
311 | @@ -56,7 +66,7 @@ | |
312 | ||
313 | installopt: | |
314 | - cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a | |
315 | - cp $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a $(LIBDIR)/threads | |
316 | + cp libthreadsnat*.a $(LIBDIR) | |
317 | + cp $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads*.a $(LIBDIR)/threads | |
318 | ||
319 | .SUFFIXES: .ml .mli .cmo .cmi .cmx | |
320 | ||
321 | @@ -67,6 +77,7 @@ | |
322 | $(CAMLC) -c $(COMPFLAGS) $< | |
323 | ||
324 | .ml.cmx: | |
325 | + $(CAMLOPT) -p -c $(COMPFLAGS) $< | |
326 | $(CAMLOPT) -c $(COMPFLAGS) $< | |
327 | ||
328 | depend: $(GENFILES) | |
329 | --- otherlibs/unix/Makefile.orig Sat Aug 8 12:53:16 1998 | |
330 | +++ otherlibs/unix/Makefile Fri Sep 11 16:13:07 1998 | |
331 | @@ -24,19 +24,27 @@ | |
332 | time.o times.o truncate.o umask.o unixsupport.o unlink.o \ | |
333 | utimes.o wait.o write.o | |
334 | ||
335 | +POBJS=$(OBJS:.o=$(EXT_PROF).o) | |
336 | + | |
337 | all: libunix.a unix.cmi unix.cma | |
338 | ||
339 | -allopt: libunix.a unix.cmi unix.cmxa | |
340 | +allopt: libunix.a libunix$(EXT_PROF).a unix.cmi unix.cmxa | |
341 | ||
342 | libunix.a: $(OBJS) | |
343 | rm -f libunix.a | |
344 | ar rc libunix.a $(OBJS) | |
345 | $(RANLIB) libunix.a | |
346 | ||
347 | +libunix$(EXT_PROF).a: $(POBJS) | |
348 | + rm -f libunix$(EXT_PROF).a | |
349 | + ar rc libunix$(EXT_PROF).a $(POBJS) | |
350 | + $(RANLIB) libunix$(EXT_PROF).a | |
351 | + | |
352 | unix.cma: unix.cmo | |
353 | $(CAMLC) -a -linkall -o unix.cma unix.cmo | |
354 | ||
355 | unix.cmxa: unix.cmx | |
356 | + $(CAMLOPT) -p -a -linkall -o unix.cmxa unix.cmx | |
357 | $(CAMLOPT) -a -linkall -o unix.cmxa unix.cmx | |
358 | ||
359 | unix.cmx: ../../ocamlopt | |
360 | @@ -53,10 +61,11 @@ | |
361 | cp unix.cmi unix.cma unix.mli $(LIBDIR) | |
362 | ||
363 | installopt: | |
364 | - cp unix.cmx unix.cmxa unix.a $(LIBDIR) | |
365 | - cd $(LIBDIR); $(RANLIB) unix.a | |
366 | + cp libunix?*.a $(LIBDIR) | |
367 | + cp unix.cmx unix.cmxa unix*.a $(LIBDIR) | |
368 | + cd $(LIBDIR); $(RANLIB) unix*.a | |
369 | ||
370 | -.SUFFIXES: .ml .mli .cmo .cmi .cmx | |
371 | +.SUFFIXES: .ml .mli .cmo .cmi .cmx .c $(EXT_PROF).o | |
372 | ||
373 | .mli.cmi: | |
374 | $(CAMLC) -c $(COMPFLAGS) $< | |
375 | @@ -65,7 +74,11 @@ | |
376 | $(CAMLC) -c $(COMPFLAGS) $< | |
377 | ||
378 | .ml.cmx: | |
379 | + $(CAMLOPT) -p -c $(COMPFLAGS) $< | |
380 | $(CAMLOPT) -c $(COMPFLAGS) $< | |
381 | + | |
382 | +.c$(EXT_PROF).o: | |
383 | + $(CC) -c -p $(CFLAGS) $< -o $*$(EXT_PROF).o | |
384 | ||
385 | depend: | |
386 | gcc -MM $(CFLAGS) *.c > .depend | |
387 | --- Makefile.orig Wed Nov 18 13:10:50 1998 | |
388 | +++ Makefile Thu Dec 10 23:50:23 1998 | |
389 | @@ -60,7 +60,7 @@ | |
390 | asmcomp/printlinear.cmo asmcomp/linearize.cmo \ | |
391 | asmcomp/schedgen.cmo asmcomp/scheduling.cmo \ | |
392 | asmcomp/emitaux.cmo asmcomp/emit.cmo asmcomp/asmgen.cmo \ | |
393 | - asmcomp/asmlink.cmo asmcomp/asmlibrarian.cmo | |
394 | + asmcomp/asmlibrarian.cmo asmcomp/asmlink.cmo | |
395 | ||
396 | DRIVER=driver/errors.cmo driver/compile.cmo driver/main_args.cmo driver/main.cmo | |
397 | ||
398 | @@ -256,6 +256,7 @@ | |
399 | -e 's|%%EXT_OBJ%%|.o|' \ | |
400 | -e 's|%%EXT_ASM%%|.s|' \ | |
401 | -e 's|%%EXT_LIB%%|.a|' \ | |
402 | + -e 's|%%EXT_PROF%%|$(EXT_PROF)|' \ | |
403 | utils/config.mlp > utils/config.ml | |
404 | @chmod -w utils/config.ml | |
405 | ||
406 | @@ -425,6 +426,8 @@ | |
407 | cd asmrun; $(MAKE) all | |
408 | if test -f stdlib/libasmrun.a; then :; else \ | |
409 | ln -s ../asmrun/libasmrun.a stdlib/libasmrun.a; fi | |
410 | + if test -f stdlib/libasmrun$(EXT_PROF).a; then :; else \ | |
411 | + ln -s ../asmrun/libasmrun$(EXT_PROF).a stdlib/libasmrun$(EXT_PROF).a; fi | |
412 | clean:: | |
413 | cd asmrun; $(MAKE) clean | |
414 | rm -f stdlib/libasmrun.a | |
415 | --- asmrun/Makefile.orig Wed Jan 27 05:52:54 1999 | |
416 | +++ asmrun/Makefile Fri Mar 5 17:16:49 1999 | |
417 | @@ -16,7 +16,7 @@ | |
418 | ||
419 | OBJS=$(COBJS) $(ASMOBJS) | |
420 | DOBJS=$(COBJS:.o=.d.o) $(ASMOBJS) | |
421 | -POBJS=$(COBJS:.o=.p.o) $(ASMOBJS:.o=.p.o) | |
422 | +POBJS=$(COBJS:.o=$(EXT_PROF).o) $(ASMOBJS:.o=$(EXT_PROF).o) | |
423 | ||
424 | all: libasmrun.a all-$(PROFILING) | |
425 | ||
426 | @@ -32,12 +32,12 @@ | |
427 | ||
428 | all-noprof: | |
429 | ||
430 | -all-prof: libasmrunp.a | |
431 | +all-prof: libasmrun$(EXT_PROF).a | |
432 | ||
433 | -libasmrunp.a: $(POBJS) | |
434 | - rm -f libasmrunp.a | |
435 | - ar rc libasmrunp.a $(POBJS) | |
436 | - $(RANLIB) libasmrunp.a | |
437 | +libasmrun$(EXT_PROF).a: $(POBJS) | |
438 | + rm -f libasmrun$(EXT_PROF).a | |
439 | + ar rc libasmrun$(EXT_PROF).a $(POBJS) | |
440 | + $(RANLIB) libasmrun$(EXT_PROF).a | |
441 | ||
442 | install: install-default install-$(PROFILING) | |
443 | ||
444 | @@ -46,17 +46,17 @@ | |
445 | cd $(LIBDIR); $(RANLIB) libasmrun.a | |
446 | ||
447 | install-noprof: | |
448 | - rm -f $(LIBDIR)/libasmrunp.a; ln -s libasmrun.a $(LIBDIR)/libasmrunp.a | |
449 | + rm -f $(LIBDIR)/libasmrun$(EXT_PROF).a; ln -s libasmrun.a $(LIBDIR)/libasmrun$(EXT_PROF).a | |
450 | ||
451 | install-prof: | |
452 | - cp libasmrunp.a $(LIBDIR)/libasmrunp.a | |
453 | - cd $(LIBDIR); $(RANLIB) libasmrunp.a | |
454 | + cp libasmrun$(EXT_PROF).a $(LIBDIR)/libasmrun$(EXT_PROF).a | |
455 | + cd $(LIBDIR); $(RANLIB) libasmrun$(EXT_PROF).a | |
456 | ||
457 | power.o: power-$(SYSTEM).o | |
458 | cp power-$(SYSTEM).o power.o | |
459 | ||
460 | -power.p.o: power-$(SYSTEM).o | |
461 | - cp power-$(SYSTEM).o power.p.o | |
462 | +power$(EXT_PROF).o: power-$(SYSTEM).o | |
463 | + cp power-$(SYSTEM).o power$(EXT_PROF).o | |
464 | ||
465 | main.c: ../byterun/main.c | |
466 | ln -s ../byterun/main.c main.c | |
467 | @@ -123,13 +123,13 @@ | |
468 | clean:: | |
469 | rm -f $(LINKEDFILES) | |
470 | ||
471 | -.SUFFIXES: .S .d.o .p.o | |
472 | +.SUFFIXES: .S .d.o $(EXT_PROF).o | |
473 | ||
474 | .S.o: | |
475 | $(ASPP) $(ASPPFLAGS) -o $*.o $*.S | |
476 | ||
477 | -.S.p.o: | |
478 | - $(ASPP) $(ASPPFLAGS) $(ASPPPROFFLAGS) -o $*.p.o $*.S | |
479 | +.S$(EXT_PROF).o: | |
480 | + $(ASPP) $(ASPPFLAGS) $(ASPPPROFFLAGS) -o $*$(EXT_PROF).o $*.S | |
481 | ||
482 | .c.d.o: | |
483 | @ if test -f $*.o; then mv $*.o $*.f.o; else :; fi | |
484 | @@ -137,17 +137,17 @@ | |
485 | mv $*.o $*.d.o | |
486 | @ if test -f $*.f.o; then mv $*.f.o $*.o; else :; fi | |
487 | ||
488 | -.c.p.o: | |
489 | +.c$(EXT_PROF).o: | |
490 | @ if test -f $*.o; then mv $*.o $*.f.o; else :; fi | |
491 | $(CC) -c $(PFLAGS) $< | |
492 | - mv $*.o $*.p.o | |
493 | + mv $*.o $*$(EXT_PROF).o | |
494 | @ if test -f $*.f.o; then mv $*.f.o $*.o; else :; fi | |
495 | ||
496 | .s.o: | |
497 | $(ASPP) $(ASPPFLAGS) -o $*.o $*.s | |
498 | ||
499 | -.s.p.o: | |
500 | - $(ASPP) $(ASPPFLAGS) $(ASPPPROFFLAGS) -o $*.p.o $*.s | |
501 | +.s$(EXT_PROF).o: | |
502 | + $(ASPP) $(ASPPFLAGS) $(ASPPPROFFLAGS) -o $*$(EXT_PROF).o $*.s | |
503 | ||
504 | clean:: | |
505 | rm -f *.o *.a *~ | |
506 | @@ -155,7 +155,7 @@ | |
507 | depend: $(COBJS:.o=.c) | |
508 | gcc -MM $(FLAGS) *.c > .depend | |
509 | gcc -MM $(FLAGS) -DDEBUG *.c | sed -e 's/\.o/.d.o/' >> .depend | |
510 | - gcc -MM $(FLAGS) -DDEBUG *.c | sed -e 's/\.o/.p.o/' >> .depend | |
511 | + gcc -MM $(FLAGS) -DDEBUG *.c | sed -e 's/\.o/$(EXT_PROF).o/' >> .depend | |
512 | ||
513 | include .depend | |
514 | ||
515 | --- stdlib/Makefile.orig Thu Feb 25 05:26:36 1999 | |
516 | +++ stdlib/Makefile Fri Mar 5 17:19:43 1999 | |
517 | @@ -23,7 +23,7 @@ | |
518 | ||
519 | allopt-noprof: | |
520 | ||
521 | -allopt-prof: stdlib.p.cmxa std_exit.p.cmx | |
522 | +allopt-prof: | |
523 | ||
524 | install: | |
525 | cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(LIBDIR) | |
526 | @@ -35,23 +35,20 @@ | |
527 | cd $(LIBDIR); $(RANLIB) stdlib.a | |
528 | ||
529 | installopt-noprof: | |
530 | - rm -f $(LIBDIR)/stdlib.p.cmxa; ln -s stdlib.cmxa $(LIBDIR)/stdlib.p.cmxa | |
531 | - rm -f $(LIBDIR)/stdlib.p.a; ln -s stdlib.a $(LIBDIR)/stdlib.p.a | |
532 | - rm -f $(LIBDIR)/std_exit.p.cmx; ln -s std_exit.cmx $(LIBDIR)/std_exit.p.cmx | |
533 | - rm -f $(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o | |
534 | + rm -f $(LIBDIR)/stdlib$(EXT_PROF).a; ln -s stdlib.a $(LIBDIR)/stdlib$(EXT_PROF).a | |
535 | + rm -f $(LIBDIR)/std_exit$(EXT_PROF).o; ln -s std_exit.o $(LIBDIR)/std_exit$(EXT_PROF).o | |
536 | ||
537 | installopt-prof: | |
538 | - cp stdlib.p.cmxa stdlib.p.a std_exit.p.cmx std_exit.p.o $(LIBDIR) | |
539 | - cd $(LIBDIR); $(RANLIB) stdlib.p.a | |
540 | + cp stdlib$(EXT_PROF).a std_exit$(EXT_PROF).o $(LIBDIR) | |
541 | + cd $(LIBDIR); $(RANLIB) stdlib$(EXT_PROF).a | |
542 | ||
543 | stdlib.cma: $(OBJS) | |
544 | $(CAMLC) -a -o stdlib.cma $(OBJS) | |
545 | ||
546 | stdlib.cmxa: $(OBJS:.cmo=.cmx) | |
547 | $(CAMLOPT) -a -o stdlib.cmxa $(OBJS:.cmo=.cmx) | |
548 | + $(CAMLOPT) -p -a -o stdlib.cmxa $(OBJS:.cmo=.cmx) | |
549 | ||
550 | -stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx) | |
551 | - $(CAMLOPT) -a -o stdlib.p.cmxa $(OBJS:.cmo=.p.cmx) | |
552 | ||
553 | camlheader camlheader_ur: header.c ../config/Makefile | |
554 | if $(SHARPBANGSCRIPTS); then \ | |
555 | @@ -73,22 +70,14 @@ | |
556 | $(CAMLC) $(COMPFLAGS) -nopervasives -c pervasives.ml | |
557 | ||
558 | pervasives.cmx: pervasives.ml | |
559 | + $(CAMLOPT) -p $(OPTCOMPFLAGS) -nopervasives -c pervasives.ml | |
560 | $(CAMLOPT) $(OPTCOMPFLAGS) -nopervasives -c pervasives.ml | |
561 | ||
562 | -pervasives.p.cmx: pervasives.ml | |
563 | - @if test -f pervasives.cmx; then mv pervasives.cmx pervasives.n.cmx; else :; fi | |
564 | - @if test -f pervasives.o; then mv pervasives.o pervasives.n.o; else :; fi | |
565 | - $(CAMLOPT) $(OPTCOMPFLAGS) -p -nopervasives -c pervasives.ml | |
566 | - mv pervasives.cmx pervasives.p.cmx | |
567 | - mv pervasives.o pervasives.p.o | |
568 | - @if test -f pervasives.n.cmx; then mv pervasives.n.cmx pervasives.cmx; else :; fi | |
569 | - @if test -f pervasives.n.o; then mv pervasives.n.o pervasives.o; else :; fi | |
570 | - | |
571 | # oo.cmi must be compiled with -nopervasives for applets | |
572 | oo.cmi: oo.mli | |
573 | $(CAMLC) $(COMPFLAGS) -nopervasives -c oo.mli | |
574 | ||
575 | -.SUFFIXES: .mli .ml .cmi .cmo .cmx .p.cmx | |
576 | +.SUFFIXES: .mli .ml .cmi .cmo .cmx | |
577 | ||
578 | .mli.cmi: | |
579 | $(CAMLC) $(COMPFLAGS) -c $< | |
580 | @@ -97,20 +86,11 @@ | |
581 | $(CAMLC) $(COMPFLAGS) -c $< | |
582 | ||
583 | .ml.cmx: | |
584 | + $(CAMLOPT) -p $(OPTCOMPFLAGS) -c $< | |
585 | $(CAMLOPT) $(OPTCOMPFLAGS) -c $< | |
586 | ||
587 | -.ml.p.cmx: | |
588 | - @if test -f $*.cmx; then mv $*.cmx $*.n.cmx; else :; fi | |
589 | - @if test -f $*.o; then mv $*.o $*.n.o; else :; fi | |
590 | - $(CAMLOPT) $(OPTCOMPFLAGS) -p -c $< | |
591 | - mv $*.cmx $*.p.cmx | |
592 | - mv $*.o $*.p.o | |
593 | - @if test -f $*.n.cmx; then mv $*.n.cmx $*.cmx; else :; fi | |
594 | - @if test -f $*.n.o; then mv $*.n.o $*.o; else :; fi | |
595 | - | |
596 | $(OBJS) std_exit.cmo: pervasives.cmi $(COMPILER) | |
597 | $(OBJS:.cmo=.cmx) std_exit.cmx: pervasives.cmi $(OPTCOMPILER) | |
598 | -$(OBJS:.cmo=.p.cmx) std_exit.p.cmx: pervasives.cmi $(OPTCOMPILER) | |
599 | $(OBJS:.cmo=.cmi) std_exit.cmi: $(COMPILER) | |
600 | ||
601 | clean:: |