non-gcc: Remove trailing whitespace

I've tried to build stage3 with
-Wleading-whitespace=blanks -Wtrailing-whitespace=blank -Wno-error=leading-whitespace=blanks -Wno-error=trailing-whitespace=blank
added to STRICT_WARN and that expectably resulted in about
2744 unique trailing whitespace warnings and 124837 leading whitespace
warnings when excluding *.md files (which obviously is in big part a
generator issue).  Others from that are generator related, I think those
need to be solved later.

The following patch just fixes up the easy case (trailing whitespace),
which could be easily automated:
for i in `find . -name \*.h -o -name \*.cc -o -name \*.c | xargs grep -l '[ 	]$' | grep -v testsuite/`; do sed -i -e 's/[ 	]*$//' $i; done
I've excluded files which I knew are obviously generated or go FE.

Is there anything else we'd want to avoid the changes?

Due to patch size, I've split it between gcc/ part
and rest (include/, libiberty/, libgcc/, libcpp/, libstdc++-v3/;
this part).

2024-10-24  Jakub Jelinek  <jakub@redhat.com>

include/
	* dyn-string.h: Remove trailing whitespace.
	* libiberty.h: Likewise.
	* xregex.h: Likewise.
	* splay-tree.h: Likewise.
	* partition.h: Likewise.
	* plugin-api.h: Likewise.
	* demangle.h: Likewise.
	* vtv-change-permission.h: Likewise.
	* fibheap.h: Likewise.
	* hsa_ext_image.h: Likewise.
	* hashtab.h: Likewise.
	* libcollector.h: Likewise.
	* sort.h: Likewise.
	* symcat.h: Likewise.
	* hsa_ext_amd.h: Likewise.
libcpp/
	* directives.cc: Remove trailing whitespace.
	* mkdeps.cc: Likewise.
	* line-map.cc: Likewise.
	* internal.h: Likewise.
	* files.cc: Likewise.
	* init.cc: Likewise.
	* makeucnid.cc: Likewise.
	* system.h: Likewise.
	* include/line-map.h: Likewise.
	* include/symtab.h: Likewise.
	* include/cpplib.h: Likewise.
	* expr.cc: Likewise.
	* charset.cc: Likewise.
	* macro.cc: Likewise.
	* errors.cc: Likewise.
	* lex.cc: Likewise.
	* traditional.cc: Likewise.
libgcc/
	* crtstuff.c: Remove trailing whitespace.
	* libgcov.h: Likewise.
	* config/alpha/crtfastmath.c: Likewise.
	* config/alpha/vms-gcc_shell_handler.c: Likewise.
	* config/alpha/vms-unwind.h: Likewise.
	* config/pa/linux-atomic.c: Likewise.
	* config/pa/linux-unwind.h: Likewise.
	* config/pa/quadlib.c: Likewise.
	* config/pa/fptr.c: Likewise.
	* config/s390/32/_fixsfdi.c: Likewise.
	* config/s390/32/_fixunssfdi.c: Likewise.
	* config/s390/32/_fixunsdfdi.c: Likewise.
	* config/c6x/pr-support.c: Likewise.
	* config/lm32/_udivsi3.c: Likewise.
	* config/lm32/libgcc_lm32.h: Likewise.
	* config/lm32/_udivmodsi4.c: Likewise.
	* config/lm32/_mulsi3.c: Likewise.
	* config/lm32/_modsi3.c: Likewise.
	* config/lm32/_umodsi3.c: Likewise.
	* config/lm32/_divsi3.c: Likewise.
	* config/darwin-crt3.c: Likewise.
	* config/msp430/mpy.c: Likewise.
	* config/ia64/tf-signs.c: Likewise.
	* config/ia64/fde-vms.c: Likewise.
	* config/ia64/unwind-ia64.c: Likewise.
	* config/ia64/vms-unwind.h: Likewise.
	* config/ia64/sfp-exceptions.c: Likewise.
	* config/ia64/quadlib.c: Likewise.
	* config/ia64/unwind-ia64.h: Likewise.
	* config/rl78/vregs.h: Likewise.
	* config/arm/bpabi.c: Likewise.
	* config/arm/unwind-arm.c: Likewise.
	* config/arm/pr-support.c: Likewise.
	* config/arm/linux-atomic.c: Likewise.
	* config/arm/bpabi-lib.h: Likewise.
	* config/frv/frvend.c: Likewise.
	* config/frv/cmovw.c: Likewise.
	* config/frv/frvbegin.c: Likewise.
	* config/frv/cmovd.c: Likewise.
	* config/frv/cmovh.c: Likewise.
	* config/aarch64/cpuinfo.c: Likewise.
	* config/i386/crtfastmath.c: Likewise.
	* config/i386/cygming-crtend.c: Likewise.
	* config/i386/32/tf-signs.c: Likewise.
	* config/i386/crtprec.c: Likewise.
	* config/i386/sfp-exceptions.c: Likewise.
	* config/i386/w32-unwind.h: Likewise.
	* config/m32r/initfini.c: Likewise.
	* config/sparc/crtfastmath.c: Likewise.
	* config/gcn/amdgcn_veclib.h: Likewise.
	* config/nios2/linux-atomic.c: Likewise.
	* config/nios2/linux-unwind.h: Likewise.
	* config/nios2/lib2-mul.c: Likewise.
	* config/nios2/lib2-nios2.h: Likewise.
	* config/xtensa/unwind-dw2-xtensa.c: Likewise.
	* config/rs6000/darwin-fallback.c: Likewise.
	* config/rs6000/ibm-ldouble.c: Likewise.
	* config/rs6000/sfp-machine.h: Likewise.
	* config/rs6000/darwin-asm.h: Likewise.
	* config/rs6000/darwin-crt2.c: Likewise.
	* config/rs6000/aix-unwind.h: Likewise.
	* config/rs6000/sfp-exceptions.c: Likewise.
	* config/gthr-vxworks.c: Likewise.
	* config/riscv/atomic.c: Likewise.
	* config/visium/memcpy.c: Likewise.
	* config/darwin-crt-tm.c: Likewise.
	* config/stormy16/lib2funcs.c: Likewise.
	* config/arc/ieee-754/divtab-arc-sf.c: Likewise.
	* config/arc/ieee-754/divtab-arc-df.c: Likewise.
	* config/arc/initfini.c: Likewise.
	* config/sol2/gmon.c: Likewise.
	* config/microblaze/divsi3_table.c: Likewise.
	* config/m68k/fpgnulib.c: Likewise.
	* libgcov-driver.c: Likewise.
	* unwind-dw2.c: Likewise.
	* fp-bit.c: Likewise.
	* dfp-bit.h: Likewise.
	* dfp-bit.c: Likewise.
	* libgcov-driver-system.c: Likewise.
