shebs 02/08/22 06:59:16
Modified: gcc Makefile.in c-lang.c cppinit.c cpplib.c cpplib.h
dwarf2asm.c flags.h gcc.c ggc-page.c toplev.c
gcc/objc objc-act.c
Log:
Fix up some local markers, make -Wno-#warnings work.
Revision Changes Path
1.127 +1 -2 gcc3/gcc/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/Makefile.in,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- Makefile.in 2002/08/09 18:23:45 1.126
+++ Makefile.in 2002/08/22 13:59:12 1.127
@@ -1267,9 +1267,8 @@
$(TARGET_H) flags.h intl.h output.h $(EXPR_H) $(RTL_H) toplev.h $(TM_P_H)
c-lang.o : c-lang.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(C_TREE_H) \
$(GGC_H) langhooks.h $(LANGHOOKS_DEF_H) c-common.h gtype-c.h
-# APPLE LOCAL Objective-C++ begin
+# APPLE LOCAL Objective-C++
stub-objc.o : stub-objc.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H)
-# APPLE LOCAL Objective-C++ end
c-lex.o : c-lex.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(RTL_H) \
debug.h $(C_TREE_H) c-common.h real.h \
c-pragma.h input.h intl.h flags.h toplev.h output.h \
1.28 +2 -2 gcc3/gcc/c-lang.c
Index: c-lang.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/c-lang.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- c-lang.c 2002/08/14 05:33:17 1.27
+++ c-lang.c 2002/08/22 13:59:12 1.28
@@ -44,10 +44,10 @@
#define LANG_HOOKS_INIT c_init
#undef LANG_HOOKS_FINISH
#define LANG_HOOKS_FINISH c_common_finish
-/* APPLE LOCAL Objective-C++ begin */
+/* APPLE LOCAL begin Objective-C++ */
#undef LANG_HOOKS_FINISH_FILE
#define LANG_HOOKS_FINISH_FILE c_objc_common_finish_file
-/* APPLE LOCAL Objective-C++ end */
+/* APPLE LOCAL end Objective-C++ */
#undef LANG_HOOKS_INIT_OPTIONS
#define LANG_HOOKS_INIT_OPTIONS c_init_options
#undef LANG_HOOKS_DECODE_OPTION
1.67 +4 -4 gcc3/gcc/cppinit.c
Index: cppinit.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cppinit.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- cppinit.c 2002/08/17 06:29:03 1.66
+++ cppinit.c 2002/08/22 13:59:12 1.67
@@ -1342,6 +1342,8 @@
DEF_OPT("MT", no_tgt, OPT_MT) \
DEF_OPT("P", 0, OPT_P) \
DEF_OPT("U", no_mac, OPT_U) \
+ /* APPLE LOCAL -Wno-#warnings */ \
+ DEF_OPT("W#warnings", 0, OPT_Wpound_warnings) \
DEF_OPT("Wall", 0, OPT_Wall) \
DEF_OPT("Wcomment", 0, OPT_Wcomment) \
DEF_OPT("Wcomments", 0, OPT_Wcomments) \
@@ -1352,6 +1354,8 @@
DEF_OPT("Wimport", 0, OPT_Wimport) \
/* APPLE LOCAL -Wnewline-eof */ \
DEF_OPT("Wnewline-eof", 0, OPT_Wnewline_eof) \
+ /* APPLE LOCAL -Wno-#warnings */ \
+ DEF_OPT("Wno-#warnings", 0, OPT_Wno_pound_warnings) \
DEF_OPT("Wno-comment", 0, OPT_Wno_comment) \
DEF_OPT("Wno-comments", 0, OPT_Wno_comments) \
DEF_OPT("Wno-endif-labels", 0, OPT_Wno_endif_labels) \
@@ -1368,8 +1372,6 @@
DEF_OPT("Wno-trigraphs", 0, OPT_Wno_trigraphs) \
DEF_OPT("Wno-undef", 0, OPT_Wno_undef) \
DEF_OPT("Wno-unused-macros", 0, OPT_Wno_unused_macros) \
- /* APPLE LOCAL -Wno-#warnings */ \
- DEF_OPT("Wno-#warnings", 0, OPT_Wno_pound_warnings) \
/* APPLE LOCAL -Wpragma-once */ \
DEF_OPT("Wpragma-once", 0, OPT_Wpragma_once) \
DEF_OPT("Wsystem-headers", 0, OPT_Wsystem_headers) \
@@ -1377,8 +1379,6 @@
DEF_OPT("Wtrigraphs", 0, OPT_Wtrigraphs) \
DEF_OPT("Wundef", 0, OPT_Wundef) \
DEF_OPT("Wunused-macros", 0, OPT_Wunused_macros) \
- /* APPLE LOCAL -Wno-#warnings */ \
- DEF_OPT("W#warnings", 0, OPT_Wpound_warnings) \
/* APPLE LOCAL fat builds */ \
DEF_OPT("arch", no_tgt, OPT_arch) \
DEF_OPT("d", no_arg, OPT_d) \
1.39 +1 -1 gcc3/gcc/cpplib.c
Index: cpplib.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cpplib.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- cpplib.c 2002/08/17 06:29:04 1.38
+++ cpplib.c 2002/08/22 13:59:12 1.39
@@ -1005,7 +1005,7 @@
do_warning (pfile)
cpp_reader *pfile;
{
- /* APPLE LOCAL -Wno-#warnings Radar 2796309 ilr */
+ /* APPLE LOCAL -Wno-#warnings */
if (!CPP_OPTION (pfile, no_pound_warnings))
/* We want #warning diagnostics to be emitted in system headers too. */
/* APPLE LOCAL begin handle -Wno-system-headers (2910306) ilr */
1.31 +2 -2 gcc3/gcc/cpplib.h
Index: cpplib.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cpplib.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cpplib.h 2002/08/21 03:37:59 1.30
+++ cpplib.h 2002/08/22 13:59:12 1.31
@@ -433,8 +433,8 @@
parsing; drivers might want to continue printing help. */
unsigned char help_only;
- /* APPLE LOCAL -Wno-#warnings Radar 2796309 ilr */
- /* Nonzero means suppress all #warning messages. */
+ /* APPLE LOCAL -Wno-#warnings */
+ /* Nonzero means suppress all #warning messages. (Radar 2796309) */
int no_pound_warnings;
/* True for traditional preprocessing. */
1.14 +2 -3 gcc3/gcc/dwarf2asm.c
Index: dwarf2asm.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/dwarf2asm.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dwarf2asm.c 2002/08/02 10:05:14 1.13
+++ dwarf2asm.c 2002/08/22 13:59:13 1.14
@@ -126,7 +126,7 @@
VA_CLOSE (ap);
}
-/* APPLE LOCAL begin C++ eh */
+/* APPLE LOCAL begin C++ EH */
/* Output the difference between two symbols in a given size.
Force a relocatable reference, i.e. a reference that will
@@ -161,8 +161,7 @@
VA_CLOSE (ap);
}
-
-/* APPLE LOCAL end C++ eh */
+/* APPLE LOCAL end C++ EH */
/* Output a section-relative reference to a label. In general this
can only be done for debugging symbols. E.g. on most targets with
1.35 +0 -6 gcc3/gcc/flags.h
Index: flags.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/flags.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- flags.h 2002/08/08 03:19:52 1.34
+++ flags.h 2002/08/22 13:59:13 1.35
@@ -184,12 +184,6 @@
extern int warn_deprecated_decl;
-/* APPLE LOCAL begin -Wno-#warnings Radar 2796309 ilr */
-/* Nonzero means suppress all #warning messages. */
-
-extern int no_pound_warnings;
-/* APPLE LOCAL end -Wno-#warnings Radar 2796309 ilr */
-
/* Nonzero if generating code to do profiling. */
extern int profile_flag;
1.138 +5 -4 gcc3/gcc/gcc.c
Index: gcc.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/gcc.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gcc.c 2002/08/21 18:08:00 1.137
+++ gcc.c 2002/08/22 13:59:13 1.138
@@ -806,7 +806,7 @@
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) \
- %{fdebug-gen-index}";
+ %{W*} %{fdebug-gen-index}";
/* APPLE LOCAL end cpp-precomp */
static const char *cpp_unique_options =
@@ -835,7 +835,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 */
+/* APPLE LOCAL cpp-precomp */
"%(cpp_unique_options) %1 %{std*} %{W*&pedantic*} %{w} %{m*} %{f*} %{!Q:-quiet}\
%{O*} %{undef}";
@@ -855,9 +855,9 @@
"%{fload=*|fdump=*:-farch=%T}"
/* APPLE LOCAL constant cfstrings */
"%yC"
-/* APPLE LOCAL PFE (%{g*} conditioned on -fdump) ilr */
"%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
%1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*}\
+"/* APPLE LOCAL PFE */"\
%{!fdump=*:%{g*}} %{g*} %{O*} %{W*&pedantic*} %{w} %{std*} %{ansi}\
%{v:-version} %{pg:-p} %{p} %{f*} %{undef}\
%{Qn:-fno-ident} %{--help:--help}\
@@ -869,7 +869,8 @@
/* APPLE LOCAL fat builds */
"%a %Y %{@:-o %f%u%O}%{!@:%{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}}";
-/* APPLE LOCAL PFE - suppress as when doing a PFE dump. ilr */
+/* APPLE LOCAL PFE */
+/* Suppress assembling when doing a PFE dump. ilr */
static const char *invoke_as =
"%{!fdump=*:%{!--help:%{!S:-o %{|!pipe:%g.s} |\n as %(asm_options) %{!pipe:%g.s} %A
}}}";
1.32 +2 -2 gcc3/gcc/ggc-page.c
Index: ggc-page.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/ggc-page.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ggc-page.c 2002/08/17 06:29:05 1.31
+++ ggc-page.c 2002/08/22 13:59:13 1.32
@@ -374,12 +374,12 @@
this factor times the allocation at the end of the last collection.
In other words, total allocation must expand by (this factor minus
one) before collection is performed. */
-/* APPLE LOCAL PFE - try to improve ggc */
+/* APPLE LOCAL try to improve ggc */
#define GGC_MIN_EXPAND_FOR_GC (2.0) /* was 1.3 */
/* Bound `allocated_last_gc' to 4MB, to prevent the memory expansion
test from triggering too often when the heap is small. */
-/* APPLE LOCAL PFE - try to improve ggc */
+/* APPLE LOCAL try to improve ggc */
#define GGC_MIN_LAST_ALLOCATED (8 * 1024 * 1024) /* was 4 */
/* Allocate pages in chunks of this size, to throttle calls to memory
1.149 +0 -9 gcc3/gcc/toplev.c
Index: toplev.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/toplev.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- toplev.c 2002/08/21 03:38:00 1.148
+++ toplev.c 2002/08/22 13:59:13 1.149
@@ -1629,12 +1629,6 @@
int warn_deprecated_decl = 1;
-/* APPLE LOCAL begin -Wno-#warnings Radar 2796309 ilr */
-/* Nonzero means suppress all #warning messages. */
-
-int no_pound_warnings = 0;
-/* APPLE LOCAL end -Wno-#warnings Radar 2796309 ilr */
-
/* Likewise for -W. */
static const lang_independent_options W_options[] =
@@ -1655,9 +1649,6 @@
N_("Treat all warnings as errors") },
{"shadow", &warn_shadow, 1,
N_("Warn when one local variable shadows another") },
- /* APPLE LOCAL -Wno-#warnings Radar 2796309 ilr */
- {"no-#warnings", &no_pound_warnings, 1,
- N_("Do not display #warning messages") },
{"switch", &warn_switch, 1,
N_("Warn about enumerated switches, with no default, missing a case") },
{"switch-default", &warn_switch_default, 1,
1.108 +2 -1 gcc3/gcc/objc/objc-act.c
Index: objc-act.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/objc/objc-act.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- objc-act.c 2002/08/21 15:43:45 1.107
+++ objc-act.c 2002/08/22 13:59:15 1.108
@@ -3265,7 +3265,8 @@
/* install return type */
TREE_TYPE (TREE_TYPE (tmp_decl)) = groktypename (TREE_TYPE (nst_methods));
- /* APPLE LOCAL PFE: The stmt field does not to need be frozen or thawed. */
+ /* APPLE LOCAL PFE */
+ /* The stmt field does not need to be frozen or thawed. */
/* FIXME: I (zll) suspect that most of what hack_method_prototype does
is not really needed... should investigate this in the near future. */
cfun->stmt = 0;
