diff options
author | Jakub Jelinek <jakub@redhat.com> | 2024-10-25 09:41:46 +0200 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2024-10-25 10:00:29 +0200 |
commit | 50332a4fdd3243899c395712c43daaef82c8180b (patch) | |
tree | db02f5650107899a0730678df371502ee0b63e5f /gcc/fortran | |
parent | 0b22f0585348335369298c7d39afd171758eebe9 (diff) | |
download | gcc-50332a4fdd3243899c395712c43daaef82c8180b.zip gcc-50332a4fdd3243899c395712c43daaef82c8180b.tar.gz gcc-50332a4fdd3243899c395712c43daaef82c8180b.tar.bz2 |
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 (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.
Diffstat (limited to 'gcc/fortran')
-rw-r--r-- | gcc/fortran/f95-lang.cc | 106 | ||||
-rw-r--r-- | gcc/fortran/gfortranspec.cc | 2 | ||||
-rw-r--r-- | gcc/fortran/io.cc | 34 | ||||
-rw-r--r-- | gcc/fortran/iso-c-binding.def | 18 | ||||
-rw-r--r-- | gcc/fortran/iso-fortran-env.def | 2 | ||||
-rw-r--r-- | gcc/fortran/match.h | 2 | ||||
-rw-r--r-- | gcc/fortran/openmp.cc | 8 | ||||
-rw-r--r-- | gcc/fortran/scanner.cc | 34 | ||||
-rw-r--r-- | gcc/fortran/trans-common.cc | 56 | ||||
-rw-r--r-- | gcc/fortran/trans-openmp.cc | 8 | ||||
-rw-r--r-- | gcc/fortran/types.def | 10 |
11 files changed, 140 insertions, 140 deletions
diff --git a/gcc/fortran/f95-lang.cc b/gcc/fortran/f95-lang.cc index 611c299..30043cf 100644 --- a/gcc/fortran/f95-lang.cc +++ b/gcc/fortran/f95-lang.cc @@ -763,11 +763,11 @@ gfc_init_builtin_functions (void) #include "mathbuiltins.def" - gfc_define_builtin ("__builtin_roundl", mfunc_longdouble[0], + gfc_define_builtin ("__builtin_roundl", mfunc_longdouble[0], BUILT_IN_ROUNDL, "roundl", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_round", mfunc_double[0], + gfc_define_builtin ("__builtin_round", mfunc_double[0], BUILT_IN_ROUND, "round", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_roundf", mfunc_float[0], + gfc_define_builtin ("__builtin_roundf", mfunc_float[0], BUILT_IN_ROUNDF, "roundf", ATTR_CONST_NOTHROW_LEAF_LIST); gfc_define_builtin ("__builtin_truncl", mfunc_longdouble[0], @@ -777,80 +777,80 @@ gfc_init_builtin_functions (void) gfc_define_builtin ("__builtin_truncf", mfunc_float[0], BUILT_IN_TRUNCF, "truncf", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_cabsl", func_clongdouble_longdouble, + gfc_define_builtin ("__builtin_cabsl", func_clongdouble_longdouble, BUILT_IN_CABSL, "cabsl", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_cabs", func_cdouble_double, + gfc_define_builtin ("__builtin_cabs", func_cdouble_double, BUILT_IN_CABS, "cabs", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_cabsf", func_cfloat_float, + gfc_define_builtin ("__builtin_cabsf", func_cfloat_float, BUILT_IN_CABSF, "cabsf", ATTR_CONST_NOTHROW_LEAF_LIST); - - gfc_define_builtin ("__builtin_copysignl", mfunc_longdouble[1], + + gfc_define_builtin ("__builtin_copysignl", mfunc_longdouble[1], BUILT_IN_COPYSIGNL, "copysignl", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_copysign", mfunc_double[1], + gfc_define_builtin ("__builtin_copysign", mfunc_double[1], BUILT_IN_COPYSIGN, "copysign", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_copysignf", mfunc_float[1], + gfc_define_builtin ("__builtin_copysignf", mfunc_float[1], BUILT_IN_COPYSIGNF, "copysignf", ATTR_CONST_NOTHROW_LEAF_LIST); - - gfc_define_builtin ("__builtin_nextafterl", mfunc_longdouble[1], + + gfc_define_builtin ("__builtin_nextafterl", mfunc_longdouble[1], BUILT_IN_NEXTAFTERL, "nextafterl", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_nextafter", mfunc_double[1], + gfc_define_builtin ("__builtin_nextafter", mfunc_double[1], BUILT_IN_NEXTAFTER, "nextafter", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_nextafterf", mfunc_float[1], + gfc_define_builtin ("__builtin_nextafterf", mfunc_float[1], BUILT_IN_NEXTAFTERF, "nextafterf", ATTR_CONST_NOTHROW_LEAF_LIST); - + /* Some built-ins depend on rounding mode. Depending on compilation options, they will be "pure" or "const". */ attr = flag_rounding_math ? ATTR_PURE_NOTHROW_LEAF_LIST : ATTR_CONST_NOTHROW_LEAF_LIST; - gfc_define_builtin ("__builtin_rintl", mfunc_longdouble[0], + gfc_define_builtin ("__builtin_rintl", mfunc_longdouble[0], BUILT_IN_RINTL, "rintl", attr); - gfc_define_builtin ("__builtin_rint", mfunc_double[0], + gfc_define_builtin ("__builtin_rint", mfunc_double[0], BUILT_IN_RINT, "rint", attr); - gfc_define_builtin ("__builtin_rintf", mfunc_float[0], + gfc_define_builtin ("__builtin_rintf", mfunc_float[0], BUILT_IN_RINTF, "rintf", attr); - gfc_define_builtin ("__builtin_remainderl", mfunc_longdouble[1], + gfc_define_builtin ("__builtin_remainderl", mfunc_longdouble[1], BUILT_IN_REMAINDERL, "remainderl", attr); - gfc_define_builtin ("__builtin_remainder", mfunc_double[1], + gfc_define_builtin ("__builtin_remainder", mfunc_double[1], BUILT_IN_REMAINDER, "remainder", attr); - gfc_define_builtin ("__builtin_remainderf", mfunc_float[1], + gfc_define_builtin ("__builtin_remainderf", mfunc_float[1], BUILT_IN_REMAINDERF, "remainderf", attr); - - gfc_define_builtin ("__builtin_logbl", mfunc_longdouble[0], + + gfc_define_builtin ("__builtin_logbl", mfunc_longdouble[0], BUILT_IN_LOGBL, "logbl", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_logb", mfunc_double[0], + gfc_define_builtin ("__builtin_logb", mfunc_double[0], BUILT_IN_LOGB, "logb", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_logbf", mfunc_float[0], + gfc_define_builtin ("__builtin_logbf", mfunc_float[0], BUILT_IN_LOGBF, "logbf", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_frexpl", mfunc_longdouble[4], + gfc_define_builtin ("__builtin_frexpl", mfunc_longdouble[4], BUILT_IN_FREXPL, "frexpl", ATTR_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_frexp", mfunc_double[4], + gfc_define_builtin ("__builtin_frexp", mfunc_double[4], BUILT_IN_FREXP, "frexp", ATTR_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_frexpf", mfunc_float[4], + gfc_define_builtin ("__builtin_frexpf", mfunc_float[4], BUILT_IN_FREXPF, "frexpf", ATTR_NOTHROW_LEAF_LIST); - - gfc_define_builtin ("__builtin_fabsl", mfunc_longdouble[0], + + gfc_define_builtin ("__builtin_fabsl", mfunc_longdouble[0], BUILT_IN_FABSL, "fabsl", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_fabs", mfunc_double[0], + gfc_define_builtin ("__builtin_fabs", mfunc_double[0], BUILT_IN_FABS, "fabs", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_fabsf", mfunc_float[0], + gfc_define_builtin ("__builtin_fabsf", mfunc_float[0], BUILT_IN_FABSF, "fabsf", ATTR_CONST_NOTHROW_LEAF_LIST); - + gfc_define_builtin ("__builtin_scalbnl", mfunc_longdouble[2], BUILT_IN_SCALBNL, "scalbnl", ATTR_CONST_NOTHROW_LEAF_LIST); gfc_define_builtin ("__builtin_scalbn", mfunc_double[2], BUILT_IN_SCALBN, "scalbn", ATTR_CONST_NOTHROW_LEAF_LIST); gfc_define_builtin ("__builtin_scalbnf", mfunc_float[2], BUILT_IN_SCALBNF, "scalbnf", ATTR_CONST_NOTHROW_LEAF_LIST); - + gfc_define_builtin ("__builtin_fmaxl", mfunc_longdouble[1], BUILT_IN_FMAXL, "fmaxl", ATTR_CONST_NOTHROW_LEAF_LIST); gfc_define_builtin ("__builtin_fmax", mfunc_double[1], @@ -865,65 +865,65 @@ gfc_init_builtin_functions (void) gfc_define_builtin ("__builtin_fminf", mfunc_float[1], BUILT_IN_FMINF, "fminf", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_fmodl", mfunc_longdouble[1], + gfc_define_builtin ("__builtin_fmodl", mfunc_longdouble[1], BUILT_IN_FMODL, "fmodl", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_fmod", mfunc_double[1], + gfc_define_builtin ("__builtin_fmod", mfunc_double[1], BUILT_IN_FMOD, "fmod", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_fmodf", mfunc_float[1], + gfc_define_builtin ("__builtin_fmodf", mfunc_float[1], BUILT_IN_FMODF, "fmodf", ATTR_CONST_NOTHROW_LEAF_LIST); /* iround{f,,l}, lround{f,,l} and llround{f,,l} */ ftype = build_function_type_list (integer_type_node, - float_type_node, NULL_TREE); + float_type_node, NULL_TREE); gfc_define_builtin("__builtin_iroundf", ftype, BUILT_IN_IROUNDF, "iroundf", ATTR_CONST_NOTHROW_LEAF_LIST); ftype = build_function_type_list (long_integer_type_node, - float_type_node, NULL_TREE); + float_type_node, NULL_TREE); gfc_define_builtin ("__builtin_lroundf", ftype, BUILT_IN_LROUNDF, "lroundf", ATTR_CONST_NOTHROW_LEAF_LIST); ftype = build_function_type_list (long_long_integer_type_node, - float_type_node, NULL_TREE); + float_type_node, NULL_TREE); gfc_define_builtin ("__builtin_llroundf", ftype, BUILT_IN_LLROUNDF, "llroundf", ATTR_CONST_NOTHROW_LEAF_LIST); ftype = build_function_type_list (integer_type_node, - double_type_node, NULL_TREE); + double_type_node, NULL_TREE); gfc_define_builtin("__builtin_iround", ftype, BUILT_IN_IROUND, "iround", ATTR_CONST_NOTHROW_LEAF_LIST); ftype = build_function_type_list (long_integer_type_node, - double_type_node, NULL_TREE); + double_type_node, NULL_TREE); gfc_define_builtin ("__builtin_lround", ftype, BUILT_IN_LROUND, "lround", ATTR_CONST_NOTHROW_LEAF_LIST); ftype = build_function_type_list (long_long_integer_type_node, - double_type_node, NULL_TREE); + double_type_node, NULL_TREE); gfc_define_builtin ("__builtin_llround", ftype, BUILT_IN_LLROUND, "llround", ATTR_CONST_NOTHROW_LEAF_LIST); ftype = build_function_type_list (integer_type_node, - long_double_type_node, NULL_TREE); + long_double_type_node, NULL_TREE); gfc_define_builtin("__builtin_iroundl", ftype, BUILT_IN_IROUNDL, "iroundl", ATTR_CONST_NOTHROW_LEAF_LIST); ftype = build_function_type_list (long_integer_type_node, - long_double_type_node, NULL_TREE); + long_double_type_node, NULL_TREE); gfc_define_builtin ("__builtin_lroundl", ftype, BUILT_IN_LROUNDL, "lroundl", ATTR_CONST_NOTHROW_LEAF_LIST); ftype = build_function_type_list (long_long_integer_type_node, - long_double_type_node, NULL_TREE); + long_double_type_node, NULL_TREE); gfc_define_builtin ("__builtin_llroundl", ftype, BUILT_IN_LLROUNDL, "llroundl", ATTR_CONST_NOTHROW_LEAF_LIST); /* These are used to implement the ** operator. */ - gfc_define_builtin ("__builtin_powl", mfunc_longdouble[1], + gfc_define_builtin ("__builtin_powl", mfunc_longdouble[1], BUILT_IN_POWL, "powl", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_pow", mfunc_double[1], + gfc_define_builtin ("__builtin_pow", mfunc_double[1], BUILT_IN_POW, "pow", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_powf", mfunc_float[1], + gfc_define_builtin ("__builtin_powf", mfunc_float[1], BUILT_IN_POWF, "powf", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_cpowl", mfunc_clongdouble[1], + gfc_define_builtin ("__builtin_cpowl", mfunc_clongdouble[1], BUILT_IN_CPOWL, "cpowl", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_cpow", mfunc_cdouble[1], + gfc_define_builtin ("__builtin_cpow", mfunc_cdouble[1], BUILT_IN_CPOW, "cpow", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_cpowf", mfunc_cfloat[1], + gfc_define_builtin ("__builtin_cpowf", mfunc_cfloat[1], BUILT_IN_CPOWF, "cpowf", ATTR_CONST_NOTHROW_LEAF_LIST); gfc_define_builtin ("__builtin_powil", mfunc_longdouble[2], BUILT_IN_POWIL, "powil", ATTR_CONST_NOTHROW_LEAF_LIST); @@ -944,7 +944,7 @@ gfc_init_builtin_functions (void) gfc_define_builtin ("__builtin_cbrtf", mfunc_float[0], BUILT_IN_CBRTF, "cbrtf", ATTR_CONST_NOTHROW_LEAF_LIST); - gfc_define_builtin ("__builtin_cexpil", func_longdouble_clongdouble, + gfc_define_builtin ("__builtin_cexpil", func_longdouble_clongdouble, BUILT_IN_CEXPIL, "cexpil", ATTR_CONST_NOTHROW_LEAF_LIST); gfc_define_builtin ("__builtin_cexpi", func_double_cdouble, diff --git a/gcc/fortran/gfortranspec.cc b/gcc/fortran/gfortranspec.cc index 0c61cd9..954f8a1 100644 --- a/gcc/fortran/gfortranspec.cc +++ b/gcc/fortran/gfortranspec.cc @@ -200,7 +200,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, int need_math = (MATH_LIBRARY[0] != '\0'); /* Whether we should link a static libgfortran. */ - int static_lib = 0; + int static_lib = 0; /* Whether we need to link statically. */ int static_linking = 0; diff --git a/gcc/fortran/io.cc b/gcc/fortran/io.cc index 5e1785e..5678a65 100644 --- a/gcc/fortran/io.cc +++ b/gcc/fortran/io.cc @@ -235,7 +235,7 @@ format_lex (void) } c = next_char_not_space (); - + negative_flag = 0; switch (c) { @@ -597,7 +597,7 @@ check_format (bool is_input) = G_("Positive width required in format string at %L"); const char *nonneg_required = G_("Nonnegative width required in format string at %L"); - const char *unexpected_element + const char *unexpected_element = G_("Unexpected element %qc in format string at %L"); const char *unexpected_end = G_("Unexpected end of format string in format string at %L"); @@ -891,7 +891,7 @@ data_desc: error = zero_width; goto syntax; } - if (!gfc_notify_std (GFC_STD_F2008, "%<G0%> in format at %L", + if (!gfc_notify_std (GFC_STD_F2008, "%<G0%> in format at %L", &format_locus)) return false; u = format_lex (); @@ -1302,7 +1302,7 @@ extension_optional_comma: } goto format_item; - + syntax: if (mode != MODE_FORMAT) format_locus.nextc += format_string_pos; @@ -1345,9 +1345,9 @@ check_format_string (gfc_expr *e, bool is_input) for (i=e->value.character.length-1;i>format_string_pos-1;i--) if (e->value.character.string[i] != ' ') { - format_locus.nextc += format_length + 1; + format_locus.nextc += format_length + 1; gfc_warning (0, - "Extraneous characters in format at %L", &format_locus); + "Extraneous characters in format at %L", &format_locus); break; } return rv; @@ -1700,7 +1700,7 @@ resolve_tag_format (gfc_expr *e) n = 0; c = gfc_constructor_first (e->value.constructor); len = c->expr->value.character.length; - + for ( ; c; c = gfc_constructor_next (c)) n += len; @@ -1860,7 +1860,7 @@ resolve_tag (const io_tag *tag, gfc_expr *e) if (tag == &tag_newunit) { - if (!gfc_notify_std (GFC_STD_F2008, "NEWUNIT specifier at %L", + if (!gfc_notify_std (GFC_STD_F2008, "NEWUNIT specifier at %L", &e->where)) return false; } @@ -1875,7 +1875,7 @@ resolve_tag (const io_tag *tag, gfc_expr *e) if (!gfc_check_vardef_context (e, false, false, false, context)) return false; } - + if (tag == &tag_convert) { if (!gfc_notify_std (GFC_STD_GNU, "CONVERT tag at %L", &e->where)) @@ -3072,7 +3072,7 @@ dtio_procs_present (gfc_symbol *sym, io_kind k) derived = sym->ts.u.derived; else return false; - if ((k == M_WRITE || k == M_PRINT) && + if ((k == M_WRITE || k == M_PRINT) && (gfc_find_specific_dtio_proc (derived, true, true) != NULL)) return true; if ((k == M_READ) && @@ -3361,7 +3361,7 @@ gfc_resolve_dt (gfc_code *dt_code, gfc_dt *dt, locus *loc) /* If we are writing, make sure the internal unit can be changed. */ gcc_assert (k != M_PRINT); if (k == M_WRITE - && !gfc_check_vardef_context (e, false, false, false, + && !gfc_check_vardef_context (e, false, false, false, _("internal unit in WRITE"))) return false; } @@ -3395,7 +3395,7 @@ gfc_resolve_dt (gfc_code *dt_code, gfc_dt *dt, locus *loc) e = gfc_get_variable_expr (gfc_find_sym_in_symtree (n->sym)); t = gfc_check_vardef_context (e, false, false, false, NULL); gfc_free_expr (e); - + if (!t) { gfc_error ("NAMELIST %qs in READ statement at %L contains" @@ -3415,7 +3415,7 @@ gfc_resolve_dt (gfc_code *dt_code, gfc_dt *dt, locus *loc) "procedure", n->sym->name, dt->namelist->name, loc); return false; } - + if ((n->sym->ts.type == BT_DERIVED) && (n->sym->ts.u.derived->attr.alloc_comp || n->sym->ts.u.derived->attr.pointer_comp)) @@ -3425,7 +3425,7 @@ gfc_resolve_dt (gfc_code *dt_code, gfc_dt *dt, locus *loc) "or POINTER components", n->sym->name, dt->namelist->name, loc)) return false; - + if (!t) { gfc_error ("NAMELIST object %qs in namelist %qs at %L has " @@ -3439,7 +3439,7 @@ gfc_resolve_dt (gfc_code *dt_code, gfc_dt *dt, locus *loc) } if (dt->extra_comma - && !gfc_notify_std (GFC_STD_LEGACY, "Comma before i/o item list at %L", + && !gfc_notify_std (GFC_STD_LEGACY, "Comma before i/o item list at %L", &dt->extra_comma->where)) return false; @@ -4686,7 +4686,7 @@ gfc_match_inquire (void) } gfc_unset_implicit_pure (NULL); - + if (inquire->id != NULL && inquire->pending == NULL) { gfc_error ("INQUIRE statement at %L requires a PENDING= specifier with " @@ -4798,7 +4798,7 @@ gfc_resolve_wait (gfc_wait *wait) if (!gfc_reference_st_label (wait->err, ST_LABEL_TARGET)) return false; - + if (!gfc_reference_st_label (wait->end, ST_LABEL_TARGET)) return false; diff --git a/gcc/fortran/iso-c-binding.def b/gcc/fortran/iso-c-binding.def index e7591d8..bad66b1 100644 --- a/gcc/fortran/iso-c-binding.def +++ b/gcc/fortran/iso-c-binding.def @@ -20,23 +20,23 @@ along with GCC; see the file COPYING3. If not see Fortran 2003 ISO_C_BINDING intrinsic module. */ #ifndef NAMED_INTCST -# define NAMED_INTCST(a,b,c,d) +# define NAMED_INTCST(a,b,c,d) #endif #ifndef NAMED_REALCST -# define NAMED_REALCST(a,b,c,d) +# define NAMED_REALCST(a,b,c,d) #endif #ifndef NAMED_CMPXCST -# define NAMED_CMPXCST(a,b,c,d) +# define NAMED_CMPXCST(a,b,c,d) #endif #ifndef NAMED_LOGCST -# define NAMED_LOGCST(a,b,c) +# define NAMED_LOGCST(a,b,c) #endif #ifndef NAMED_CHARKNDCST -# define NAMED_CHARKNDCST(a,b,c) +# define NAMED_CHARKNDCST(a,b,c) #endif #ifndef NAMED_FUNCTION @@ -54,7 +54,7 @@ along with GCC; see the file COPYING3. If not see /* The arguments to NAMED_*CST are: -- an internal name -- the symbol name in the module, as seen by Fortran code - -- the value it has, for use in trans-types.cc + -- the value it has, for use in trans-types.cc -- the standard that supports this type */ NAMED_INTCST (ISOCBINDING_INT, "c_int", gfc_c_int_kind, GFC_STD_F2003) @@ -202,10 +202,10 @@ NAMED_LOGCST (ISOCBINDING_BOOL, "c_bool", \ NAMED_CHARKNDCST (ISOCBINDING_CHAR, "c_char", gfc_default_character_kind) #ifndef NAMED_CHARCST -# define NAMED_CHARCST(a,b,c) +# define NAMED_CHARCST(a,b,c) #endif -/* Use langhooks to deal with host to target translations. */ +/* Use langhooks to deal with host to target translations. */ NAMED_CHARCST (ISOCBINDING_NULL_CHAR, "c_null_char", \ lang_hooks.to_target_charset ('\0')) NAMED_CHARCST (ISOCBINDING_ALERT, "c_alert", \ @@ -224,7 +224,7 @@ NAMED_CHARCST (ISOCBINDING_VERTICAL_TAB, "c_vertical_tab", \ lang_hooks.to_target_charset ('\v')) #ifndef DERIVED_TYPE -# define DERIVED_TYPE(a,b,c) +# define DERIVED_TYPE(a,b,c) #endif DERIVED_TYPE (ISOCBINDING_PTR, "c_ptr", \ diff --git a/gcc/fortran/iso-fortran-env.def b/gcc/fortran/iso-fortran-env.def index 0debb66..9375003 100644 --- a/gcc/fortran/iso-fortran-env.def +++ b/gcc/fortran/iso-fortran-env.def @@ -43,7 +43,7 @@ along with GCC; see the file COPYING3. If not see -- an internal name -- the symbol name in the module, as seen by Fortran code -- the value it has - -- the standard that supports this type */ + -- the standard that supports this type */ NAMED_INTCST (ISOFORTRANENV_FILE_ATOMIC_INT_KIND, "atomic_int_kind", \ gfc_atomic_int_kind, GFC_STD_F2008) diff --git a/gcc/fortran/match.h b/gcc/fortran/match.h index 2c76afb..b2158e1 100644 --- a/gcc/fortran/match.h +++ b/gcc/fortran/match.h @@ -101,7 +101,7 @@ match gfc_match_call (void); /* We want to use this function to check for a common-block-name that can exist in a bind statement, so removed the "static" declaration of the function in match.cc. */ - + match gfc_match_common_name (char *name); match gfc_match_common (void); diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc index aaede54..9fb3836 100644 --- a/gcc/fortran/openmp.cc +++ b/gcc/fortran/openmp.cc @@ -4899,7 +4899,7 @@ gfc_match_oacc_routine (void) new_st.op = EXEC_OACC_ROUTINE; new_st.ext.omp_clauses = c; - return MATCH_YES; + return MATCH_YES; cleanup: gfc_current_locus = old_loc; @@ -8770,7 +8770,7 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses, n->sym->name, &n->where); } } - + for (n = omp_clauses->lists[OMP_LIST_TO]; n; n = n->next) n->sym->mark = 0; for (n = omp_clauses->lists[OMP_LIST_FROM]; n; n = n->next) @@ -11930,7 +11930,7 @@ resolve_oacc_directive_inside_omp_region (gfc_code *code) gfc_statement st = omp_code_to_statement (omp_current_ctx->code); gfc_statement oacc_st = oacc_code_to_statement (code); gfc_error ("The %s directive cannot be specified within " - "a %s region at %L", gfc_ascii_statement (oacc_st), + "a %s region at %L", gfc_ascii_statement (oacc_st), gfc_ascii_statement (st), &code->loc); } } @@ -11943,7 +11943,7 @@ resolve_omp_directive_inside_oacc_region (gfc_code *code) gfc_statement st = oacc_code_to_statement (omp_current_ctx->code); gfc_statement omp_st = omp_code_to_statement (code); gfc_error ("The %s directive cannot be specified within " - "a %s region at %L", gfc_ascii_statement (omp_st), + "a %s region at %L", gfc_ascii_statement (omp_st), gfc_ascii_statement (st), &code->loc); } } diff --git a/gcc/fortran/scanner.cc b/gcc/fortran/scanner.cc index 7e3237c..30b6cbf 100644 --- a/gcc/fortran/scanner.cc +++ b/gcc/fortran/scanner.cc @@ -67,7 +67,7 @@ static locus gcc_attribute_locus; gfc_source_form gfc_current_form; static gfc_linebuf *line_head, *line_tail; - + locus gfc_current_locus; const char *gfc_source_file; static FILE *gfc_src_file; @@ -284,19 +284,19 @@ gfc_scanner_done_1 (void) gfc_linebuf *lb; gfc_file *f; - while(line_head != NULL) + while(line_head != NULL) { lb = line_head->next; free (line_head); line_head = lb; } - - while(file_head != NULL) + + while(file_head != NULL) { f = file_head->next; free (file_head->filename); free (file_head); - file_head = f; + file_head = f; } } @@ -371,7 +371,7 @@ add_path_to_list (gfc_directorylist **list, const char *path, char *q; size_t len; int i; - + p = path; while (*p == ' ' || *p == '\t') /* someone might do "-I include" */ if (*p++ == '\0') @@ -634,7 +634,7 @@ gfc_advance_line (void) { end_flag = 1; return; - } + } if (gfc_current_locus.u.lb->next && !gfc_current_locus.u.lb->next->dbg_emitted) @@ -647,11 +647,11 @@ gfc_advance_line (void) if (gfc_current_locus.u.lb != NULL) gfc_current_locus.nextc = gfc_current_locus.u.lb->line; - else + else { gfc_current_locus.nextc = NULL; end_flag = 1; - } + } } @@ -668,7 +668,7 @@ static gfc_char_t next_char (void) { gfc_char_t c; - + if (gfc_current_locus.nextc == NULL) return '\n'; @@ -785,7 +785,7 @@ skip_free_oacc_sentinel (locus start, locus old_loc) openacc_locus = old_loc; gfc_current_locus = start; } - else + else r = false; } else @@ -825,7 +825,7 @@ skip_free_omp_sentinel (locus start, locus old_loc) openmp_locus = old_loc; gfc_current_locus = start; } - else + else r = false; } else @@ -1105,7 +1105,7 @@ skip_fixed_comments (void) continue_line = gfc_linebuf_linenum (gfc_current_locus.u.lb); /* If -fopenmp/-fopenacc, we need to handle here 2 things: - 1) don't treat !$omp/!$acc|c$omp/c$acc|*$omp / *$acc as comments, + 1) don't treat !$omp/!$acc|c$omp/c$acc|*$omp / *$acc as comments, but directives 2) handle OpenMP conditional compilation, where !$|c$|*$ should be treated as 2 spaces if the characters @@ -1373,7 +1373,7 @@ restart: skip_comment_line (); else gfc_advance_line (); - + if (gfc_at_eof ()) goto not_continuation; @@ -1478,7 +1478,7 @@ restart: { gfc_current_locus.nextc--; if (warn_ampersand && in_string == INSTRING_WARN) - gfc_warning (OPT_Wampersand, + gfc_warning (OPT_Wampersand, "Missing %<&%> in continued character " "constant at %C"); } @@ -1801,7 +1801,7 @@ gfc_gobble_whitespace (void) load_line returns whether the line was truncated. NOTE: The error machinery isn't available at this point, so we can't - easily report line and column numbers consistent with other + easily report line and column numbers consistent with other parts of gfortran. */ static bool @@ -1861,7 +1861,7 @@ load_line (FILE *input, gfc_char_t **pbuf, int *pbuflen, const int *first_char) if (c == '\n') { /* Check for illegal use of ampersand. See F95 Standard 3.3.1.3. */ - if (gfc_current_form == FORM_FREE + if (gfc_current_form == FORM_FREE && !seen_printable && seen_ampersand) { if (pedantic) diff --git a/gcc/fortran/trans-common.cc b/gcc/fortran/trans-common.cc index 7c3681a..ac69a47 100644 --- a/gcc/fortran/trans-common.cc +++ b/gcc/fortran/trans-common.cc @@ -16,22 +16,22 @@ for more details. You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see -<http://www.gnu.org/licenses/>. */ +<http://www.gnu.org/licenses/>. */ /* The core algorithm is based on Andy Vaught's g95 tree. Also the way to build UNION_TYPE is borrowed from Richard Henderson. - + Transform common blocks. An integral part of this is processing equivalence variables. Equivalenced variables that are not in a common block end up in a private block of their own. Each common block or local equivalence list is declared as a union. Variables within the block are represented as a field within the - block with the proper offset. - + block with the proper offset. + So if two variables are equivalenced, they just point to a common area in memory. - + Mathematically, laying out an equivalence block is equivalent to solving a linear system of equations. The matrix is usually a sparse matrix in which each row contains all zero elements except @@ -40,7 +40,7 @@ along with GCC; see the file COPYING3. If not see overdetermined, underdetermined or have a unique solution. If the system is inconsistent, the program is not standard conforming. The solution vector is integral, since all of the pivots are +1 or -1. - + How we lay out an equivalence block is a little less complicated. In an equivalence list with n elements, there are n-1 conditions to be satisfied. The conditions partition the variables into what we @@ -51,43 +51,43 @@ along with GCC; see the file COPYING3. If not see common block is made up of a series of segments that are joined one after the other. In the linear system, a segment is a block diagonal. - + To lay out a segment we first start with some variable and determine its length. The first variable is assumed to start at offset one and extends to however long it is. We then traverse the list of equivalences to find an unused condition that involves at least one of the variables currently in the segment. - + Each equivalence condition amounts to the condition B+b=C+c where B and C are the offsets of the B and C variables, and b and c are constants which are nonzero for array elements, substrings or structure components. So for - + EQUIVALENCE(B(2), C(3)) we have B + 2*size of B's elements = C + 3*size of C's elements. - + If B and C are known we check to see if the condition already holds. If B is known we can solve for C. Since we know the length of C, we can see if the minimum and maximum extents of the segment are affected. Eventually, we make a full pass through the equivalence list without finding any new conditions and the segment is fully specified. - + At this point, the segment is added to the current common block. Since we know the minimum extent of the segment, everything in the segment is translated to its position in the common block. The usual case here is that there are no equivalence statements and the common block is series of segments with one variable each, which is a diagonal matrix in the matrix formulation. - + Each segment is described by a chain of segment_info structures. Each segment_info structure describes the extents of a single variable within the segment. This list is maintained in the order the elements are positioned within the segment. If two elements have the same starting offset the smaller will come first. If they also have the same size their - ordering is undefined. - + ordering is undefined. + Once all common blocks have been created, the list of equivalences is examined for still-unused equivalence conditions. We create a block for each merged equivalence list. */ @@ -543,7 +543,7 @@ build_common_decl (gfc_common_head *com, tree union_type, bool is_init) /* Return a field that is the size of the union, if an equivalence has overlapping initializers. Merge the initializers into a single - initializer for this new field, then free the old ones. */ + initializer for this new field, then free the old ones. */ static tree get_init_field (segment_info *head, tree union_type, tree *field_init, @@ -598,7 +598,7 @@ get_init_field (segment_info *head, tree union_type, tree *field_init, &chk[s->offset], (size_t)s->length); } - + for (i = 0; i < length; i++) CONSTRUCTOR_APPEND_ELT (v, NULL, build_int_cst (type, data[i])); @@ -847,7 +847,7 @@ get_mpz (gfc_expr *e) array element number (zero based). Bounds and elements are guaranteed to be constants. If something goes wrong we generate an error and return zero. */ - + static HOST_WIDE_INT element_number (gfc_array_ref *ar) { @@ -863,7 +863,7 @@ element_number (gfc_array_ref *ar) mpz_init (n); for (i = 0; i < rank; i++) - { + { if (ar->dimen_type[i] != DIMEN_ELEMENT) gfc_internal_error ("element_number(): Bad dimension type"); @@ -871,10 +871,10 @@ element_number (gfc_array_ref *ar) mpz_sub (n, *get_mpz (ar->start[i]), *get_mpz (as->lower[i])); else mpz_sub_ui (n, *get_mpz (ar->start[i]), 1); - + mpz_mul (n, n, multiplier); mpz_add (offset, offset, n); - + if (as && as->upper[i] && as->lower[i]) { mpz_sub (extent, *get_mpz (as->upper[i]), *get_mpz (as->lower[i])); @@ -882,20 +882,20 @@ element_number (gfc_array_ref *ar) } else mpz_set_ui (extent, 0); - + if (mpz_sgn (extent) < 0) mpz_set_ui (extent, 0); - + mpz_mul (multiplier, multiplier, extent); - } - + } + i = mpz_get_ui (offset); - + mpz_clear (multiplier); mpz_clear (offset); mpz_clear (extent); mpz_clear (n); - + return i; } @@ -964,7 +964,7 @@ new_condition (segment_info *v, gfc_equiv *eq1, gfc_equiv *eq2) a = get_segment_info (eq2->expr->symtree->n.sym, v->offset + offset1 - offset2); - + current_segment = add_segments (current_segment, a); } @@ -1337,7 +1337,7 @@ finish_equivalences (gfc_namespace *ns) for (z = ns->equiv; z; z = z->next) for (y = z->eq; y; y = y->eq) { - if (y->used) + if (y->used) continue; sym = z->expr->symtree->n.sym; current_segment = get_segment_info (sym, 0); diff --git a/gcc/fortran/trans-openmp.cc b/gcc/fortran/trans-openmp.cc index 279090f..6c2c7482 100644 --- a/gcc/fortran/trans-openmp.cc +++ b/gcc/fortran/trans-openmp.cc @@ -2968,7 +2968,7 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses, for (; n != NULL; n = n->next) { if (iterator && prev->u2.ns != n->u2.ns) - { + { BLOCK_SUBBLOCKS (tree_block) = gfc_finish_block (&iter_block); TREE_VEC_ELT (iterator, 5) = tree_block; for (tree c = omp_clauses; c != prev_clauses; @@ -3125,7 +3125,7 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses, omp_clauses = gfc_trans_add_clause (node, omp_clauses); } if (iterator) - { + { BLOCK_SUBBLOCKS (tree_block) = gfc_finish_block (&iter_block); TREE_VEC_ELT (iterator, 5) = tree_block; for (tree c = omp_clauses; c != prev_clauses; @@ -4981,7 +4981,7 @@ gfc_trans_oacc_construct (gfc_code *code) } /* update, enter_data, exit_data, cache. */ -static tree +static tree gfc_trans_oacc_executable_directive (gfc_code *code) { stmtblock_t block; @@ -5009,7 +5009,7 @@ gfc_trans_oacc_executable_directive (gfc_code *code) gfc_start_block (&block); oacc_clauses = gfc_trans_omp_clauses (&block, code->ext.omp_clauses, code->loc, false, true, code->op); - stmt = build1_loc (input_location, construct_code, void_type_node, + stmt = build1_loc (input_location, construct_code, void_type_node, oacc_clauses); gfc_add_expr_to_block (&block, stmt); return gfc_finish_block (&block); diff --git a/gcc/fortran/types.def b/gcc/fortran/types.def index aa61750..a69e252 100644 --- a/gcc/fortran/types.def +++ b/gcc/fortran/types.def @@ -199,19 +199,19 @@ DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_LONG_LONG_LONG_LONG_LONGPTR_LONGPTR, DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_BOOL_ULL_ULL_ULL_ULLPTR_ULLPTR, BT_BOOL, BT_BOOL, BT_ULONGLONG, BT_ULONGLONG, BT_ULONGLONG, BT_PTR_ULONGLONG, BT_PTR_ULONGLONG) -DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I1_BOOL_INT_INT, +DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I1_BOOL_INT_INT, BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I1, BT_BOOL, BT_INT, BT_INT) -DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I2_BOOL_INT_INT, +DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I2_BOOL_INT_INT, BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I2, BT_BOOL, BT_INT, BT_INT) -DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I4_BOOL_INT_INT, +DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I4_BOOL_INT_INT, BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I4, BT_BOOL, BT_INT, BT_INT) -DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I8_BOOL_INT_INT, +DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I8_BOOL_INT_INT, BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I8, BT_BOOL, BT_INT, BT_INT) -DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I16_BOOL_INT_INT, +DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_VPTR_PTR_I16_BOOL_INT_INT, BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I16, BT_BOOL, BT_INT, BT_INT) DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_SIZE_VPTR_PTR_PTR_INT_INT, BT_BOOL, BT_SIZE, |