shebs 02/08/14 14:39:43
Modified: gcc cppfiles.c cppinit.c ggc-page.c ggc.h hashtable.c
gcc/cp lex.c spew.c
gcc/objc objc-act.c objc-act.h
Log:
Tweak some local markers.
Revision Changes Path
1.50 +2 -2 gcc3/gcc/cppfiles.c
Index: cppfiles.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cppfiles.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- cppfiles.c 2002/08/03 05:28:10 1.49
+++ cppfiles.c 2002/08/14 21:39:39 1.50
@@ -1072,7 +1072,7 @@
if (type == IT_IMPORT && inc->include_count)
_cpp_never_reread (inc);
- /* APPLE LOCAL PFE begin validation dpatel */
+ /* APPLE LOCAL begin PFE */
if (pfe_operation == PFE_LOAD)
{
/* Determine whether the specified file has already been
@@ -1093,7 +1093,7 @@
pfe_add_header_name (inc->name, inc->st.st_mtime,
inc->st.st_ino);
}
- /* APPLE LOCAL PFE end validation dpatel */
+ /* APPLE LOCAL end PFE */
stacked = stack_include_file (pfile, inc);
1.65 +4 -4 gcc3/gcc/cppinit.c
Index: cppinit.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cppinit.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- cppinit.c 2002/08/11 19:22:05 1.64
+++ cppinit.c 2002/08/14 21:39:40 1.65
@@ -1355,13 +1355,13 @@
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) \
- /* APPLE LOCAL -Wno-extra-tokens */ \
+ /* APPLE LOCAL -Wextra-tokens */ \
DEF_OPT("Wno-extra-tokens", 0, OPT_Wno_extra_tokens) \
DEF_OPT("Wno-error", 0, OPT_Wno_error) \
DEF_OPT("Wno-import", 0, OPT_Wno_import) \
- /* APPLE LOCAL -Wno_newline-eof */ \
+ /* APPLE LOCAL -Wnewline-eof */ \
DEF_OPT("Wno-newline-eof", 0, OPT_Wno_newline_eof) \
- /* APPLE LOCAL -Wno-pragma-once */ \
+ /* APPLE LOCAL -Wpragma-once */ \
DEF_OPT("Wno-pragma-once", 0, OPT_Wno_pragma_once) \
DEF_OPT("Wno-system-headers", 0, OPT_Wno_system_headers) \
DEF_OPT("Wno-traditional", 0, OPT_Wno_traditional) \
@@ -1377,7 +1377,7 @@
DEF_OPT("Wtrigraphs", 0, OPT_Wtrigraphs) \
DEF_OPT("Wundef", 0, OPT_Wundef) \
DEF_OPT("Wunused-macros", 0, OPT_Wunused_macros) \
- /* APPLE LOCAL -W#warnings */ \
+ /* APPLE LOCAL -Wno-#warnings */ \
DEF_OPT("W#warnings", 0, OPT_Wpound_warnings) \
/* APPLE LOCAL fat builds */ \
DEF_OPT("arch", no_tgt, OPT_arch) \
1.30 +12 -12 gcc3/gcc/ggc-page.c
Index: ggc-page.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/ggc-page.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ggc-page.c 2002/08/07 03:13:10 1.29
+++ ggc-page.c 2002/08/14 21:39:40 1.30
@@ -652,7 +652,7 @@
memset (entry, 0, page_entry_size);
}
else
- /* APPLE LOCAL PFE - expand to pfe_free or free */
+ /* APPLE LOCAL PFE */
PFE_FREE (p);
}
#ifdef USING_MMAP
@@ -674,7 +674,7 @@
memory order. */
for (i = GGC_QUIRE_SIZE - 1; i >= 1; i--)
{
- /* APPLE LOCAL PFE - expand to pfe_calloc or xcalloc */
+ /* APPLE LOCAL PFE */
e = (struct page_entry *) PFE_CALLOC (1, page_entry_size,
PFE_ALLOC_GGC_PAGE_ENTRY);
e->order = order;
@@ -706,7 +706,7 @@
alloc_size = GGC_QUIRE_SIZE * G.pagesize;
else
alloc_size = entry_size + G.pagesize - 1;
- /* APPLE LOCAL PFE - expand to pfe_malloc or xmalloc */
+ /* APPLE LOCAL PFE */
allocation = PFE_MALLOC (alloc_size, PFE_ALLOC_GGC_PAGE_GROUP);
page = (char *) (((size_t) allocation + G.pagesize - 1) & -G.pagesize);
@@ -751,7 +751,7 @@
struct page_entry *e, *f = G.free_pages;
for (a = enda - G.pagesize; a != page; a -= G.pagesize)
{
- /* APPLE LOCAL PFE - expand to pfe_calloc or xcalloc */
+ /* APPLE LOCAL PFE */
e = (struct page_entry *) PFE_CALLOC (1, page_entry_size,
PFE_ALLOC_GGC_PAGE_ENTRY);
e->order = order;
@@ -766,8 +766,8 @@
}
#endif
- /* APPLE LOCAL PFE - expand to pfe_calloc or xcalloc */
if (entry == NULL)
+ /* APPLE LOCAL PFE */
entry = (struct page_entry *) PFE_CALLOC (1, page_entry_size,
PFE_ALLOC_GGC_PAGE_ENTRY);
@@ -850,7 +850,7 @@
start = p->page;
next = p->next;
len = p->bytes;
- /* APPLE LOCAL PFE - expand to pfe_free or free */
+ /* APPLE LOCAL PFE */
PFE_FREE (p);
p = next;
@@ -858,7 +858,7 @@
{
next = p->next;
len += p->bytes;
- /* APPLE LOCAL PFE - expand to pfe_free or free */
+ /* APPLE LOCAL PFE */
PFE_FREE (p);
p = next;
}
@@ -881,7 +881,7 @@
if (p->group->in_use == 0)
{
*pp = p->next;
- /* APPLE LOCAL PFE - expand to pfe_free or free */
+ /* APPLE LOCAL PFE */
PFE_FREE (p);
}
else
@@ -894,7 +894,7 @@
{
*gp = g->next;
G.bytes_mapped -= g->alloc_size;
- /* APPLE LOCAL PFE - expand to pfe_free or free */
+ /* APPLE LOCAL PFE */
PFE_FREE (g->allocation);
}
else
@@ -1178,7 +1178,7 @@
}
/* We have a good page, might as well hold onto it... */
- /* APPLE LOCAL PFE - expand to pfe_calloc or xcalloc */
+ /* APPLE LOCAL PFE */
e = (struct page_entry *) PFE_CALLOC (1, sizeof (struct page_entry),
PFE_ALLOC_GGC_PAGE_ENTRY);
e->bytes = G.pagesize;
@@ -1302,7 +1302,7 @@
else if (p->context_depth == depth && p->save_in_use_p)
{
ggc_recalculate_in_use_p (p);
- /* APPLE LOCAL PFE - expand to pfe_free or free */
+ /* APPLE LOCAL PFE */
PFE_FREE (p->save_in_use_p);
p->save_in_use_p = 0;
}
@@ -1336,7 +1336,7 @@
marks. So, back them up first. */
if (p->context_depth < G.context_depth)
{
- /* APPLE LOCAL PFE - expand to pfe_malloc or xmalloc */
+ /* APPLE LOCAL PFE */
if (! p->save_in_use_p)
p->save_in_use_p = PFE_MALLOC (bitmap_size,
PFE_ALLOC_GGC_BIT_MAP);
1.11 +3 -3 gcc3/gcc/ggc.h
Index: ggc.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/ggc.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ggc.h 2002/08/02 10:05:21 1.10
+++ ggc.h 2002/08/14 21:39:40 1.11
@@ -110,19 +110,19 @@
/* Like ggc_alloc_cleared, but performs a multiplication. */
extern void *ggc_calloc PARAMS ((size_t, size_t));
-/* APPLE LOCAL PFE - expand to pfe_ggc_alloc or ggc_alloc */
+/* APPLE LOCAL PFE */
#define ggc_alloc_rtx(NSLOTS) \
((struct rtx_def *) GGC_ALLOC (sizeof (struct rtx_def) \
+ ((NSLOTS) - 1) * sizeof (rtunion), \
PFE_ALLOC_GGC_RTX))
-/* APPLE LOCAL PFE - expand to pfe_ggc_alloc or ggc_alloc */
+/* APPLE LOCAL PFE */
#define ggc_alloc_rtvec(NELT) \
((struct rtvec_def *) GGC_ALLOC (sizeof (struct rtvec_def) \
+ ((NELT) - 1) * sizeof (rtx), \
PFE_ALLOC_GGC_RTVEC))
-/* APPLE LOCAL PFE - expand to pfe_ggc_alloc or ggc_alloc */
+/* APPLE LOCAL PFE */
#define ggc_alloc_tree(LENGTH) ((union tree_node *) GGC_ALLOC (LENGTH, \
PFE_ALLOC_GGC_TREE))
1.15 +3 -3 gcc3/gcc/hashtable.c
Index: hashtable.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/hashtable.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- hashtable.c 2002/08/07 03:13:10 1.14
+++ hashtable.c 2002/08/14 21:39:40 1.15
@@ -96,7 +96,7 @@
unsigned int nslots = 1 << order;
hash_table *table;
- /* APPLE LOCAL PFE - expand to pfe_malloc or xmalloc */
+ /* APPLE LOCAL PFE */
table = (hash_table *) PFE_MALLOC (sizeof (hash_table), PFE_ALLOC_HASH_TABLE);
memset (table, 0, sizeof (hash_table));
@@ -205,7 +205,7 @@
unsigned int size, sizemask;
size = table->nslots * 2;
- /* APPLE LOCAL PFE - expand to pfe_calloc or xcalloc */
+ /* APPLE LOCAL PFE */
nentries = (hashnode *) PFE_CALLOC (size, sizeof (hashnode), PFE_ALLOC_HASHNODE);
sizemask = size - 1;
@@ -233,7 +233,7 @@
}
while (++p < limit);
- /* APPLE LOCAL PFE - expand to pfe_free or free */
+ /* APPLE LOCAL PFE */
PFE_FREE (table->entries);
table->entries = nentries;
table->nslots = size;
1.52 +6 -6 gcc3/gcc/cp/lex.c
Index: lex.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cp/lex.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- lex.c 2002/08/11 19:22:07 1.51
+++ lex.c 2002/08/14 21:39:42 1.52
@@ -447,7 +447,7 @@
{ "volatile", RID_VOLATILE, 0 },
{ "wchar_t", RID_WCHAR, 0 },
{ "while", RID_WHILE, 0 },
- /* APPLE LOCAL Objective-C++ begin */
+ /* APPLE LOCAL begin Objective-C++ */
{ "id", RID_ID, D_OBJC },
/* These objc keywords are recognized only immediately after
@@ -473,7 +473,7 @@
{ "inout", RID_INOUT, D_OBJC },
{ "oneway", RID_ONEWAY, D_OBJC },
{ "out", RID_OUT, D_OBJC },
- /* APPLE LOCAL Objective-C++ end */
+ /* APPLE LOCAL end Objective-C++ */
/* APPLE LOCAL AltiVec */
/* All keywords which follow are only recognized when
@@ -525,7 +525,7 @@
/* RID_EXPORT */ EXPORT,
/* RID_MUTABLE */ SCSPEC,
- /* APPLE LOCAL Objective-C++ begin */
+ /* APPLE LOCAL begin Objective-C++ */
/* ObjC */
/* RID_IN */ CV_QUALIFIER,
/* RID_OUT */ CV_QUALIFIER,
@@ -533,7 +533,7 @@
/* RID_BYCOPY */ CV_QUALIFIER,
/* RID_BYREF */ CV_QUALIFIER,
/* RID_ONEWAY */ CV_QUALIFIER,
- /* APPLE LOCAL Objective-C++ end */
+ /* APPLE LOCAL end Objective-C++ */
/* APPLE LOCAL AltiVec */
/* RID_ALTIVEC_VECTOR */ TYPESPEC,
@@ -615,7 +615,7 @@
/* RID_REINTCAST */ REINTERPRET_CAST,
/* RID_STATCAST */ STATIC_CAST,
- /* APPLE LOCAL Objective-C++ begin */
+ /* APPLE LOCAL begin Objective-C++ */
/* Objective C */
/* RID_ID */ OBJECTNAME,
/* RID_AT_ENCODE */ ENCODE,
@@ -630,7 +630,7 @@
/* RID_AT_SELECTOR */ SELECTOR,
/* RID_AT_INTERFACE */ INTERFACE,
/* RID_AT_IMPLEMENTATION */ IMPLEMENTATION
- /* APPLE LOCAL Objective-C++ end */
+ /* APPLE LOCAL end Objective-C++ */
};
void
1.36 +2 -2 gcc3/gcc/cp/spew.c
Index: spew.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cp/spew.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- spew.c 2002/08/13 05:53:56 1.35
+++ spew.c 2002/08/14 21:39:42 1.36
@@ -416,7 +416,7 @@
yylexstring (t);
break;
- /* APPLE LOCAL Objective-C++ begin */
+ /* APPLE LOCAL begin Objective-C++ */
/* This token is Objective-C specific. It gives the next token
special significance. */
case CPP_ATSIGN:
@@ -478,7 +478,7 @@
}
}
break;
- /* APPLE LOCAL Objective-C++ end */
+ /* APPLE LOCAL end Objective-C++ */
default:
yyerror ("parse error");
1.105 +2 -2 gcc3/gcc/objc/objc-act.c
Index: objc-act.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/objc/objc-act.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- objc-act.c 2002/08/08 03:20:05 1.104
+++ objc-act.c 2002/08/14 21:39:42 1.105
@@ -6728,7 +6728,7 @@
else if (TREE_CODE (class) == CLASS_INTERFACE_TYPE)
{
- /* APPLE LOCAL Objective-C++ begin */
+ /* APPLE LOCAL begin Objective-C++ */
/* Some of this should go back to the FSF... */
#ifdef OBJCPLUS
@@ -6739,7 +6739,7 @@
tree record = start_struct (RECORD_TYPE, CLASS_NAME (class));
/* APPLE LOCAL bitfield alignment */
finish_struct (record, build_ivar_chain (class), NULL_TREE);
- /* APPLE LOCAL Objective-C++ end */
+ /* APPLE LOCAL end Objective-C++ */
CLASS_STATIC_TEMPLATE (class) = record;
/* Mark this record as a class template for static typing. */
1.23 +1 -2 gcc3/gcc/objc/objc-act.h
Index: objc-act.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/objc/objc-act.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- objc-act.h 2002/08/02 10:08:58 1.22
+++ objc-act.h 2002/08/14 21:39:42 1.23
@@ -29,11 +29,10 @@
/* used by yyparse */
-/* APPLE LOCAL Objective-C++ begin */
+/* APPLE LOCAL Objective-C++ */
void objc_finish_file PARAMS ((void));
/* APPLE LOCAL bitfield alignment */
tree build_ivar_chain PARAMS ((tree));
-/* APPLE LOCAL Objective-C++ end */
tree start_class PARAMS ((enum tree_code, tree, tree,
tree));
tree continue_class PARAMS ((tree));
void finish_class PARAMS ((tree));
