shebs       02/09/01 20:45:56

  Modified:    gcc      c-common.c c-common.h c-decl.c c-lex.c c-opts.c
                        cppexp.c cppinit.c cpplex.c cpplib.h dmp-tree.c
                        dwarf2out.c gcc.c print-tree.c toplev.c
                        tree-inline.c tree.h varasm.c
  Log:
  Fix -Wfour-char-constants and -Wextra-tokens bugs revealed
  by testsuite, remove no-longer-needed -funsigned-char local
  change, make more local markers consistent.
  
  Revision  Changes    Path
  1.76      +4 -15     gcc3/gcc/c-common.c
  
  Index: c-common.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/c-common.c,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- c-common.c        2002/08/27 22:54:36     1.75
  +++ c-common.c        2002/09/02 03:45:48     1.76
  @@ -361,16 +361,6 @@
   int warn_altivec_long_deprecated = 1; /* radar 2841709 */
   /* APPLE LOCAL end AltiVec */
   
  -/* APPLE LOCAL begin -Wfour-char-constants  */
  -/* Nonzero means warn about 'abcd' type constants (eg, MacOS OSTypes.)  */
  -
  -#ifndef WARN_FOUR_CHAR_CONSTANTS
  -#define WARN_FOUR_CHAR_CONSTANTS 1
  -#endif
  -
  -int warn_four_char_constants = WARN_FOUR_CHAR_CONSTANTS;
  -/* APPLE LOCAL end -Wfour-char-constants  */
  -
   /* C/ObjC language option variables.  */
   
   
  @@ -716,14 +706,14 @@
      This is a count, since unevaluated expressions can nest.  */
   int skip_evaluation;
   
  -/* APPLE LOCAL begin long double */
  +/* APPLE LOCAL begin -Wlong-double */
   /* Nonzero means warn about usage of long double.  */
   #ifdef CONFIG_DARWIN_H
   int warn_long_double = 1;
   #else
   int warn_long_double = 0;
   #endif
  -/* APPLE LOCAL end long double */
  +/* APPLE LOCAL end -Wlong-double */
   
   /* APPLE LOCAL begin constant cfstrings */
   static void create_cfstring_template PARAMS ((void));
  @@ -6732,9 +6722,8 @@
   
     (*callback) (ctx, param, param_num);
   }
  -
  -/* APPLE LOCAL begin long double dpatel */
   
  +/* APPLE LOCAL begin -Wlong-double dpatel */
   void
   warn_about_long_double ()
   {
  @@ -6758,7 +6747,7 @@
         warned_about_long_double = 1;
       }       
   }
  -/* APPLE LOCAL end long double dpatel */
  +/* APPLE LOCAL end -Wlong-double dpatel */
   
   /* APPLE LOCAL begin constant cfstrings */
   
  
  
  
  1.56      +3 -8      gcc3/gcc/c-common.h
  
  Index: c-common.h
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/c-common.h,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- c-common.h        2002/08/26 20:07:58     1.55
  +++ c-common.h        2002/09/02 03:45:48     1.56
  @@ -487,11 +487,11 @@
   
   extern int warn_long_long;
   
  -/* APPLE LOCAL begin long double */
  +/* APPLE LOCAL begin -Wlong-double */
   /* Nonzero means warn about usage of long double.  */
   
   extern int warn_long_double;
  -/* APPLE LOCAL end long double */
  +/* APPLE LOCAL end -Wlong-double */
   
   /* APPLE LOCAL begin AltiVec */
   /* Nonzero means warn about deprecated use of 'long' vector types.  */
  @@ -525,11 +525,6 @@
   
   extern int warn_unknown_pragmas; /* Tri state variable.  */  
   
  -/* APPLE LOCAL  -Wfour-char-constants  */
  -/* Warn about four-char literals (e.g., MacOS-style OSTypes: 'APPL'.)  */
  -
  -extern int warn_four_char_constants;
  -
   /* Warn about format/argument anomalies in calls to formatted I/O functions
      (*printf, *scanf, strftime, strfmon, etc.).  */
   
  @@ -1336,7 +1331,7 @@
   extern tree lookup_objc_ivar                 PARAMS ((tree));
   /* APPLE LOCAL end Objective-C++  */
   
  -/* APPLE LOCAL long double  */
  +/* APPLE LOCAL -Wlong-double  */
   extern void warn_about_long_double           PARAMS ((void));
   
   /* APPLE LOCAL begin constant cfstrings */
  
  
  
  1.117     +1 -1      gcc3/gcc/c-decl.c
  
  Index: c-decl.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/c-decl.c,v
  retrieving revision 1.116
  retrieving revision 1.117
  diff -u -r1.116 -r1.117
  --- c-decl.c  2002/08/26 05:39:27     1.116
  +++ c-decl.c  2002/09/02 03:45:49     1.117
  @@ -3862,7 +3862,7 @@
       {
         specbits &= ~(1 << (int) RID_LONG);
         type = long_double_type_node;
  -      /* APPLE LOCAL long double dpatel */
  +      /* APPLE LOCAL -Wlong-double dpatel */
         warn_about_long_double ();
       }
   
  
  
  
  1.41      +0 -4      gcc3/gcc/c-lex.c
  
  Index: c-lex.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/c-lex.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- c-lex.c   2002/08/26 05:39:28     1.40
  +++ c-lex.c   2002/09/02 03:45:49     1.41
  @@ -1121,10 +1121,6 @@
     int unsignedp;
   
     result = cpp_interpret_charconst (parse_in, token,
  -                                 /* APPLE LOCAL -Wfour-char-constants */
  -                                 warn_four_char_constants,
  -                                 /* APPLE LOCAL -funsigned-char */
  -                                 TREE_UNSIGNED (char_type_node),
                                    &chars_seen, &unsignedp);
   
     /* Cast to cppchar_signed_t to get correct sign-extension of RESULT
  
  
  
  1.4       +2 -2      gcc3/gcc/c-opts.c
  
  Index: c-opts.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/c-opts.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- c-opts.c  2002/08/26 20:07:58     1.3
  +++ c-opts.c  2002/09/02 03:45:49     1.4
  @@ -717,7 +717,7 @@
   
         /* APPLE LOCAL begin -Wno-#warnings */
       case OPT_Wpound_warnings:
  -      cpp_opts->no_pound_warnings = on;
  +      cpp_opts->no_pound_warnings = !on;
         break;
         /* APPLE LOCAL end -Wno-#warnings */
   
  @@ -874,7 +874,7 @@
   
         /* APPLE LOCAL begin -Wfour-char-constants */
       case OPT_Wfour_char_constants:
  -      warn_four_char_constants = on;
  +      cpp_opts->warn_four_char_constants = on;
         break;
         /* APPLE LOCAL end -Wfour-char-constants */
   
  
  
  
  1.17      +0 -3      gcc3/gcc/cppexp.c
  
  Index: cppexp.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/cppexp.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- cppexp.c  2002/08/26 05:39:31     1.16
  +++ cppexp.c  2002/09/02 03:45:49     1.17
  @@ -562,9 +562,6 @@
       case CPP_CHAR:
         {
        cppchar_t cc = cpp_interpret_charconst (pfile, token,
  -                                             /* APPLE LOCAL -Wfour-char-constants */
  -                                             /* APPLE LOCAL -funsigned-char */
  -                                             1, 1,
                                                &temp, &unsignedp);
   
        result.high = 0;
  
  
  
  1.71      +11 -5     gcc3/gcc/cppinit.c
  
  Index: cppinit.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/cppinit.c,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- cppinit.c 2002/08/27 22:54:36     1.70
  +++ cppinit.c 2002/09/02 03:45:49     1.71
  @@ -610,10 +610,10 @@
     pfile = (cpp_reader *) xcalloc (1, sizeof (cpp_reader));
   
     cpp_set_lang (pfile, lang);
  -  /* APPLE LOCAL begin #import 2001-07-26 zll */
  +  /* APPLE LOCAL begin #import not deprecated 2001-07-26 zll */
     /* #import is *not* deprecated on Mac OS X :).  */
     CPP_OPTION (pfile, warn_import) = 0;
  -  /* APPLE LOCAL end #import 2001-07-26 zll */
  +  /* APPLE LOCAL end #import not deprecated 2001-07-26 zll */
     /* APPLE LOCAL begin -Wpragma-once 2001-08-01 sts */
     /* Suppress #pragma once warnings by default, so more Apple builds
        succeed.  */
  @@ -621,19 +621,26 @@
     /* APPLE LOCAL end -Wpragma-once 2001-08-01 sts */
     /* APPLE LOCAL begin -Wextra-tokens 2001-08-01 sts */
     /* Suppress warnings about extra tokens after #endif etc.  */
  -  CPP_OPTION (pfile, warn_extra_tokens) = 1;
  +  CPP_OPTION (pfile, warn_extra_tokens) = 0;
     /* APPLE LOCAL end -Wextra-tokens 2001-08-01 sts */
     /* APPLE LOCAL begin -Wnewline-eof 2001-08-23 sts */
     /* Suppress warnings about missing newlines at ends of files.  */
     CPP_OPTION (pfile, warn_newline_at_eof) = 0;
     /* APPLE LOCAL end -Wnewline-eof 2001-08-23 sts */
  +  /* APPLE LOCAL begin -Wfour-char-constants  */
  +  /* Warn about 4-char constants everywhere except on Macs.  */
  +  CPP_OPTION (pfile, warn_four_char_constants) = WARN_FOUR_CHAR_CONSTANTS;
  +  /* APPLE LOCAL end -Wfour-char-constants  */
     CPP_OPTION (pfile, warn_multichar) = 1;
     CPP_OPTION (pfile, discard_comments) = 1;
     CPP_OPTION (pfile, discard_comments_in_macro_exp) = 1;
     CPP_OPTION (pfile, show_column) = 1;
     CPP_OPTION (pfile, tabstop) = 8;
     CPP_OPTION (pfile, operator_names) = 1;
  -  CPP_OPTION (pfile, warn_endif_labels) = 1;
  +  /* APPLE LOCAL begin -Wextra-tokens */
  +  /* Suppress warnings about extra tokens after #endif etc.  */
  +  CPP_OPTION (pfile, warn_endif_labels) = 0;
  +  /* APPLE LOCAL end -Wextra-tokens */
     CPP_OPTION (pfile, warn_long_long) = !CPP_OPTION (pfile, c99);
   
     CPP_OPTION (pfile, pending) =
  @@ -1349,7 +1356,6 @@
     DEF_OPT("D",                        no_mac, OPT_D)                          \
     /* APPLE LOCAL framework headers */  \
     DEF_OPT("F",                        no_dir, OPT_F)                          \
  -  DEF_OPT("H",                        0,      OPT_H)                          \
     DEF_OPT("I",                        no_dir, OPT_I)                          \
     DEF_OPT("U",                        no_mac, OPT_U)                          \
     /* APPLE LOCAL fat builds */  \
  
  
  
  1.43      +6 -14     gcc3/gcc/cpplex.c
  
  Index: cpplex.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/cpplex.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- cpplex.c  2002/08/26 20:07:59     1.42
  +++ cpplex.c  2002/09/02 03:45:49     1.43
  @@ -1934,15 +1934,9 @@
      characters seen, and UNSIGNEDP to a variable that indicates whether
      the result has signed type.  */
   cppchar_t
  -/* APPLE LOCAL -Wfour-char-constants */
  -/* APPLE LOCAL -funsigned-char */
  -cpp_interpret_charconst (pfile, token, warn_four, force_unsigned, pchars_seen, 
unsignedp)
  +cpp_interpret_charconst (pfile, token, pchars_seen, unsignedp)
        cpp_reader *pfile;
        const cpp_token *token;
  -     /* APPLE LOCAL -Wfour-char-constants */
  -     int warn_four;
  -     /* APPLE LOCAL -funsigned-char */
  -     int force_unsigned;
        unsigned int *pchars_seen;
        int *unsignedp;
   {
  @@ -2029,13 +2023,12 @@
          cpp_error (pfile, DL_WARNING,
                     "character constant too long for its type");
        }
  -      else if (CPP_OPTION (pfile, warn_multichar))
  +      /* APPLE LOCAL begin -Wfour-char-constants */
  +      else if ((chars_seen == 4 && CPP_OPTION (pfile, warn_four_char_constants))
  +            || (chars_seen != 4 && CPP_OPTION (pfile, warn_multichar)))
  +     /* APPLE LOCAL end -Wfour-char-constants */
        cpp_error (pfile, DL_WARNING, "multi-character character constant");
       }
  -  /* APPLE LOCAL begin -Wfour-char-constants */
  -  else if (chars_seen > 1 && (warn_four || chars_seen != 4))
  -    cpp_error (pfile, DL_WARNING, "multi-character character constant");
  -  /* APPLE LOCAL end -Wfour-char-constants */
   
     /* Sign-extend or truncate the constant to cppchar_t.  The value is
        in WIDTH bits, but for multi-char charconsts it's value is the
  @@ -2045,8 +2038,7 @@
     if (width < BITS_PER_CPPCHAR_T)
       {
         mask = ((cppchar_t) 1 << width) - 1;
  -      /* APPLE LOCAL -funsigned-char */
  -      if (force_unsigned || unsigned_p || !(result & (1 << (width - 1))))
  +      if (unsigned_p || !(result & (1 << (width - 1))))
        result &= mask;
         else
        result |= ~mask;
  
  
  
  1.33      +7 -3      gcc3/gcc/cpplib.h
  
  Index: cpplib.h
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/cpplib.h,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- cpplib.h  2002/08/26 05:39:32     1.32
  +++ cpplib.h  2002/09/02 03:45:50     1.33
  @@ -330,6 +330,13 @@
     /* Nonzero means warn if no newline at end of file.  */
     unsigned char warn_newline_at_eof;
     /* APPLE LOCAL end -Wnewline-eof 2001-08-23 sts */
  +  /* APPLE LOCAL begin -Wfour-char-constants  */
  +  /* Warn about four-char literals (e.g., MacOS-style OSTypes: 'APPL').  */
  +#ifndef WARN_FOUR_CHAR_CONSTANTS
  +#define WARN_FOUR_CHAR_CONSTANTS 1
  +#endif
  +  unsigned char warn_four_char_constants;
  +  /* APPLE LOCAL end -Wfour-char-constants  */
   
     /* Nonzero means warn about multicharacter charconsts.  */
     unsigned char warn_multichar;
  @@ -617,9 +624,6 @@
   /* Evaluate a CPP_CHAR or CPP_WCHAR token.  */
   extern cppchar_t
   cpp_interpret_charconst PARAMS ((cpp_reader *, const cpp_token *,
  -                              /* APPLE LOCAL -Wfour-char-constants */
  -                              /* APPLE LOCAL -funsigned-char */
  -                              int, int,
                                 unsigned int *, int *));
   
   /* Used to register builtins during the register_builtins callback.
  
  
  
  1.66      +1 -4      gcc3/gcc/dmp-tree.c
  
  Index: dmp-tree.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/dmp-tree.c,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- dmp-tree.c        2002/08/08 03:19:51     1.65
  +++ dmp-tree.c        2002/09/02 03:45:50     1.66
  @@ -628,7 +628,7 @@
         /* APPLE LOCAL private extern */
         if (DECL_PRIVATE_EXTERN (node))
        fputs (" pvt-ext", file);
  -      /* APPLE LOCAL coalesced */
  +      /* APPLE LOCAL coalescing */
         if (DECL_COALESCED (node))
        fputs (" coal", file);
         /* APPLE LOCAL begin weak_import (Radar 2809704) ilr */
  @@ -1119,10 +1119,8 @@
       fputs (" protected", file);
     if (TREE_BOUNDED (node))
       fputs (" bounded", file);
  -  /* APPLE LOCAL begin deprecated (Radar 2637521) ilr */
     if (TREE_DEPRECATED (node))
       fputs (" deprecated", file);
  -  /* APPLE LOCAL end deprecated ilr */
     /* APPLE LOCAL begin unavailable (Radar 2809697) ilr */
     if (TREE_UNAVAILABLE (node))
       fputs (" unavailable", file);
  @@ -1655,7 +1653,6 @@
     dump_tree (file, "(imag)", TREE_IMAGPART (node), indent + INDENT);
   }
   
  -/* APPLE LOCAL: AltiVec */
   static void
   print_VECTOR_CST (file, annotation, node, indent)
        FILE *file;
  
  
  
  1.49      +3 -2      gcc3/gcc/dwarf2out.c
  
  Index: dwarf2out.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/dwarf2out.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- dwarf2out.c       2002/08/26 05:39:33     1.48
  +++ dwarf2out.c       2002/09/02 03:45:50     1.49
  @@ -1705,12 +1705,13 @@
         break;
   
       default:
  -      /* APPLE LOCAL begin AltiVec shenanigans (VRsave)  */
  +      /* APPLE LOCAL begin AltiVec */
  +      /* shenanigans with VRsave */
   #ifdef TARGET_ALTIVEC
         if (GET_CODE (dest) == UNSPEC_VOLATILE && flag_altivec)
        return;
   #endif
  -      /* APPLE LOCAL end AltiVec shenanigans (VRsave)  */
  +      /* APPLE LOCAL end AltiVec */
         abort ();
       }
   }
  
  
  
  1.141     +2 -2      gcc3/gcc/gcc.c
  
  Index: gcc.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/gcc.c,v
  retrieving revision 1.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- gcc.c     2002/08/26 20:07:59     1.140
  +++ gcc.c     2002/09/02 03:45:50     1.141
  @@ -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) \
  -  %{W*} %{fdebug-gen-index}";
  +  %{W*} %{funsigned-char:-D__CHAR_UNSIGNED__} %{fdebug-gen-index}";
   /* APPLE LOCAL end cpp-precomp */
   
   static const char *cpp_unique_options =
  @@ -1055,7 +1055,7 @@
     {".i", "@cpp-output", 0},
     {"@cpp-output",
      "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) 
%{!fsyntax-only:%(invoke_as)}}}}", 0},
  -  /* APPLE LOCAL preprocess .s files as well as .S 2001-07-24 sts */
  +  /* APPLE LOCAL preprocess .s files 2001-07-24 sts */
     /* This is kind of lame; the purpose of having .s and .S be treated
        differently is so that we can control whether to run the
        preprocessor on assembly files.  The standard behavior would
  
  
  
  1.21      +1 -1      gcc3/gcc/print-tree.c
  
  Index: print-tree.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/print-tree.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- print-tree.c      2002/08/26 05:39:40     1.20
  +++ print-tree.c      2002/09/02 03:45:51     1.21
  @@ -333,7 +333,7 @@
         /* APPLE LOCAL private extern */
         if (DECL_PRIVATE_EXTERN (node))
        fputs (" private_extern", file);
  -      /* APPLE LOCAL coalesced */
  +      /* APPLE LOCAL coalescing */
         if (DECL_COALESCED (node))
        fputs (" coalesced", file);
   
  
  
  
  1.152     +3 -0      gcc3/gcc/toplev.c
  
  Index: toplev.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/toplev.c,v
  retrieving revision 1.151
  retrieving revision 1.152
  diff -u -r1.151 -r1.152
  --- toplev.c  2002/08/29 01:34:25     1.151
  +++ toplev.c  2002/09/02 03:45:51     1.152
  @@ -5903,6 +5903,9 @@
   
     /* 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.28      +1 -1      gcc3/gcc/tree-inline.c
  
  Index: tree-inline.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/tree-inline.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- tree-inline.c     2002/08/26 05:39:49     1.27
  +++ tree-inline.c     2002/09/02 03:45:51     1.28
  @@ -35,7 +35,7 @@
   #include "hashtab.h"
   #include "splay-tree.h"
   #include "langhooks.h"
  -/* APPLE LOCAL for rs6000-protos.h */
  +/* APPLE LOCAL AltiVec */
   #include "tm_p.h"
   
   /* This should be eventually be generalized to other languages, but
  
  
  
  1.55      +2 -2      gcc3/gcc/tree.h
  
  Index: tree.h
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/tree.h,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- tree.h    2002/08/26 05:39:49     1.54
  +++ tree.h    2002/09/02 03:45:51     1.55
  @@ -1737,7 +1737,7 @@
   /* APPLE LOCAL private extern */
   #define DECL_PRIVATE_EXTERN(NODE) (DECL_CHECK (NODE)->decl.private_extern_flag)
   
  -/* APPLE LOCAL coalesced  */
  +/* APPLE LOCAL coalescing  */
   /* "coalesced" symbols are similar to, but have more restrictions than,
      ELF-style "weak" symbols.  */
   #define DECL_COALESCED(NODE) (DECL_CHECK (NODE)->decl.coalesced_flag)
  @@ -1851,7 +1851,7 @@
     unsigned weak_import_flag : 1;
     /* APPLE LOCAL private extern */
     unsigned private_extern_flag : 1;
  -  /* APPLE LOCAL coalesced  */
  +  /* APPLE LOCAL coalescing  */
     unsigned coalesced_flag : 1;
     /* APPLE MERGE this is probably bad :-) */
     /* Minus 1 unused bits.  */
  
  
  
  1.79      +10 -9     gcc3/gcc/varasm.c
  
  Index: varasm.c
  ===================================================================
  RCS file: /cvs/Darwin/gcc3/gcc/varasm.c,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- varasm.c  2002/08/26 05:39:50     1.78
  +++ varasm.c  2002/09/02 03:45:52     1.79
  @@ -1696,10 +1696,10 @@
     /* APPLE LOCAL begin zerofill turly 20020218  */
   #ifdef ASM_OUTPUT_ZEROFILL
     /* We need a ZEROFILL COALESCED option!  */
  -  /* APPLE LOCAL coalescing */
  -  if (! DECL_COALESCED (decl))
     if (flag_no_common
         && ! dont_output_data
  +      /* APPLE LOCAL coalescing */
  +      && ! DECL_COALESCED (decl)
         && (DECL_INITIAL (decl) == 0 || DECL_INITIAL (decl) == error_mark_node))
       {
         ASM_OUTPUT_ZEROFILL (asm_out_file, name,
  @@ -1712,7 +1712,6 @@
         return;
       }
   #endif
  -
     /* APPLE LOCAL end zerofill turly 20020218  */
   
     /* dbxout.c needs to know this.  */
  @@ -2239,7 +2238,8 @@
   }
   
   /* We do RTX_UNSPEC + XINT (blah), so nothing can go after RTX_UNSPEC.  */
  -/* APPLE LOCAL AltiVec, rearrange so >RTX_DOUBLE works */
  +/* APPLE LOCAL AltiVec */
  +/* rearrange so >RTX_DOUBLE works */
   enum kind { RTX_UNKNOWN, RTX_VECTOR, RTX_DOUBLE, RTX_INT, RTX_UNSPEC };
   struct rtx_const GTY(())
   {
  @@ -2259,7 +2259,8 @@
     } GTY ((desc ("%1.kind >= RTX_INT"), descbits ("1"))) un;
   };
   #if 0
  -    /* APPLE LOCAL AltiVec, fix so store into vechi[] doesn't clobber veclo[] */
  +/* APPLE LOCAL AltiVec */
  +/* fix so store into vechi[] doesn't clobber veclo[] */
       struct {HOST_WIDE_INT veclo, vechi; } vec[16];
   #endif
   /* Uniquize all constants that appear in memory.
  @@ -3145,7 +3146,7 @@
            if (GET_MODE_CLASS (mode) == MODE_VECTOR_INT)
              {
   #if 0 /* APPLE FIXME */              
  -             /* APPLE LOCAL AltiVec data structure changed */
  +             /* APPLE LOCAL AltiVec */
                value->un.vec[i].veclo = (HOST_WIDE_INT) INTVAL (elt);
                value->un.vec[i].vechi = 0;
   #endif
  @@ -3153,7 +3154,7 @@
            else if (GET_MODE_CLASS (mode) == MODE_VECTOR_FLOAT)
              {
   #if 0 /* APPLE FIXME */              
  -             /* APPLE LOCAL AltiVec data structure changed */
  +             /* APPLE LOCAL AltiVec */
                value->un.vec[i].veclo = (HOST_WIDE_INT) CONST_DOUBLE_LOW (elt);
                value->un.vec[i].vechi = (HOST_WIDE_INT) CONST_DOUBLE_HIGH (elt);
   #endif
  @@ -4770,7 +4771,7 @@
       }
   #endif
   
  -  /* APPLE LOCAL begin coalesced symbols */
  +  /* APPLE LOCAL begin coalescing */
     /* Weak definitions are used for coalesced symbols.  They're not the
        same thing as weak references.  The naming is unfortunate. */
   #ifdef ASM_WEAK_DEFINITIONIZE_LABEL
  @@ -4789,7 +4790,7 @@
         return;
       }
   #endif /* ASM_PRIVATE_EXTERNIZE_LABEL */
  -  /* APPLE LOCAL end coalesced symbols */
  +  /* APPLE LOCAL end coalescing */
   
     (*targetm.asm_out.globalize_label) (asm_out_file, name);
   }
  
  
  


Reply via email to