shebs 02/09/10 13:53:54
Modified: gcc calls.c cse.c expmed.c gcc.c gcse.c loop.c
regrename.c reload.c rtl.h toplev.c tree.h
unwind-dw2-fde.c
gcc/config darwin-protos.h
gcc/config/rs6000 darwin.h ops-to-gp rs6000-protos.h
rs6000.c rs6000.md
gcc/cp decl.c decl2.c
gcc/objc objc-act.c
Log:
Give names to anonymous local markers, tweak some comments to not look like
local markers.
Revision Changes Path
1.36 +2 -2 gcc3/gcc/calls.c
Index: calls.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/calls.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- calls.c 2002/08/26 05:39:29 1.35
+++ calls.c 2002/09/10 20:53:19 1.36
@@ -3118,7 +3118,7 @@
next_arg_reg = FUNCTION_ARG (args_so_far, VOIDmode,
void_type_node, 1);
- /* APPLE LOCAL indirect calls in R12 */
+ /* APPLE LOCAL begin indirect calls in R12 */
#ifdef MAGIC_INDIRECT_CALL_REG
/* For indirect calls, put the callee address in R12. This is necessary
for ObjC methods. This could be handled by patterns in rs6000.md,
@@ -3134,7 +3134,7 @@
use_reg (&call_fusage, magic_reg);
}
#endif
- /* end APPLE LOCAL */
+ /* APPLE LOCAL end indirect calls in R12 */
/* All arguments and registers used for the call must be set up by
now! */
1.26 +3 -3 gcc3/gcc/cse.c
Index: cse.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cse.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cse.c 2002/08/02 10:05:11 1.25
+++ cse.c 2002/09/10 20:53:20 1.26
@@ -3565,9 +3565,9 @@
return fold_rtx (copy_rtx (XEXP (new, 0)), insn);
break;
- /* APPLE LOCAL */
+ /* APPLE LOCAL fused multiply-add */
#ifdef TARGET_FUSED_MADD
- /* The multiply-add cases will remain APPLE LOCAL. The others
+ /* The multiply-add cases will remain Apple local. The others
have been submitted to FSF and really should be approved... */
case PLUS:
/* If we have (PLUS X Y), see if X is known to be (NEG Z).
@@ -3684,7 +3684,7 @@
}
break;
#endif /* TARGET_FUSED_MADD */
- /* APPLE LOCAL end */
+ /* APPLE LOCAL end fused multiply-add */
case MEM:
/* If we are not actually processing an insn, don't try to find the
1.15 +2 -1 gcc3/gcc/expmed.c
Index: expmed.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/expmed.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- expmed.c 2002/08/02 10:05:15 1.14
+++ expmed.c 2002/09/10 20:53:21 1.15
@@ -596,7 +596,7 @@
/* Fetch that unit, store the bitfield in it, then store
the unit. */
tempreg = copy_to_reg (op0);
- /* APPLE LOCAL */
+ /* APPLE LOCAL begin do not use float fieldmode */
/* If value was float, we munged it to be int above, so it
is never appropriate to use a float fieldmode here. */
store_bit_field (tempreg, bitsize, bitpos,
@@ -604,6 +604,7 @@
&& GET_MODE_CLASS (fieldmode) != MODE_PARTIAL_INT)
? GET_MODE (value) : fieldmode,
value, total_size);
+ /* APPLE LOCAL end do not use float fieldmode */
emit_move_insn (op0, tempreg);
return value;
}
1.142 +2 -2 gcc3/gcc/gcc.c
Index: gcc.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/gcc.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- gcc.c 2002/09/02 03:45:50 1.141
+++ gcc.c 2002/09/10 20:53:22 1.142
@@ -5177,7 +5177,7 @@
temp_filename_length + 1);
obstack_grow (&obstack, temp_filename,
temp_filename_length);
- /* APPLE LOCAL */
+ /* APPLE LOCAL what is this for? */
delete_this_arg = 0;
arg_going = 1;
break;
@@ -5222,7 +5222,7 @@
free (saved_suffix);
obstack_grow (&obstack, t->filename, t->filename_length);
- /* APPLE LOCAL */
+ /* APPLE LOCAL what is this for? */
delete_this_arg = (save_temps_flag == 0);
}
arg_going = 1;
1.20 +10 -7 gcc3/gcc/gcse.c
Index: gcse.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/gcse.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gcse.c 2002/09/05 21:01:21 1.19
+++ gcse.c 2002/09/10 20:53:23 1.20
@@ -826,12 +826,13 @@
during this pass. */
changed = one_cprop_pass (pass + 1, 0);
- /* APPLE LOCAL */
+ /* APPLE LOCAL begin div by const */
/* div by const optimization can introduce new instructions.
All this stuff needs to be recomputed. */
free_gcse_mem ();
max_gcse_regno = max_reg_num ();
alloc_gcse_mem (f);
+ /* APPLE LOCAL end div by const */
if (optimize_size)
changed |= one_classic_gcse_pass (pass + 1);
@@ -4223,7 +4224,7 @@
fprintf (gcse_file, "\n");
}
}
- /* APPLE LOCAL */
+ /* APPLE LOCAL begin div by const */
/* Look for int div by constant and expand if found. */
if ( GET_CODE (insn) == INSN
&& GET_CODE (PATTERN (insn)) == SET
@@ -4280,7 +4281,7 @@
changed = 1;
break;
}
- /* APPLE LOCAL end */
+ /* APPLE LOCAL end div by const */
}
else if (GET_CODE (src) == REG
&& REGNO (src) >= FIRST_PSEUDO_REGISTER
@@ -5794,14 +5795,16 @@
something_changed = 1;
delete_insn (last_insn);
-/* APPLE LOCAL */
-/* This is invalid. The compare sets CC and might be used later in
- another block. If so, maybe a later pass will move the compare down to
- the second branch; if not, maybe a later pass will delete it. */
+ /* APPLE LOCAL begin remove invalid delete */
+ /* This is invalid. The compare sets CC and might be used later
+ in another block. If so, maybe a later pass will move the
+ compare down to the second branch; if not, maybe a later pass
+ will delete it. */
#if 0
if (compare_and_branch == 2)
delete_insn (earliest);
#endif
+ /* APPLE LOCAL end remove invalid delete */
purge_dead_edges (bb);
/* Don't check this block again. (Note that BLOCK_END is
1.27 +13 -13 gcc3/gcc/loop.c
Index: loop.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/loop.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- loop.c 2002/09/07 13:30:56 1.26
+++ loop.c 2002/09/10 20:53:25 1.27
@@ -875,11 +875,6 @@
we can replace the usage of this register with the source
of this SET. If we can, delete this insn.
- APPLE LOCAL: Don't do this if the source of the SET is
- a memory reference. We generally want to move loads out of
- loops when possible. I haven't experimented, but I suspect
- this is not true on x86, so the change is ppc-only.
-
Don't do this if P has a REG_RETVAL note or if we have
SMALL_REGISTER_CLASSES and SET_SRC is a hard register. */
@@ -902,11 +897,16 @@
&& ! modified_between_p (SET_SRC (set), p,
regs->array[regno].single_usage)
&& no_labels_between_p (p, regs->array[regno].single_usage)
- /* APPLE LOCAL */
+ /* APPLE LOCAL begin move loads out of loops */
+ /* Don't do this if the source of the SET is a
+ memory reference. We generally want to move
+ loads out of loops when possible. I haven't
+ experimented, but I suspect this is not true on
+ x86, so the change is ppc-only. */
#ifdef TARGET_POWERPC
&& GET_CODE (SET_SRC (set)) != MEM
#endif
- /* APPLE LOCAL end */
+ /* APPLE LOCAL end move loads out of loops */
&& validate_replace_rtx (SET_DEST (set), SET_SRC (set),
regs->array[regno].single_usage))
{
@@ -2204,18 +2204,18 @@
to say it lives at least the full length of this loop.
This will help guide optimizations in outer loops. */
- /* APPLE LOCAL begin avoid out-of-bounds ref */
+ /* APPLE LOCAL begin avoid out-of-bounds refs */
if (REGNO_FIRST_UID (regno) > max_uid_for_loop
|| REGNO_FIRST_LUID (regno) > INSN_LUID (loop_start))
- /* APPLE LOCAL end avoid out-of-bounds ref */
+ /* APPLE LOCAL end avoid out-of-bounds refs */
/* This is the old insn before all the moved insns.
We can't use the moved insn because it is out of range
in uid_luid. Only the old insns have luids. */
REGNO_FIRST_UID (regno) = INSN_UID (loop_start);
- /* APPLE LOCAL begin avoid out-of-bounds ref */
+ /* APPLE LOCAL begin avoid out-of-bounds refs */
if (REGNO_LAST_UID (regno) > max_uid_for_loop
|| REGNO_LAST_LUID (regno) < INSN_LUID (loop_end))
- /* APPLE LOCAL end avoid out-of-bounds ref */
+ /* APPLE LOCAL end avoid out-of-bounds refs */
REGNO_LAST_UID (regno) = INSN_UID (loop_end);
/* Combine with this moved insn any other matching movables. */
@@ -4973,7 +4973,7 @@
determining code size than run-time benefits. */
benefit -= add_cost * bl->biv_count;
- /* APPLE LOCAL */
+ /* APPLE LOCAL better induction variable selection */
#ifdef TARGET_POWERPC
/* Adjust this computation to allow for the likelihood that the
original increment of the biv will be deleted. This permits
@@ -4989,7 +4989,7 @@
benefit += orig_add_cost * bl->biv_count;
}
#endif
- /* APPLE LOCAL end */
+ /* APPLE LOCAL end better induction variable selection */
/* Decide whether to strength-reduce this giv or to leave the code
unchanged (recompute it from the biv each time it is used). This
1.12 +4 -2 gcc3/gcc/regrename.c
Index: regrename.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/regrename.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- regrename.c 2002/08/26 05:39:40 1.11
+++ regrename.c 2002/09/10 20:53:26 1.12
@@ -1310,12 +1310,13 @@
enum machine_mode orig_mode, new_mode;
unsigned int regno ATTRIBUTE_UNUSED;
{
-/* APPLE LOCAL */
+ /* APPLE LOCAL begin add mode change case */
#ifdef TARGET_POWERPC
/* This arises from FLOAT_EXTEND which is really a NOP. */
if (orig_mode == SFmode && new_mode == DFmode)
return true;
#endif
+ /* APPLE LOCAL end add mode change case */
if (GET_MODE_SIZE (orig_mode) < GET_MODE_SIZE (new_mode))
return false;
@@ -1772,7 +1773,7 @@
/* Notice copies. */
if (set && REG_P (SET_DEST (set)) && REG_P (SET_SRC (set)))
copy_value (SET_DEST (set), SET_SRC (set), vd);
-/* APPLE LOCAL */
+ /* APPLE LOCAL begin record that float extend is a copy */
#ifdef TARGET_POWERPC
/* FLOAT_EXTEND is actually a copy; record that too. */
if (set && REG_P (SET_DEST (set))
@@ -1780,6 +1781,7 @@
&& REG_P (XEXP (SET_SRC (set), 0)))
copy_value (SET_DEST (set), XEXP (SET_SRC (set), 0), vd);
#endif
+ /* APPLE LOCAL end record that float extend is a copy */
if (insn == bb->end)
break;
1.22 +5 -3 gcc3/gcc/reload.c
Index: reload.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/reload.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- reload.c 2002/08/26 05:39:41 1.21
+++ reload.c 2002/09/10 20:53:27 1.22
@@ -1681,12 +1681,13 @@
if ((rld[i].when_needed == RELOAD_FOR_OUTPUT_ADDRESS
|| rld[i].when_needed == RELOAD_FOR_OUTADDR_ADDRESS)
&& rld[i].opnum == rld[output_reload].opnum)
- /* APPLE LOCAL */
+ /* APPLE LOCAL begin try destroyed input */
#ifdef TARGET_POWERPC
goto try_destroyed_input;
#else
return;
#endif
+ /* APPLE LOCAL end try destroyed input */
/* Check each input reload; can we combine it? */
@@ -1782,10 +1783,11 @@
that it does not occur in the output (we already know it isn't an
earlyclobber. If this is an asm insn, give up. */
-/* APPLE LOCAL */
+ /* APPLE LOCAL begin try destroyed input */
#ifdef TARGET_POWERPC
-try_destroyed_input:
+ try_destroyed_input:
#endif
+ /* APPLE LOCAL end try destroyed input */
if (INSN_CODE (this_insn) == -1)
return;
1.36 +1 -1 gcc3/gcc/rtl.h
Index: rtl.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/rtl.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- rtl.h 2002/08/26 05:39:43 1.35
+++ rtl.h 2002/09/10 20:53:28 1.36
@@ -135,7 +135,7 @@
1 in a CALL_INSN if it is a sibling call.
1 in a SET that is for a return.
In a CODE_LABEL, part of the two-bit alternate entry field. */
- /* APPLE LOCAL
+ /* APPLE LOCAL weak import
SYMBOL_REF_WEAK_IMPORT in a SYMBOL_REF. */
unsigned int jump : 1;
/* In a CODE_LABEL, part of the two-bit alternate entry field. */
1.155 +6 -0 gcc3/gcc/toplev.c
Index: toplev.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/toplev.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- toplev.c 2002/09/08 18:49:44 1.154
+++ toplev.c 2002/09/10 20:53:29 1.155
@@ -5918,6 +5918,12 @@
#endif
/* APPLE LOCAL end testsuite OS flush bug workaround */
+ /* APPLE LOCAL work around Radar 2844245. */
+ fflush(stdout); fflush(stderr);
+#if 0 /* this helps test results sometimes */
+ sleep (2);
+#endif
+
if (errorcount || sorrycount)
return (FATAL_EXIT_CODE);
1.56 +1 -1 gcc3/gcc/tree.h
Index: tree.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/tree.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- tree.h 2002/09/02 03:45:51 1.55
+++ tree.h 2002/09/10 20:53:30 1.56
@@ -245,7 +245,7 @@
FUNCTION_DECL
SAVE_EXPR_NOPLACEHOLDER in
SAVE_EXPR
- APPLE LOCAL:
+ APPLE LOCAL weak import
IDENTIFIER_WEAK_IMPORT in
IDENTIFIER
1.30 +3 -4 gcc3/gcc/unwind-dw2-fde.c
Index: unwind-dw2-fde.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/unwind-dw2-fde.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- unwind-dw2-fde.c 2002/08/16 17:06:55 1.29
+++ unwind-dw2-fde.c 2002/09/10 20:53:31 1.30
@@ -38,10 +38,10 @@
#include "unwind-dw2-fde.h"
#include "gthr.h"
#endif
-/* APPLE LOCAL FSF candidate */
+/* APPLE LOCAL declare string functions */
#include <string.h>
-/* APPLE LOCAL */
+/* APPLE LOCAL begin fde end extension */
#ifdef DWARF2_OBJECT_END_PTR_EXTENSION
static inline int VALID_FDE_P(struct object *OB, struct dwarf_fde *FDE)
{
@@ -61,8 +61,7 @@
#else
#define VALID_FDE_P(OB, FDE) ((FDE)->length != 0)
#endif
-
-/* APPLE LOCAL */
+/* APPLE LOCAL end fde end extension */
#define Dprintf if (0) printf
1.35 +1 -1 gcc3/gcc/config/darwin-protos.h
Index: darwin-protos.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/config/darwin-protos.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- darwin-protos.h 2002/08/26 05:40:15 1.34
+++ darwin-protos.h 2002/09/10 20:53:41 1.35
@@ -102,7 +102,7 @@
/* APPLE LOCAL end temporary pragmas 2001-07-05 sts */
#endif
-/* APPLE LOCAL named sections */
+/* APPLE LOCAL coalescing */
extern void darwin_asm_named_section PARAMS ((const char *, unsigned int));
extern unsigned int darwin_section_type_flags PARAMS ((tree, const char *,
int));
1.75 +5 -4 gcc3/gcc/config/rs6000/darwin.h
Index: darwin.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/config/rs6000/darwin.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- darwin.h 2002/08/26 20:08:04 1.74
+++ darwin.h 2002/09/10 20:53:42 1.75
@@ -85,7 +85,7 @@
#undef RS6000_PIC_OFFSET_TABLE_REGNUM
#define RS6000_PIC_OFFSET_TABLE_REGNUM 31
-/* APPLE LOCAL */
+/* APPLE LOCAL begin -pg fix */
/* -pg has a problem which is normally concealed by -fPIC;
either -mdynamic-no-pic or -static exposes the -pg problem, causing the
crash. FSF gcc for Darwin also has this bug. The problem is that -pg
@@ -101,6 +101,7 @@
#define PIC_OFFSET_TABLE_REGNUM ((flag_pic || profile_flag) \
? RS6000_PIC_OFFSET_TABLE_REGNUM \
: INVALID_REGNUM)
+/* APPLE LOCAL end -pg fix */
/* Pad the outgoing args area to 16 bytes instead of the usual 8. */
@@ -280,16 +281,16 @@
N_("Align structs and unions according to natural rules")},
/* APPLE LOCAL end Macintosh alignment 2002-2-26 ff */
-/* APPLE LOCAL: AltiVec */
+/* APPLE LOCAL AltiVec */
#undef DWARF_FRAME_REGISTERS
#define DWARF_FRAME_REGISTERS 110
-/* APPLE LOCAL begin */
+/* APPLE LOCAL begin alignment */
/* Make sure local alignments come from the type node, not the mode;
mode-based alignments are wrong for vectors. */
#undef LOCAL_ALIGNMENT
#define LOCAL_ALIGNMENT(TYPE, ALIGN) (MAX (ALIGN, TYPE_ALIGN (TYPE)))
-/* APPLE LOCAL end */
+/* APPLE LOCAL end alignment */
/* XXX: Darwin supports neither .quad, or .llong, but it also doesn't
support 64 bit powerpc either, so this just keeps things happy. */
1.2 +1 -1 gcc3/gcc/config/rs6000/ops-to-gp
Index: ops-to-gp
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/config/rs6000/ops-to-gp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ops-to-gp 2002/06/26 22:53:31 1.1
+++ ops-to-gp 2002/09/10 20:53:43 1.2
@@ -483,7 +483,7 @@
END {
if (status) exit;
- # Gcc3: Mark file as APPLE LOCAL
+ # Gcc3: Mark file as Apple local
printf "/* APPLE LOCAL file AltiVec */\n";
printf "/* This file is generated by ops-to-gp. Do not edit. */\n\n";
printf "/* To regenerate execute:\n";
1.33 +1 -1 gcc3/gcc/config/rs6000/rs6000-protos.h
Index: rs6000-protos.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/config/rs6000/rs6000-protos.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rs6000-protos.h 2002/08/26 05:40:47 1.32
+++ rs6000-protos.h 2002/09/10 20:53:43 1.33
@@ -146,7 +146,7 @@
extern int lmw_operation PARAMS ((rtx, enum machine_mode));
extern struct rtx_def *create_TOC_reference PARAMS ((rtx));
extern void rs6000_emit_eh_toc_restore PARAMS ((rtx));
-/* APPLE LOCAL */
+/* APPLE LOCAL RTX_COST for multiply */
extern int rs6000_rtx_mult_cost PARAMS ((rtx));
extern void rs6000_emit_move PARAMS ((rtx, rtx, enum machine_mode));
extern rtx rs6000_legitimize_address PARAMS ((rtx, rtx, enum machine_mode));
1.172 +2 -2 gcc3/gcc/config/rs6000/rs6000.c
Index: rs6000.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/config/rs6000/rs6000.c,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- rs6000.c 2002/09/06 01:09:04 1.171
+++ rs6000.c 2002/09/10 20:53:44 1.172
@@ -12540,7 +12540,7 @@
RTVEC_ELT (p, i + 2) = gen_rtx_SET (VOIDmode, mem, reg);
}
- /* APPLE LOCAL begin */
+ /* APPLE LOCAL begin fix 2866661 */
#if TARGET_MACHO
/* Darwin version of these functions stores R0. */
RTVEC_ELT (p, i + 2) = gen_rtx_USE (VOIDmode, gen_rtx_REG (Pmode, 0));
@@ -12557,7 +12557,7 @@
gen_rtx_REG (Pmode, LINK_REGISTER_REGNUM));
}
#endif
- /* APPLE LOCAL end */
+ /* APPLE LOCAL end fix 2866661 */
insn = emit_insn (gen_rtx_PARALLEL (VOIDmode, p));
rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
NULL_RTX, NULL_RTX);
1.78 +11 -10 gcc3/gcc/config/rs6000/rs6000.md
Index: rs6000.md
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/config/rs6000/rs6000.md,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- rs6000.md 2002/08/26 20:08:05 1.77
+++ rs6000.md 2002/09/10 20:53:45 1.78
@@ -5332,7 +5332,7 @@
"{fd|fdiv} %0,%1,%2"
[(set_attr "type" "ddiv")])
-;; APPLE LOCAL
+;; APPLE LOCAL fused multiply-add
;; fmadd: D = (A * B) + C
(define_insn ""
[(set (match_operand:SF 0 "gpc_reg_operand" "=f")
@@ -5352,7 +5352,7 @@
"{fma|fmadd} %0,%1,%2,%3"
[(set_attr "type" "dmul")])
-;; APPLE LOCAL
+;; APPLE LOCAL fused multiply-add
;; fmsub 1: D = (A * B) - C
(define_insn ""
[(set (match_operand:SF 0 "gpc_reg_operand" "=f")
@@ -5363,7 +5363,7 @@
"fmsubs %0,%1,%2,%3"
[(set_attr "type" "fp")])
-;; APPLE LOCAL begin
+;; APPLE LOCAL begin fused multiply-add
;; fmsub 2: D = -C + (A * B)
(define_insn ""
[(set (match_operand:SF 0 "gpc_reg_operand" "=f")
@@ -5395,7 +5395,7 @@
"TARGET_POWERPC && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_FUSED_MADD"
"fmsubs %0,%1,%2,%3"
[(set_attr "type" "fp")])
-;; APPLE LOCAL end
+;; APPLE LOCAL end fused multiply-add
(define_insn ""
[(set (match_operand:SF 0 "gpc_reg_operand" "=f")
@@ -5684,7 +5684,7 @@
"{fd|fdiv} %0,%1,%2"
[(set_attr "type" "ddiv")])
-;; APPLE LOCAL
+;; APPLE LOCAL fused multiply-add
;; fmadd: D = (A * B) + C
(define_insn ""
[(set (match_operand:DF 0 "gpc_reg_operand" "=f")
@@ -5695,7 +5695,7 @@
"{fma|fmadd} %0,%1,%2,%3"
[(set_attr "type" "dmul")])
-;; APPLE LOCAL
+;; APPLE LOCAL fused multiply-add
;; fmsub 1: D = (A * B) - C
(define_insn ""
[(set (match_operand:DF 0 "gpc_reg_operand" "=f")
@@ -5706,7 +5706,7 @@
"{fms|fmsub} %0,%1,%2,%3"
[(set_attr "type" "dmul")])
-;; APPLE LOCAL
+;; APPLE LOCAL fused multiply-add
;; fmsub 2: D = -C + (A * B)
(define_insn ""
[(set (match_operand:DF 0 "gpc_reg_operand" "=f")
@@ -5749,7 +5749,7 @@
"{fnma|fnmadd} %0,%1,%2,%3"
[(set_attr "type" "dmul")])
-;; APPLE LOCAL
+;; APPLE LOCAL fused multiply-add
;; fnmadd 2: D = (-A * B) - C
(define_insn ""
[(set (match_operand:DF 0 "gpc_reg_operand" "=f")
@@ -5780,7 +5780,7 @@
"{fnms|fnmsub} %0,%1,%2,%3"
[(set_attr "type" "dmul")])
-;; APPLE LOCAL
+;; APPLE LOCAL fused multiply-add
;; fnmsub 2: D = C - (A * B)
(define_insn ""
[(set (match_operand:DF 0 "gpc_reg_operand" "=f")
@@ -8459,7 +8459,7 @@
[(set_attr "type" "store")
(set_attr "length" "4")])
-;; APPLE LOCAL
+;; APPLE LOCAL begin fix 2857104
;; reload can produce this, at least for now. Handling it this way
;; is a real abuse. It must go before *movsi_internal1
(define_insn "*movsf_hardfloat2"
@@ -8477,6 +8477,7 @@
stfs%U0%X0 %1,%0"
[(set_attr "type" "fpload,fpstore")
(set_attr "length" "4,4")])
+;; APPLE LOCAL end fix 2857104
(define_insn "*movsi_internal1"
[(set (match_operand:SI 0 "nonimmediate_operand"
"=r,r,r,m,r,r,r,r,r,*q,*c*l,*h,*h")
1.116 +3 -3 gcc3/gcc/cp/decl.c
Index: decl.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cp/decl.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- decl.c 2002/09/06 01:15:19 1.115
+++ decl.c 2002/09/10 20:53:52 1.116
@@ -13681,9 +13681,9 @@
/* If this is the real definition for a previous forward reference,
fill in the contents in the same object that used to be the
- forward reference.
- Note that an anonymous enum cannot be forward-referenced. */
- /* APPLE LOCAL */
+ forward reference. */
+ /* APPLE LOCAL do not forward reference anonymous enum */
+ /* Note that an anonymous enum cannot be forward-referenced. */
if (name != NULL_TREE && !ANON_AGGRNAME_P (name))
enumtype = lookup_tag (ENUMERAL_TYPE, name, b, 1);
1.91 +4 -2 gcc3/gcc/cp/decl2.c
Index: decl2.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cp/decl2.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- decl2.c 2002/09/06 01:15:20 1.90
+++ decl2.c 2002/09/10 20:53:53 1.91
@@ -2203,12 +2203,13 @@
DECL_LANG_SPECIFIC (current_function_decl)->decl_flags.u2sel = 1;
GLOBAL_INIT_PRIORITY (current_function_decl) = initp;
- /* APPLE LOCAL */
+ /* APPLE LOCAL begin static structors in __StaticInit section */
#ifdef STATIC_INIT_SECTION
if ( ! flag_apple_kext)
DECL_SECTION_NAME (current_function_decl) =
build_string (strlen (STATIC_INIT_SECTION), STATIC_INIT_SECTION);
#endif
+ /* APPLE LOCAL end static structors in __StaticInit section */
body = begin_compound_stmt (/*has_no_scope=*/0);
@@ -2327,12 +2328,13 @@
TREE_PUBLIC (ssdf_decl) = 0;
DECL_ARTIFICIAL (ssdf_decl) = 1;
- /* APPLE LOCAL */
+ /* APPLE LOCAL begin static structors in __StaticInit section */
#ifdef STATIC_INIT_SECTION
if ( ! flag_apple_kext)
DECL_SECTION_NAME (ssdf_decl) = build_string (strlen (STATIC_INIT_SECTION),
STATIC_INIT_SECTION);
#endif
+ /* APPLE LOCAL end static structors in __StaticInit section */
/* Put this function in the list of functions to be called from the
static constructors and destructors. */
1.114 +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.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- objc-act.c 2002/08/28 19:56:56 1.113
+++ objc-act.c 2002/09/10 20:53:54 1.114
@@ -3037,7 +3037,7 @@
sprintf (buf, "%d", forwarding_offset (parms));
/* Indicate register. */
- /* APPLE LOCAL */
+ /* APPLE LOCAL add + for GNU runtime only */
if (offset_is_register && !flag_next_runtime)
obstack_1grow (&util_obstack, '+');
@@ -5228,7 +5228,7 @@
if (iface)
method_prototype = lookup_instance_method_static (iface, sel_name);
- /* APPLE LOCAL */
+ /* APPLE LOCAL check ctype also */
if (! method_prototype && ctype && TYPE_PROTOCOL_LIST (ctype))
method_prototype
= lookup_method_in_protocol_list (TYPE_PROTOCOL_LIST (ctype),
