mirror of
https://github.com/gcc-mirror/gcc.git
synced 2024-11-21 13:40:47 +00:00
50332a4fdd
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 (this patch) and rest (include/, libiberty/, libgcc/, libcpp/, libstdc++-v3/). 2024-10-24 Jakub Jelinek <jakub@redhat.com> gcc/ * lra-assigns.cc: Remove trailing whitespace. * symtab.cc: Likewise. * stmt.cc: Likewise. * cgraphbuild.cc: Likewise. * cfgcleanup.cc: Likewise. * loop-init.cc: Likewise. * df-problems.cc: Likewise. * diagnostic-macro-unwinding.cc: Likewise. * langhooks.h: Likewise. * except.cc: Likewise. * tree-vect-loop.cc: Likewise. * coverage.cc: Likewise. * hash-table.cc: Likewise. * ggc-page.cc: Likewise. * gimple-ssa-strength-reduction.cc: Likewise. * tree-parloops.cc: Likewise. * internal-fn.cc: Likewise. * ipa-split.cc: Likewise. * calls.cc: Likewise. * reorg.cc: Likewise. * sbitmap.h: Likewise. * omp-offload.cc: Likewise. * cfgrtl.cc: Likewise. * reginfo.cc: Likewise. * gengtype.h: Likewise. * omp-general.h: Likewise. * ipa-comdats.cc: Likewise. * gimple-range-edge.h: Likewise. * tree-ssa-structalias.cc: Likewise. * target.def: Likewise. * basic-block.h: Likewise. * graphite-isl-ast-to-gimple.cc: Likewise. * auto-profile.cc: Likewise. * optabs.cc: Likewise. * gengtype-lex.l: Likewise. * optabs.def: Likewise. * ira-build.cc: Likewise. * ira.cc: Likewise. * function.h: Likewise. * tree-ssa-propagate.cc: Likewise. * gcov-io.cc: Likewise. * builtin-types.def: Likewise. * ddg.cc: Likewise. * lra-spills.cc: Likewise. * cfg.cc: Likewise. * bitmap.cc: Likewise. * gimple-range-gori.h: Likewise. * tree-ssa-loop-im.cc: Likewise. * cfghooks.h: Likewise. * genmatch.cc: Likewise. * explow.cc: Likewise. * lto-streamer-in.cc: Likewise. * graphite-scop-detection.cc: Likewise. * ipa-prop.cc: Likewise. * gcc.cc: Likewise. * vec.h: Likewise. * cfgexpand.cc: Likewise. * config/alpha/vms.h: Likewise. * config/alpha/alpha.cc: Likewise. * config/alpha/driver-alpha.cc: Likewise. * config/alpha/elf.h: Likewise. * config/iq2000/iq2000.h: Likewise. * config/iq2000/iq2000.cc: Likewise. * config/pa/pa-64.h: Likewise. * config/pa/som.h: Likewise. * config/pa/pa.cc: Likewise. * config/pa/pa.h: Likewise. * config/pa/pa32-regs.h: Likewise. * config/c6x/c6x.cc: Likewise. * config/openbsd-stdint.h: Likewise. * config/elfos.h: Likewise. * config/lm32/lm32.cc: Likewise. * config/lm32/lm32.h: Likewise. * config/lm32/lm32-protos.h: Likewise. * config/darwin-c.cc: Likewise. * config/rx/rx.cc: Likewise. * config/host-darwin.h: Likewise. * config/netbsd.h: Likewise. * config/ia64/ia64.cc: Likewise. * config/ia64/freebsd.h: Likewise. * config/avr/avr-c.cc: Likewise. * config/avr/avr.cc: Likewise. * config/avr/avr-arch.h: Likewise. * config/avr/avr.h: Likewise. * config/avr/stdfix.h: Likewise. * config/avr/gen-avr-mmcu-specs.cc: Likewise. * config/avr/avr-log.cc: Likewise. * config/avr/elf.h: Likewise. * config/avr/gen-avr-mmcu-texi.cc: Likewise. * config/avr/avr-devices.cc: Likewise. * config/nvptx/nvptx.cc: Likewise. * config/vx-common.h: Likewise. * config/sol2.cc: Likewise. * config/rl78/rl78.cc: Likewise. * config/cris/cris.cc: Likewise. * config/arm/symbian.h: Likewise. * config/arm/unknown-elf.h: Likewise. * config/arm/linux-eabi.h: Likewise. * config/arm/arm.cc: Likewise. * config/arm/arm-mve-builtins.h: Likewise. * config/arm/bpabi.h: Likewise. * config/arm/vxworks.h: Likewise. * config/arm/arm.h: Likewise. * config/arm/aout.h: Likewise. * config/arm/elf.h: Likewise. * config/host-linux.cc: Likewise. * config/sh/sh_treg_combine.cc: Likewise. * config/sh/vxworks.h: Likewise. * config/sh/elf.h: Likewise. * config/sh/netbsd-elf.h: Likewise. * config/sh/sh.cc: Likewise. * config/sh/embed-elf.h: Likewise. * config/sh/sh.h: Likewise. * config/darwin-driver.cc: Likewise. * config/m32c/m32c.cc: Likewise. * config/frv/frv.cc: Likewise. * config/openbsd.h: Likewise. * config/aarch64/aarch64-protos.h: Likewise. * config/aarch64/aarch64-builtins.cc: Likewise. * config/aarch64/aarch64-cost-tables.h: Likewise. * config/aarch64/aarch64.cc: Likewise. * config/bfin/bfin.cc: Likewise. * config/bfin/bfin.h: Likewise. * config/bfin/bfin-protos.h: Likewise. * config/i386/gmm_malloc.h: Likewise. * config/i386/djgpp.h: Likewise. * config/i386/sol2.h: Likewise. * config/i386/stringop.def: Likewise. * config/i386/i386-features.cc: Likewise. * config/i386/openbsdelf.h: Likewise. * config/i386/cpuid.h: Likewise. * config/i386/i386.h: Likewise. * config/i386/smmintrin.h: Likewise. * config/i386/avx10_2-512convertintrin.h: Likewise. * config/i386/i386-options.cc: Likewise. * config/i386/i386-opts.h: Likewise. * config/i386/i386-expand.cc: Likewise. * config/i386/avx512dqintrin.h: Likewise. * config/i386/wmmintrin.h: Likewise. * config/i386/gnu-user.h: Likewise. * config/i386/host-mingw32.cc: Likewise. * config/i386/avx10_2bf16intrin.h: Likewise. * config/i386/cygwin.h: Likewise. * config/i386/driver-i386.cc: Likewise. * config/i386/biarch64.h: Likewise. * config/i386/host-cygwin.cc: Likewise. * config/i386/cygming.h: Likewise. * config/i386/i386-builtins.cc: Likewise. * config/i386/avx10_2convertintrin.h: Likewise. * config/i386/i386.cc: Likewise. * config/i386/gas.h: Likewise. * config/i386/freebsd.h: Likewise. * config/mingw/winnt-cxx.cc: Likewise. * config/mingw/winnt.cc: Likewise. * config/h8300/h8300.cc: Likewise. * config/host-solaris.cc: Likewise. * config/m32r/m32r.h: Likewise. * config/m32r/m32r.cc: Likewise. * config/darwin.h: Likewise. * config/sparc/linux64.h: Likewise. * config/sparc/sparc-protos.h: Likewise. * config/sparc/sysv4.h: Likewise. * config/sparc/sparc.h: Likewise. * config/sparc/linux.h: Likewise. * config/sparc/freebsd.h: Likewise. * config/sparc/sparc.cc: Likewise. * config/gcn/gcn-run.cc: Likewise. * config/gcn/gcn.cc: Likewise. * config/gcn/gcn-tree.cc: Likewise. * config/kopensolaris-gnu.h: Likewise. * config/nios2/nios2.h: Likewise. * config/nios2/elf.h: Likewise. * config/nios2/nios2.cc: Likewise. * config/host-netbsd.cc: Likewise. * config/rtems.h: Likewise. * config/pdp11/pdp11.cc: Likewise. * config/pdp11/pdp11.h: Likewise. * config/mn10300/mn10300.cc: Likewise. * config/mn10300/linux.h: Likewise. * config/moxie/moxie.h: Likewise. * config/moxie/moxie.cc: Likewise. * config/rs6000/aix71.h: Likewise. * config/rs6000/vec_types.h: Likewise. * config/rs6000/xcoff.h: Likewise. * config/rs6000/rs6000.cc: Likewise. * config/rs6000/rs6000-internal.h: Likewise. * config/rs6000/rs6000-p8swap.cc: Likewise. * config/rs6000/rs6000-c.cc: Likewise. * config/rs6000/aix.h: Likewise. * config/rs6000/rs6000-logue.cc: Likewise. * config/rs6000/rs6000-string.cc: Likewise. * config/rs6000/rs6000-call.cc: Likewise. * config/rs6000/ppu_intrinsics.h: Likewise. * config/rs6000/altivec.h: Likewise. * config/rs6000/darwin.h: Likewise. * config/rs6000/host-darwin.cc: Likewise. * config/rs6000/freebsd64.h: Likewise. * config/rs6000/spu2vmx.h: Likewise. * config/rs6000/linux.h: Likewise. * config/rs6000/si2vmx.h: Likewise. * config/rs6000/driver-rs6000.cc: Likewise. * config/rs6000/freebsd.h: Likewise. * config/vxworksae.h: Likewise. * config/mips/frame-header-opt.cc: Likewise. * config/mips/mips.h: Likewise. * config/mips/mips.cc: Likewise. * config/mips/sde.h: Likewise. * config/darwin-protos.h: Likewise. * config/mcore/mcore-elf.h: Likewise. * config/mcore/mcore.h: Likewise. * config/mcore/mcore.cc: Likewise. * config/epiphany/epiphany.cc: Likewise. * config/fr30/fr30.h: Likewise. * config/fr30/fr30.cc: Likewise. * config/riscv/riscv-vector-builtins-shapes.cc: Likewise. * config/riscv/riscv-vector-builtins-bases.cc: Likewise. * config/visium/visium.h: Likewise. * config/mmix/mmix.cc: Likewise. * config/v850/v850.cc: Likewise. * config/v850/v850-c.cc: Likewise. * config/v850/v850.h: Likewise. * config/stormy16/stormy16.cc: Likewise. * config/stormy16/stormy16-protos.h: Likewise. * config/stormy16/stormy16.h: Likewise. * config/arc/arc.cc: Likewise. * config/vxworks.cc: Likewise. * config/microblaze/microblaze-c.cc: Likewise. * config/microblaze/microblaze-protos.h: Likewise. * config/microblaze/microblaze.h: Likewise. * config/microblaze/microblaze.cc: Likewise. * config/freebsd-spec.h: Likewise. * config/m68k/m68kelf.h: Likewise. * config/m68k/m68k.cc: Likewise. * config/m68k/netbsd-elf.h: Likewise. * config/m68k/linux.h: Likewise. * config/freebsd.h: Likewise. * config/host-openbsd.cc: Likewise. * regcprop.cc: Likewise. * dumpfile.cc: Likewise. * combine.cc: Likewise. * tree-ssa-forwprop.cc: Likewise. * ipa-profile.cc: Likewise. * hw-doloop.cc: Likewise. * opts.cc: Likewise. * gcc-ar.cc: Likewise. * tree-cfg.cc: Likewise. * incpath.cc: Likewise. * tree-ssa-sccvn.cc: Likewise. * function.cc: Likewise. * genattrtab.cc: Likewise. * rtl.def: Likewise. * genchecksum.cc: Likewise. * profile.cc: Likewise. * df-core.cc: Likewise. * tree-pretty-print.cc: Likewise. * tree.h: Likewise. * plugin.cc: Likewise. * tree-ssa-loop-ch.cc: Likewise. * emit-rtl.cc: Likewise. * haifa-sched.cc: Likewise. * gimple-range-edge.cc: Likewise. * range-op.cc: Likewise. * tree-ssa-ccp.cc: Likewise. * dwarf2cfi.cc: Likewise. * recog.cc: Likewise. * vtable-verify.cc: Likewise. * system.h: Likewise. * regrename.cc: Likewise. * tree-ssa-dom.cc: Likewise. * loop-unroll.cc: Likewise. * lra-constraints.cc: Likewise. * pretty-print.cc: Likewise. * ifcvt.cc: Likewise. * ipa.cc: Likewise. * alloc-pool.h: Likewise. * collect2.cc: Likewise. * pointer-query.cc: Likewise. * cfgloop.cc: Likewise. * toplev.cc: Likewise. * sese.cc: Likewise. * gengtype.cc: Likewise. * gimplify-me.cc: Likewise. * double-int.cc: Likewise. * bb-reorder.cc: Likewise. * dwarf2out.cc: Likewise. * tree-ssa-loop-ivcanon.cc: Likewise. * tree-ssa-reassoc.cc: Likewise. * cgraph.cc: Likewise. * sel-sched.cc: Likewise. * attribs.cc: Likewise. * expr.cc: Likewise. * tree-ssa-scopedtables.h: Likewise. * gimple-range-cache.cc: Likewise. * ipa-pure-const.cc: Likewise. * tree-inline.cc: Likewise. * genhooks.cc: Likewise. * gimple-range-phi.h: Likewise. * shrink-wrap.cc: Likewise. * tree.cc: Likewise. * gimple.cc: Likewise. * backend.h: Likewise. * opts-common.cc: Likewise. * cfg-flags.def: Likewise. * gcse-common.cc: Likewise. * tree-ssa-scopedtables.cc: Likewise. * ccmp.cc: Likewise. * builtins.def: Likewise. * builtin-attrs.def: Likewise. * postreload.cc: Likewise. * sched-deps.cc: Likewise. * ipa-inline-transform.cc: Likewise. * tree-vect-generic.cc: Likewise. * ipa-polymorphic-call.cc: Likewise. * builtins.cc: Likewise. * sel-sched-ir.cc: Likewise. * trans-mem.cc: Likewise. * ipa-visibility.cc: Likewise. * cgraph.h: Likewise. * tree-ssa-phiopt.cc: Likewise. * genopinit.cc: Likewise. * ipa-inline.cc: Likewise. * omp-low.cc: Likewise. * ipa-utils.cc: Likewise. * tree-ssa-math-opts.cc: Likewise. * tree-ssa-ifcombine.cc: Likewise. * gimple-range.cc: Likewise. * ipa-fnsummary.cc: Likewise. * ira-color.cc: Likewise. * value-prof.cc: Likewise. * varasm.cc: Likewise. * ipa-icf.cc: Likewise. * ira-emit.cc: Likewise. * lto-streamer.h: Likewise. * lto-wrapper.cc: Likewise. * regs.h: Likewise. * gengtype-parse.cc: Likewise. * alias.cc: Likewise. * lto-streamer.cc: Likewise. * real.h: Likewise. * wide-int.h: Likewise. * targhooks.cc: Likewise. * gimple-ssa-warn-access.cc: Likewise. * real.cc: Likewise. * ipa-reference.cc: Likewise. * bitmap.h: Likewise. * ginclude/float.h: Likewise. * ginclude/stddef.h: Likewise. * ginclude/stdarg.h: Likewise. * ginclude/stdatomic.h: Likewise. * optabs.h: Likewise. * sel-sched-ir.h: Likewise. * convert.cc: Likewise. * cgraphunit.cc: Likewise. * lra-remat.cc: Likewise. * tree-if-conv.cc: Likewise. * gcov-dump.cc: Likewise. * tree-predcom.cc: Likewise. * dominance.cc: Likewise. * gimple-range-cache.h: Likewise. * ipa-devirt.cc: Likewise. * rtl.h: Likewise. * ubsan.cc: Likewise. * tree-ssa.cc: Likewise. * ssa.h: Likewise. * cse.cc: Likewise. * jump.cc: Likewise. * hwint.h: Likewise. * caller-save.cc: Likewise. * coretypes.h: Likewise. * ipa-fnsummary.h: Likewise. * tree-ssa-strlen.cc: Likewise. * modulo-sched.cc: Likewise. * cgraphclones.cc: Likewise. * lto-cgraph.cc: Likewise. * hw-doloop.h: Likewise. * data-streamer.h: Likewise. * compare-elim.cc: Likewise. * profile-count.h: Likewise. * tree-vect-loop-manip.cc: Likewise. * ree.cc: Likewise. * reload.cc: Likewise. * tree-ssa-loop-split.cc: Likewise. * tree-into-ssa.cc: Likewise. * gcse.cc: Likewise. * cfgloopmanip.cc: Likewise. * df.h: Likewise. * fold-const.cc: Likewise. * wide-int.cc: Likewise. * gengtype-state.cc: Likewise. * sanitizer.def: Likewise. * tree-ssa-sink.cc: Likewise. * target-hooks-macros.h: Likewise. * tree-ssa-pre.cc: Likewise. * gimple-pretty-print.cc: Likewise. * ipa-utils.h: Likewise. * tree-outof-ssa.cc: Likewise. * tree-ssa-coalesce.cc: Likewise. * gimple-match.h: Likewise. * tree-ssa-loop-niter.cc: Likewise. * tree-loop-distribution.cc: Likewise. * tree-emutls.cc: Likewise. * tree-eh.cc: Likewise. * varpool.cc: Likewise. * ssa-iterators.h: Likewise. * asan.cc: Likewise. * reload1.cc: Likewise. * cfgloopanal.cc: Likewise. * tree-vectorizer.cc: Likewise. * simplify-rtx.cc: Likewise. * opts-global.cc: Likewise. * gimple-ssa-store-merging.cc: Likewise. * expmed.cc: Likewise. * tree-ssa-loop-prefetch.cc: Likewise. * tree-ssa-dse.h: Likewise. * tree-vect-stmts.cc: Likewise. * gimple-fold.cc: Likewise. * lra-coalesce.cc: Likewise. * data-streamer-out.cc: Likewise. * diagnostic.cc: Likewise. * tree-ssa-alias.cc: Likewise. * tree-vect-patterns.cc: Likewise. * common/common-target.def: Likewise. * common/config/rx/rx-common.cc: Likewise. * common/config/msp430/msp430-common.cc: Likewise. * common/config/avr/avr-common.cc: Likewise. * common/config/i386/i386-common.cc: Likewise. * common/config/pdp11/pdp11-common.cc: Likewise. * common/config/rs6000/rs6000-common.cc: Likewise. * common/config/mcore/mcore-common.cc: Likewise. * graphite.cc: Likewise. * gimple-low.cc: Likewise. * genmodes.cc: Likewise. * gimple-loop-jam.cc: Likewise. * lto-streamer-out.cc: Likewise. * predict.cc: Likewise. * omp-expand.cc: Likewise. * gimple-array-bounds.cc: Likewise. * predict.def: Likewise. * opts.h: Likewise. * tree-stdarg.cc: Likewise. * gimplify.cc: Likewise. * ira-lives.cc: Likewise. * loop-doloop.cc: Likewise. * lra.cc: Likewise. * gimple-iterator.h: Likewise. * tree-sra.cc: Likewise. gcc/fortran/ * trans-openmp.cc: Remove trailing whitespace. * trans-common.cc: Likewise. * match.h: Likewise. * scanner.cc: Likewise. * gfortranspec.cc: Likewise. * io.cc: Likewise. * iso-c-binding.def: Likewise. * iso-fortran-env.def: Likewise. * types.def: Likewise. * openmp.cc: Likewise. * f95-lang.cc: Likewise. gcc/analyzer/ * state-purge.cc: Remove trailing whitespace. * region-model.h: Likewise. * region-model.cc: Likewise. * program-point.cc: Likewise. * exploded-graph.h: Likewise. * program-state.cc: Likewise. * supergraph.cc: Likewise. gcc/c-family/ * c-ubsan.cc: Remove trailing whitespace. * stub-objc.cc: Likewise. * c-pragma.cc: Likewise. * c-ppoutput.cc: Likewise. * c-indentation.cc: Likewise. * c-ada-spec.cc: Likewise. * c-opts.cc: Likewise. * c-common.cc: Likewise. * c-format.cc: Likewise. * c-omp.cc: Likewise. * c-objc.h: Likewise. * c-cppbuiltin.cc: Likewise. * c-attribs.cc: Likewise. * c-target.def: Likewise. * c-common.h: Likewise. gcc/c/ * c-typeck.cc: Remove trailing whitespace. * gimple-parser.cc: Likewise. * c-parser.cc: Likewise. * c-decl.cc: Likewise. gcc/cp/ * vtable-class-hierarchy.cc: Remove trailing whitespace. * typeck2.cc: Likewise. * decl.cc: Likewise. * init.cc: Likewise. * semantics.cc: Likewise. * module.cc: Likewise. * rtti.cc: Likewise. * cxx-pretty-print.cc: Likewise. * cvt.cc: Likewise. * mangle.cc: Likewise. * name-lookup.h: Likewise. * coroutines.cc: Likewise. * error.cc: Likewise. * lambda.cc: Likewise. * tree.cc: Likewise. * g++spec.cc: Likewise. * decl2.cc: Likewise. * cp-tree.h: Likewise. * parser.cc: Likewise. * pt.cc: Likewise. * call.cc: Likewise. * lex.cc: Likewise. * cp-lang.cc: Likewise. * cp-tree.def: Likewise. * constexpr.cc: Likewise. * typeck.cc: Likewise. * name-lookup.cc: Likewise. * optimize.cc: Likewise. * search.cc: Likewise. * mapper-client.cc: Likewise. * ptree.cc: Likewise. * class.cc: Likewise. gcc/jit/ * docs/examples/tut04-toyvm/toyvm.cc: Remove trailing whitespace. gcc/lto/ * lto-object.cc: Remove trailing whitespace. * lto-symtab.cc: Likewise. * lto-partition.cc: Likewise. * lang-specs.h: Likewise. * lto-lang.cc: Likewise. gcc/objc/ * objc-encoding.cc: Remove trailing whitespace. * objc-map.h: Likewise. * objc-next-runtime-abi-01.cc: Likewise. * objc-act.cc: Likewise. * objc-map.cc: Likewise. gcc/objcp/ * objcp-decl.cc: Remove trailing whitespace. * objcp-lang.cc: Likewise. * objcp-decl.h: Likewise. gcc/rust/ * util/optional.h: Remove trailing whitespace. * util/expected.h: Likewise. * util/rust-unicode-data.h: Likewise. gcc/m2/ * mc-boot/GFpuIO.cc: Remove trailing whitespace. * mc-boot/GFIO.cc: Likewise. * mc-boot/GFormatStrings.cc: Likewise. * mc-boot/GCmdArgs.cc: Likewise. * mc-boot/GDebug.h: Likewise. * mc-boot/GM2Dependent.cc: Likewise. * mc-boot/GRTint.cc: Likewise. * mc-boot/GDebug.cc: Likewise. * mc-boot/GmcError.cc: Likewise. * mc-boot/Gmcp4.cc: Likewise. * mc-boot/GM2RTS.cc: Likewise. * mc-boot/GIO.cc: Likewise. * mc-boot/Gmcp5.cc: Likewise. * mc-boot/GDynamicStrings.cc: Likewise. * mc-boot/Gmcp1.cc: Likewise. * mc-boot/GFormatStrings.h: Likewise. * mc-boot/Gmcp2.cc: Likewise. * mc-boot/Gmcp3.cc: Likewise. * pge-boot/GFIO.cc: Likewise. * pge-boot/GDebug.h: Likewise. * pge-boot/GM2Dependent.cc: Likewise. * pge-boot/GDebug.cc: Likewise. * pge-boot/GM2RTS.cc: Likewise. * pge-boot/GSymbolKey.cc: Likewise. * pge-boot/GIO.cc: Likewise. * pge-boot/GIndexing.cc: Likewise. * pge-boot/GDynamicStrings.cc: Likewise. * pge-boot/GFormatStrings.h: Likewise. gcc/go/ * go-gcc.cc: Remove trailing whitespace. * gospec.cc: Likewise.
549 lines
16 KiB
C++
549 lines
16 KiB
C++
/* Set up combined include path chain for the preprocessor.
|
|
Copyright (C) 1986-2024 Free Software Foundation, Inc.
|
|
|
|
Broken out of cppinit.c and cppfiles.c and rewritten Mar 2003.
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 3, or (at your option) any
|
|
later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; see the file COPYING3. If not see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "coretypes.h"
|
|
#include "target.h"
|
|
#include "cpplib.h"
|
|
#include "prefix.h"
|
|
#include "intl.h"
|
|
#include "incpath.h"
|
|
#include "cppdefault.h"
|
|
|
|
/* Microsoft Windows does not natively support inodes.
|
|
VMS has non-numeric inodes. */
|
|
#ifdef VMS
|
|
# define INO_T_EQ(A, B) (!memcmp (&(A), &(B), sizeof (A)))
|
|
# define INO_T_COPY(DEST, SRC) memcpy (&(DEST), &(SRC), sizeof (SRC))
|
|
#elif !defined (HOST_LACKS_INODE_NUMBERS)
|
|
# define INO_T_EQ(A, B) ((A) == (B))
|
|
# define INO_T_COPY(DEST, SRC) (DEST) = (SRC)
|
|
#endif
|
|
|
|
#if defined INO_T_EQ
|
|
#define DIRS_EQ(A, B) ((A)->dev == (B)->dev \
|
|
&& INO_T_EQ ((A)->ino, (B)->ino))
|
|
#else
|
|
#define DIRS_EQ(A, B) (!filename_cmp ((A)->canonical_name, (B)->canonical_name))
|
|
#endif
|
|
|
|
#ifndef HOST_STAT_FOR_64BIT_INODES
|
|
#define HOST_STAT_FOR_64BIT_INODES stat
|
|
#endif
|
|
|
|
static const char dir_separator_str[] = { DIR_SEPARATOR, 0 };
|
|
|
|
static void add_env_var_paths (const char *, incpath_kind);
|
|
static void add_standard_paths (const char *, const char *, const char *, int);
|
|
static void free_path (struct cpp_dir *, int);
|
|
static void merge_include_chains (const char *, cpp_reader *, int);
|
|
static void add_sysroot_to_chain (const char *, int);
|
|
static struct cpp_dir *remove_duplicates (cpp_reader *, struct cpp_dir *,
|
|
struct cpp_dir *, struct cpp_dir *,
|
|
int);
|
|
|
|
/* Include chains heads and tails. */
|
|
static struct cpp_dir *heads[INC_MAX];
|
|
static struct cpp_dir *tails[INC_MAX];
|
|
|
|
static bool quote_ignores_source_dir;
|
|
enum { REASON_QUIET = 0, REASON_NOENT, REASON_DUP, REASON_DUP_SYS };
|
|
|
|
/* Free an element of the include chain, possibly giving a reason. */
|
|
static void
|
|
free_path (struct cpp_dir *path, int reason)
|
|
{
|
|
switch (reason)
|
|
{
|
|
case REASON_DUP:
|
|
case REASON_DUP_SYS:
|
|
fprintf (stderr, _("ignoring duplicate directory \"%s\"\n"), path->name);
|
|
if (reason == REASON_DUP_SYS)
|
|
fprintf (stderr,
|
|
_(" as it is a non-system directory that duplicates a system directory\n"));
|
|
break;
|
|
|
|
case REASON_NOENT:
|
|
fprintf (stderr, _("ignoring nonexistent directory \"%s\"\n"),
|
|
path->name);
|
|
break;
|
|
|
|
case REASON_QUIET:
|
|
default:
|
|
break;
|
|
}
|
|
|
|
free (path->name);
|
|
free (path);
|
|
}
|
|
|
|
/* Read ENV_VAR for a PATH_SEPARATOR-separated list of file names; and
|
|
append all the names to the search path CHAIN. */
|
|
static void
|
|
add_env_var_paths (const char *env_var, incpath_kind chain)
|
|
{
|
|
char *p, *q, *path;
|
|
|
|
q = getenv (env_var);
|
|
|
|
if (!q)
|
|
return;
|
|
|
|
for (p = q; *q; p = q + 1)
|
|
{
|
|
q = p;
|
|
while (*q != 0 && *q != PATH_SEPARATOR)
|
|
q++;
|
|
|
|
if (p == q)
|
|
path = xstrdup (".");
|
|
else
|
|
{
|
|
path = XNEWVEC (char, q - p + 1);
|
|
memcpy (path, p, q - p);
|
|
path[q - p] = '\0';
|
|
}
|
|
|
|
add_path (path, chain, chain == INC_SYSTEM, false);
|
|
}
|
|
}
|
|
|
|
/* Append the standard include chain defined in cppdefault.cc. */
|
|
static void
|
|
add_standard_paths (const char *sysroot, const char *iprefix,
|
|
const char *imultilib, int cxx_stdinc)
|
|
{
|
|
const struct default_include *p;
|
|
int relocated = cpp_relocated ();
|
|
size_t len;
|
|
|
|
if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0)
|
|
{
|
|
/* Look for directories that start with the standard prefix.
|
|
"Translate" them, i.e. replace /usr/local/lib/gcc... with
|
|
IPREFIX and search them first. */
|
|
for (p = cpp_include_defaults; p->fname; p++)
|
|
{
|
|
if (p->cplusplus == 0
|
|
|| (cxx_stdinc && (p->cplusplus == flag_stdlib_kind)))
|
|
{
|
|
/* Should we be translating sysrooted dirs too? Assume
|
|
that iprefix and sysroot are mutually exclusive, for
|
|
now. */
|
|
if (sysroot && p->add_sysroot)
|
|
continue;
|
|
if (!filename_ncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
|
|
{
|
|
char *str = concat (iprefix, p->fname + len, NULL);
|
|
if (p->multilib == 1 && imultilib)
|
|
str = reconcat (str, str, dir_separator_str,
|
|
imultilib, NULL);
|
|
else if (p->multilib == 2)
|
|
{
|
|
if (!imultiarch)
|
|
{
|
|
free (str);
|
|
continue;
|
|
}
|
|
str = reconcat (str, str, dir_separator_str,
|
|
imultiarch, NULL);
|
|
}
|
|
add_path (str, INC_SYSTEM, p->cxx_aware, false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
for (p = cpp_include_defaults; p->fname; p++)
|
|
{
|
|
if (p->cplusplus == 0
|
|
|| (cxx_stdinc && (p->cplusplus == flag_stdlib_kind)))
|
|
{
|
|
char *str;
|
|
|
|
/* Should this directory start with the sysroot? */
|
|
if (sysroot && p->add_sysroot)
|
|
{
|
|
char *sysroot_no_trailing_dir_separator = xstrdup (sysroot);
|
|
size_t sysroot_len = strlen (sysroot);
|
|
|
|
if (sysroot_len > 0 && sysroot[sysroot_len - 1] == DIR_SEPARATOR)
|
|
sysroot_no_trailing_dir_separator[sysroot_len - 1] = '\0';
|
|
str = concat (sysroot_no_trailing_dir_separator, p->fname, NULL);
|
|
free (sysroot_no_trailing_dir_separator);
|
|
}
|
|
else if (!p->add_sysroot && relocated
|
|
&& !filename_ncmp (p->fname, cpp_PREFIX, cpp_PREFIX_len))
|
|
{
|
|
static const char *relocated_prefix;
|
|
char *ostr;
|
|
/* If this path starts with the configure-time prefix,
|
|
but the compiler has been relocated, replace it
|
|
with the run-time prefix. The run-time exec prefix
|
|
is GCC_EXEC_PREFIX. Compute the path from there back
|
|
to the toplevel prefix. */
|
|
if (!relocated_prefix)
|
|
{
|
|
char *dummy;
|
|
/* Make relative prefix expects the first argument
|
|
to be a program, not a directory. */
|
|
dummy = concat (gcc_exec_prefix, "dummy", NULL);
|
|
relocated_prefix
|
|
= make_relative_prefix (dummy,
|
|
cpp_EXEC_PREFIX,
|
|
cpp_PREFIX);
|
|
free (dummy);
|
|
}
|
|
ostr = concat (relocated_prefix,
|
|
p->fname + cpp_PREFIX_len,
|
|
NULL);
|
|
str = update_path (ostr, p->component);
|
|
free (ostr);
|
|
}
|
|
else
|
|
str = update_path (p->fname, p->component);
|
|
|
|
if (p->multilib == 1 && imultilib)
|
|
str = reconcat (str, str, dir_separator_str, imultilib, NULL);
|
|
else if (p->multilib == 2)
|
|
{
|
|
if (!imultiarch)
|
|
{
|
|
free (str);
|
|
continue;
|
|
}
|
|
str = reconcat (str, str, dir_separator_str, imultiarch, NULL);
|
|
}
|
|
|
|
add_path (str, INC_SYSTEM, p->cxx_aware, false);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* For each duplicate path in chain HEAD, keep just the first one.
|
|
Remove each path in chain HEAD that also exists in chain SYSTEM.
|
|
Set the NEXT pointer of the last path in the resulting chain to
|
|
JOIN, unless it duplicates JOIN in which case the last path is
|
|
removed. Return the head of the resulting chain. Any of HEAD,
|
|
JOIN and SYSTEM can be NULL. */
|
|
|
|
static struct cpp_dir *
|
|
remove_duplicates (cpp_reader *pfile, struct cpp_dir *head,
|
|
struct cpp_dir *system, struct cpp_dir *join,
|
|
int verbose)
|
|
{
|
|
struct cpp_dir **pcur, *tmp, *cur;
|
|
struct HOST_STAT_FOR_64BIT_INODES st;
|
|
|
|
for (pcur = &head; *pcur; )
|
|
{
|
|
int reason = REASON_QUIET;
|
|
|
|
cur = *pcur;
|
|
|
|
if (HOST_STAT_FOR_64BIT_INODES (cur->name, &st))
|
|
{
|
|
/* Dirs that don't exist or have denied permissions are
|
|
silently ignored, unless verbose. */
|
|
if ((errno != ENOENT) && (errno != EPERM))
|
|
cpp_errno (pfile, CPP_DL_ERROR, cur->name);
|
|
else
|
|
{
|
|
/* If -Wmissing-include-dirs is given, warn. */
|
|
cpp_options *opts = cpp_get_options (pfile);
|
|
if (opts->warn_missing_include_dirs && cur->user_supplied_p)
|
|
cpp_warning (pfile, CPP_W_MISSING_INCLUDE_DIRS, "%s: %s",
|
|
cur->name, xstrerror (errno));
|
|
reason = REASON_NOENT;
|
|
}
|
|
}
|
|
else if (!S_ISDIR (st.st_mode))
|
|
cpp_error_with_line (pfile, CPP_DL_WARNING, 0, 0,
|
|
"%s: not a directory", cur->name);
|
|
else
|
|
{
|
|
#if defined (INO_T_COPY)
|
|
INO_T_COPY (cur->ino, st.st_ino);
|
|
cur->dev = st.st_dev;
|
|
#endif
|
|
|
|
/* Remove this one if it is in the system chain. */
|
|
reason = REASON_DUP_SYS;
|
|
for (tmp = system; tmp; tmp = tmp->next)
|
|
if (DIRS_EQ (tmp, cur) && cur->construct == tmp->construct)
|
|
break;
|
|
|
|
if (!tmp)
|
|
{
|
|
/* Duplicate of something earlier in the same chain? */
|
|
reason = REASON_DUP;
|
|
for (tmp = head; tmp != cur; tmp = tmp->next)
|
|
if (DIRS_EQ (cur, tmp) && cur->construct == tmp->construct)
|
|
break;
|
|
|
|
if (tmp == cur
|
|
/* Last in the chain and duplicate of JOIN? */
|
|
&& !(cur->next == NULL && join
|
|
&& DIRS_EQ (cur, join)
|
|
&& cur->construct == join->construct))
|
|
{
|
|
/* Unique, so keep this directory. */
|
|
pcur = &cur->next;
|
|
continue;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Remove this entry from the chain. */
|
|
*pcur = cur->next;
|
|
free_path (cur, verbose ? reason : REASON_QUIET);
|
|
}
|
|
|
|
*pcur = join;
|
|
return head;
|
|
}
|
|
|
|
/* Add SYSROOT to any user-supplied paths in CHAIN starting with
|
|
"=" or "$SYSROOT". */
|
|
|
|
static void
|
|
add_sysroot_to_chain (const char *sysroot, int chain)
|
|
{
|
|
struct cpp_dir *p;
|
|
|
|
for (p = heads[chain]; p != NULL; p = p->next)
|
|
{
|
|
if (p->user_supplied_p)
|
|
{
|
|
if (p->name[0] == '=')
|
|
p->name = concat (sysroot, p->name + 1, NULL);
|
|
if (startswith (p->name, "$SYSROOT"))
|
|
p->name = concat (sysroot, p->name + strlen ("$SYSROOT"), NULL);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Merge the four include chains together in the order quote, bracket,
|
|
system, after. Remove duplicate dirs (determined in
|
|
system-specific manner).
|
|
|
|
We can't just merge the lists and then uniquify them because then
|
|
we may lose directories from the <> search path that should be
|
|
there; consider -iquote foo -iquote bar -Ifoo -Iquux. It is
|
|
however safe to treat -iquote bar -iquote foo -Ifoo -Iquux as if
|
|
written -iquote bar -Ifoo -Iquux. */
|
|
|
|
static void
|
|
merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
|
|
{
|
|
/* Add the sysroot to user-supplied paths starting with "=". */
|
|
if (sysroot)
|
|
{
|
|
add_sysroot_to_chain (sysroot, INC_QUOTE);
|
|
add_sysroot_to_chain (sysroot, INC_BRACKET);
|
|
add_sysroot_to_chain (sysroot, INC_SYSTEM);
|
|
add_sysroot_to_chain (sysroot, INC_AFTER);
|
|
add_sysroot_to_chain (sysroot, INC_EMBED);
|
|
}
|
|
|
|
/* Join the SYSTEM and AFTER chains. Remove duplicates in the
|
|
resulting SYSTEM chain. */
|
|
if (heads[INC_SYSTEM])
|
|
tails[INC_SYSTEM]->next = heads[INC_AFTER];
|
|
else
|
|
heads[INC_SYSTEM] = heads[INC_AFTER];
|
|
heads[INC_SYSTEM]
|
|
= remove_duplicates (pfile, heads[INC_SYSTEM], 0, 0, verbose);
|
|
|
|
/* Remove duplicates from BRACKET that are in itself or SYSTEM, and
|
|
join it to SYSTEM. */
|
|
heads[INC_BRACKET]
|
|
= remove_duplicates (pfile, heads[INC_BRACKET], heads[INC_SYSTEM],
|
|
heads[INC_SYSTEM], verbose);
|
|
|
|
/* Remove duplicates from QUOTE that are in itself or SYSTEM, and
|
|
join it to BRACKET. */
|
|
heads[INC_QUOTE]
|
|
= remove_duplicates (pfile, heads[INC_QUOTE], heads[INC_SYSTEM],
|
|
heads[INC_BRACKET], verbose);
|
|
|
|
/* Remove duplicates from EMBED that are in itself. */
|
|
heads[INC_EMBED]
|
|
= remove_duplicates (pfile, heads[INC_EMBED], 0, 0, verbose);
|
|
|
|
/* If verbose, print the list of dirs to search. */
|
|
if (verbose)
|
|
{
|
|
struct cpp_dir *p;
|
|
|
|
fprintf (stderr, _("#include \"...\" search starts here:\n"));
|
|
for (p = heads[INC_QUOTE];; p = p->next)
|
|
{
|
|
if (p == heads[INC_BRACKET])
|
|
fprintf (stderr, _("#include <...> search starts here:\n"));
|
|
if (!p)
|
|
break;
|
|
fprintf (stderr, " %s\n", p->name);
|
|
}
|
|
fprintf (stderr, _("End of search list.\n"));
|
|
if (heads[INC_EMBED])
|
|
{
|
|
fprintf (stderr, _("#embed <...> search starts here:\n"));
|
|
for (p = heads[INC_EMBED]; p; p = p->next)
|
|
fprintf (stderr, " %s\n", p->name);
|
|
fprintf (stderr, _("End of #embed search list.\n"));
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Use given -I paths for #include "..." but not #include <...>, and
|
|
don't search the directory of the present file for #include "...".
|
|
(Note that -I. -I- is not the same as the default setup; -I. uses
|
|
the compiler's working dir.) */
|
|
void
|
|
split_quote_chain (void)
|
|
{
|
|
if (heads[INC_QUOTE])
|
|
free_path (heads[INC_QUOTE], REASON_QUIET);
|
|
if (tails[INC_QUOTE])
|
|
free_path (tails[INC_QUOTE], REASON_QUIET);
|
|
heads[INC_QUOTE] = heads[INC_BRACKET];
|
|
tails[INC_QUOTE] = tails[INC_BRACKET];
|
|
heads[INC_BRACKET] = NULL;
|
|
tails[INC_BRACKET] = NULL;
|
|
/* This is NOT redundant. */
|
|
quote_ignores_source_dir = true;
|
|
}
|
|
|
|
/* Add P to the chain specified by CHAIN. */
|
|
|
|
void
|
|
add_cpp_dir_path (cpp_dir *p, incpath_kind chain)
|
|
{
|
|
if (tails[chain])
|
|
tails[chain]->next = p;
|
|
else
|
|
heads[chain] = p;
|
|
tails[chain] = p;
|
|
}
|
|
|
|
/* Add PATH to the include chain CHAIN. PATH must be malloc-ed and
|
|
NUL-terminated. */
|
|
void
|
|
add_path (char *path, incpath_kind chain, int cxx_aware, bool user_supplied_p)
|
|
{
|
|
cpp_dir *p;
|
|
size_t pathlen = strlen (path);
|
|
|
|
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
|
|
/* Remove unnecessary trailing slashes. On some versions of MS
|
|
Windows, trailing _forward_ slashes cause no problems for stat().
|
|
On newer versions, stat() does not recognize a directory that ends
|
|
in a '\\' or '/', unless it is a drive root dir, such as "c:/",
|
|
where it is obligatory. */
|
|
char* end = path + pathlen - 1;
|
|
/* Preserve the lead '/' or lead "c:/". */
|
|
char* start = path + (pathlen > 2 && path[1] == ':' ? 3 : 1);
|
|
|
|
for (; end > start && IS_DIR_SEPARATOR (*end); end--)
|
|
*end = 0;
|
|
pathlen = end - path;
|
|
#endif
|
|
|
|
p = XNEW (cpp_dir);
|
|
p->next = NULL;
|
|
p->name = path;
|
|
p->len = pathlen;
|
|
#ifndef INO_T_EQ
|
|
p->canonical_name = lrealpath (path);
|
|
#endif
|
|
if (chain == INC_SYSTEM || chain == INC_AFTER)
|
|
p->sysp = 1 + !cxx_aware;
|
|
else
|
|
p->sysp = 0;
|
|
p->construct = 0;
|
|
p->user_supplied_p = user_supplied_p;
|
|
|
|
add_cpp_dir_path (p, chain);
|
|
}
|
|
|
|
/* Exported function to handle include chain merging, duplicate
|
|
removal, and registration with cpplib. */
|
|
void
|
|
register_include_chains (cpp_reader *pfile, const char *sysroot,
|
|
const char *iprefix, const char *imultilib,
|
|
int stdinc, int cxx_stdinc, int verbose)
|
|
{
|
|
static const char *const lang_env_vars[] =
|
|
{ "C_INCLUDE_PATH", "CPLUS_INCLUDE_PATH",
|
|
"OBJC_INCLUDE_PATH", "OBJCPLUS_INCLUDE_PATH" };
|
|
cpp_options *cpp_opts = cpp_get_options (pfile);
|
|
size_t idx = (cpp_opts->objc ? 2 : 0);
|
|
|
|
if (cpp_opts->cplusplus)
|
|
idx++;
|
|
else
|
|
cxx_stdinc = false;
|
|
|
|
/* CPATH and language-dependent environment variables may add to the
|
|
include chain. */
|
|
add_env_var_paths ("CPATH", INC_BRACKET);
|
|
add_env_var_paths (lang_env_vars[idx], INC_SYSTEM);
|
|
|
|
target_c_incpath.extra_pre_includes (sysroot, iprefix, stdinc);
|
|
|
|
/* Finally chain on the standard directories. */
|
|
if (stdinc)
|
|
add_standard_paths (sysroot, iprefix, imultilib, cxx_stdinc);
|
|
|
|
target_c_incpath.extra_includes (sysroot, iprefix, stdinc);
|
|
|
|
merge_include_chains (sysroot, pfile, verbose);
|
|
|
|
cpp_set_include_chains (pfile, heads[INC_QUOTE], heads[INC_BRACKET],
|
|
heads[INC_EMBED], quote_ignores_source_dir);
|
|
}
|
|
|
|
/* Return the current chain of cpp dirs. */
|
|
|
|
struct cpp_dir *
|
|
get_added_cpp_dirs (incpath_kind chain)
|
|
{
|
|
return heads[chain];
|
|
}
|
|
|
|
#if !(defined TARGET_EXTRA_INCLUDES) || !(defined TARGET_EXTRA_PRE_INCLUDES)
|
|
static void hook_void_charptr_charptr_int (const char *sysroot ATTRIBUTE_UNUSED,
|
|
const char *iprefix ATTRIBUTE_UNUSED,
|
|
int stdinc ATTRIBUTE_UNUSED)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#ifndef TARGET_EXTRA_INCLUDES
|
|
#define TARGET_EXTRA_INCLUDES hook_void_charptr_charptr_int
|
|
#endif
|
|
#ifndef TARGET_EXTRA_PRE_INCLUDES
|
|
#define TARGET_EXTRA_PRE_INCLUDES hook_void_charptr_charptr_int
|
|
#endif
|
|
|
|
struct target_c_incpath_s target_c_incpath = { TARGET_EXTRA_PRE_INCLUDES, TARGET_EXTRA_INCLUDES };
|
|
|