libgcc/config/libbid/
	* _le_td.c: Remove trailing whitespace.
	* bid128_compare.c: Likewise.
	* bid_div_macros.h: Likewise.
	* bid64_to_bid128.c: Likewise.
	* bid64_to_uint32.c: Likewise.
	* bid128_to_uint64.c: Likewise.
	* bid64_div.c: Likewise.
	* bid128_round_integral.c: Likewise.
	* bid_binarydecimal.c: Likewise.
	* bid128_string.c: Likewise.
	* bid_flag_operations.c: Likewise.
	* bid128_to_int64.c: Likewise.
	* _mul_sd.c: Likewise.
	* bid64_mul.c: Likewise.
	* bid128_noncomp.c: Likewise.
	* _gt_dd.c: Likewise.
	* bid64_add.c: Likewise.
	* bid64_string.c: Likewise.
	* bid_from_int.c: Likewise.
	* bid128.c: Likewise.
	* _ge_dd.c: Likewise.
	* _ne_sd.c: Likewise.
	* _dd_to_td.c: Likewise.
	* _unord_sd.c: Likewise.
	* bid64_to_uint64.c: Likewise.
	* _gt_sd.c: Likewise.
	* _sd_to_td.c: Likewise.
	* _addsub_td.c: Likewise.
	* _ne_td.c: Likewise.
	* bid_dpd.c: Likewise.
	* bid128_add.c: Likewise.
	* bid128_next.c: Likewise.
	* _lt_sd.c: Likewise.
	* bid64_next.c: Likewise.
	* bid128_mul.c: Likewise.
	* _lt_dd.c: Likewise.
	* _ge_td.c: Likewise.
	* _unord_dd.c: Likewise.
	* bid64_sqrt.c: Likewise.
	* bid_sqrt_macros.h: Likewise.
	* bid64_fma.c: Likewise.
	* _sd_to_dd.c: Likewise.
	* bid_conf.h: Likewise.
	* bid64_noncomp.c: Likewise.
	* bid_gcc_intrinsics.h: Likewise.
	* _gt_td.c: Likewise.
	* _ge_sd.c: Likewise.
	* bid128_minmax.c: Likewise.
	* bid128_quantize.c: Likewise.
	* bid32_to_bid64.c: Likewise.
	* bid_round.c: Likewise.
	* _td_to_sd.c: Likewise.
	* bid_inline_add.h: Likewise.
	* bid128_fma.c: Likewise.
	* _eq_td.c: Likewise.
	* bid32_to_bid128.c: Likewise.
	* bid64_rem.c: Likewise.
	* bid128_2_str_tables.c: Likewise.
	* _mul_dd.c: Likewise.
	* _dd_to_sd.c: Likewise.
	* bid128_div.c: Likewise.
	* _lt_td.c: Likewise.
	* bid64_compare.c: Likewise.
	* bid64_to_int32.c: Likewise.
	* _unord_td.c: Likewise.
	* bid128_rem.c: Likewise.
	* bid_internal.h: Likewise.
	* bid64_to_int64.c: Likewise.
	* _eq_dd.c: Likewise.
	* _td_to_dd.c: Likewise.
	* bid128_to_int32.c: Likewise.
	* bid128_to_uint32.c: Likewise.
	* _ne_dd.c: Likewise.
	* bid64_quantize.c: Likewise.
	* _le_dd.c: Likewise.
	* bid64_round_integral.c: Likewise.
	* _le_sd.c: Likewise.
	* bid64_minmax.c: Likewise.
libgcc/config/avr/libf7/
	* f7-renames.h: Remove trailing whitespace.
