gkeating 03/02/12 09:54:40
Modified: live/gcc3 README.Apple
live/gcc3/gcc cppinit.c cpplib.c fix-header.c flags.h gcc.c
genindex.c line-map.c toplev.c
live/gcc3/gcc/cp lang-specs.h
live/gcc3/gcc/doc invoke.texi
live/gcc3/gcc/objc lang-specs.h
live/gcc3/gcc/objcp lang-specs.h
live/gcc3/gcc/testsuite/lib gcc.exp objc.exp
live/gcc3/libstdc++-v3/libsupc++ Makefile.am Makefile.in
live/gcc3/man-pages gcc3.1
Log:
Remove cpp-precomp support.
Bug #: 3119160
Reviewed by: devang
Revision Changes Path
1.25 +1 -14 src/live/gcc3/README.Apple
Index: README.Apple
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/README.Apple,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- README.Apple 2002/07/30 00:16:01 1.24
+++ README.Apple 2003/02/12 17:54:32 1.25
@@ -29,8 +29,7 @@
PFE precompiled headers and Objective-C++ are of interest on other
platforms, we have generally conditionalized Mac-specific code so that
the compiler will build and run elsewhere. You may however run into
-mistakes, such as attempts to run the cpp-precomp preprocessor (use
--no-cpp-precomp to bypass); please let us know about them and we will
+mistakes; please let us know about them and we will
fix these if possible.
NOTE! It's best to assume that this code has been updated from FSF
@@ -341,18 +340,6 @@
that the 'int' should be used. The compiler will thus issue a warning
for these cases. The warning may be suppressed by specifying
-Wno-altivec-long-deprecated.
-
-cpp-precomp
-
-By default, this version does C and Objective-C preprocessing with
-cpp-precomp, which is good if you're using Cocoa, and maybe a problem
-if you're not. As with the standard Apple compiler, -no-cpp-precomp
-switches back to the standard integrated preprocessor, and if you want
-to use cpp-precomp for C++, -cpp-precomp enables it. The option
--precomp is available to create precomps. Non-Darwin systems are
-always effectively -no-cpp-precomp.
-
-The compiler option -precomp-trustfile is used by PB.
-mdynamic-no-pic
1.74 +2 -13 src/live/gcc3/gcc/cppinit.c
Index: cppinit.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/cppinit.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- cppinit.c 2002/10/24 23:42:51 1.73
+++ cppinit.c 2003/02/12 17:54:33 1.74
@@ -35,9 +35,6 @@
#include "pfe/pfe.h"
#include "pfe/pfe-header.h"
-/* APPLE LOCAL cpp-precomp */
-extern int flag_cpp_precomp;
-
/* APPLE LOCAL begin framework headers */
#ifdef FRAMEWORK_HEADERS
struct { char *path; int u1; }
@@ -548,6 +545,7 @@
const struct lang_flags *l = &lang_defaults[(int) lang];
CPP_OPTION (pfile, lang) = lang;
+
/* APPLE LOCAL flag_objc */
CPP_OPTION (pfile, objc) = flag_objc;
CPP_OPTION (pfile, c99) = l->c99;
@@ -1152,8 +1150,7 @@
/* For foo.i, read the original filename foo.c now, for the benefit
of the front ends. */
- /* APPLE LOCAL cpp-precomp */
- if (CPP_OPTION (pfile, preprocessed) || flag_cpp_precomp)
+ if (CPP_OPTION (pfile, preprocessed))
read_original_filename (pfile);
return pfile->map->to_file;
@@ -1259,14 +1256,6 @@
pfile->next_include_file = &head->next;
else
{
- /* APPLE LOCAL begin cpp-precomp */
- /* When cpp-precomp is used main file name is at
- pfile->line_maps.maps[1].to_file */
- if (flag_cpp_precomp)
- _cpp_do_file_change (pfile, LC_RENAME,
- pfile->line_maps.maps[1].to_file, 1, 0);
- else
- /* APPLE LOCAL end cpp-precomp */
/* All done; restore the line map from <command line>. */
_cpp_do_file_change (pfile, LC_RENAME,
pfile->line_maps.maps[0].to_file, 1, 0);
1.49 +3 -15 src/live/gcc3/gcc/cpplib.c
Index: cpplib.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/cpplib.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cpplib.c 2003/02/06 00:12:13 1.48
+++ cpplib.c 2003/02/12 17:54:33 1.49
@@ -37,9 +37,6 @@
/* APPLE LOCAL indexing dpatel */
#include "genindex.h"
-/* APPLE LOCAL cpp-precomp */
-extern int flag_cpp_precomp;
-
/* Chained list of answers to an assertion. */
struct answer
{
@@ -333,8 +330,6 @@
if (CPP_PEDANTIC (pfile)
&& ! pfile->state.skipping
&& dir->origin == EXTENSION)
- /* APPLE LOCAL cpp-precomp */
- if (!flag_cpp_precomp)
cpp_error (pfile, DL_PEDWARN, "#%s is a GCC extension", dir->name);
/* Traditionally, a directive is ignored unless its # is in
@@ -958,12 +953,7 @@
if (reason == LC_ENTER)
process_header_indexing ((char *)new_file, PB_INDEX_BEGIN);
else if (reason == LC_LEAVE)
- {
- if (flag_cpp_precomp)
- process_header_indexing ((char *)new_file, PB_INDEX_END);
- else
- process_header_indexing ((char *)pfile->map->to_file, PB_INDEX_END);
- }
+ process_header_indexing ((char *)pfile->map->to_file, PB_INDEX_END);
}
/* APPLE LOCAL end indexing dpatel */
@@ -1290,8 +1280,7 @@
if (CPP_OPTION (pfile, warn_pragma_once))
cpp_error (pfile, DL_WARNING, "#pragma once is obsolete");
- /* APPLE LOCAL cpp-precomp */
- if (pfile->buffer->prev == NULL && !flag_cpp_precomp)
+ if (pfile->buffer->prev == NULL)
cpp_error (pfile, DL_WARNING, "#pragma once in main file");
else
_cpp_never_reread (pfile->buffer->inc);
@@ -1345,8 +1334,7 @@
{
cpp_buffer *buffer = pfile->buffer;
- /* APPLE LOCAL cpp-precomp */
- if (buffer->prev == 0 && !flag_cpp_precomp)
+ if (buffer->prev == 0)
cpp_error (pfile, DL_WARNING,
"#pragma system_header ignored outside include file");
else
1.20 +0 -6 src/live/gcc3/gcc/fix-header.c
Index: fix-header.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/fix-header.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fix-header.c 2002/08/26 20:07:59 1.19
+++ fix-header.c 2003/02/12 17:54:33 1.20
@@ -1329,10 +1329,4 @@
void warning (char *msgid) { printf ("%s\n", msgid); }
/* APPLE LOCAL end indexing */
-/* APPLE LOCAL begin cpp-precomp dpatel */
-/* Dummy to link cpp0*. flag_cpp_precomp is used by line-map.c
- to avoid unnecessary/unavoidable warnings/errors. */
-int flag_cpp_precomp = 0;
-/* APPLE LOCAL end cpp-precomp dpatel */
-
int flag_objc = 0;
1.41 +0 -3 src/live/gcc3/gcc/flags.h
Index: flags.h
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/flags.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- flags.h 2003/02/04 03:12:58 1.40
+++ flags.h 2003/02/12 17:54:33 1.41
@@ -450,9 +450,6 @@
extern int flag_really_no_inline;
-/* APPLE LOCAL cpp-precomp dpatel */
-extern int flag_cpp_precomp;
-
/* APPLE LOCAL indexing dpatel */
extern int flag_gen_index;
extern int flag_gen_index_header;
1.163 +36 -249 src/live/gcc3/gcc/gcc.c
Index: gcc.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/gcc.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gcc.c 2003/02/04 03:12:58 1.162
+++ gcc.c 2003/02/12 17:54:33 1.163
@@ -81,8 +81,6 @@
#include "prefix.h"
#include "gcc.h"
#include "flags.h"
-/* APPLE LOCAL cpp-precomp */
-#include "cppdefault.h"
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
@@ -491,11 +489,6 @@
%I Substitute a -iprefix option made from GCC_EXEC_PREFIX.
APPLE LOCAL framework headers
%Q Substitute -iframework default paths.
- APPLE LOCAL begin cpp-precomp
- %y0 Cause -isystem pointing to gcc's version-specific system includes
- to be generated.
- %y1 Same as %y0, but additional c++ include paths are generated.
- APPLE LOCAL end cpp-precomp
APPLE LOCAL constant cfstrings
%yC Emit '-fconstant-cfstrings' option, if needed.
%s current argument is the name of a library or startup file of some sort.
@@ -781,19 +774,13 @@
compiling multiple architectures and the output is a .o or an
executable. */
static char *ofile_merge_spec = "\
-%{!fdump=*:%{!M:%{!MM:%{!E:%{!precomp:%{!S:\
+%{!fdump=*:%{!M:%{!MM:%{!E:%{!S:\
lipo -create %F%{c:%W{o}%{!o:%{!foutput-dbg*:-o %w%b%O} %{foutput-dbg*:-o
%w%i%O}}}\
%{!c:%{!foutput-dbg*:-o %w%u%O} %{foutput-dbg*:-o
%w%i%O}}\n}}}}}}";
static char *exec_merge_spec = "\
-%{!fdump=*:%{!M:%{!MM:%{!E:%{!precomp:%{!S:%{!c:lipo -create %F \
+%{!fdump=*:%{!M:%{!MM:%{!E:%{!S:%{!c:lipo -create %F \
%{o}%{!o:-o a.out}\n}}}}}}}";
-/* NOTE that this issues a .p file by default even if the input file
- is C++/ObjC++. It's theoretically possible to infer .p vs .pp by
- examining infile language, but it would need a new %-directive. */
-static char *precomp_merge_spec = "\
-%{!M:%{!MM:%{!E:%{precomp:%{!S:%{!c:lipo -create %F \
- %{o}%{!o:-o %b-gcc3.p}\n}}}}}}";
/* APPLE LOCAL end fat builds */
/* APPLE LOCAL begin AltiVec */
@@ -821,20 +808,6 @@
/* APPLE LOCAL Symbol Separation */
static const char *dbg_ss= "%{foutput-dbg*: -gfull %(invoke_as)}";
-/* APPLE LOCAL begin cpp-precomp */
-/* Encapsulate cpp-precomp's name and basic options in a subspec. */
-static const char *cpp_precomp =
-"/usr/libexec/gcc/darwin/%T/cpp-precomp -smart -arch %T %{precomp} \
-%{fdebug-gen-index} ";
-/* Encapsulate option specs for cpp-precomp.
- cpp-precomp does not understand -MF filename, but cpp-precomp
- understands -MD filename. Do not allow cpp_option to play
- with -MD later. (Because, it will translate -MD into -MF again). */
-static const char *cpp_precomp_options =
-" %{MF*:-MD %*} %{!MF:%{MD:-MD %b.d}} %{<MD} %{<MF} %(cpp_unique_options) \
- %{W*} %{funsigned-char:-D__CHAR_UNSIGNED__} %{fdebug-gen-index}";
-/* APPLE LOCAL end cpp-precomp */
-
/* We don't wrap .d files in %W{} since a missing .d file, and
therefore no dependency entry, confuses make into thinking a .o
file that happens to exist is up-to-date. */
@@ -845,8 +818,7 @@
"/* APPLE LOCAL framework headers */"\
%{!traditional:%{!ftraditional:%{!traditional-cpp:%Q}}}\
%{CC:%{!E:%eGNU C does not support -CC without using -E}}\
-"/* APPLE LOCAL cpp-precomp */"\
- %{nostdinc*} %{C} %{CC} %{v} %{I*} %{F*} %{P} %I\
+ %{!Q:-quiet} %{nostdinc*} %{C} %{CC} %{v} %{I*} %{P} %I\
%{MD:-MD %{!o:%b.d}%{o*:%.d%*}}\
%{MMD:-MMD %{!o:%b.d}%{o*:%.d%*}}\
%{M} %{MM} %{MF*} %{MG} %{MP} %{MQ*} %{MT*}\
@@ -864,8 +836,7 @@
options used to set target flags. Those special target flags settings may
in turn cause preprocessor symbols to be defined specially. */
static const char *cpp_options =
-/* APPLE LOCAL cpp-precomp */
-"%(cpp_unique_options) %1 %{std*} %{d*} %{ansi} %{W*&pedantic*} %{w} %{m*} %{f*}
%{!Q:-quiet}\
+"%(cpp_unique_options) %1 %{m*} %{std*} %{ansi} %{W*&pedantic*} %{w} %{f*}\
%{O*} %{undef}";
/* This contains cpp options which are not passed when the preprocessor
@@ -1034,48 +1005,22 @@
/* Next come the entries for C. */
{".c", "@c", 0},
{"@c",
- /* APPLE LOCAL begin cpp-precomp dpatel */
- /* Add support to invoke cpp-precomp.
- - Invoke cpp-precomp
- 1) by default (C and Objective-C).
- 2) when -cpp-precomp is used.
- - But do not invoke cpp-precomp when
- 1) -no-cpp-precomp is used
- 2) PFE is used
- */
- "%{M|MM:%(trad_capable_cpp) %(cpp_options)}\
+ /* cc1 has an integrated ISO C preprocessor. We should invoke the
+ external preprocessor if -save-temps is given. */
+ "%{E|M|MM:%(trad_capable_cpp) %(cpp_options) %(cpp_debug_options)}\
+ "/* APPLE LOCAL fat builds */"\
%{E|S:%{@:%e-E and -S are not allowed with multiple -arch flags}}\
- %{E:\
- %{traditional|ftraditional|traditional-cpp|no-cpp-precomp:\
- %(trad_capable_cpp) %(cpp_options)}\
- %{!traditional:%{!ftraditional:%{!traditional-cpp:%{!no-cpp-precomp:\
- %(cpp_precomp) -lang-c %{ansi:-std=c89} %(cpp_precomp_options) %y0}}}}}\
+ "/* APPLE LOCAL cpp-precomp compatibility */"\
+ %{precomp:%ecpp-precomp not supported}%{no-cpp-precomp:}%{Wno-precomp:}\
%{!E:%{!M:%{!MM:\
- %{save-temps|no-integrated-cpp:\
- %{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)}}}\
- %{!save-temps:%{!no-integrated-cpp:\
- %{traditional|ftraditional|traditional-cpp:%{!cpp-precomp:\
- tradcpp0 %(cpp_options) %{!pipe:%g.i} |\n\
- cc1 -fpreprocessed %{!pipe:%g.i} %(cc1_options)}}}\
-
%{!fdump=*:%{!fload=*:%{!no-cpp-precomp|cpp-precomp:%{!precomp:%{!traditional-cpp:\
- %(cpp_precomp) -lang-c %{ansi:-std=c89}\
- %(cpp_precomp_options) %y0 %{!pipe:%g.i} |\n\
- cc1 -cpp-precomp %{!pipe:%g.i} %(cc1_options)}}}}}\
- %{precomp:\
- %(cpp_precomp) -lang-c %{ansi:-std=c89}\
- %(cpp_precomp_options) %y0\
- %{@:-o %f%u.p}%{!@:%W{o}%W{!o*:-o %b-gcc3.p}} }\
- %{!traditional:%{!ftraditional:%{!traditional-cpp:\
- %{fload=*|fdump=*|no-cpp-precomp:%{!precomp:\
- cc1 %(cpp_unique_options) %(cc1_options)}}}}}}\
- %{!fsyntax-only:%{!precomp:%(invoke_as)}}}}}", 0},
- /* APPLE LOCAL end cpp-precomp dpatel */
+ %{traditional|ftraditional:\
+%eGNU C no longer supports -traditional without -E}\
+ %{save-temps|traditional-cpp:%(trad_capable_cpp) \
+ %(cpp_options) %b.i \n\
+ cc1 -fpreprocessed %b.i %(cc1_options)}\
+ %{!save-temps:%{!traditional-cpp:\
+ cc1 %(cpp_unique_options) %(cc1_options)}}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0},
{"-",
"%{!E:%e-E required when input is from standard input}\
%(trad_capable_cpp) %(cpp_options) %(cpp_debug_options)", 0},
@@ -1083,28 +1028,15 @@
{"@c-header",
/* cc1 has an integrated ISO C preprocessor. We should invoke the
external preprocessor if -save-temps is given. */
- /* APPLE LOCAL begin cpp-precomp */
- "%{precomp:\
- %(cpp_precomp) -lang-c %{ansi:-std=c89}\
- %(cpp_precomp_options) %y0\
- %{@:-o %f%u.p}%{!@:%W{o}%W{!o*:-o %b-gcc3.p}}}\
- %{!precomp:\
- %{M|MM:%(trad_capable_cpp) %(cpp_options) %(cpp_debug_options)}\
- %{E:%{!no-cpp-precomp:\
- %(cpp_precomp) -lang-c %{ansi:-std=c89}\
- %(cpp_precomp_options) %y0\
- %{precomp:%{@:-o %f%u.p}%{!@:%W{o}%W{!o*:-o %b-gcc3.p}}}}\
- %{no-cpp-precomp:\
- %(trad_capable_cpp) %(cpp_options) %(cpp_debug_options)}}\
- %{!E:%{!M:%{!MM:\
- %{save-temps|traditional-cpp:\
- %(trad_capable_cpp) %(cpp_options) %b.i \n\
- cc1 -fpreprocessed %b.i %(cc1_options)\
- %(dbg_ss) %(pch)}\
- %{!save-temps:%{!traditional-cpp:\
- cc1 %(cpp_unique_options) %(cc1_options)\
- %(dbg_ss) %(pch)}}}}}}", 0},
- /* APPLE LOCAL end cpp-precomp */
+ "%{E|M|MM:%(trad_capable_cpp) %(cpp_options) %(cpp_debug_options)}\
+ %{!E:%{!M:%{!MM:\
+ %{save-temps|traditional-cpp:%(trad_capable_cpp) \
+ %(cpp_options) %b.i \n\
+ cc1 -fpreprocessed %b.i %(cc1_options)\
+ %(dbg_ss) %(pch)}\
+ %{!save-temps:%{!traditional-cpp:\
+ cc1 %(cpp_unique_options) %(cc1_options)\
+ %(dbg_ss) %(pch)}}}}}", 0},
{".i", "@cpp-output", 0},
{"@cpp-output",
"%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options)
%{!fsyntax-only:%(invoke_as)}}}}", 0},
@@ -1254,8 +1186,6 @@
{"--target", "-b", "a"},
{"--time", "-time", 0},
{"--trace-includes", "-H", 0},
- /* APPLE LOCAL cpp-precomp */
- {"--cpp-precomp", "-cpp-precomp", 0},
{"--traditional", "-traditional", 0},
{"--traditional-cpp", "-traditional-cpp", 0},
{"--trigraphs", "-trigraphs", 0},
@@ -1677,9 +1607,6 @@
INIT_STATIC_SPEC ("cpp_debug_options", &cpp_debug_options),
INIT_STATIC_SPEC ("cpp_unique_options", &cpp_unique_options),
INIT_STATIC_SPEC ("trad_capable_cpp", &trad_capable_cpp),
- /* APPLE LOCAL cpp-precomp */
- INIT_STATIC_SPEC ("cpp_precomp", &cpp_precomp),
- INIT_STATIC_SPEC ("cpp_precomp_options", &cpp_precomp_options),
INIT_STATIC_SPEC ("pch", &pch),
/* APPLE LOCAL Symbol Separtion */
INIT_STATIC_SPEC ("dbg_ss", &dbg_ss),
@@ -2987,14 +2914,12 @@
/* APPLE LOCAL begin 2920964 */
if (verbose_flag && print_help_list
- && (!strcmp ("/usr/libexec/gcc/darwin/ppc/cpp-precomp", string)
- || !strcmp ("/usr/libexec/gcc/darwin/ppc/as", string)
+ && (!strcmp ("/usr/libexec/gcc/darwin/ppc/as", string)
|| !strcmp ("/usr/libexec/gcc/darwin/i386/as", string)
- || !strcmp ("ld", string)
- || !strcmp ("/usr/libexec/gcc/darwin/i386/cpp-precomp", string)))
+ || !strcmp ("ld", string)))
{
/* Do nothing.
- cpp-precomp, as and ld do not entertain --help. */
+ as and ld do not entertain --help. */
}
else
/* APPLE LOCAL end 2920964 */
@@ -3039,12 +2964,10 @@
/* APPLE LOCAL begin 2920964 */
if (verbose_flag && print_help_list
- && (!strcmp ("/usr/libexec/gcc/darwin/ppc/cpp-precomp", commands[i].prog)
- || !strcmp ("as", commands[i].prog)
- || !strcmp ("ld", commands[i].prog)
- || !strcmp ("/usr/libexec/gcc/darwin/i386/cpp-precomp",
commands[i].prog)))
+ && (!strcmp ("as", commands[i].prog)
+ || !strcmp ("ld", commands[i].prog)))
{
- /* cpp-precomp, as and ld do not entertain --help. */
+ /* as and ld do not entertain --help. */
i++;
continue;
}
@@ -3382,14 +3305,6 @@
n_infiles = 0;
added_libraries = 0;
- /* APPLE LOCAL begin cpp-precomp */
-#if !(defined(__APPLE__) && defined(__MACH__))
- /* If not hosted on Darwin, leave a space for a -no-cpp-precomp
- later. */
- n_switches = 1;
-#endif
- /* APPLE LOCAL end cpp-precomp */
-
/* Figure compiler version from version string. */
compiler_version = temp1 = xstrdup (version_string);
@@ -4160,18 +4075,6 @@
n_infiles = 0;
last_language_n_infiles = -1;
- /* APPLE LOCAL begin cpp-precomp */
-#if !(defined(__APPLE__) && defined(__MACH__))
- /* If not hosted on Darwin, use the space reserved earlier to insert
- a -no-cpp-precomp ahead of all other switches. */
- switches[n_switches].part1 = "no-cpp-precomp";
- switches[n_switches].args = 0;
- switches[n_switches].live_cond = SWITCH_OK;
- switches[n_switches].validated = 0;
- n_switches++;
-#endif
- /* APPLE LOCAL end cpp-precomp */
-
/* This, time, copy the text of each switch and store a pointer
to the copy in the vector of switches.
Store all the infiles in their vector. */
@@ -5250,8 +5153,7 @@
break;
/* APPLE LOCAL end framework headers */
- /* APPLE LOCAL begin cpp-precomp */
- /* APPLE LOCAL constant cfstrings */
+ /* APPLE LOCAL begin constant cfstrings */
case 'y':
{
int c1 = *p++;
@@ -5266,122 +5168,10 @@
}
}
else
- {
- char *tmpstr = xmalloc (strlen (STANDARD_EXEC_PREFIX)
- + strlen (DEFAULT_TARGET_VERSION)
- + strlen (DEFAULT_TARGET_MACHINE) + 25);
- char *header_path = xmalloc (strlen (STANDARD_EXEC_PREFIX)
- + strlen (DEFAULT_TARGET_VERSION)
- + strlen (DEFAULT_TARGET_MACHINE) + 25);
- do_spec_1 ("-isystem", 1, NULL);
- /* Make this a separate argument. */
- do_spec_1 (" ", 0, NULL);
-/* APPLE LOCAL begin fat builds */
-#ifdef PHAT
- sprintf (tmpstr, "/usr/include/gcc/darwin/%s",
- DEFAULT_TARGET_VERSION);
- strcpy (header_path, tmpstr);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
- sprintf (tmpstr, "-ispecs=%s%s/%s/specs",
- STANDARD_EXEC_PREFIX,
- arches[current_arch].name,
- DEFAULT_TARGET_VERSION);
-#else
- sprintf (tmpstr, "%s%s/%s/include", STANDARD_EXEC_PREFIX,
- DEFAULT_TARGET_MACHINE,
- DEFAULT_TARGET_VERSION);
- strcpy (header_path, tmpstr);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
- sprintf (tmpstr, "-ispecs=%s%s/%s/specs", STANDARD_EXEC_PREFIX,
- DEFAULT_TARGET_MACHINE,
- DEFAULT_TARGET_VERSION);
-#endif
-/* APPLE LOCAL end fat builds */
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
-
- if (c1 == '1')
- {
- /* Add -isystem ...include.../c++ */
- do_spec_1 ("-isystem", 1, NULL);
- do_spec_1 (" ", 0, NULL);
- sprintf (tmpstr, "%s/c++", header_path);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
-
- /* Add -isystem ...include.../c++/backward */
- do_spec_1 ("-isystem", 1, NULL);
- do_spec_1 (" ", 0, NULL);
- sprintf (tmpstr, "%s/c++/backward", header_path);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
-
- /* Add -isystem ...include.../c++/ppc-darwin */
- do_spec_1 ("-isystem", 1, NULL);
- do_spec_1 (" ", 0, NULL);
- sprintf (tmpstr, "%s/c++/%s-darwin",
header_path,arches[current_arch].name);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
- }
- if (!strcmp(arches[current_arch].name, "ppc"))
- {
- sprintf (tmpstr, "-D__ppc__");
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL);
-
- sprintf (tmpstr, "-D__POWERPC__");
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL);
-
- sprintf (tmpstr, "-D__BIG_ENDIAN__");
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL);
-
- sprintf (tmpstr, "-D__NATURAL_ALIGNMENT__");
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL);
- }
- else if (!strcmp(arches[current_arch].name, "i386"))
- {
- sprintf (tmpstr, "-D__i386__");
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL);
-
- sprintf (tmpstr, "-D__i386");
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL);
-
- sprintf (tmpstr, "-D__LITTLE_ENDIAN__");
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL);
- }
-
- sprintf (tmpstr, "-D__MACH__");
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL);
-
- sprintf (tmpstr, "-D__APPLE__");
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL);
-
- sprintf (tmpstr, "-D__SIZE_TYPE__=%s", SIZE_TYPE);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
- sprintf (tmpstr, "-D__PTRDIFF_TYPE__=%s", PTRDIFF_TYPE);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
- sprintf (tmpstr, "-D__WCHAR_TYPE__=%s", WCHAR_TYPE);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
- /* Note the WINT_TYPE is no longer available here -sts */
- free (tmpstr);
- free (header_path);
- }
+ abort ();
}
break;
- /* APPLE LOCAL end cpp-precomp */
+ /* APPLE LOCAL end constant cfstrings */
case 'o':
{
@@ -7203,9 +6993,6 @@
value = do_spec (ofile_merge_spec);
if (value < 0)
this_file_error = 1;
- value = do_spec (precomp_merge_spec);
- if (value < 0)
- this_file_error = 1;
}
/* APPLE LOCAL end fat builds */
}
1.23 +3 -26 src/live/gcc3/gcc/genindex.c
Index: genindex.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/genindex.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- genindex.c 2002/10/10 23:34:44 1.22
+++ genindex.c 2003/02/12 17:54:34 1.23
@@ -22,7 +22,6 @@
#include "genindex.h"
-extern int flag_cpp_precomp;
extern void warning PARAMS ((const char *, ...));
enum index_language_kind index_language = PB_INDEX_LANGUAGE_INVALID;
@@ -315,11 +314,7 @@
strcpy (info, "+vm ");
break;
case INDEX_FILE_BEGIN:
- /* If cpp-precomp is used, then it's File Resume. */
- if (flag_cpp_precomp)
- strcpy (info, "<Fm ");
- else
- strcpy (info, "+Fm ");
+ strcpy (info, "+Fm ");
break;
case INDEX_FILE_INCLUDE:
strcpy (info, "+Fi ");
@@ -508,12 +503,7 @@
int components;
int len_header;
- /* If cpp-precomp is used as a preprocessor, then we have two
- components. */
- if (flag_cpp_precomp)
- components = 2;
- else
- components = 1;
+ components = 1;
header = (char *) xmalloc (sizeof (char) * (40 + len));
len_header = sprintf (header, "pbxindex-begin v1.2 0x%08lX %02u/%02u %s\n",
@@ -982,18 +972,7 @@
char *name = NULL;
#if 1
- if (flag_cpp_precomp)
- {
- if (when == PB_INDEX_END)
- name = pop_begin_header_stack ();
- else
- {
- name = absolute_path_name (input_name);
- push_begin_header_stack (name);
- }
- }
- else
- name = absolute_path_name (input_name);
+ name = absolute_path_name (input_name);
#endif
if (!name)
@@ -1046,8 +1025,6 @@
}
update_header_status (cursor, when, found);
- if (flag_cpp_precomp && when == PB_INDEX_END)
- free (name);
return found;
}
1.4 +1 -6 src/live/gcc3/gcc/line-map.c
Index: line-map.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/line-map.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- line-map.c 2001/12/18 01:22:54 1.3
+++ line-map.c 2003/02/12 17:54:34 1.4
@@ -25,9 +25,6 @@
#include "line-map.h"
#include "intl.h"
-/* APPLE LOCAL cpp-precomp */
-extern int flag_cpp_precomp;
-
static void trace_include
PARAMS ((const struct line_maps *, const struct line_map *));
@@ -119,9 +116,7 @@
/* Depending upon whether we are handling preprocessed input or
not, this can be a user error or an ICE. */
- /* APPLE LOCAL cpp-precomp dpatel */
- /* Remove when Radar 2788633 is fixed. */
- if (error && !flag_cpp_precomp)
+ if (error)
fprintf (stderr, "line-map.c: file \"%s\" left but not entered\n",
to_file);
1.173 +2 -21 src/live/gcc3/gcc/toplev.c
Index: toplev.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/toplev.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- toplev.c 2003/02/07 01:25:00 1.172
+++ toplev.c 2003/02/12 17:54:34 1.173
@@ -751,8 +751,6 @@
/* Nonzero means that we should emit static const variables
regardless of whether or not optimization is turned on. */
-/* APPLE LOCAL cpp-precomp dpatel */
-int flag_cpp_precomp = 0;
/* APPLE LOCAL indexing dpatel */
/* Indexing engine needs to know, if compiler is processing
preprocessed source or not. */
@@ -4365,13 +4363,6 @@
{
set_Wunused (0);
}
- /* APPLE LOCAL begin cpp-precomp */
- /* One fine day, we should teach the driver not to pass '-Wno-precomp'
- down here, since only cpp-precomp actually understands it. */
- else if (!strcmp (arg, "no-precomp"))
- return 1;
- /* APPLE LOCAL end cpp-precomp */
-
else
return 0;
@@ -4710,15 +4701,6 @@
return 0;
break;
- /* APPLE LOCAL begin cpp-precomp dpatel */
- case 'c':
- if (!strcmp (arg, "cpp-precomp"))
- flag_cpp_precomp = 1;
- else
- return 0;
- break;
- /* APPLE LOCAL end cpp-precomp dpatel */
-
case 'q':
if (!strcmp (arg, "quiet"))
quiet_flag = 1;
@@ -5750,8 +5732,7 @@
dump_base_name = name ? name : "gccdump";
/* APPLE LOCAL indexing dpatel */
- /* With -save-temps, driver invokes compiler again with -fpreprocessed
- without -cpp-precomp. */
+ /* With -save-temps, driver invokes compiler again with -fpreprocessed. */
if (flag_preprocessing)
disable_gen_index ();
else
@@ -5766,7 +5747,7 @@
return 0;
/* APPLE LOCAL begin indexing dpatel */
- if (flag_gen_index && !flag_cpp_precomp && flag_gen_index_header)
+ if (flag_gen_index && flag_gen_index_header)
{
if (name[0] != '/')
{
1.32 +12 -58 src/live/gcc3/gcc/cp/lang-specs.h
Index: lang-specs.h
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/cp/lang-specs.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lang-specs.h 2003/02/04 03:13:05 1.31
+++ lang-specs.h 2003/02/12 17:54:36 1.32
@@ -48,66 +48,20 @@
%(cc1_options) %2 %{+e1*} %(dbg_ss) %(pch)}}}",
CPLUSPLUS_CPP_SPEC},
{"@c++",
- /* cc1plus has an integrated ISO C preprocessor. We should invoke
- the external preprocessor if -save-temps is given. */
- /* APPLE LOCAL begin cpp-precomp dpatel */
- /* Add support to invoke cpp-precomp with -precomp
- or -cpp-precomp, and optionally with -E. */
- "%{M|MM:cc1plus -E %{!no-gcc:-D__GNUG__=%v1}\
- %(cpp_options) %2 %(cpp_debug_options)}\
- %{E|S:%{@:%e-E and -S are not allowed with multiple -arch flags}}\
- %{E:\
- %{cpp-precomp:\
- %(cpp_precomp) -lang-c++ %{!no-gcc:-D__GNUG__=%v1}\
- %{!Wno-deprecated:-D__DEPRECATED}\
- %{!fno-exceptions:-D__EXCEPTIONS}\
- -D__cplusplus -D__GXX_ABI_VERSION=100\
- %{ansi:-std=c++98} %(cpp_precomp_options) %y1}\
- %{!cpp-precomp:\
- cc1plus -E %{!no-gcc:-D__GNUG__=%v1}\
- %(cpp_options) %2 %(cpp_debug_options)}}\
- %{precomp: %(cpp_precomp) -lang-c++ \
- %{!no-gcc:-D__GNUG__=%v1}\
- %{!Wno-deprecated:-D__DEPRECATED}\
- %{!fno-exceptions:-D__EXCEPTIONS}\
- -D__GXX_ABI_VERSION=100\
- %{ansi:-std=c++98}\
- -D__cplusplus %(cpp_precomp_options) %y1\
- %{@:-o %f%u.pp}%{!@:%W{o}%W{!o*:-o %b-gcc3.pp}} \n}\
- %{!E:%{!M:%{!MM:%{!precomp:\
-
%{!save-temps:%{!no-integrated-cpp:%{!fload=*:%{!fdump=*:%{cpp-precomp:%(cpp_precomp)
-lang-c++ \
- %{!no-gcc:-D__GNUG__=%v1}\
- %{!Wno-deprecated:-D__DEPRECATED}\
- %{!fno-exceptions:-D__EXCEPTIONS}\
- -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 \
- %{<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}\
- %{!Wno-deprecated:-D__DEPRECATED}\
- %{!fno-exceptions:-D__EXCEPTIONS}\
- -D__GXX_ABI_VERSION=100\
- %{ansi:-D__STRICT_ANSI__}\
- %(cpp_precomp_options) %y1 %b.ii \n}}}}\
- cc1plus %{save-temps|no-integrated-cpp:%{!cpp-precomp:-fpreprocessed}
%{cpp-precomp:-cpp-precomp} %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
-
%{!save-temps:%{!no-integrated-cpp:%{cpp-precomp:%{!fload=*:%{!fdump=*:-cpp-precomp
%d%{save-temps:%b.ii} %{!save-temps:%g.ii}}}}}}\
- %{!save-temps:%{!cpp-precomp|fload=*|fdump=*:%(cpp_unique_options)\
- %{!no-gcc:-D__GNUG__=%v1} \
- %{!Wno-deprecated:-D__DEPRECATED}\
- %{!fno-exceptions:-D__EXCEPTIONS}\
- %{ansi:-D__STRICT_ANSI__}}}\
- %(cc1_options) %2 %{+e1*}\
- %{!fsyntax-only:%(invoke_as)}}}}}",
+ "%{E|M|MM:cc1plus -E %{!no-gcc:-D__GNUG__=%v1}\
+ %(cpp_options) %2 %(cpp_debug_options)}\
+ "/* APPLE LOCAL prohibit -arch with -E and -S */"\
+ %{E|S:%{@:%e-E and -S are not allowed with multiple -arch flags}}\
+ %{!E:%{!M:%{!MM:\
+ %{save-temps:cc1plus -E %{!no-gcc:-D__GNUG__=%v1}\
+ %(cpp_options) %2 %b.ii \n}\
+ cc1plus %{save-temps:-fpreprocessed %b.ii}\
+ %{!save-temps:%(cpp_unique_options) %{!no-gcc:-D__GNUG__=%v1}}\
+ %(cc1_options) %2 %{+e1*}\
+ %{!fsyntax-only:%(invoke_as)}}}}",
CPLUSPLUS_CPP_SPEC},
- /* APPLE LOCAL end cpp-precomp dpatel */
{".ii", "@c++-cpp-output", 0},
- /* APPLE LOCAL cpp-precomp dpatel */
- /* Do not invoke_as with -precomp */
{"@c++-cpp-output",
"%{!M:%{!MM:%{!E:\
cc1plus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
- %{!fsyntax-only:%{!precomp:%(invoke_as)}}}}}", 0},
+ %{!fsyntax-only:%(invoke_as)}}}}", 0},
1.49 +0 -17 src/live/gcc3/gcc/doc/invoke.texi
Index: invoke.texi
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/doc/invoke.texi,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- invoke.texi 2003/01/22 06:03:35 1.48
+++ invoke.texi 2003/02/12 17:54:36 1.49
@@ -355,8 +355,6 @@
-M -MM -MF -MG -MP -MQ -MT -nostdinc -P -remap @gol
@c APPLE LOCAL -dependency-file
-dependency-file (APPLE ONLY) @gol
-@c APPLE LOCAL cpp-precomp
--no-cpp-precomp (APPLE ONLY) @gol
@c APPLE LOCAL PFE
--dump-pch @var{name} (APPLE ONLY) --load-pch @var{name} (APPLE ONLY) @gol
-trigraphs -undef -U@var{macro} -Wp,@var{option}}
@@ -1320,16 +1318,6 @@
Support ISO C trigraphs. The @option{-ansi} option (and @option{-std}
options for strict ISO C conformance) implies @option{-trigraphs}.
-@c APPLE LOCAL begin cpp-precomp
-@item -no-cpp-precomp
-@opindex no-cpp-precomp
-By default, Apple's GCC preprocesses C and Objective-C with a special
-preprocessor called @samp{cpp-precomp} that supports precompiled
-headers. This preprocessor cannot always handle every construct that
-GCC supports; use @samp{-no-cpp-precomp} to switch to using GNU cpp
-instead. (APPLE ONLY)
-@c APPLE LOCAL end cpp-precomp
-
@c APPLE LOCAL begin PFE
@item --dump-pch @var{name}
@opindex dump-pch
@@ -1364,11 +1352,6 @@
C compiler. They are now only supported with the @option{-E} switch.
The preprocessor continues to support a pre-standard mode. See the GNU
CPP manual for details.
-
-@c APPLE LOCAL cpp-precomp
-In Apple's version of GCC, this means to use GNU cpp instead of
-cpp-precomp to preprocess. This meaning of the option is deprecated,
-and will eventually revert to its standard meaning.
@item -fcond-mismatch
@opindex fcond-mismatch
1.28 +10 -35 src/live/gcc3/gcc/objc/lang-specs.h
Index: lang-specs.h
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/objc/lang-specs.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- lang-specs.h 2002/10/08 01:34:10 1.27
+++ lang-specs.h 2003/02/12 17:54:38 1.28
@@ -25,46 +25,21 @@
{"@objective-c",
/* cc1obj has an integrated ISO C preprocessor. We should invoke the
external preprocessor if -save-temps or -traditional is given. */
- /* 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|M|MM:%(trad_capable_cpp)\
+ -lang-objc %(cpp_options) %(cpp_debug_options)}\
+ "/* APPLE LOCAL prohibit -arch with -E and -S */"\
%{E|S:%{@:%e-E and -S are not allowed with multiple -arch flags}}\
- %{E:\
- %{traditional-cpp|no-cpp-precomp:\
- %(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}}}\
+ "/* APPLE LOCAL cpp-precomp compatibility */"\
+ %{precomp:%ecpp-precomp not supported}%{no-cpp-precomp:}%{Wno-precomp:}\
%{!E:%{!M:%{!MM:\
%{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 -cpp-precomp %b.mi %(cc1_options) %{gen-decls}}}}\
+ %{save-temps:cc1obj -E %(cpp_options) %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 PFE cpp-precomp */
+ cc1obj %(cpp_unique_options) %(cc1_options) %{gen-decls}}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0},
{".mi", "@objc-cpp-output", 0},
{"@objc-cpp-output",
- /* APPLE LOCAL cpp-precomp dpatel */
"%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{gen-decls}\
- %{!fsyntax-only:%{!precomp:%(invoke_as)}}}}}", 0},
+ %{!fsyntax-only:%(invoke_as)}}}}", 0},
1.14 +14 -52 src/live/gcc3/gcc/objcp/lang-specs.h
Index: lang-specs.h
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/objcp/lang-specs.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lang-specs.h 2002/08/26 20:08:12 1.13
+++ lang-specs.h 2003/02/12 17:54:38 1.14
@@ -1,6 +1,6 @@
/* APPLE LOCAL Objective-C++ */
-/* Definitions for specs for Objective-C++.
- Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
+/* Definitions for specs for C++.
+ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
Free Software Foundation, Inc.
This file is part of GNU CC.
@@ -21,7 +21,7 @@
Boston, MA 02111-1307, USA. */
/* This is the contribution to the `default_compilers' array in gcc.c for
- g++. */
+ objective-c++. */
#ifndef OBJCPLUSPLUS_CPP_SPEC
#define OBJCPLUSPLUS_CPP_SPEC 0
@@ -30,58 +30,20 @@
{".mm", "@objective-c++", 0},
{".M", "@objective-c++", 0},
{"@objective-c++",
- /* cc1objplus has an integrated ISO C preprocessor. We should invoke
- the external preprocessor if -save-temps is given. */
- /* APPLE LOCAL begin cpp-precomp dpatel */
- /* Add support to invoke cpp-precomp with -precomp
- or -cpp-precomp, and optionally with -E. */
- "%{M|MM:cc1objplus -E %{!no-gcc:-D__GNUG__=%v1}\
+ "%{E|M|MM:cc1objplus -E %{!no-gcc:-D__GNUG__=%v1}\
%(cpp_options) %2 %(cpp_debug_options)}\
- %{E|S:%{@:%e-E and -S are not allowed with multiple -arch flags}}\
- %{E:\
- %{cpp-precomp:\
- %(cpp_precomp) -lang-objc++ %{!no-gcc:-D__GNUG__=%v1}\
- %{!Wno-deprecated:-D__DEPRECATED}\
- %{!fno-exceptions:-D__EXCEPTIONS}\
- -D__OBJC__ -D__cplusplus -D__GXX_ABI_VERSION=100\
- %{ansi:-std=c++98} %(cpp_precomp_options) %y1}\
- %{!cpp-precomp:\
- cc1objplus -E %{!no-gcc:-D__GNUG__=%v1}\
- %(cpp_options) %2 %(cpp_debug_options)}}\
- %{precomp: %(cpp_precomp) -lang-objc++ \
- %{!no-gcc:-D__GNUG__=%v1}\
- %{!Wno-deprecated:-D__DEPRECATED}\
- %{!fno-exceptions:-D__EXCEPTIONS}\
- -D__GXX_ABI_VERSION=100\
- %{ansi:-std=c++98} -D__OBJC__ -D__cplusplus %(cpp_precomp_options) %y1\
- %{@:-o %f%u.pp}%{!@:%W{o}%W{!o*:-o %b-gcc3.pp}} \n}\
- %{!E:%{!M:%{!MM:%{!precomp:\
-
%{!save-temps:%{!no-integrated-cpp:%{!fload=*:%{!fdump=*:%{cpp-precomp:%(cpp_precomp)
-lang-objc++ \
- %{!no-gcc:-D__GNUG__=%v1}\
- %{!Wno-deprecated:-D__DEPRECATED}\
- %{!fno-exceptions:-D__EXCEPTIONS}\
- -D__GXX_ABI_VERSION=100\
- %{ansi:-std=c++98}\
- -D__OBJC__ -D__cplusplus %(cpp_precomp_options) %y1 %d%g.mii
\n}}}}}\
- %{save-temps|no-integrated-cpp:%{!cpp-precomp|fdump=*|fload=*:cc1objplus -E \
- %(cpp_options) %2 %b.mii \n}}\
-
%{save-temps|no-integrated-cpp:%{cpp-precomp:%{!fdump=*:%{!fload=*:%(cpp_precomp)
-lang-objc++ \
- %{!no-gcc:-D__GNUG__=%v1}\
- %{!Wno-deprecated:-D__DEPRECATED}\
- %{!fno-exceptions:-D__EXCEPTIONS}\
- -D__GXX_ABI_VERSION=100\
- %{ansi:-std=c++98} %(cpp_precomp_options) %y1 %b.mii \n}}}}\
- cc1objplus %{save-temps|no-integrated-cpp:%{!cpp-precomp:-fpreprocessed}
%{cpp-precomp:-cpp-precomp} %b.mii}\
- %{cpp-precomp:%{!fload=*:%{!fdump=*:-cpp-precomp %d%b.mii}}}\
-
%{!save-temps:%{!no-integrated-cpp:%{!cpp-precomp|fload=*|fdump=*:%(cpp_unique_options)
%{!no-gcc:-D__GNUG__=%v1}}}}\
- %(cc1_options) %{gen-decls} %2 %{+e1*}\
- %{!fsyntax-only:%(invoke_as)}}}}}",
+ "/* APPLE LOCAL prohibit -arch with -E and -S */"\
+ %{E|S:%{@:%e-E and -S are not allowed with multiple -arch flags}}\
+ %{!E:%{!M:%{!MM:\
+ %{save-temps:cc1objplus -E %{!no-gcc:-D__GNUG__=%v1}\
+ %(cpp_options) %2 %b.mii \n}\
+ cc1objplus %{save-temps:-fpreprocessed %b.mii}\
+ %{!save-temps:%(cpp_unique_options) %{!no-gcc:-D__GNUG__=%v1}}\
+ %(cc1_options) %{gen-decls} %2 %{+e1*}\
+ %{!fsyntax-only:%(invoke_as)}}}}",
OBJCPLUSPLUS_CPP_SPEC},
- /* APPLE LOCAL end cpp-precomp dpatel */
{".mii", "@objc++-cpp-output", 0},
- /* APPLE LOCAL cpp-precomp dpatel */
- /* Do not invoke_as with -precomp */
{"@objc++-cpp-output",
"%{!M:%{!MM:%{!E:\
cc1objplus -fpreprocessed %i %(cc1_options) %{gen-decls} %2 %{+e*}\
- %{!fsyntax-only:%{!precomp:%(invoke_as)}}}}}", 0},
+ %{!fsyntax-only:%(invoke_as)}}}}", 0},
1.18 +0 -2 src/live/gcc3/gcc/testsuite/lib/gcc.exp
Index: gcc.exp
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/testsuite/lib/gcc.exp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gcc.exp 2002/10/24 23:49:56 1.17
+++ gcc.exp 2003/02/12 17:54:38 1.18
@@ -145,8 +145,6 @@
}
if { 1 } {
lappend options "additional_flags=-DNO_LABEL_VALUES"
- # APPLE LOCAL cpp-precomp
- lappend options "additional_flags=-no-cpp-precomp"
}
if [info exists TOOL_OPTIONS] {
lappend options "additional_flags=$TOOL_OPTIONS"
1.9 +0 -2 src/live/gcc3/gcc/testsuite/lib/objc.exp
Index: objc.exp
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/testsuite/lib/objc.exp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- objc.exp 2002/10/24 23:49:56 1.8
+++ objc.exp 2003/02/12 17:54:38 1.9
@@ -162,8 +162,6 @@
if [target_info exists objc,no_label_values] {
lappend options "additional_flags=-DNO_LABEL_VALUES"
}
- # APPLE LOCAL cpp-precomp
- lappend options "additional_flags=-no-cpp-precomp"
if [info exists TOOL_OPTIONS] {
lappend options "additional_flags=$TOOL_OPTIONS"
}
1.9 +1 -2 src/live/gcc3/libstdc++-v3/libsupc++/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/libstdc++-v3/libsupc++/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am 2002/12/08 00:41:10 1.8
+++ Makefile.am 2003/02/12 17:54:39 1.9
@@ -126,10 +126,9 @@
$(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
# LTCOMPILE is copied from LTCXXCOMPILE below.
-# APPLE LOCAL cpp-precomp
LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \
$(DEFS) $(GCC_INCLUDES) $(LIBSUPCXX_PICFLAGS) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_FLAGS) $(CFLAGS)
+ $(AM_CPPFLAGS) $(CPPFLAGS)
# AM_CXXFLAGS needs to be in each subdirectory so that it can be
1.17 +1 -2 src/live/gcc3/libstdc++-v3/libsupc++/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/libstdc++-v3/libsupc++/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.in 2003/01/22 06:04:49 1.16
+++ Makefile.in 2003/02/12 17:54:39 1.17
@@ -223,10 +223,9 @@
# LTCOMPILE is copied from LTCXXCOMPILE below.
-# APPLE LOCAL cpp-precomp
LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \
$(DEFS) $(GCC_INCLUDES) $(LIBSUPCXX_PICFLAGS) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ $(AM_CPPFLAGS) $(CPPFLAGS)
# AM_CXXFLAGS needs to be in each subdirectory so that it can be
1.2 +0 -13 src/live/gcc3/man-pages/gcc3.1
Index: gcc3.1
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/man-pages/gcc3.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc3.1 2002/06/20 02:46:07 1.1
+++ gcc3.1 2003/02/12 17:54:39 1.2
@@ -347,7 +347,6 @@
\&\fB\-iwithprefixbefore\fR \fIdir\fR \fB\-isystem\fR \fIdir\fR
\&\fB\-M \-MM \-MF \-MG \-MP \-MQ \-MT \-nostdinc \-P \-remap
\&\-dependency-file (\s-1APPLE\s0 \s-1ONLY\s0)
-\&\-no-cpp-precomp (\s-1APPLE\s0 \s-1ONLY\s0)
\&\-\-dump-pch\fR \fIname\fR \fB(\s-1APPLE\s0 \s-1ONLY\s0) \-\-load-pch\fR
\fIname\fR \fB(\s-1APPLE\s0 \s-1ONLY\s0)
\&\-trigraphs \-undef \-U\fR\fImacro\fR \fB\-Wp,\fR\fIoption\fR
.Ip "\fIAssembler Option\fR" 4
@@ -870,13 +869,6 @@
.Sp
We do not guarantee to retain this option in future, and we may change
its semantics.
-.Ip "\fB\-no-cpp-precomp\fR" 4
-.IX Item "-no-cpp-precomp"
-By default, Apple's \s-1GCC\s0 preprocesses C and Objective-C with a special
-preprocessor called \fBcpp-precomp\fR that supports precompiled
-headers. This preprocessor cannot always handle every construct that
-\&\s-1GCC\s0 supports; use \fB\-no-cpp-precomp\fR to switch to using \s-1GNU\s0 cpp
-instead. (\s-1APPLE\s0 \s-1ONLY\s0)
.Ip "\fB\*(--dump-pch\fR \fIname\fR" 4
.IX Item "dump-pch name"
Dump the state of the compiler into a directory named \fIname\fR, after
@@ -952,11 +944,6 @@
.Sp
The \fB\-traditional\fR option also enables \fB\-traditional-cpp\fR.
.RE
-.Ip "\fB\-traditional-cpp\fR" 4
-.IX Item "-traditional-cpp"
-In Apple's version of \s-1GCC\s0, this means to use \s-1GNU\s0 cpp instead of
-cpp-precomp to preprocess. This meaning of the option is deprecated,
-and will eventually revert to its standard meaning.
.Ip "\fB\-fcond-mismatch\fR" 4
.IX Item "-fcond-mismatch"
Allow conditional expressions with mismatched types in the second and
