Skip to content

Commit

Permalink
Rollup merge of rust-lang#110430 - jsoref:spelling-src-ci, r=albertla…
Browse files Browse the repository at this point in the history
…rsan68

Spelling src ci

The various src/* items seem slightly disparate, so I'm doing src/* individually.

split from rust-lang#110392
  • Loading branch information
matthiaskrgr authored Apr 19, 2023
2 parents af92c6a + 9c8d10a commit dc0de09
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/ci/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ For targets: `armv7-unknown-linux-gnueabihf`
(\*) These options have been selected to match the configuration of the arm
toolchains shipped with Ubuntu 15.10
(+) These options have been selected to match the gcc flags we use to compile C
libraries like jemalloc. See the mk/cfg/arm(v7)-uknown-linux-gnueabi{,hf}.mk
libraries like jemalloc. See the mk/cfg/arm(v7)-unknown-linux-gnueabi{,hf}.mk
file in Rust's source code.

### `aarch64-linux-gnu.config`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Remove stime() function calls

stime() has been deprecated in glibc 2.31 and replaced with
clock_settime(). Let's replace the stime() function calls with
clock_settime() in preperation.
clock_settime() in preparation.

function old new delta
rdate_main 197 224 +27
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y
CT_CC_GCC_HAS_ARCH_OPTIONS=y

#
# archictecture-specific options
# architecture-specific options
#
CT_CC_GCC_mips_llsc=m
CT_CC_GCC_mips_synci=m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y
CT_CC_GCC_HAS_ARCH_OPTIONS=y

#
# archictecture-specific options
# architecture-specific options
#
CT_CC_GCC_mips_llsc=m
CT_CC_GCC_mips_synci=m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y
CT_CC_GCC_HAS_ARCH_OPTIONS=y

#
# archictecture-specific options
# architecture-specific options
#
CT_CC_GCC_mips_llsc=m
CT_CC_GCC_mips_synci=m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ CT_CC_GCC_DEC_FLOAT_AUTO=y
CT_CC_GCC_HAS_ARCH_OPTIONS=y

#
# archictecture-specific options
# architecture-specific options
#
CT_CC_GCC_mips_llsc=m
CT_CC_GCC_mips_synci=m
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# A quick smoke test to make sure publish_tooolstate.py works.
# A quick smoke test to make sure publish_toolstate.py works.

set -euo pipefail
IFS=$'\n\t'
Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/scripts/qemu-bare-bones-rcS
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ mount -t sysfs none /sys
/addentropy < /addentropy
cat /dev/urandom | head -n 2048 | /addentropy

# Set up IP that qemu expects. This confgures eth0 with the public IP that QEMU
# Set up IP that qemu expects. This configures eth0 with the public IP that QEMU
# will communicate to as well as the loopback 127.0.0.1 address.
ifconfig eth0 10.0.2.15
ifconfig lo up
Expand Down

0 comments on commit dc0de09

Please sign in to comment.