libstdc++-v3/
	* include/debug/debug.h: Remove trailing whitespace.
	* include/parallel/base.h: Likewise.
	* include/parallel/types.h: Likewise.
	* include/parallel/settings.h: Likewise.
	* include/parallel/multiseq_selection.h: Likewise.
	* include/parallel/partition.h: Likewise.
	* include/parallel/random_number.h: Likewise.
	* include/parallel/find_selectors.h: Likewise.
	* include/parallel/partial_sum.h: Likewise.
	* include/parallel/list_partition.h: Likewise.
	* include/parallel/search.h: Likewise.
	* include/parallel/algorithmfwd.h: Likewise.
	* include/parallel/random_shuffle.h: Likewise.
	* include/parallel/multiway_mergesort.h: Likewise.
	* include/parallel/sort.h: Likewise.
	* include/parallel/algobase.h: Likewise.
	* include/parallel/numericfwd.h: Likewise.
	* include/parallel/multiway_merge.h: Likewise.
	* include/parallel/losertree.h: Likewise.
	* include/bits/basic_ios.h: Likewise.
	* include/bits/stringfwd.h: Likewise.
	* include/bits/ostream_insert.h: Likewise.
	* include/bits/stl_heap.h: Likewise.
	* include/bits/unordered_map.h: Likewise.
	* include/bits/hashtable_policy.h: Likewise.
	* include/bits/stl_iterator_base_funcs.h: Likewise.
	* include/bits/valarray_before.h: Likewise.
	* include/bits/regex.h: Likewise.
	* include/bits/postypes.h: Likewise.
	* include/bits/stl_iterator.h: Likewise.
	* include/bits/localefwd.h: Likewise.
	* include/bits/stl_algo.h: Likewise.
	* include/bits/ios_base.h: Likewise.
	* include/bits/stl_function.h: Likewise.
	* include/bits/basic_string.h: Likewise.
	* include/bits/hashtable.h: Likewise.
	* include/bits/valarray_after.h: Likewise.
	* include/bits/char_traits.h: Likewise.
	* include/bits/gslice.h: Likewise.
	* include/bits/locale_facets_nonio.h: Likewise.
	* include/bits/mask_array.h: Likewise.
	* include/bits/specfun.h: Likewise.
	* include/bits/random.h: Likewise.
	* include/bits/slice_array.h: Likewise.
	* include/bits/valarray_array.h: Likewise.
	* include/tr1/float.h: Likewise.
	* include/tr1/functional_hash.h: Likewise.
	* include/tr1/math.h: Likewise.
	* include/tr1/hashtable_policy.h: Likewise.
	* include/tr1/stdio.h: Likewise.
	* include/tr1/complex.h: Likewise.
	* include/tr1/stdbool.h: Likewise.
	* include/tr1/stdarg.h: Likewise.
	* include/tr1/inttypes.h: Likewise.
	* include/tr1/fenv.h: Likewise.
	* include/tr1/stdlib.h: Likewise.
	* include/tr1/wchar.h: Likewise.
	* include/tr1/tgmath.h: Likewise.
	* include/tr1/limits.h: Likewise.
	* include/tr1/wctype.h: Likewise.
	* include/tr1/stdint.h: Likewise.
	* include/tr1/ctype.h: Likewise.
	* include/tr1/random.h: Likewise.
	* include/tr1/shared_ptr.h: Likewise.
	* include/ext/mt_allocator.h: Likewise.
	* include/ext/sso_string_base.h: Likewise.
	* include/ext/debug_allocator.h: Likewise.
	* include/ext/vstring_fwd.h: Likewise.
	* include/ext/pointer.h: Likewise.
	* include/ext/pod_char_traits.h: Likewise.
	* include/ext/malloc_allocator.h: Likewise.
	* include/ext/vstring.h: Likewise.
	* include/ext/bitmap_allocator.h: Likewise.
	* include/ext/pool_allocator.h: Likewise.
	* include/ext/type_traits.h: Likewise.
	* include/ext/ropeimpl.h: Likewise.
	* include/ext/codecvt_specializations.h: Likewise.
	* include/ext/throw_allocator.h: Likewise.
	* include/ext/extptr_allocator.h: Likewise.
	* include/ext/atomicity.h: Likewise.
	* include/ext/concurrence.h: Likewise.
	* include/c_compatibility/wchar.h: Likewise.
	* include/c_compatibility/stdint.h: Likewise.
	* include/backward/hash_fun.h: Likewise.
	* include/backward/binders.h: Likewise.
	* include/backward/hashtable.h: Likewise.
	* include/backward/auto_ptr.h: Likewise.
	* libsupc++/eh_arm.cc: Likewise.
	* libsupc++/unwind-cxx.h: Likewise.
	* libsupc++/si_class_type_info.cc: Likewise.
	* libsupc++/vec.cc: Likewise.
	* libsupc++/class_type_info.cc: Likewise.
	* libsupc++/vmi_class_type_info.cc: Likewise.
	* libsupc++/guard_error.cc: Likewise.
	* libsupc++/bad_typeid.cc: Likewise.
	* libsupc++/eh_personality.cc: Likewise.
	* libsupc++/atexit_arm.cc: Likewise.
	* libsupc++/pmem_type_info.cc: Likewise.
	* libsupc++/vterminate.cc: Likewise.
	* libsupc++/eh_terminate.cc: Likewise.
	* libsupc++/bad_cast.cc: Likewise.
	* libsupc++/exception_ptr.h: Likewise.
	* libsupc++/eh_throw.cc: Likewise.
	* libsupc++/bad_alloc.cc: Likewise.
	* libsupc++/nested_exception.cc: Likewise.
	* libsupc++/pointer_type_info.cc: Likewise.
	* libsupc++/pbase_type_info.cc: Likewise.
	* libsupc++/bad_array_new.cc: Likewise.
	* libsupc++/pure.cc: Likewise.
	* libsupc++/eh_exception.cc: Likewise.
	* libsupc++/bad_array_length.cc: Likewise.
	* libsupc++/cxxabi.h: Likewise.
	* libsupc++/guard.cc: Likewise.
	* libsupc++/eh_catch.cc: Likewise.
	* libsupc++/cxxabi_forced.h: Likewise.
	* libsupc++/tinfo.h: Likewise.

17 files changed, 103 insertions, 103 deletions

diff --git a/libcpp/charset.cc b/libcpp/charset.cc
index cc38769..9337fbc 100644
--- a/libcpp/charset.cc
+++ b/libcpp/charset.cc
@@ -1826,7 +1826,7 @@ _cpp_valid_ucn (cpp_reader *pfile, const uchar **pstr,
 		 (int) (str - base), base);
       result = 1;
     }
