[llvm-commits] [llvm-gcc-4.2] r55653 - in /llvm-gcc-4.2/trunk: gcc/common.opt gcc/cp/Make-lang.in gcc/cp/class.c gcc/cp/cp-gimplify.c gcc/cp/cp-lang.c gcc/cp/cp-objcp-common.c gcc/cp/cp-tree.h gcc/gimplify.c gcc/objcp/objcp-lang.c gcc/toplev.c gcc/tree.c libcpp/charset.c
Bill Wendling
isanbard at gmail.com
Tue Sep 2 14:34:10 PDT 2008
Author: void
Date: Tue Sep 2 16:34:10 2008
New Revision: 55653
URL: http://llvm.org/viewvc/llvm-project?rev=55653&view=rev
Log:
Comment and whitespace fixes
Modified:
llvm-gcc-4.2/trunk/gcc/common.opt
llvm-gcc-4.2/trunk/gcc/cp/Make-lang.in
llvm-gcc-4.2/trunk/gcc/cp/class.c
llvm-gcc-4.2/trunk/gcc/cp/cp-gimplify.c
llvm-gcc-4.2/trunk/gcc/cp/cp-lang.c
llvm-gcc-4.2/trunk/gcc/cp/cp-objcp-common.c
llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h
llvm-gcc-4.2/trunk/gcc/gimplify.c
llvm-gcc-4.2/trunk/gcc/objcp/objcp-lang.c
llvm-gcc-4.2/trunk/gcc/toplev.c
llvm-gcc-4.2/trunk/gcc/tree.c
llvm-gcc-4.2/trunk/libcpp/charset.c
Modified: llvm-gcc-4.2/trunk/gcc/common.opt
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/common.opt?rev=55653&r1=55652&r2=55653&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/common.opt (original)
+++ llvm-gcc-4.2/trunk/gcc/common.opt Tue Sep 2 16:34:10 2008
@@ -1011,9 +1011,12 @@
Common RejectNegative Joined
-fstack-limit-symbol=<name> Trap if the stack goes past symbol <name>
+; APPLE LOCAL begin stack-protector default 5095227
+; LLVM LOCAL FIXME Don't add Init just yet
fstack-protector
Common Report Var(flag_stack_protect, 1)
Use propolice as a stack protection method
+; APPLE LOCAL end stack-protector default 5095227
fstack-protector-all
Common Report RejectNegative Var(flag_stack_protect, 2) VarExists
Modified: llvm-gcc-4.2/trunk/gcc/cp/Make-lang.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/Make-lang.in?rev=55653&r1=55652&r2=55653&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/Make-lang.in (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/Make-lang.in Tue Sep 2 16:34:10 2008
@@ -107,7 +107,7 @@
$(LINKCC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
$(CXX_OBJS) dummy-checksum.o $(BACKEND) $(LIBS) \
$(CC1PLUS_ORDER_FLAGS)
-# APLE LOCAL end LLVM
+# LLVM LOCAL end
cc1plus-checksum.c : cc1plus-dummy$(exeext) build/genchecksum$(build_exeext)
build/genchecksum$(build_exeext) cc1plus-dummy$(exeext) > $@
Modified: llvm-gcc-4.2/trunk/gcc/cp/class.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/class.c?rev=55653&r1=55652&r2=55653&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/class.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/class.c Tue Sep 2 16:34:10 2008
@@ -1481,9 +1481,9 @@
= TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t);
/* APPLE LOCAL begin omit calls to empty destructors 5559195 */
- CLASSTYPE_HAS_NONTRIVIAL_DESTRUCTOR_BODY (variants) =
+ CLASSTYPE_HAS_NONTRIVIAL_DESTRUCTOR_BODY (variants) =
CLASSTYPE_HAS_NONTRIVIAL_DESTRUCTOR_BODY (t);
- CLASSTYPE_DESTRUCTOR_NONTRIVIAL_BECAUSE_OF_BASE (variants) =
+ CLASSTYPE_DESTRUCTOR_NONTRIVIAL_BECAUSE_OF_BASE (variants) =
CLASSTYPE_DESTRUCTOR_NONTRIVIAL_BECAUSE_OF_BASE (t);
/* APPLE LOCAL end omit calls to empty destructors 5559195 */
@@ -8011,7 +8011,7 @@
/* APPLE LOCAL end KEXT double destructor */
/* APPLE LOCAL begin 4167759 */
-/* Set DECL_IGNORED_P flag for ctors and dtors associated
+/* Set DECL_IGNORED_P flag for ctors and dtors associated
with TYPE using VALUE. */
void cp_set_decl_ignore_flag (tree type, int value)
Modified: llvm-gcc-4.2/trunk/gcc/cp/cp-gimplify.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/cp-gimplify.c?rev=55653&r1=55652&r2=55653&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/cp-gimplify.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/cp-gimplify.c Tue Sep 2 16:34:10 2008
@@ -292,7 +292,7 @@
append_to_statement_list (t, &exit);
/* elem = nil */
t = build2 (MODIFY_EXPR, void_type_node, inner_foreach,
- fold_convert (TREE_TYPE (inner_foreach),
+ fold_convert (TREE_TYPE (inner_foreach),
integer_zero_node));
gimplify_stmt (&t);
append_to_statement_list (t, &exit);
@@ -314,7 +314,7 @@
/* APPLE LOCAL begin radar 4547045 */
/* Pop foreach's inner loop break label so outer loop's
- break label becomes target of inner loop body's break statements.
+ break label becomes target of inner loop body's break statements.
*/
t = NULL_TREE;
/* APPLE LOCAL radar 4667060 */
Modified: llvm-gcc-4.2/trunk/gcc/cp/cp-lang.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/cp-lang.c?rev=55653&r1=55652&r2=55653&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/cp-lang.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/cp-lang.c Tue Sep 2 16:34:10 2008
@@ -150,4 +150,5 @@
{
cp_finish_file ();
}
+
#include "gtype-cp.h"
Modified: llvm-gcc-4.2/trunk/gcc/cp/cp-objcp-common.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/cp-objcp-common.c?rev=55653&r1=55652&r2=55653&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/cp-objcp-common.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/cp-objcp-common.c Tue Sep 2 16:34:10 2008
@@ -291,7 +291,7 @@
code = TREE_CODE (typename);
class = TREE_CODE_CLASS (code);
- if (code != IDENTIFIER_NODE
+ if (code != IDENTIFIER_NODE
|| class != tcc_exceptional)
return retval;
Modified: llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h?rev=55653&r1=55652&r2=55653&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h Tue Sep 2 16:34:10 2008
@@ -3134,8 +3134,8 @@
/* APPLE LOCAL begin for-fsf-4_4 3274130 5295549 */ \
#define DO_ATTRIBUTES(NODE) TREE_OPERAND (DO_STMT_CHECK (NODE), 2)
/* APPLE LOCAL begin C* language */
-/* Used as a flag to indicate synthesized inner do-while loop of a
- foreach statement. Used for generation of break/continue statement
+/* Used as a flag to indicate synthesized inner do-while loop of a
+ foreach statement. Used for generation of break/continue statement
of the loop. */
#define DO_FOREACH(NODE) TREE_OPERAND (DO_STMT_CHECK (NODE), 3)
/* APPLE LOCAL end C* language */
Modified: llvm-gcc-4.2/trunk/gcc/gimplify.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/gimplify.c?rev=55653&r1=55652&r2=55653&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/gimplify.c (original)
+++ llvm-gcc-4.2/trunk/gcc/gimplify.c Tue Sep 2 16:34:10 2008
@@ -1148,7 +1148,7 @@
tree result_decl, result;
if (!ret_expr || TREE_CODE (ret_expr) == RESULT_DECL
- /* APPLE LOCAL begin radar 6040305 - blocks */
+ /* APPLE LOCAL radar 6040305 - blocks */
|| ret_expr == error_mark_node || cur_block)
return GS_ALL_DONE;
Modified: llvm-gcc-4.2/trunk/gcc/objcp/objcp-lang.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/objcp/objcp-lang.c?rev=55653&r1=55652&r2=55653&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/objcp/objcp-lang.c (original)
+++ llvm-gcc-4.2/trunk/gcc/objcp/objcp-lang.c Tue Sep 2 16:34:10 2008
@@ -213,4 +213,5 @@
{
objc_finish_file ();
}
+
#include "gtype-objcp.h"
Modified: llvm-gcc-4.2/trunk/gcc/toplev.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/toplev.c?rev=55653&r1=55652&r2=55653&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/toplev.c (original)
+++ llvm-gcc-4.2/trunk/gcc/toplev.c Tue Sep 2 16:34:10 2008
@@ -259,10 +259,8 @@
int flag_short_enums;
/* LLVM LOCAL begin */
-
/* Options to pass directly into the LLVM backend. */
const char *llvm_optns = 0;
-
/* LLVM LOCAL end */
/* APPLE LOCAL begin -fast or -fastf or -fastcp */
Modified: llvm-gcc-4.2/trunk/gcc/tree.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree.c?rev=55653&r1=55652&r2=55653&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree.c (original)
+++ llvm-gcc-4.2/trunk/gcc/tree.c Tue Sep 2 16:34:10 2008
@@ -2883,7 +2883,7 @@
}
else if (CONSTANT_CLASS_P (node))
;
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
#ifdef ENABLE_LLVM
/* Support the "array ref with pointer base" extension. If we have &p[i],
treat this like we do a binop.
@@ -2898,7 +2898,7 @@
TREE_SIDE_EFFECTS(TREE_OPERAND(node, 1));
}
#endif
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
else
{
ti = tc = false;
Modified: llvm-gcc-4.2/trunk/libcpp/charset.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/libcpp/charset.c?rev=55653&r1=55652&r2=55653&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/libcpp/charset.c (original)
+++ llvm-gcc-4.2/trunk/libcpp/charset.c Tue Sep 2 16:34:10 2008
@@ -1692,7 +1692,7 @@
terminate with another \r, not an \n, so that we do not mistake
the \r\n sequence for a single DOS line ending and erroneously
issue the "No newline at end of file" diagnostic. */
- /* APPLE LOCAL don't read to.text[-1] radar 6121572 */
+ /* APPLE LOCAL don't access to.text[-1] radar 6121572 */
if (to.len > 0 && to.text[to.len - 1] == '\r')
to.text[to.len] = '\r';
else
More information about the llvm-commits
mailing list