dpatel 02/10/04 12:35:22
Modified: gcc gcc.c
gcc/objc lang-specs.h
gcc/cp lang-specs.h
Log:
Fix merge issue: Sometimes -save-temps does not work as expected.
Revision Changes Path
1.148 +6 -5 gcc3/gcc/gcc.c
Index: gcc.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/gcc.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- gcc.c 2002/09/20 22:51:28 1.147
+++ gcc.c 2002/10/04 19:35:21 1.148
@@ -1017,12 +1017,13 @@
%(cpp_precomp) -lang-c %{ansi:-std=c89} %(cpp_precomp_options) %y0}}}}}\
%{!E:%{!M:%{!MM:\
%{save-temps|no-integrated-cpp:\
- %{no-cpp-precomp|traditional-cpp|fload=*|fdump=*:\
- %(trad_capable_cpp) %(cpp_options) %{save-temps:%b.i}
%{!save-temps:%g.i} \n\
- cc1 -fpreprocessed %{save-temps:%b.i} %{!save-temps:%g.i}
%(cc1_options)}\
- %{cpp-precomp|!no-cpp-precomp:%{!traditional-cpp:%{!fdump=*:%{!fload=*:\
+ %{no-cpp-precomp|traditional-cpp:%{!fload=*:%{!fdump=*:\
+ %(trad_capable_cpp) %(cpp_options) %b.i \n\
+ cc1 -fpreprocessed %b.i %(cc1_options)}}}\
+ %{cpp-precomp|!no-cpp-precomp|fdump=*|fload=*:%{!traditional-cpp:\
+ %{<fload=*} %{<fdump=*} \
%(cpp_precomp) -lang-c %{ansi:-std=c89} %(cpp_precomp_options) %y0
%b.i \n\
- cc1 -cpp-precomp %b.i %(cc1_options)}}}}}\
+ cc1 -cpp-precomp %b.i %(cc1_options)}}}\
%{!save-temps:%{!no-integrated-cpp:\
%{traditional|ftraditional|traditional-cpp:%{!cpp-precomp:\
tradcpp0 %(cpp_options) %{!pipe:%g.i} |\n\
1.26 +29 -29 gcc3/gcc/objc/lang-specs.h
Index: lang-specs.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/objc/lang-specs.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- lang-specs.h 2002/08/26 20:08:10 1.25
+++ lang-specs.h 2002/10/04 19:35:21 1.26
@@ -25,44 +25,44 @@
{"@objective-c",
/* cc1obj has an integrated ISO C preprocessor. We should invoke the
external preprocessor if -save-temps or -traditional is given. */
- /* APPLE LOCAL begin cpp-precomp dpatel */
+ /* APPLE LOCAL PFE cpp-precomp */
/* Add support to invoke cpp-precomp with -precomp or -cpp-precomp or -E.
Do not invoke cpp-precomp when -no-cpp-precomp is specified */
"%{M|MM:%(trad_capable_cpp) %(cpp_options) %(cpp_debug_options)}\
%{E|S:%{@:%e-E and -S are not allowed with multiple -arch flags}}\
%{E:\
%{traditional-cpp|no-cpp-precomp:\
- %(trad_capable_cpp) %(cpp_options) %(cpp_debug_options)}\
+ %(trad_capable_cpp) -lang-objc %(cpp_options) %(cpp_debug_options)}\
%{!traditional-cpp:%{!no-cpp-precomp:\
- %(cpp_precomp) -lang-objc -D__OBJC__ %{ansi:-std=c89}
%(cpp_precomp_options) %y0}}}\
+ %(cpp_precomp) -lang-objc -D__OBJC__ %{ansi:-std=c89} \
+ %(cpp_precomp_options) %y0}}}\
%{!E:%{!M:%{!MM:\
- %{save-temps|no-integrated-cpp:\
- %{no-cpp-precomp|traditional-cpp|fload=*|fdump=*:\
- %(trad_capable_cpp) -lang-objc -D__OBJC__ %{ansi:-std=c89}
%(cpp_options) %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\
- cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi}
%(cc1_options) %{gen-decls}}\
-
%{cpp-precomp|!no-cpp-precomp:%{!traditional-cpp:%{!fdump=*:%{!fload=*:%{!precomp:\
- %(cpp_precomp) -lang-objc -D__OBJC__ %{ansi:-std=c89}
%(cpp_precomp_options) %y0 %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\
- cc1obj -cpp-precomp %{save-temps:%b.mi} %{!save-temps:%g.mi}
%(cc1_options) %{gen-decls}}}}}}}\
- %{precomp:\
- %(cpp_precomp) -lang-objc -D__OBJC__ %{ansi:-std=c89}\
- %(cpp_precomp_options) %y0\
- %{precomp:%{@:-o %f%u.p}%{!@:%W{o}%W{!o*:-o %b-gcc3.p}}} }\
- %{!save-temps:%{!no-integrated-cpp:\
- %{traditional|ftraditional|traditional-cpp:%{!cpp-precomp:\
-%eGNU Objective C no longer supports traditional compilation}}\
-
%{!fdump=*:%{!fload=*:%{!no-cpp-precomp|cpp-precomp:%{!precomp:%{!traditional-cpp:\
- %(cpp_precomp) -lang-objc -D__OBJC__ %{ansi:-std=c89}\
- %(cpp_precomp_options) %y0 %{!pipe:%g.mi} |\n\
- cc1obj -cpp-precomp %{!pipe:%g.mi} %(cc1_options)
%{gen-decls}}}}}}\
- %{precomp:\
- %(cpp_precomp) -lang-objc -D__OBJC__ %{ansi:-std=c89}\
- %(cpp_precomp_options) %y0\
- %{precomp:%{@:-o %f%u.p}%{!@:%W{o}%W{!o*:-o %b-gcc3.p}}} }\
- %{!traditional:%{!ftraditional:%{!traditional-cpp:\
- %{fload=*|fdump=*|no-cpp-precomp:%{!precomp:\
- cc1obj %(cpp_unique_options) %(cc1_options) %{gen-decls}}}}}}}}\
+ %{traditional|ftraditional|traditional-cpp:\
+%eGNU Objective C no longer supports traditional compilation}\
+ %{save-temps:\
+ %{<fload=*} %{<fdump=*}\
+ %{no-cpp-precomp: cc1obj -E %(cpp_options) %b.mi \n\
+ cc1obj -fpreprocessed %b.mi %(cc1_options) %{gen-decls}}\
+ %{!no-cpp-precomp: \
+ %(cpp_precomp) -lang-objc -D__OBJC__ %{ansi:-std=c89} \
+ %(cpp_precomp_options) %y0 \
+ %{precomp:%{@:-o %f%u.p}%{!@:%W{o}%W{!o*:-o %b-gcc3.p}}\n}\
+ %{!precomp:\
+ %b.mi \n\
+ cc1obj -fpreprocessed %b.mi %(cc1_options) %{gen-decls}}}}\
+ %{!save-temps:\
+ %{no-cpp-precomp|fload=*|fdump=*:\
+ cc1obj %(cpp_unique_options) %(cc1_options) %{gen-decls}}\
+ %{!no-cpp-precomp:%{!fload=*:%{!fdump=*:\
+ %(cpp_precomp) -lang-objc -D__OBJC__ %{ansi:-std=c89}\
+ %(cpp_precomp_options) %y0 \
+ %{precomp:%{@:-o %f%u.p}%{!@:%W{o}%W{!o*:-o %b-gcc3.p}}\n}\
+ %{!precomp:\
+ %{!pipe:%g.mi} %{pipe:|}\n\
+ cc1obj -cpp-precomp %{!pipe:%g.mi} %(cc1_options) \
+ %{gen-decls}}}}}}\
%{!fsyntax-only:%{!precomp:%(invoke_as)}}}}}", 0},
- /* APPLE LOCAL end cpp-precomp dpatel */
+ /* APPLE LOCAL PFE cpp-precomp */
{".mi", "@objc-cpp-output", 0},
{"@objc-cpp-output",
/* APPLE LOCAL cpp-precomp dpatel */
1.27 +3 -1 gcc3/gcc/cp/lang-specs.h
Index: lang-specs.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cp/lang-specs.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- lang-specs.h 2002/09/17 22:04:53 1.26
+++ lang-specs.h 2002/10/04 19:35:22 1.27
@@ -70,7 +70,9 @@
-D__GXX_ABI_VERSION=100\
%{ansi:-std=c++98}\
-D__cplusplus %(cpp_precomp_options) %y1 %d%g.ii \n}}}}}\
- %{save-temps|no-integrated-cpp:%{!cpp-precomp|fdump=*|fload=*:cc1plus -E
%{!no-gcc:-D__GNUG__=%v1}\
+ %{save-temps|no-integrated-cpp:%{!cpp-precomp|fdump=*|fload=*:cc1plus \
+ %{<fload=*} %{<fdump=*} \
+ -E %{!no-gcc:-D__GNUG__=%v1}\
%(cpp_options) %2 %b.ii \n}}\
%{save-temps|no-integrated-cpp:%{cpp-precomp:%{!fdump=*:%{!fload=*:%(cpp_precomp)
-lang-c++ \
%{!no-gcc:-D__GNUG__=%v1}\
