diff options
| author | Evan Green <evgreen@chromium.org> | 2021-08-02 20:21:45 +0000 |
|---|---|---|
| committer | Evan Green <evgreen@chromium.org> | 2021-08-02 20:28:24 +0000 |
| commit | 62e8a15c4bc87f9c9c146527922b6435a9136e63 (patch) | |
| tree | bf078f1197e0b5f1a0b82f21e79b53cbcc1307fb /Makefile.toolchain | |
| parent | 5af75662e7d236f887cbb1c295e4317fce00184b (diff) | |
| download | chrome-ec-62e8a15c4bc87f9c9c146527922b6435a9136e63.tar.gz | |
Revert "make: Compile host tests in 32-bit mode"
This reverts commit 1821e9423af84c7a126a4a15303c6492dd44e94b.
Reason for revert: This change broke the build.
BUG=b:195332627
TEST=None
BRANCH=None
Original change's description:
> make: Compile host tests in 32-bit mode
>
> Compile the host tests in 32-bit mode instead of 64-bit mode as it's
> more likely to match the actual environments our ECs run on. For
> instance, in 32-bit mode the tests might actually have a prayer of
> finding a torn read or write bug, whereas in 64-bit mode 64-bit integers
> are always operated on atomically.
>
> BUG=b:179062230
> BRANCH=none
> TEST=make -j runhosttests BOARD=host on x86_64 and i686
>
> Signed-off-by: Evan Green <evgreen@chromium.org>
> Change-Id: I02517066337ec08c311c1f7daae5d3de84b1f4c2
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3059231
> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Bug: b:179062230
Change-Id: I35bcac77deeb1d031a31b32d911781f5fed4ab13
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3067826
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Allen Webb <allenwebb@google.com>
Tested-by: Evan Green <evgreen@chromium.org>
Diffstat (limited to 'Makefile.toolchain')
| -rw-r--r-- | Makefile.toolchain | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.toolchain b/Makefile.toolchain index fe7c9be5b9..e39a1c3016 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -95,13 +95,11 @@ BUILD_CPPFLAGS=$(CFLAGS_DEFINE) -Icore/host $(CFLAGS_INCLUDE) $(CFLAGS_TEST) \ HOST_CPPFLAGS=$(CFLAGS_DEFINE) $(CFLAGS_INCLUDE) $(CFLAGS_TEST) \ $(EXTRA_CFLAGS) $(CFLAGS_COVERAGE) $(CFLAGS_HOSTTEST) $(LATE_CFLAGS_DEFINE) \ -DSECTION_IS_$(BLD)=$(EMPTY) -DSECTION=$(BLD) $(CPPFLAGS_$(BLD)) -LD_R_FLAGS= ifneq ($(BOARD),host) CPPFLAGS+=-ffreestanding -fno-builtin -nostdinc -nostdlib CPPFLAGS+=-Ibuiltin/ else CPPFLAGS+=-Og -LD_R_FLAGS=-m elf_i386 endif CPPFLAGS+= -DCHROMIUM_EC=$(EMPTY) CFLAGS=$(CPPFLAGS) $(CFLAGS_CPU) $(CFLAGS_DEBUG) $(COMMON_WARN) $(CFLAGS_y) @@ -149,7 +147,7 @@ LDFLAGS=-nostdlib -g -Wl,-X -Wl,--gc-sections -Wl,--build-id=none \ BUILD_LDFLAGS=$(LIBFTDIUSB_LDLIBS) HOST_LDFLAGS=$(LIBFTDIUSB_LDLIBS) HOST_TEST_LDFLAGS=-Wl,-T core/host/host_exe.lds -lrt -pthread -rdynamic -lm\ - -fuse-ld=bfd -m32 \ + -fuse-ld=bfd \ $(if $(TEST_COVERAGE), --coverage,) \ $(if $(TEST_ASAN), -fsanitize=address) \ $(if $(TEST_MSAN), -fsanitize=memory) \ |