summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorEvan Green <evgreen@chromium.org>2021-08-02 20:21:45 +0000
committerEvan Green <evgreen@chromium.org>2021-08-02 20:28:24 +0000
commit62e8a15c4bc87f9c9c146527922b6435a9136e63 (patch)
treebf078f1197e0b5f1a0b82f21e79b53cbcc1307fb /Makefile.rules
parent5af75662e7d236f887cbb1c295e4317fce00184b (diff)
downloadchrome-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.rules')
-rw-r--r--Makefile.rules2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 0cdd724c9d..8cd04edf38 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -64,7 +64,7 @@ export STATIC_VERSION
# a ccache issue.
# commands to build all targets
-cmd_libec = $(LD) -r $(LD_R_FLAGS) $^ -o $@.1.o ${silent_err} && \
+cmd_libec = $(LD) -r $^ -o $@.1.o ${silent_err} && \
$(OBJCOPY) --localize-hidden $@.1.o $@.2.o ${silent_err} && \
$(AR) scr $@ $@.2.o ${silent_err}
cmd_lds = $(CPP) -P -C -MMD -MF $@.d -MT $@ $(CPPFLAGS) $< -o $@