gkeating 02/12/17 14:42:40
Modified: live/gcc3/gcc Tag: no-precomp-testing-branch cppinit.c
cpplib.c cppmain.c fix-header.c flags.h gcc.c
genindex.c line-map.c toplev.c version.c
live/gcc3/gcc/cp Tag: no-precomp-testing-branch lang-specs.h
live/gcc3/gcc/doc Tag: no-precomp-testing-branch invoke.texi
live/gcc3/gcc/objc Tag: no-precomp-testing-branch
lang-specs.h
live/gcc3/gcc/objcp Tag: no-precomp-testing-branch
lang-specs.h
Log:
Remove cpp-precomp for testing purposes.
Revision Changes Path
No revision
No revision
1.57.8.1 +1 -15 src/live/gcc3/gcc/cppinit.c
Index: cppinit.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/cppinit.c,v
retrieving revision 1.57
retrieving revision 1.57.8.1
diff -u -r1.57 -r1.57.8.1
--- cppinit.c 2002/06/04 21:32:35 1.57
+++ cppinit.c 2002/12/17 22:42:23 1.57.8.1
@@ -39,9 +39,6 @@
#include "pfe/pfe-header.h"
#endif
-/* APPLE LOCAL cpp-precomp */
-extern int flag_cpp_precomp;
-
/* APPLE LOCAL begin framework headers */
#ifdef FRAMEWORK_HEADERS
struct { char *path; int u1; }
@@ -1115,10 +1112,7 @@
/* For foo.i, read the original filename foo.c now, for the benefit
of the front ends. */
- /* APPLE LOCAL cpp-precomp */
- /* ??? Why we do not add -fpreprocessed while invoking cc1*
- when cpp-precomp is used as preprocessor? -dpatel */
- if (CPP_OPTION (pfile, preprocessed) || flag_cpp_precomp)
+ if (CPP_OPTION (pfile, preprocessed))
read_original_filename (pfile);
return pfile->map->to_file;
@@ -1246,14 +1240,6 @@
CPP_OPTION (pfile, pending) = NULL;
/* Restore the line map for the main file. */
- /* 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 */
if (! CPP_OPTION (pfile, preprocessed))
_cpp_do_file_change (pfile, LC_RENAME,
pfile->line_maps.maps[0].to_file, 1, 0);
1.32.4.1.2.1 +2 -8 src/live/gcc3/gcc/cpplib.c
Index: cpplib.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/cpplib.c,v
retrieving revision 1.32.4.1
retrieving revision 1.32.4.1.2.1
diff -u -r1.32.4.1 -r1.32.4.1.2.1
--- cpplib.c 2002/09/17 22:21:07 1.32.4.1
+++ cpplib.c 2002/12/17 22:42:24 1.32.4.1.2.1
@@ -34,9 +34,6 @@
extern void pfe_find_macro PARAMS ((const char *));
#endif
-/* APPLE LOCAL cpp-precomp */
-extern int flag_cpp_precomp;
-
/* APPLE LOCAL indexing dpatel */
#include "genindex.h"
@@ -294,8 +291,6 @@
if (CPP_PEDANTIC (pfile)
&& ! pfile->state.skipping
&& dir->origin == EXTENSION)
- /* APPLE LOCAL cpp-precomp */
- if (!flag_cpp_precomp)
cpp_pedwarn (pfile, "#%s is a GCC extension", dir->name);
/* Traditionally, a directive is ignored unless its # is in
@@ -1148,7 +1143,7 @@
if (CPP_OPTION (pfile, warn_pragma_once))
cpp_warning (pfile, "#pragma once is obsolete");
- if (pfile->buffer->prev == NULL && !flag_cpp_precomp)
+ if (pfile->buffer->prev == NULL)
cpp_warning (pfile, "#pragma once in main file");
else
_cpp_never_reread (pfile->buffer->inc);
@@ -1201,8 +1196,7 @@
{
cpp_buffer *buffer = pfile->buffer;
- /* APPLE LOCAL cpp-precomp */
- if (buffer->prev == 0 && !flag_cpp_precomp)
+ if (buffer->prev == 0)
cpp_warning (pfile, "#pragma system_header ignored outside include file");
else
{
1.25.14.1 +0 -7 src/live/gcc3/gcc/cppmain.c
Index: cppmain.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/cppmain.c,v
retrieving revision 1.25
retrieving revision 1.25.14.1
diff -u -r1.25 -r1.25.14.1
--- cppmain.c 2002/04/04 07:13:31 1.25
+++ cppmain.c 2002/12/17 22:42:25 1.25.14.1
@@ -502,10 +502,3 @@
void warning PARAMS ((char *));
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 warnings/errors. */
-int flag_cpp_precomp = 0;
-/* APPLE LOCAL end cpp-precomp dpatel */
-
1.15.14.1 +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.15
retrieving revision 1.15.14.1
diff -u -r1.15 -r1.15.14.1
--- fix-header.c 2002/03/14 01:31:15 1.15
+++ fix-header.c 2002/12/17 22:42:26 1.15.14.1
@@ -1335,12 +1335,6 @@
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;
-/* APPLLE LOCAL end cpp-precomp dpatel */
-
/* APPLE LOCAL begin compiling_objc */
/* ObjC and ObjC++ no longer have their own rows; instead, compiling_objc is
set on top of another C/C++ dialect. */
1.31.2.1.2.1 +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.31.2.1
retrieving revision 1.31.2.1.2.1
diff -u -r1.31.2.1 -r1.31.2.1.2.1
--- flags.h 2002/11/07 20:15:56 1.31.2.1
+++ flags.h 2002/12/17 22:42:27 1.31.2.1.2.1
@@ -425,9 +425,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.129.2.4.2.1 +21 -162 src/live/gcc3/gcc/gcc.c
Index: gcc.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/gcc.c,v
retrieving revision 1.129.2.4
retrieving revision 1.129.2.4.2.1
diff -u -r1.129.2.4 -r1.129.2.4.2.1
--- gcc.c 2002/10/17 01:25:45 1.129.2.4
+++ gcc.c 2002/12/17 22:42:28 1.129.2.4.2.1
@@ -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>
@@ -490,11 +488,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 begin constant cfstrings
%yC Emit '-fconstant-cfstrings' option, if needed.
%yV Emit '-DMAC_OS_X_VERSION_MIN_REQUIRED', based on the value of the
@@ -800,20 +793,6 @@
static const char *trad_capable_cpp =
"%{traditional|ftraditional|traditional-cpp:trad}cpp0";
-/* 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_options) \
- %{fdebug-gen-index}";
-/* APPLE LOCAL end cpp-precomp */
-
static const char *cpp_unique_options =
"%{C:%{!E:%eGNU C does not support -C without using -E}}\
"/* APPLE LOCAL AltiVec */"\
@@ -998,62 +977,32 @@
/* 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
- */
+ /* APPLE LOCAL prohibit -E and -S with -arch, -precomp */
"%{M|MM:%(trad_capable_cpp) -lang-c %{ansi:-std=c89} %(cpp_options)}\
%{E|S:%{@:%e-E and -S are not allowed with multiple -arch flags}}\
- %{E:\
- %{traditional|ftraditional|traditional-cpp|no-cpp-precomp:\
- %(trad_capable_cpp) -lang-c %{ansi:-std=c89} %(cpp_options)}\
- %{!traditional:%{!ftraditional:%{!traditional-cpp:%{!no-cpp-precomp:\
- %(cpp_precomp) -lang-c %{ansi:-std=c89} %(cpp_precomp_options) %y0}}}}}\
+ %{precomp:%ecpp-precomp not supported}%{<no-cpp-precomp}\
+ %{E: %(trad_capable_cpp) -lang-c %{ansi:-std=c89} %(cpp_options)}\
%{!E:%{!M:%{!MM:\
%{save-temps|no-integrated-cpp:\
- %{no-cpp-precomp|traditional-cpp|fload=*|fdump=*:\
- %(trad_capable_cpp) -lang-c %{ansi:-std=c89} %(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=*:\
- %(cpp_precomp) -lang-c %{ansi:-std=c89} %(cpp_precomp_options) %y0
%b.i \n\
- cc1 -cpp-precomp %b.i %(cc1_options)}}}}}\
+ %(trad_capable_cpp) -lang-c %{ansi:-std=c89} %(cpp_options)
%{save-temps:%b.i} %{!save-temps:%g.i} \n\
+ cc1 -fpreprocessed %{save-temps:%b.i} %{!save-temps:%g.i}
%(cc1_options)}\
%{!save-temps:%{!no-integrated-cpp:\
- %{traditional|ftraditional|traditional-cpp:%{!cpp-precomp:\
+ %{traditional|ftraditional|traditional-cpp:\
tradcpp0 -lang-c %{ansi:-std=c89} %(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}} }\
+ cc1 -fpreprocessed %{!pipe:%g.i} %(cc1_options)}}\
%{!traditional:%{!ftraditional:%{!traditional-cpp:\
- %{fload=*|fdump=*|no-cpp-precomp:%{!precomp:\
- cc1 -lang-c %{ansi:-std=c89} %(cpp_unique_options)
%(cc1_options)}}}}}}\
- %{!fsyntax-only:%{!precomp:%(invoke_as)}}}}}", 0},
- /* APPLE LOCAL end cpp-precomp dpatel */
+ cc1 -lang-c %{ansi:-std=c89} %(cpp_unique_options)
%(cc1_options)}}}}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0},
{"-",
"%{!E:%e-E required when input is from standard input}\
%(trad_capable_cpp) -lang-c %{ansi:-std=c89} %(cpp_options)", 0},
{".h", "@c-header", 0},
{"@c-header",
- /* APPLE LOCAL begin cpp-precomp */
+ /* APPLE LOCAL prohibit -E with -arch */
"%{!E:%{!precomp:%ecompilation of header file requested}} \
%{E:%{@:%e-E is not allowed with multiple -arch flags}}\
- %{traditional-cpp|no-cpp-precomp:%{!precomp:\
- %(trad_capable_cpp) -lang-c %{ansi:-std=c89} %(cpp_options)}}\
- %{!traditional-cpp:%{!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}}} }}", 0},
- /* APPLE LOCAL end cpp-precomp */
+ %{precomp:%ecpp-precomp not supported}%{<no-cpp-precomp}\
+ %(trad_capable_cpp) -lang-c %{ansi:-std=c89} %(cpp_options)", 0},
{".i", "@cpp-output", 0},
{"@cpp-output",
"%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options)
%{!fsyntax-only:%(invoke_as)}}}}", 0},
@@ -1614,9 +1563,6 @@
INIT_STATIC_SPEC ("cpp_options", &cpp_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 ("cc1", &cc1_spec),
INIT_STATIC_SPEC ("cc1_options", &cc1_options),
INIT_STATIC_SPEC ("cc1plus", &cc1plus_spec),
@@ -3075,14 +3021,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 */
@@ -3127,12 +3071,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;
}
@@ -5245,8 +5187,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++;
@@ -5275,92 +5216,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.../g++-v3 */
- do_spec_1 ("-isystem", 1, NULL);
- do_spec_1 (" ", 0, NULL);
- sprintf (tmpstr, "%s/g++-v3", header_path);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
-
- /* Add -isystem ...include.../g++-v3/backward */
- do_spec_1 ("-isystem", 1, NULL);
- do_spec_1 (" ", 0, NULL);
- sprintf (tmpstr, "%s/g++-v3/backward", header_path);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
-
- /* Add -isystem ...include.../g++-v3/ppc-darwin */
- do_spec_1 ("-isystem", 1, NULL);
- do_spec_1 (" ", 0, NULL);
- sprintf (tmpstr, "%s/g++-v3/%s-darwin",
header_path,arches[current_arch].name);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
- }
-
-#ifndef NO_BUILTIN_SIZE_TYPE
- sprintf (tmpstr, "-D__SIZE_TYPE__=%s", SIZE_TYPE);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
-#endif
-#ifndef NO_BUILTIN_PTRDIFF_TYPE
- sprintf (tmpstr, "-D__PTRDIFF_TYPE__=%s", PTRDIFF_TYPE);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
-#endif
-#ifndef NO_BUILTIN_WCHAR_TYPE
- sprintf (tmpstr, "-D__WCHAR_TYPE__=%s", WCHAR_TYPE);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
-#endif
-#ifndef NO_BUILTIN_WINT_TYPE
- sprintf (tmpstr, "-D__WINT_TYPE__=%s", WINT_TYPE);
- do_spec_1 (tmpstr, 1, NULL);
- do_spec_1 (" ", 0, NULL); /* fh */
-#endif
- free (tmpstr);
- free (header_path);
- }
+ abort ();
}
break;
- /* APPLE LOCAL end cpp-precomp */
+ /* APPLE LOCAL end constant cfstrings */
case 'o':
{
1.16.2.1.2.1 +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.16.2.1
retrieving revision 1.16.2.1.2.1
diff -u -r1.16.2.1 -r1.16.2.1.2.1
--- genindex.c 2002/09/17 22:21:06 1.16.2.1
+++ genindex.c 2002/12/17 22:42:30 1.16.2.1.2.1
@@ -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;
@@ -303,11 +302,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 ");
@@ -497,12 +492,7 @@
int len = strlen (name);
int components;
- /* 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));
sprintf (header, "pbxindex-begin v1.2 0x%08lX %02u/%02u %s\n",
@@ -968,18 +958,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)
@@ -1032,8 +1011,6 @@
}
update_header_status (cursor, when, found);
- if (flag_cpp_precomp && when == PB_INDEX_END)
- free (name);
return found;
}
1.3.20.1 +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.3.20.1
diff -u -r1.3 -r1.3.20.1
--- line-map.c 2001/12/18 01:22:54 1.3
+++ line-map.c 2002/12/17 22:42:30 1.3.20.1
@@ -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.136.2.8.2.1 +1 -20 src/live/gcc3/gcc/toplev.c
Index: toplev.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/toplev.c,v
retrieving revision 1.136.2.8
retrieving revision 1.136.2.8.2.1
diff -u -r1.136.2.8 -r1.136.2.8.2.1
--- toplev.c 2002/12/05 00:20:13 1.136.2.8
+++ toplev.c 2002/12/17 22:42:31 1.136.2.8.2.1
@@ -715,9 +715,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;
-
int flag_keep_static_consts = 1;
/* Nonzero means we should be saving declaration info into a .X file. */
@@ -4243,13 +4240,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;
@@ -4559,15 +4549,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;
@@ -5592,7 +5573,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.44.2.21.2.1 +1 -1 src/live/gcc3/gcc/version.c
Index: version.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/version.c,v
retrieving revision 1.44.2.21
retrieving revision 1.44.2.21.2.1
diff -u -r1.44.2.21 -r1.44.2.21.2.1
--- version.c 2002/12/02 23:34:40 1.44.2.21
+++ version.c 2002/12/17 22:42:33 1.44.2.21.2.1
@@ -6,5 +6,5 @@
/* APPLE LOCAL begin Apple version */
/* Note that we can't say "apple_v*rs**n_str*ng" because of a cheesy
grep in configure that will get very confused if we do. */
-const char *const apple_version_str = "1175";
+const char *const apple_version_str = "1240";
/* APPLE LOCAL end Apple version */
No revision
No revision
1.22.14.1 +10 -51 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.22
retrieving revision 1.22.14.1
diff -u -r1.22 -r1.22.14.1
--- lang-specs.h 2002/04/15 23:37:57 1.22
+++ lang-specs.h 2002/12/17 22:42:37 1.22.14.1
@@ -35,61 +35,23 @@
{"@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:cpp0 -lang-c++ %{!no-gcc:-D__GNUG__=%v1}\
+ /* APPLE LOCAL prohibit -arch with -E and -S */
+ "%{E|M|MM:cpp0 -lang-c++ %{!no-gcc:-D__GNUG__=%v1}\
%{!Wno-deprecated:-D__DEPRECATED}\
%{!fno-exceptions:-D__EXCEPTIONS}\
-D__GXX_ABI_VERSION=100\
%{ansi:-D__STRICT_ANSI__ -trigraphs -$} %(cpp_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:-D__STRICT_ANSI__ -trigraphs -$} %(cpp_precomp_options) %y1}\
- %{!cpp-precomp:\
- cpp0 -lang-c++ %{!no-gcc:-D__GNUG__=%v1}\
- %{!Wno-deprecated:-D__DEPRECATED}\
- %{!fno-exceptions:-D__EXCEPTIONS}\
- -D__GXX_ABI_VERSION=100\
- %{ansi:-D__STRICT_ANSI__ -trigraphs -$} %(cpp_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:-D__STRICT_ANSI__ -trigraphs -$}\
- -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:-D__STRICT_ANSI__ -trigraphs -$}\
- -D__cplusplus %(cpp_precomp_options) %y1 %d%g.ii \n}}}}}\
- %{save-temps|no-integrated-cpp:%{!cpp-precomp|fdump=*|fload=*:cpp0 -lang-c++
\
- %{!no-gcc:-D__GNUG__=%v1}\
- %{!Wno-deprecated:-D__DEPRECATED}\
- %{!fno-exceptions:-D__EXCEPTIONS}\
- -D__GXX_ABI_VERSION=100\
- %{ansi:-D__STRICT_ANSI__ -trigraphs -$}\
- %(cpp_options) %b.ii \n}}\
-
%{save-temps|no-integrated-cpp:%{cpp-precomp:%{!fdump=*:%{!fload=*:%(cpp_precomp)
-lang-c++ \
+ %{E|S:%{@:%e-E and -S are not allowed with multiple -arch flags}}\
+ %{!E:%{!M:%{!MM:\
+ %{save-temps|no-integrated-cpp:cpp0 -lang-c++ \
%{!no-gcc:-D__GNUG__=%v1}\
%{!Wno-deprecated:-D__DEPRECATED}\
%{!fno-exceptions:-D__EXCEPTIONS}\
-D__GXX_ABI_VERSION=100\
%{ansi:-D__STRICT_ANSI__ -trigraphs -$}\
- %(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)\
+ %(cpp_options) %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
+ cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii}
%{!save-temps:%g.ii}}\
+ %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)\
%{!no-gcc:-D__GNUG__=%v1} \
%{!Wno-deprecated:-D__DEPRECATED}\
%{!fno-exceptions:-D__EXCEPTIONS}\
@@ -97,13 +59,10 @@
%{ansi:-D__STRICT_ANSI__}}}\
%{ansi:-trigraphs -$}\
%(cc1_options) %2 %{+e1*}\
- %{!fsyntax-only:%(invoke_as)}}}}}",
+ %{!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},
No revision
No revision
1.36.12.1 +2 -16 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.36
retrieving revision 1.36.12.1
diff -u -r1.36 -r1.36.12.1
--- invoke.texi 2002/06/20 02:34:53 1.36
+++ invoke.texi 2002/12/17 22:42:37 1.36.12.1
@@ -346,8 +346,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}}
@@ -1282,16 +1280,6 @@
We do not guarantee to retain this option in future, and we may change
its semantics.
-@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
@@ -1386,10 +1374,8 @@
@item -traditional-cpp
@opindex traditional-cpp
-@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.
+Attempt to support some aspects of traditional C preprocessors.
+See the GNU CPP manual for details.
@item -fcond-mismatch
@opindex fcond-mismatch
No revision
No revision
1.21.4.1.2.1 +13 -39 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.21.4.1
retrieving revision 1.21.4.1.2.1
diff -u -r1.21.4.1 -r1.21.4.1.2.1
--- lang-specs.h 2002/10/01 21:22:20 1.21.4.1
+++ lang-specs.h 2002/12/17 22:42:39 1.21.4.1.2.1
@@ -25,47 +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 begin cpp-precomp dpatel */
- /* 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) -lang-objc -D__OBJC__ %{ansi:-std=c89}
%(cpp_options)}\
+ /* APPLE LOCAL prohibit -arch with -E and -S */
+ "%{E|M|MM:%(trad_capable_cpp) -lang-objc %{ansi:-std=c89} %(cpp_options)}\
%{E|S:%{@:%e-E and -S are not allowed with multiple -arch flags}}\
- %{E:\
- %{traditional-cpp|no-cpp-precomp:\
- %(trad_capable_cpp) -lang-objc -D__OBJC__ %{ansi:-std=c89} %(cpp_options)}\
- %{!traditional-cpp:%{!no-cpp-precomp:\
- %(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:\
- tradcpp0 -lang-objc -D__OBJC__ %{ansi:-std=c89} %(cpp_options)
%{!pipe:%g.mi} |\n\
- cc1obj -fpreprocessed %{!pipe:%g.mi} %(cc1_options) %{gen-decls}}}\
-
%{!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 -lang-objc -D__OBJC__ %{ansi:-std=c89}
%(cpp_unique_options) %(cc1_options) %{gen-decls}}}}}}}}\
- %{!fsyntax-only:%{!precomp:%(invoke_as)}}}}}", 0},
- /* APPLE LOCAL end cpp-precomp dpatel */
+ %{save-temps:%(trad_capable_cpp) -lang-objc %{ansi:-std=c89}\
+ %(cpp_options) %b.mi \n\
+ cc1obj -fpreprocessed %b.mi %(cc1_options) %{gen-decls}}\
+ %{!save-temps:\
+ %{traditional|ftraditional|traditional-cpp:\
+ tradcpp0 -lang-objc %{ansi:-std=c89} %(cpp_options) %{!pipe:%g.mi} |\n\
+ cc1obj -fpreprocessed %{!pipe:%g.mi} %(cc1_options) %{gen-decls}}\
+ %{!traditional:%{!ftraditional:%{!traditional-cpp:\
+ cc1obj %{ansi:-std=c89} %(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},
No revision
No revision
1.11.14.1 +64 -2 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.11
retrieving revision 1.11.14.1
diff -u -r1.11 -r1.11.14.1
--- lang-specs.h 2002/04/15 23:37:58 1.11
+++ lang-specs.h 2002/12/17 22:42:39 1.11.14.1
@@ -1,5 +1,69 @@
/* APPLE LOCAL Objective-C++ */
/* Definitions for specs for Objective-C++.
+ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ Free Software Foundation, Inc.
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING. If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+
+/* This is the contribution to the `default_compilers' array in gcc.c for
+ objc++. */
+
+#ifndef OBJCPLUSPLUS_CPP_SPEC
+#define OBJCPLUSPLUS_CPP_SPEC 0
+#endif
+
+ {".mm", "@objective-c++", 0},
+ {".M", "@objective-c++", 0},
+ {"@objective-c++",
+ /* objcc1plus has an integrated ISO C preprocessor. We should invoke
+ the external preprocessor if -save-temps is given. */
+ /* APPLE LOCAL prohibit -arch with -E and -S */
+ "%{E|M|MM:cpp0 -lang-objc++ %{!no-gcc:-D__GNUG__=%v1}\
+ %{!Wno-deprecated:-D__DEPRECATED}\
+ %{!fno-exceptions:-D__EXCEPTIONS}\
+ -D__GXX_ABI_VERSION=100\
+ %{ansi:-D__STRICT_ANSI__ -trigraphs -$} %(cpp_options)}\
+ %{E|S:%{@:%e-E and -S are not allowed with multiple -arch flags}}\
+ %{!E:%{!M:%{!MM:\
+ %{save-temps|no-integrated-cpp:cpp0 -lang-c++ \
+ %{!no-gcc:-D__GNUG__=%v1}\
+ %{!Wno-deprecated:-D__DEPRECATED}\
+ %{!fno-exceptions:-D__EXCEPTIONS}\
+ -D__GXX_ABI_VERSION=100\
+ %{ansi:-D__STRICT_ANSI__ -trigraphs -$}\
+ %(cpp_options) %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\
+ cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.mii}
%{!save-temps:%g.mii}}\
+ %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)\
+ %{!no-gcc:-D__GNUG__=%v1} \
+ %{!Wno-deprecated:-D__DEPRECATED}\
+ %{!fno-exceptions:-D__EXCEPTIONS}\
+ -D__GXX_ABI_VERSION=100\
+ %{ansi:-D__STRICT_ANSI__}}}\
+ %{ansi:-trigraphs -$}\
+ %(cc1_options) %{gen-decls} %2 %{+e1*}\
+ %{!fsyntax-only:%(invoke_as)}}}}",
+ OBJCPLUSPLUS_CPP_SPEC},
+ {".mii", "@objc++-cpp-output", 0},
+ {"@objc++-cpp-output",
+ "%{!M:%{!MM:%{!E:\
+ cc1objplus -fpreprocessed %i %(cc1_options) %{gen-decls} %2 %{+e*}\
+ %{!fsyntax-only:%(invoke_as)}}}}", 0},
+/* Definitions for specs for Objective-C++.
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
Free Software Foundation, Inc.
@@ -98,8 +162,6 @@
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*}\