-  else if (identifier_pos && result == 0x24 
+  else if (identifier_pos && result == 0x24
 	   && CPP_OPTION (pfile, dollars_in_ident)
 	   /* In C++26 when dollars are allowed in identifiers,
 	      we should still reject \u0024 as $ is part of the basic
@@ -2994,7 +2994,7 @@ _cpp_interpret_identifier (cpp_reader *pfile, const uchar *id, size_t len)
   uchar * buf = (uchar *) alloca (len + 1);
   uchar * bufp = buf;
   size_t idp;
-  
+
   for (idp = 0; idp < len; idp++)
     if (id[idp] != '\\')
       *bufp++ = id[idp];
@@ -3060,7 +3060,7 @@ _cpp_interpret_identifier (cpp_reader *pfile, const uchar *id, size_t len)
 	  }
       }
 
-  return CPP_HASHNODE (ht_lookup (pfile->hash_table, 
+  return CPP_HASHNODE (ht_lookup (pfile->hash_table,
 				  buf, bufp - buf, HT_ALLOC));
 }
 
@@ -3101,7 +3101,7 @@ cpp_check_utf8_bom (const char *data, size_t data_length)
    PFILE is only used to generate diagnostics; setting it to NULL suppresses
    diagnostics, and causes a return of NULL if there was any error instead.  */
 
-uchar * 
+uchar *
 _cpp_convert_input (cpp_reader *pfile, const char *input_charset,
 		    uchar *input, size_t size, size_t len,
 		    const unsigned char **buffer_start, off_t *st_size)
diff --git a/libcpp/directives.cc b/libcpp/directives.cc
index 5706c28..0071de5 100644
--- a/libcpp/directives.cc
+++ b/libcpp/directives.cc
@@ -513,7 +513,7 @@ _cpp_handle_directive (cpp_reader *pfile, bool indented)
 	 compiled with -save-temps, we recognize directives in
 	 -fpreprocessed mode only if the # is in column 1.  macro.cc
 	 puts a space in front of any '#' at the start of a macro.
-	 
+
 	 We exclude the -fdirectives-only case because macro expansion
 	 has not been performed yet, and block comments can cause spaces
 	 to precede the directive.  */
@@ -915,8 +915,8 @@ do_include_common (cpp_reader *pfile, enum include_type type)
 
   /* Prevent #include recursion.  */
   if (pfile->line_table->depth >= CPP_OPTION (pfile, max_include_depth))
-    cpp_error (pfile, 
-	       CPP_DL_ERROR, 
+    cpp_error (pfile,
+	       CPP_DL_ERROR,
 	       "%<#include%> nested depth %u exceeds maximum of %u"
 	       " (use %<-fmax-include-depth=DEPTH%> to increase the maximum)",
 	       pfile->line_table->depth,
@@ -1891,7 +1891,7 @@ cpp_register_deferred_pragma (cpp_reader *pfile, const char *space,
       entry->allow_expansion = allow_expansion;
       entry->u.ident = ident;
     }
-}  
+}
 
 /* Register the pragmas the preprocessor itself handles.  */
 void
@@ -2447,7 +2447,7 @@ destringize_and_run (cpp_reader *pfile, const cpp_string *in,
   pfile->directive = save_directive;
 
   /* We always insert at least one token, the directive result.  It'll
-     either be a CPP_PADDING or a CPP_PRAGMA.  In the later case, we 
+     either be a CPP_PADDING or a CPP_PRAGMA.  In the later case, we
      need to insert *all* of the tokens, including the CPP_PRAGMA_EOL.  */
 
   /* If we're not handling the pragma internally, read all of the tokens from
diff --git a/libcpp/errors.cc b/libcpp/errors.cc
index b644c36..2517c17 100644
--- a/libcpp/errors.cc
+++ b/libcpp/errors.cc
@@ -200,7 +200,7 @@ cpp_diagnostic_with_line (cpp_reader * pfile, enum cpp_diagnostic_level level,
 			  const char *msgid, va_list *ap)
 {
   bool ret;
-  
+
   if (!pfile->cb.diagnostic)
     abort ();
   /* Don't override note locations, which will likely make the note
diff --git a/libcpp/expr.cc b/libcpp/expr.cc
index 2a57dc79d..53980f4 100644
--- a/libcpp/expr.cc
+++ b/libcpp/expr.cc
@@ -860,7 +860,7 @@ cpp_classify_number (cpp_reader *pfile, const cpp_token *token,
       if ((result & CPP_N_WIDTH) == CPP_N_LARGE
 	  && CPP_OPTION (pfile, cpp_warn_long_long))
         {
-          const char *message = CPP_OPTION (pfile, cplusplus) 
+          const char *message = CPP_OPTION (pfile, cplusplus)
 				? N_("use of C++11 long long integer constant")
 		                : N_("use of C99 long long integer constant");
 
@@ -1723,7 +1723,7 @@ reduce (cpp_reader *pfile, struct op *top, enum cpp_ttype op)
 	case CPP_OPEN_PAREN:
 	  if (op != CPP_CLOSE_PAREN)
 	    {
-	      cpp_error_with_line (pfile, CPP_DL_ERROR, 
+	      cpp_error_with_line (pfile, CPP_DL_ERROR,
 				   top->token->src_loc,
 				   0, "missing %<)%> in expression");
 	      return 0;
diff --git a/libcpp/files.cc b/libcpp/files.cc
index fbbd59e..c63f582 100644
--- a/libcpp/files.cc
+++ b/libcpp/files.cc
@@ -278,7 +278,7 @@ open_file (_cpp_file *file)
 	/* The call to stat may have reset errno.  */
 	errno = EACCES;
     }
-#endif    
+#endif
   else if (errno == ENOTDIR)
     errno = ENOENT;
 
@@ -375,7 +375,7 @@ maybe_shorter_path (const char * file)
     {
       return file2;
     }
-  else 
+  else
     {
       free (file2);
       return NULL;
@@ -461,7 +461,7 @@ find_file_in_dir (cpp_reader *pfile, _cpp_file *file, bool *invalid_pch,
     }
   else
     {
-      file->err_no = ENOENT; 
+      file->err_no = ENOENT;
       file->path = NULL;
     }
 
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
index b4ff6a9..f2ed087 100644
--- a/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@ -266,7 +266,7 @@ struct GTY(()) cpp_token {
   {
     /* An identifier.  */
     struct cpp_identifier GTY ((tag ("CPP_TOKEN_FLD_NODE"))) node;
-	 
+
     /* Inherit padding from this token.  */
     cpp_token * GTY ((tag ("CPP_TOKEN_FLD_SOURCE"))) source;
 
@@ -325,7 +325,7 @@ enum cpp_normalize_level {
   normalized_none
 };
 
-enum cpp_main_search 
+enum cpp_main_search
 {
   CMS_none,    /* A regular source file.  */
   CMS_header,  /* Is a directly-specified header file (eg PCH or
@@ -477,7 +477,7 @@ struct cpp_options
   /* Nonzero means we're looking at already preprocessed code, so don't
      bother trying to do macro expansion and whatnot.  */
   unsigned char preprocessed;
-  
+
   /* Nonzero means we are going to emit debugging logs during
      preprocessing.  */
   unsigned char debug;
@@ -874,7 +874,7 @@ struct cpp_dir
   /* Is this a user-supplied directory? */
   bool user_supplied_p;
 
-  /* The canonicalized NAME as determined by lrealpath.  This field 
+  /* The canonicalized NAME as determined by lrealpath.  This field
      is only used by hosts that lack reliable inode numbers.  */
   char *canonical_name;
 
@@ -904,7 +904,7 @@ enum cpp_macro_kind {
 /* Each macro definition is recorded in a cpp_macro structure.
    Variadic macros cannot occur with traditional cpp.  */
 struct GTY(()) cpp_macro {
-  union cpp_parm_u 
+  union cpp_parm_u
   {
     /* Parameters, if any.  If parameter names use extended identifiers,
        the original spelling of those identifiers, not the canonical
@@ -1245,7 +1245,7 @@ inline location_t cpp_macro_definition_location (cpp_hashnode *node)
   return macro ? macro->line : 0;
 }
 /* Return an idempotent time stamp (possibly from SOURCE_DATE_EPOCH).  */
-enum class CPP_time_kind 
+enum class CPP_time_kind
 {
   FIXED = -1,	/* Fixed time via source epoch.  */
   DYNAMIC = -2,	/* Dynamic via time(2).  */
@@ -1280,7 +1280,7 @@ extern cppchar_t cpp_host_to_exec_charset (cpp_reader *, cppchar_t);
    The text is the same as the command line argument.  */
 extern void cpp_define (cpp_reader *, const char *);
 extern void cpp_define_unused (cpp_reader *, const char *);
-extern void cpp_define_formatted (cpp_reader *pfile, 
+extern void cpp_define_formatted (cpp_reader *pfile,
 				  const char *fmt, ...) ATTRIBUTE_PRINTF_2;
 extern void cpp_define_formatted_unused (cpp_reader *pfile,
 					 const char *fmt,
diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h
index e6e2b08..732ec5e 100644
--- a/libcpp/include/line-map.h
+++ b/libcpp/include/line-map.h
@@ -392,7 +392,7 @@ struct GTY((tag ("0"), desc ("MAP_ORDINARY_P (&%h) ? 1 : 2"))) line_map {
 
 /* An ordinary line map encodes physical source locations. Those
    physical source locations are called "spelling locations".
-   
+
    Physical source file TO_FILE at line TO_LINE at column 0 is represented
    by the logical START_LOCATION.  TO_LINE+L at column C is represented by
    START_LOCATION+(L*(1<<m_column_and_range_bits))+(C*1<<m_range_bits), as
@@ -457,7 +457,7 @@ struct cpp_hashnode;
 
 /* A macro line map encodes location of tokens coming from a macro
    expansion.
-   
+
    The offset from START_LOCATION is used to index into
    MACRO_LOCATIONS; this holds the original location of the token.  */
 struct GTY((tag ("2"))) line_map_macro : public line_map {
diff --git a/libcpp/include/symtab.h b/libcpp/include/symtab.h
index 16c0edf..67aced8 100644
--- a/libcpp/include/symtab.h
+++ b/libcpp/include/symtab.h
@@ -52,7 +52,7 @@ struct ht
   hashnode *entries;
   /* Call back, allocate a node.  */
   hashnode (*alloc_node) (cpp_hash_table *);
-  /* Call back, allocate something that hangs off a node like a cpp_macro.  
+  /* Call back, allocate something that hangs off a node like a cpp_macro.
      NULL means use the usual allocator.  */
   void * (*alloc_subobject) (size_t);
 
diff --git a/libcpp/init.cc b/libcpp/init.cc
index fff0eb8..c8c466d 100644
--- a/libcpp/init.cc
+++ b/libcpp/init.cc
@@ -883,7 +883,7 @@ read_original_directory (cpp_reader *pfile)
 	  /* Smash the string directly, it's dead at this point  */
 	  char *smashy = (char *)text;
 	  smashy[len - 3] = 0;
-	  
+
 	  pfile->cb.dir_change (pfile, smashy + 1);
 	}
 
diff --git a/libcpp/internal.h b/libcpp/internal.h
index 066652b..9ded9a7 100644
--- a/libcpp/internal.h
+++ b/libcpp/internal.h
@@ -304,7 +304,7 @@ struct spec_nodes
   cpp_hashnode *n__VA_OPT__;		/* C++ vararg macros */
 
   enum {M_EXPORT, M_MODULE, M_IMPORT, M__IMPORT, M_HWM};
-  
+
   /* C++20 modules, only set when module_directives is in effect.
      incoming variants [0], outgoing ones [1] */
   cpp_hashnode *n_modules[M_HWM][2];
@@ -854,7 +854,7 @@ extern size_t _cpp_replacement_text_len (const cpp_macro *);
    It starts initialized to all zeros, and at the end
    'level' is the normalization level of the sequence.  */
 
-struct normalize_state 
+struct normalize_state
 {
   /* The previous starter character.  */
   cppchar_t previous;
diff --git a/libcpp/lex.cc b/libcpp/lex.cc
index 8406c10..4bd4630 100644
--- a/libcpp/lex.cc
+++ b/libcpp/lex.cc
@@ -104,7 +104,7 @@ add_line_note (cpp_buffer *buffer, const uchar *pos, unsigned int type)
    path below.  Since this loop is very hot it's worth doing these kinds
    of optimizations.
 
-   One of the paths through the ifdefs should provide 
+   One of the paths through the ifdefs should provide
 
      const uchar *search_line_fast (const uchar *s, const uchar *end);
 
@@ -168,7 +168,7 @@ static inline word_type
 acc_char_cmp (word_type val, word_type c)
 {
 #if defined(__GNUC__) && defined(__alpha__)
-  /* We can get exact results using a compare-bytes instruction.  
+  /* We can get exact results using a compare-bytes instruction.
      Get (val == c) via (0 >= (val ^ c)).  */
   return __builtin_alpha_cmpbge (0, val ^ c);
 #else
@@ -215,7 +215,7 @@ acc_char_index (word_type cmp ATTRIBUTE_UNUSED,
 }
 
 /* A version of the fast scanner using bit fiddling techniques.
- 
+
    For 32-bit words, one would normally perform 16 comparisons and
    16 branches.  With this algorithm one performs 24 arithmetic
    operations and one branch.  Whether this is faster with a 32-bit
@@ -236,7 +236,7 @@ search_line_acc_char (const uchar *s, const uchar *end ATTRIBUTE_UNUSED)
   unsigned int misalign;
   const word_type *p;
   word_type val, t;
-  
+
   /* Align the buffer.  Mask out any bytes from before the beginning.  */
   p = (word_type *)((uintptr_t)s & -sizeof(word_type));
   val = *p;
@@ -433,20 +433,20 @@ search_line_fast (const uchar *s, const uchar *end ATTRIBUTE_UNUSED)
   typedef __attribute__((altivec(vector))) unsigned char vc;
 
   const vc repl_nl = {
-    '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', 
+    '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n',
     '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n'
   };
   const vc repl_cr = {
-    '\r', '\r', '\r', '\r', '\r', '\r', '\r', '\r', 
+    '\r', '\r', '\r', '\r', '\r', '\r', '\r', '\r',
     '\r', '\r', '\r', '\r', '\r', '\r', '\r', '\r'
   };
   const vc repl_bs = {
-    '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', 
+    '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\',
     '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\'
   };
   const vc repl_qm = {
-    '?', '?', '?', '?', '?', '?', '?', '?', 
-    '?', '?', '?', '?', '?', '?', '?', '?', 
+    '?', '?', '?', '?', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?',
   };
   const vc zero = { 0 };
 
@@ -537,20 +537,20 @@ search_line_fast (const uchar *s, const uchar *end ATTRIBUTE_UNUSED)
   typedef __attribute__((altivec(vector))) unsigned char vc;
 
   const vc repl_nl = {
-    '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n', 
+    '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n',
     '\n', '\n', '\n', '\n', '\n', '\n', '\n', '\n'
   };
   const vc repl_cr = {
-    '\r', '\r', '\r', '\r', '\r', '\r', '\r', '\r', 
+    '\r', '\r', '\r', '\r', '\r', '\r', '\r', '\r',
     '\r', '\r', '\r', '\r', '\r', '\r', '\r', '\r'
   };
   const vc repl_bs = {
-    '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', 
+    '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\',
     '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\'
   };
   const vc repl_qm = {
-    '?', '?', '?', '?', '?', '?', '?', '?', 
-    '?', '?', '?', '?', '?', '?', '?', '?', 
+    '?', '?', '?', '?', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?',
   };
   const vc ones = {
     -1, -1, -1, -1, -1, -1, -1, -1,
@@ -786,8 +786,8 @@ search_line_fast (const uchar *s, const uchar *end ATTRIBUTE_UNUSED)
       l = vpadd_u8 (vget_low_u8 (t), vget_high_u8 (t));
       m = vpaddl_u8 (l);
       n = vpaddl_u16 (m);
-      
-      found = vget_lane_u32 ((uint32x2_t) vorr_u64 ((uint64x1_t) n, 
+
+      found = vget_lane_u32 ((uint32x2_t) vorr_u64 ((uint64x1_t) n,
 	      vshr_n_u64 ((uint64x1_t) n, 24)), 0);
       found &= mask;
     }
@@ -2022,7 +2022,7 @@ name_p (cpp_reader *pfile, const cpp_string *string)
 /* After parsing an identifier or other sequence, produce a warning about
    sequences not in NFC/NFKC.  */
 static void
-warn_about_normalization (cpp_reader *pfile, 
+warn_about_normalization (cpp_reader *pfile,
 			  const cpp_token *token,
 			  const struct normalize_state *s,
 			  bool identifier)
@@ -2587,7 +2587,7 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
     ++note;
 
   lit_accum accum;
-  
+
   uchar prefix[17];
   unsigned prefix_len = 0;
   enum Phase
@@ -2998,14 +2998,14 @@ cpp_get_comments (cpp_reader *pfile)
 }
 
 /* Append a comment to the end of the comment table. */
-static void 
-store_comment (cpp_reader *pfile, cpp_token *token) 
+static void
+store_comment (cpp_reader *pfile, cpp_token *token)
 {
   int len;
 
   if (pfile->comments.allocated == 0)
     {
-      pfile->comments.allocated = 256; 
+      pfile->comments.allocated = 256;
       pfile->comments.entries = (cpp_comment *) xmalloc
 	(pfile->comments.allocated * sizeof (cpp_comment));
     }
@@ -3021,7 +3021,7 @@ store_comment (cpp_reader *pfile, cpp_token *token)
   len = token->val.str.len;
 
   /* Copy comment. Note, token may not be NULL terminated. */
-  pfile->comments.entries[pfile->comments.count].comment = 
+  pfile->comments.entries[pfile->comments.count].comment =
     (char *) xmalloc (sizeof (char) * (len + 1));
   memcpy (pfile->comments.entries[pfile->comments.count].comment,
 	  token->val.str.text, len);
@@ -3588,7 +3588,7 @@ cpp_maybe_module_directive (cpp_reader *pfile, cpp_token *result)
 	  if (_cpp_defined_macro_p (node)
 	      && _cpp_maybe_notify_macro_use (pfile, node, tok->src_loc)
 	      && !cpp_fun_like_macro_p (node))
-	    cpp_error_with_line (pfile, CPP_DL_ERROR, tok->src_loc, 0, 
+	    cpp_error_with_line (pfile, CPP_DL_ERROR, tok->src_loc, 0,
 				 "module control-line %qs cannot be"
 				 " an object-like macro",
 				 NODE_NAME (node));
@@ -3991,7 +3991,7 @@ _cpp_lex_direct (cpp_reader *pfile)
       /* A potential block or line comment.  */
       comment_start = buffer->cur;
       c = *buffer->cur;
-      
+
       if (c == '*')
 	{
 	  if (_cpp_skip_block_comment (pfile))
@@ -4379,21 +4379,21 @@ utf8_to_ucn (unsigned char *buffer, const unsigned char *name)
   int ucn_len_c;
   unsigned t;
   unsigned long utf32;
-  
+
   /* Compute the length of the UTF-8 sequence.  */
   for (t = *name; t & 0x80; t <<= 1)
     ucn_len++;
-  
+
   utf32 = *name & (0x7F >> ucn_len);
   for (ucn_len_c = 1; ucn_len_c < ucn_len; ucn_len_c++)
     {
       utf32 = (utf32 << 6) | (*++name & 0x3F);
-      
+
       /* Ill-formed UTF-8.  */
       if ((*name & ~0x3F) != 0x80)
 	abort ();
     }
-  
+
   *buffer++ = '\\';
   *buffer++ = 'U';
   for (j = 7; j >= 0; j--)
@@ -4418,7 +4418,7 @@ _cpp_spell_ident_ucns (unsigned char *buffer, cpp_hashnode *ident)
 {
   size_t i;
   const unsigned char *name = NODE_NAME (ident);
-	  
+
   for (i = 0; i < NODE_LEN (ident); i++)
     if (name[i] & ~0x7F)
       {
@@ -4492,7 +4492,7 @@ cpp_spell_token (cpp_reader *pfile, const cpp_token *token,
    freed when the reader is destroyed.  Useful for diagnostics.  */
 unsigned char *
 cpp_token_as_text (cpp_reader *pfile, const cpp_token *token)
-{ 
+{
   unsigned int len = cpp_token_len (token) + 1;
   unsigned char *start = _cpp_unaligned_alloc (pfile, len), *end;
 
@@ -5154,7 +5154,7 @@ do_peek_module (cpp_reader *pfile, unsigned char c,
      preprocessing tokens, or module followed by identifier, ':' or
      ';' preprocessing tokens.  */
   unsigned char p = *peek++;
-      
+
   /* A character literal is ... single quotes, ... optionally preceded
      by u8, u, U, or L */
   /* A string-literal is a ... double quotes, optionally prefixed by
@@ -5310,7 +5310,7 @@ cpp_directive_only_process (cpp_reader *pfile,
 		  goto next_line;
 		}
 	      goto dflt;
-	      
+
 	    case '#':
 	      if (bol)
 		{
@@ -5648,7 +5648,7 @@ cpp_directive_only_process (cpp_reader *pfile,
 	      bad_string:
 		cpp_error_with_line (pfile, CPP_DL_ERROR, sloc, 0,
 				     "unterminated literal");
-		
+
 	      done_string:
 		raw = false;
 		lwm = pos - 1;
diff --git a/libcpp/line-map.cc b/libcpp/line-map.cc
index 05c4daf..ac765c7 100644
--- a/libcpp/line-map.cc
+++ b/libcpp/line-map.cc
@@ -468,7 +468,7 @@ line_map_new_raw (line_maps *set, bool macro_p, unsigned num)
 {
   unsigned num_maps_allocated = LINEMAPS_ALLOCATED (set, macro_p);
   unsigned num_maps_used = LINEMAPS_USED (set, macro_p);
-  
+
   if (num > num_maps_allocated - num_maps_used)
     {
       /* We need more space!  */
@@ -494,7 +494,7 @@ line_map_new_raw (line_maps *set, bool macro_p, unsigned num)
       /* We are going to execute some dance to try to reduce the
 	 overhead of the memory allocator, in case we are using the
 	 ggc-page.cc one.
-	 
+
 	 The actual size of memory we are going to get back from the
 	 allocator may well be larger than what we ask for.  Use this
 	 hook to find what that size is.  */
@@ -1080,7 +1080,7 @@ linemap_position_for_loc_and_offset (line_maps *set,
   if (column >= (1u << (map->m_column_and_range_bits - map->m_range_bits)))
     return loc;
 
-  location_t r = 
+  location_t r =
     linemap_position_for_line_and_column (set, map, line, column);
   if (linemap_assert_fails (r <= set->highest_location)
       || linemap_assert_fails (map == linemap_lookup (set, r)))
@@ -1277,7 +1277,7 @@ linemap_macro_map_loc_unwind_toward_spelling (const line_maps *set,
   linemap_assert (token_no < MACRO_MAP_NUM_MACRO_TOKENS (map));
 
   location = MACRO_MAP_LOCATIONS (map)[2 * token_no];
-  
+
   return location;
 }
 
@@ -1580,7 +1580,7 @@ linemap_macro_loc_to_spelling_point (const line_maps *set,
    macro.  Otherwise, return LOCATION.  SET is the set of maps
    location come from.  ORIGINAL_MAP is an output parm. If non NULL,
    the function sets *ORIGINAL_MAP to the ordinary (non-macro) map the
-   returned location comes from. 
+   returned location comes from.
 
    This is a subroutine of linemap_resolve_location.  */
 
@@ -1768,14 +1768,14 @@ linemap_location_from_macro_definition_p (const line_maps *set,
     }
 }
 
-/* 
+/*
    Suppose that LOC is the virtual location of a token T coming from
    the expansion of a macro M.  This function then steps up to get the
    location L of the point where M got expanded.  If L is a spelling
    location inside a macro expansion M', then this function returns
    the locus of the point where M' was expanded.  Said otherwise, this
    function returns the location of T in the context that triggered
-   the expansion of M. 
+   the expansion of M.
 
    *LOC_MAP must be set to the map of LOC.  This function then sets it
    to the map of the returned location.  */
diff --git a/libcpp/macro.cc b/libcpp/macro.cc
index f0dfc79..3ad1eb7 100644
--- a/libcpp/macro.cc
+++ b/libcpp/macro.cc
@@ -586,9 +586,9 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node,
             struct _cpp_file *file = cpp_get_file (pbuffer);
 	    if (file)
 	      {
-    		/* Generate __TIMESTAMP__ string, that represents 
-		   the date and time of the last modification 
-		   of the current source file. The string constant 
+    		/* Generate __TIMESTAMP__ string, that represents
+		   the date and time of the last modification
+		   of the current source file. The string constant
 		   looks like "Sun Sep 16 01:03:52 1973".  */
 		struct tm *tb = NULL;
 		struct stat *st = _cpp_get_file_stat (file);
@@ -699,7 +699,7 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node,
 	    {
 	      cpp_errno (pfile, CPP_DL_WARNING,
 			 "could not determine date and time");
-		
+
 	      pfile->date = UC"\"??? ?? ????\"";
 	      pfile->time = UC"\"??:??:??\"";
 	    }
@@ -777,7 +777,7 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node,
       sprintf ((char *) result, "%u", number);
     }
 
-  return result;      
+  return result;
 }
 
 /* Get an idempotent date.  Either the cached value, the value from
@@ -1477,7 +1477,7 @@ funlike_invocation_p (cpp_reader *pfile, cpp_hashnode *node,
       pfile->state.parsing_args = 2;
       return collect_args (pfile, node, pragma_buff, num_args);
     }
-  
+
   /* Back up.  A CPP_EOF is either an EOF from an argument we're
      expanding, or a fake one from lex_direct.  We want to backup the
      former, but not the latter.  We may have skipped padding, in
@@ -1784,7 +1784,7 @@ arg_token_ptr_at (const macro_arg *arg, size_t index,
     case MACRO_ARG_TOKEN_NORMAL:
       tokens_ptr = arg->first;
       break;
-    case MACRO_ARG_TOKEN_STRINGIFIED:      
+    case MACRO_ARG_TOKEN_STRINGIFIED:
       tokens_ptr = (const cpp_token **) &arg->stringified;
       break;
     case MACRO_ARG_TOKEN_EXPANDED:
@@ -1902,12 +1902,12 @@ macro_arg_token_iter_get_location (const macro_arg_token_iter *it)
    want each tokens resulting from function-like macro arguments
    expansion to have a different location or not.
 
-   E.g, consider this function-like macro: 
+   E.g, consider this function-like macro:
 
         #define M(x) x - 3
 
    Then consider us "calling" it (and thus expanding it) like:
-   
+
        M(1+4)
 
    It will be expanded into:
@@ -2045,7 +2045,7 @@ replace_args (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro,
      location that records many things like the locus of the expansion
      point as well as the original locus inside the definition of the
      macro.  This location is called a virtual location.
-     
+
      So the buffer BUFF holds a set of cpp_token*, and the buffer
      VIRT_LOCS holds the virtual locations of the tokens held by BUFF.
 
@@ -2053,7 +2053,7 @@ replace_args (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro,
      context, when the latter is pushed.  The memory allocated to
      store the tokens and their locations is going to be freed once
      the context of macro expansion is popped.
-     
+
      As far as tokens are concerned, the memory overhead of
      -ftrack-macro-expansion is proportional to the number of
      macros that get expanded multiplied by sizeof (location_t).
@@ -2400,7 +2400,7 @@ replace_args (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro,
 			    " in ISO C++98",
 			    NODE_NAME (node), src->val.macro_arg.arg_no);
 	  else if (CPP_OPTION (pfile, cpp_warn_c90_c99_compat))
-	    cpp_pedwarning (pfile, 
+	    cpp_pedwarning (pfile,
 			    CPP_OPTION (pfile, cpp_warn_c90_c99_compat) > 0
 			    ? CPP_W_C90_C99_COMPAT : CPP_W_PEDANTIC,
 			    "invoking macro %s argument %d: "
@@ -2693,7 +2693,7 @@ tokens_buff_add_token (_cpp_buff *buffer,
 {
   const cpp_token **result;
   location_t *virt_loc_dest = NULL;
-  unsigned token_index = 
+  unsigned token_index =
     (BUFF_FRONT (buffer) - buffer->base) / sizeof (cpp_token *);
 
   /* Abort if we pass the end the buffer.  */
@@ -2840,7 +2840,7 @@ in_macro_expansion_p (cpp_reader *pfile)
   if (pfile == NULL)
     return false;
 
-  return (pfile->about_to_expand_macro_p 
+  return (pfile->about_to_expand_macro_p
 	  || macro_of_context (pfile->context));
 }
 
@@ -2944,7 +2944,7 @@ consume_next_token_from_context (cpp_reader *pfile,
       *location = (*token)->src_loc;
       FIRST (c).token++;
     }
-  else if ((c)->tokens_kind == TOKENS_KIND_INDIRECT)		
+  else if ((c)->tokens_kind == TOKENS_KIND_INDIRECT)
     {
       *token = *FIRST (c).ptoken;
       *location = (*token)->src_loc;
@@ -3205,7 +3205,7 @@ cpp_get_token_1 (cpp_reader *pfile, location_t *location)
 	    _cpp_extend_buff (pfile, &pfile->u_buff, len + 1 + dotme * 2);
 	  unsigned char *buf = BUFF_FRONT (pfile->u_buff);
 	  size_t pos = 0;
-	      
+
 	  if (dotme)
 	    {
 	      buf[pos++] = '.';
@@ -3221,7 +3221,7 @@ cpp_get_token_1 (cpp_reader *pfile, location_t *location)
 
 	  tmp->type = CPP_HEADER_NAME;
 	  XDELETEVEC (fname);
-	  
+
 	  result = tmp;
 	}
     }
@@ -3475,7 +3475,7 @@ _cpp_save_parameter (cpp_reader *pfile, unsigned n, cpp_hashnode *node,
 	= XRESIZEVEC (unsigned char, pfile->macro_buffer, len);
       pfile->macro_buffer_len = len;
     }
-  
+
   macro_arg_saved_data *saved = (macro_arg_saved_data *)pfile->macro_buffer;
   saved[n].canonical_node = node;
   saved[n].value = node->value;
diff --git a/libcpp/makeucnid.cc b/libcpp/makeucnid.cc
index 484f09c..4dada79 100644
--- a/libcpp/makeucnid.cc
+++ b/libcpp/makeucnid.cc
@@ -64,7 +64,7 @@ read_ucnid (const char *fname)
 {
   FILE *f = fopen (fname, "r");
   unsigned fl = 0;
-  
+
   if (!f)
     fail ("opening ucnid.tab");
   for (;;)
@@ -130,7 +130,7 @@ static void
 read_table (char *fname)
 {
   FILE * f = fopen (fname, "r");
-  
+
   if (!f)
     fail ("opening UnicodeData.txt");
   for (;;)
@@ -163,12 +163,12 @@ read_table (char *fname)
       combining_value[codepoint] = strtoul (l, &l, 10);
       if (*l++ != ';')
 	fail ("parsing UnicodeData.txt, junk after combining class");
-	
+
       /* Skip over bidi value.  */
       do {
 	l++;
       } while (*l != ';');
-      
+
       /* Decomposition mapping.  */
       decomp_useful = flags[codepoint];
       if (*++l == '<')  /* Compatibility mapping. */
@@ -204,7 +204,7 @@ static void
 read_derived (const char *fname)
 {
   FILE * f = fopen (fname, "r");
-  
+
   if (!f)
     fail ("opening DerivedNormalizationProps.txt");
   for (;;)
@@ -221,7 +221,7 @@ read_derived (const char *fname)
       maybe_not_NFC_p = (strstr (line, "; NFC_QC; M") != NULL);
       if (! not_NFC_p && ! not_NFKC_p && ! maybe_not_NFC_p)
 	continue;
-	
+
       start = strtoul (line, &l, 16);
       if (l == line)
 	fail ("parsing DerivedNormalizationProps.txt, reading start");
@@ -233,7 +233,7 @@ read_derived (const char *fname)
 	end = start;
 
       while (start <= end)
-	flags[start++] |= ((not_NFC_p ? not_NFC : 0) 
+	flags[start++] |= ((not_NFC_p ? not_NFC : 0)
 			   | (not_NFKC_p ? not_NFKC : 0)
 			   | (maybe_not_NFC_p ? maybe_not_NFC : 0)
 			   );
@@ -250,7 +250,7 @@ static void
 read_derivedcore (char *fname)
 {
   FILE * f = fopen (fname, "r");
-  
+
   if (!f)
     fail ("opening DerivedCoreProperties.txt");
   for (;;)
@@ -269,7 +269,7 @@ read_derivedcore (char *fname)
 	fail ("parsing DerivedCoreProperties.txt, reading code point");
       if (codepoint_start > MAX_CODE_POINT)
 	fail ("parsing DerivedCoreProperties.txt, code point too large");
-      
+
       if (*l == '.' && l[1] == '.')
 	{
 	  char *l2 = l + 2;
@@ -324,7 +324,7 @@ write_table (void)
   unsigned char last_combine = combining_value[0];
 
   printf ("static const struct ucnrange ucnranges[] = {\n");
-  
+
   for (i = 1; i <= NUM_CODE_POINTS; i++)
     if (i == NUM_CODE_POINTS
 	|| (flags[i] != last_flag && ((flags[i] | last_flag) & all_languages))
@@ -502,7 +502,7 @@ write_copyright (void)
    shall not be used in advertising or otherwise to promote the sale,\n\
    use or other dealings in these Data Files or Software without prior\n\
    written authorization of the copyright holder.  */\n";
-   
+
    puts (copyright);
 }
 
diff --git a/libcpp/mkdeps.cc b/libcpp/mkdeps.cc
index 622d0dc..a31890a 100644
--- a/libcpp/mkdeps.cc
+++ b/libcpp/mkdeps.cc
@@ -355,7 +355,7 @@ deps_add_module_target (struct mkdeps *d, const char *m,
 			const char *cmi, bool is_header_unit, bool is_exported)
 {
   gcc_assert (!d->module_name);
-  
+
   d->module_name = xstrdup (m);
   d->is_header_unit = is_header_unit;
   d->is_exported = is_exported;
diff --git a/libcpp/system.h b/libcpp/system.h
index ae6540a..d40a437 100644
--- a/libcpp/system.h
+++ b/libcpp/system.h
@@ -51,9 +51,9 @@ along with GCC; see the file COPYING3.  If not see
 /* Some of these are #define on some systems, e.g. on AIX to redirect
    the names to 64bit capable functions for LARGE_FILES support. These
    redefs are pointless here so we can override them.  */
-    
-#undef fopen 
-#undef freopen 
+
+#undef fopen
+#undef freopen
 
 #define fopen(PATH,MODE) fopen_unlocked(PATH,MODE)
 #define fdopen(FILDES,MODE) fdopen_unlocked(FILDES,MODE)
diff --git a/libcpp/traditional.cc b/libcpp/traditional.cc
index ac01f9d..0a3a66d 100644
--- a/libcpp/traditional.cc
+++ b/libcpp/traditional.cc
@@ -168,7 +168,7 @@ copy_comment (cpp_reader *pfile, const uchar *cur, int in_define)
     unterminated = skip_macro_block_comment (pfile);
   else
     unterminated = _cpp_skip_block_comment (pfile);
-    
+
   if (unterminated)
     cpp_error_with_line (pfile, CPP_DL_ERROR, src_loc, 0,
 			 "unterminated comment");
@@ -919,7 +919,7 @@ _cpp_replacement_text_len (const cpp_macro *macro)
     }
   else
     len = macro->count;
-  
+
   return len;
 }