From 02fec1e6e5b6728c13763718c98cf5db68b1cce3 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Mon, 23 May 2022 20:56:49 +0000 Subject: [PATCH] 8287155: Additional make typos Reviewed-by: lancea, iris --- make/autoconf/flags-cflags.m4 | 4 ++-- make/autoconf/flags.m4 | 2 +- make/autoconf/lib-hsdis.m4 | 2 +- make/autoconf/lib-std.m4 | 2 +- make/autoconf/platform.m4 | 2 +- make/autoconf/toolchain_microsoft.m4 | 2 +- make/conf/jib-profiles.js | 2 +- make/devkit/createWindowsDevkit.sh | 2 +- make/ide/idea/jdk/template/src/idea/JdkIdeaAntLogger.java | 2 +- .../langtools/template/src/idea/LangtoolsIdeaAntLogger.java | 2 +- make/ide/netbeans/langtools/build.xml | 2 +- make/langtools/build.xml | 2 +- make/scripts/logger.sh | 4 ++-- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4 index 0ebc0ba54de..2faa3d5e942 100644 --- a/make/autoconf/flags-cflags.m4 +++ b/make/autoconf/flags-cflags.m4 @@ -893,8 +893,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], # $2 - Prefix for compiler variables (either BUILD_ or nothing). AC_DEFUN([FLAGS_SETUP_GCC6_COMPILER_FLAGS], [ - # These flags are required for GCC 6 builds as undefined behaviour in OpenJDK code - # runs afoul of the more aggressive versions of these optimisations. + # These flags are required for GCC 6 builds as undefined behavior in OpenJDK code + # runs afoul of the more aggressive versions of these optimizations. # Notably, value range propagation now assumes that the this pointer of C++ # member functions is non-null. NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4 index 1452a1b3009..203c0e5708c 100644 --- a/make/autoconf/flags.m4 +++ b/make/autoconf/flags.m4 @@ -295,7 +295,7 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN], # FIXME: Don't really know how to do with this, but this was the old behavior GLOBAL_CPPFLAGS="$SYSROOT_CFLAGS" - # FIXME: For compatilibity, export this as EXTRA_CFLAGS for now. + # FIXME: For compatibility, export this as EXTRA_CFLAGS for now. EXTRA_CFLAGS="$MACHINE_FLAG $USER_CFLAGS" EXTRA_CXXFLAGS="$MACHINE_FLAG $USER_CXXFLAGS" EXTRA_LDFLAGS="$MACHINE_FLAG $USER_LDFLAGS" diff --git a/make/autoconf/lib-hsdis.m4 b/make/autoconf/lib-hsdis.m4 index f3e5da5f869..d72bbf6df32 100644 --- a/make/autoconf/lib-hsdis.m4 +++ b/make/autoconf/lib-hsdis.m4 @@ -47,7 +47,7 @@ AC_DEFUN([LIB_SETUP_HSDIS_CAPSTONE], fi else if test "x$OPENJDK_TARGET_OS" = xwindows; then - # There is no way to auto-detect capstone on Windowos + # There is no way to auto-detect capstone on Windows AC_MSG_NOTICE([You must specify capstone location using --with-capstone=]) AC_MSG_ERROR([Cannot continue]) fi diff --git a/make/autoconf/lib-std.m4 b/make/autoconf/lib-std.m4 index dc964889030..e470cdbe66f 100644 --- a/make/autoconf/lib-std.m4 +++ b/make/autoconf/lib-std.m4 @@ -31,7 +31,7 @@ ################################################################################ AC_DEFUN_ONCE([LIB_SETUP_STD_LIBS], [ - # statically link libstdc++ before C++ ABI is stablized on Linux unless + # statically link libstdc++ before C++ ABI is stabilized on Linux unless # dynamic build is configured on command line. AC_ARG_WITH([stdc++lib], [AS_HELP_STRING([--with-stdc++lib=,,], [force linking of the C++ runtime on Linux to either static or dynamic, default is static with dynamic as fallback])], diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4 index 2c5444d42e8..2e068442828 100644 --- a/make/autoconf/platform.m4 +++ b/make/autoconf/platform.m4 @@ -384,7 +384,7 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD], fi ]) -# Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour +# Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behavior # accordingly. Must be done after setting up build and target system, but before # doing anything else with these values. AC_DEFUN([PLATFORM_SETUP_TARGET_CPU_BITS], diff --git a/make/autoconf/toolchain_microsoft.m4 b/make/autoconf/toolchain_microsoft.m4 index e6a2049e623..b47f184ea8f 100644 --- a/make/autoconf/toolchain_microsoft.m4 +++ b/make/autoconf/toolchain_microsoft.m4 @@ -317,7 +317,7 @@ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO], eval MSVCP_NAME="\${VS_MSVCP_${VS_VERSION}}" eval USE_UCRT="\${VS_USE_UCRT_${VS_VERSION}}" eval VS_SUPPORTED="\${VS_SUPPORTED_${VS_VERSION}}" - # The rest of the variables are already evaled while probing + # The rest of the variables are already evaluated while probing AC_MSG_NOTICE([Found $VS_DESCRIPTION]) break fi diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index 023d5f9a3b4..80a085578c9 100644 --- a/make/conf/jib-profiles.js +++ b/make/conf/jib-profiles.js @@ -837,7 +837,7 @@ var getJibProfilesProfiles = function (input, common, data) { [ "", common.open_suffix ].forEach(function (suffix) { var cmpBaselineName = name + suffix + "-cmp-baseline"; profiles[cmpBaselineName] = clone(profiles[name + suffix]); - // Only compare the images target. This should pressumably be expanded + // Only compare the images target. This should presumably be expanded // to include more build targets when possible. profiles[cmpBaselineName].default_make_targets = [ "images", "test-image" ]; if (name == "linux-x64") { diff --git a/make/devkit/createWindowsDevkit.sh b/make/devkit/createWindowsDevkit.sh index f738c3a89fb..9e36e3c6778 100644 --- a/make/devkit/createWindowsDevkit.sh +++ b/make/devkit/createWindowsDevkit.sh @@ -107,7 +107,7 @@ POTENTIAL_INI_FILES="Common7/IDE/wdexpress.isolation.ini Common7/IDE/devenv.isol for f in $POTENTIAL_INI_FILES; do if [ -f "$VS_INSTALL_DIR/$f" ]; then VS_VERSION_SP="$(grep ^SemanticVersion= "$VS_INSTALL_DIR/$f")" - # Remove SemnaticVersion= + # Remove SemanticVersion= VS_VERSION_SP="${VS_VERSION_SP#*=}" # Remove suffix of too detailed numbering starting with + VS_VERSION_SP="${VS_VERSION_SP%+*}" diff --git a/make/ide/idea/jdk/template/src/idea/JdkIdeaAntLogger.java b/make/ide/idea/jdk/template/src/idea/JdkIdeaAntLogger.java index 22d42a93805..d58fa40cc8b 100644 --- a/make/ide/idea/jdk/template/src/idea/JdkIdeaAntLogger.java +++ b/make/ide/idea/jdk/template/src/idea/JdkIdeaAntLogger.java @@ -254,7 +254,7 @@ public final class JdkIdeaAntLogger extends DefaultLogger { /** flag - is this the first target we encounter? */ boolean firstTarget = true; - /** flag - should subsequenet failures be suppressed ? */ + /** flag - should subsequent failures be suppressed ? */ boolean suppressTaskFailures = false; /** flag - have we ran into a javac crash ? */ diff --git a/make/ide/idea/langtools/template/src/idea/LangtoolsIdeaAntLogger.java b/make/ide/idea/langtools/template/src/idea/LangtoolsIdeaAntLogger.java index 2005a390573..11ebfbf3e39 100644 --- a/make/ide/idea/langtools/template/src/idea/LangtoolsIdeaAntLogger.java +++ b/make/ide/idea/langtools/template/src/idea/LangtoolsIdeaAntLogger.java @@ -243,7 +243,7 @@ public final class LangtoolsIdeaAntLogger extends DefaultLogger { /** flag - is this the first target we encounter? */ boolean firstTarget = true; - /** flag - should subsequenet failures be suppressed ? */ + /** flag - should subsequent failures be suppressed ? */ boolean suppressTaskFailures = false; /** flag - have we ran into a javac crash ? */ diff --git a/make/ide/netbeans/langtools/build.xml b/make/ide/netbeans/langtools/build.xml index 35691512d14..b23614649b8 100644 --- a/make/ide/netbeans/langtools/build.xml +++ b/make/ide/netbeans/langtools/build.xml @@ -40,7 +40,7 @@ That would reduce the list of Ant targets that get displayed for this file, but it also complicates the interface between the project build file and the main build file. For example, some imported targets - would have to be reclared, properties would have to be restructured, + would have to be redeclared, properties would have to be restructured, and it would be harder to run results (e.g. in properties) from nested targets. --> diff --git a/make/langtools/build.xml b/make/langtools/build.xml index e61b520d536..400edb6f674 100644 --- a/make/langtools/build.xml +++ b/make/langtools/build.xml @@ -42,7 +42,7 @@ build |-bin (scripts to invoke various tools, javac etc.) - |-genrsc (generated sources - i.e. properties) + |-gensrc (generated sources - i.e. properties) |-modules (compiled classes in a modular layout) |-jtreg (test work/results) |-toolclasses (tools used for building - like the property compiler) diff --git a/make/scripts/logger.sh b/make/scripts/logger.sh index 1ead00c9edd..0a7d8b99f6f 100644 --- a/make/scripts/logger.sh +++ b/make/scripts/logger.sh @@ -22,11 +22,11 @@ # questions. # -# Usage: ./logger.sh theloggfile acommand arg1 arg2 +# Usage: ./logger.sh thelogfile acommand arg1 arg2 # # Execute acommand with args, in such a way that # both stdout and stderr from acommand are appended to -# theloggfile. +# thelogfile. # # Preserve stdout and stderr, so that the stdout # from logger.sh is the same from acommand and equally