shebs 02/09/01 20:50:04
Modified: gcc/config darwin.h
gcc/config/i386 x-darwin
gcc/config/rs6000 rs6000.c rs6000.h
gcc/cp decl.c decl2.c method.c rtti.c
Log:
Turn off dwarf-2 debugging (will fail in testsuite until
assembler fixed), remove useless ASM_OUTPUT_IDENT, make
more local markers consistent.
Revision Changes Path
1.179 +4 -7 gcc3/gcc/config/darwin.h
Index: darwin.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/config/darwin.h,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- darwin.h 2002/08/26 20:08:02 1.178
+++ darwin.h 2002/09/02 03:49:59 1.179
@@ -331,9 +331,9 @@
#define DBX_DEBUGGING_INFO
/* Also enable Dwarf 2 as an option. */
+/* APPLE LOCAL disable Dwarf 2 until assembler fixed */
+/* #define DWARF2_DEBUGGING_INFO */
-#define DWARF2_DEBUGGING_INFO
-
#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
/* APPLE LOCAL begin gdb only used symbols */
@@ -524,11 +524,6 @@
machopic_define_name (NAME); \
} while (0)
-/* Output nothing for #ident. */
-
-#undef ASM_OUTPUT_IDENT
-#define ASM_OUTPUT_IDENT(FILE, NAME)
-
/* The maximum alignment which the object file format can support.
For Mach-O, this is 2^15. */
@@ -1190,6 +1185,8 @@
/* APPLE LOCAL end double destructor turly 20020214 */
/* APPLE LOCAL begin zerofill turly 20020218 */
+/* This keeps uninitialized data from bloating the data when -fno-common.
+ Radar 2863107. */
#define ASM_OUTPUT_ZEROFILL(FILE, NAME, SIZE, ALIGNMENT) \
do { fputs (".zerofill __DATA, __common, ", (FILE)); \
assemble_name ((FILE), (NAME)); \
1.4 +1 -1 gcc3/gcc/config/i386/x-darwin
Index: x-darwin
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/config/i386/x-darwin,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- x-darwin 2002/08/03 05:28:28 1.3
+++ x-darwin 2002/09/02 03:49:59 1.4
@@ -1,4 +1,4 @@
-# APPLE LOCAL file darwin x86
+# APPLE LOCAL file cpp-precomp
# The spiffy cpp-precomp chokes on some legitimate constructs in GCC
# sources; use -no-cpp-precomp to get to GNU cpp. (This is another
# peculiarity of Apple's GCC that we hope to get rid of.)
1.169 +10 -11 gcc3/gcc/config/rs6000/rs6000.c
Index: rs6000.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/config/rs6000/rs6000.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- rs6000.c 2002/08/26 20:08:04 1.168
+++ rs6000.c 2002/09/02 03:50:00 1.169
@@ -233,8 +233,7 @@
/* APPLE LOCAL begin AltiVec */
/* AltiVec Programming Model. */
-/* APPLE LOCAL: AltiVec - not written in target-independent manner!!! */
- /* Machine intrinsics */
+/* Machine intrinsics */
#define BUILT_IN_FIRST_TARGET_OVERLOADED_INTRINSIC 500
#define BUILT_IN_LAST_TARGET_OVERLOADED_INTRINSIC 800
@@ -2433,7 +2432,7 @@
/* Return 1 if the operand is a CONST_INT and can be put into a
register with one instruction. */
-/* APPLE LOCAL AltiVec stub out */
+/* APPLE LOCAL AltiVec */
#if 0
static int
easy_vector_constant (op)
@@ -2475,7 +2474,7 @@
gcc doesn't generate them yet. FIXME later. */
return 1;
}
-/* APPLE LOCAL AltiVec stub out */
+/* APPLE LOCAL AltiVec */
#endif
/* Return 1 if the operand is the constant 0. This works for scalars
@@ -10914,7 +10913,7 @@
else
info_ptr->spe_gp_size = 0;
- /* APPLE LOCAL AltiVec stub out */
+ /* APPLE LOCAL AltiVec */
if (0 /*TARGET_ALTIVEC_ABI && TARGET_ALTIVEC_VRSAVE*/)
{
info_ptr->vrsave_mask = compute_vrsave_mask ();
@@ -10970,7 +10969,7 @@
/* Align stack so vector save area is on a quadword boundary. */
if (info_ptr->altivec_size != 0)
info_ptr->altivec_padding_size
- /* APPLE LOCAL AltiVec padding fix */
+ /* APPLE LOCAL AltiVec */
= (16 - (-info_ptr->vrsave_save_offset % 16)) % 16;
else
info_ptr->altivec_padding_size = 0;
@@ -11144,7 +11143,7 @@
if (! TARGET_ALTIVEC_ABI || info_ptr->altivec_size == 0)
info_ptr->altivec_save_offset = 0;
- /* APPLE LOCAL AltiVec stub out */
+ /* APPLE LOCAL AltiVec */
if (0 /* ! TARGET_ALTIVEC_ABI || info_ptr->vrsave_mask == 0 */)
info_ptr->vrsave_save_offset = 0;
@@ -12241,7 +12240,7 @@
/* APPLE LOCAL end special ObjC method use of R12 */
/* Save AltiVec registers if needed. */
- /* APPLE LOCAL AltiVec stub out */
+ /* APPLE LOCAL AltiVec */
if (0 /* TARGET_ALTIVEC_ABI && info->altivec_size != 0 */)
{
int i;
@@ -12281,7 +12280,7 @@
used in this function, and do the corresponding magic in the
epilogue. */
- /* APPLE LOCAL AltiVec stub out */
+ /* APPLE LOCAL AltiVec */
if (0 /* TARGET_ALTIVEC && info->vrsave_mask != 0 */)
{
rtx reg, mem, vrsave;
@@ -13441,7 +13440,7 @@
}
/* APPLE LOCAL end AltiVec */
/* Restore AltiVec registers if needed. */
- /* APPLE LOCAL AltiVec stub out */
+ /* APPLE LOCAL AltiVec */
#if 0 /* this messes up the "else if" below and causes double lr gets. */
if (0 /* TARGET_ALTIVEC_ABI && info->altivec_size != 0 */)
{
@@ -13468,7 +13467,7 @@
}
/* Restore VRSAVE if needed. */
- /* APPLE LOCAL AltiVec stub out */
+ /* APPLE LOCAL AltiVec */
if (0 /* TARGET_ALTIVEC_ABI && info->vrsave_mask != 0 */)
{
rtx addr, mem, reg;
1.72 +8 -7 gcc3/gcc/config/rs6000/rs6000.h
Index: rs6000.h
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/config/rs6000/rs6000.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- rs6000.h 2002/08/26 05:40:48 1.71
+++ rs6000.h 2002/09/02 03:50:00 1.72
@@ -636,9 +636,10 @@
#define FUNCTION_BOUNDARY 32
/* Constants for alignment macros below. */
-/* APPLE LOCAL AltiVec and other alignment */
+/* APPLE LOCAL Macintosh alignment */
#define RS6000_DOUBLE_ALIGNMENT 64
#define RS6000_LONGLONG_ALIGNMENT 64
+/* APPLE LOCAL AltiVec */
#define RS6000_VECTOR_ALIGNMENT 128
/* No data type wants to be aligned rounder than this. */
@@ -1149,14 +1150,14 @@
BASE_REGS,
GENERAL_REGS,
FLOAT_REGS,
- /* APPLE LOCAL AltiVec fix */
+ /* APPLE LOCAL AltiVec */
NON_SPECIAL_REGS,
ALTIVEC_REGS,
VRSAVE_REGS,
VSCR_REGS,
SPE_ACC_REGS,
SPEFSCR_REGS,
- /* APPLE LOCAL AltiVec fix */
+ /* APPLE LOCAL AltiVec */
/* lose the NON_SPECIAL_REGS here */
MQ_REGS,
LINK_REGS,
@@ -1182,14 +1183,14 @@
"BASE_REGS", \
"GENERAL_REGS", \
"FLOAT_REGS", \
- /* APPLE LOCAL AltiVec fix */ \
+ /* APPLE LOCAL AltiVec */ \
"NON_SPECIAL_REGS", \
"ALTIVEC_REGS", \
"VRSAVE_REGS", \
"VSCR_REGS", \
"SPE_ACC_REGS", \
"SPEFSCR_REGS", \
- /* APPLE LOCAL AltiVec fix */ \
+ /* APPLE LOCAL AltiVec */ \
/* lose the NON_SPECIAL_REGS here */ \
"MQ_REGS", \
"LINK_REGS", \
@@ -1215,13 +1216,13 @@
{ 0xffffffff, 0x00000000, 0x00000008, 0x00000000 }, /* GENERAL_REGS */ \
{ 0x00000000, 0xffffffff, 0x00000000, 0x00000000 }, /* FLOAT_REGS */ \
{ 0xffffffff, 0xffffffff, 0x00000008, 0x00000000 }, /* NON_SPECIAL_REGS */ \
- /* APPLE LOCAL AltiVec fix */ \
+ /* APPLE LOCAL AltiVec */ \
{ 0x00000000, 0x00000000, 0xffffe000, 0x00001fff }, /* ALTIVEC_REGS */ \
{ 0x00000000, 0x00000000, 0x00000000, 0x00002000 }, /* VRSAVE_REGS */ \
{ 0x00000000, 0x00000000, 0x00000000, 0x00004000 }, /* VSCR_REGS */ \
{ 0x00000000, 0x00000000, 0x00000000, 0x00008000 }, /* SPE_ACC_REGS */ \
{ 0x00000000, 0x00000000, 0x00000000, 0x00010000 }, /* SPEFSCR_REGS */ \
- /* APPLE LOCAL AltiVec fix */ \
+ /* APPLE LOCAL AltiVec */ \
/* lose the NON_SPECIAL_REGS here */ \
{ 0x00000000, 0x00000000, 0x00000001, 0x00000000 }, /* MQ_REGS */ \
{ 0x00000000, 0x00000000, 0x00000002, 0x00000000 }, /* LINK_REGS */ \
1.114 +3 -2 gcc3/gcc/cp/decl.c
Index: decl.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cp/decl.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- decl.c 2002/08/27 22:54:38 1.113
+++ decl.c 2002/09/02 03:50:02 1.114
@@ -6871,7 +6871,8 @@
/* Warn if a function in the namespace for users
is used without an occasion to consider it declared. */
- /* APPLE LOCAL AltiVec AltiVec builtins are always "declared". */
+ /* APPLE LOCAL AltiVec */
+ /* AltiVec builtins are always "declared". */
if (class != BUILT_IN_MD && (name[0] != '_' || name[1] != '_'))
DECL_ANTICIPATED (decl) = 1;
@@ -10645,7 +10646,7 @@
RIDBIT_RESET (RID_LONG, specbits);
type = build_qualified_type (long_double_type_node,
cp_type_quals (type));
- /* APPLE LOCAL long double dpatel */
+ /* APPLE LOCAL -Wlong-double dpatel */
warn_about_long_double ();
}
1.89 +3 -2 gcc3/gcc/cp/decl2.c
Index: decl2.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cp/decl2.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- decl2.c 2002/08/26 20:08:07 1.88
+++ decl2.c 2002/09/02 03:50:02 1.89
@@ -1974,14 +1974,15 @@
else
comdat_linkage (decl);
#if 0 /* APPLE MERGE need a new home for this */
- /* APPLE LOCAL begin coalesce inline member functions */
+ /* APPLE LOCAL begin coalescing */
+ /* coalesce inline member functions */
#ifdef MAKE_DECL_COALESCED
if (DECL_DECLARED_INLINE_P (decl))
{
MAKE_DECL_COALESCED (decl);
}
#endif /* MAKE_DECL_COALESCED */
- /* APPLE LOCAL end coalesce inline member functions */
+ /* APPLE LOCAL end coalescing */
#endif
}
else
1.20 +3 -2 gcc3/gcc/cp/method.c
Index: method.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cp/method.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- method.c 2002/08/26 05:41:00 1.19
+++ method.c 2002/09/02 03:50:02 1.20
@@ -400,14 +400,15 @@
return;
}
- /* APPLE LOCAL begin coalesce thunks */
+ /* APPLE LOCAL begin coalescing */
+ /* coalesce thunks */
#if defined(DECL_PRIVATE_EXTERN) && defined(COALESCE_STATIC_THUNK)
DECL_PRIVATE_EXTERN (thunk_fndecl) = DECL_PRIVATE_EXTERN (function);
if (DECL_PRIVATE_EXTERN (function) || !TREE_PUBLIC (function) || DECL_INLINE
(function))
COALESCE_STATIC_THUNK (thunk_fndecl, /* public*/ 0);
#endif /* DECL_PRIVATE_EXTERN && COALESCE_STATIC_THUNK */
- /* APPLE LOCAL end coalesce thunks */
+ /* APPLE LOCAL end coalescing */
push_to_top_level ();
1.12 +6 -4 gcc3/gcc/cp/rtti.c
Index: rtti.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/cp/rtti.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rtti.c 2002/08/17 19:17:53 1.11
+++ rtti.c 2002/09/02 03:50:03 1.12
@@ -755,11 +755,12 @@
DECL_EXTERNAL (name_decl) = 0;
TREE_PUBLIC (name_decl) = 1;
comdat_linkage (name_decl);
- /* APPLE LOCAL begin coalesce typeinfo */
+ /* APPLE LOCAL begin coalescing */
+ /* coalesce typeinfo */
#ifdef MAKE_DECL_COALESCED
MAKE_DECL_COALESCED (name_decl);
#endif /* MAKE_DECL_COALESCED */
- /* APPLE LOCAL end coalesce typeinfo */
+ /* APPLE LOCAL end coalescing */
/* External name of the string containing the type's name has a
special name. */
@@ -1161,12 +1162,13 @@
TREE_PUBLIC (decl) = 1;
if (flag_weak || !typeinfo_in_lib_p (target_type))
comdat_linkage (decl);
- /* APPLE LOCAL begin coalesce typeinfo */
+ /* APPLE LOCAL begin coalescing */
+ /* coalesce typeinfo */
#ifdef MAKE_DECL_COALESCED
if (!typeinfo_in_lib_p (target_type))
MAKE_DECL_COALESCED (decl);
#endif /* MAKE_DECL_COALESCED */
- /* APPLE LOCAL end coalesce typeinfo */
+ /* APPLE LOCAL end coalescing */
}
SET_DECL_ASSEMBLER_NAME (decl, name);
DECL_INITIAL (decl) = init;
