diff options
| author | Justin TerAvest <teravest@chromium.org> | 2018-06-13 16:40:41 +0000 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-06-14 01:31:52 -0700 |
| commit | 27fb3c44b131ac4a5d6994906fcf30a04e0432c8 (patch) | |
| tree | 6246f63130afcbf09f6c8d45b1e24b287b588477 /core | |
| parent | ed30a9ea110f18d19fad3e9ece1f47e0c7019140 (diff) | |
| download | chrome-ec-27fb3c44b131ac4a5d6994906fcf30a04e0432c8.tar.gz | |
Revert "nds32: make code build with gcc 8.1"
This reverts commit 194c7a7e0ad27ee80abc66d211a3f7e8e4e2f4d1.
Reason for revert: Breaks build for octopus-release.
Original change's description:
> nds32: make code build with gcc 8.1
>
> *** 21744 bytes still available in flash on reef_it8320 ****
>
> BUG=b:65441143
> BRANCH=none
> TEST=make BOARD=reef_it8320 builds with gcc 8.1. not tested at all
>
> Change-Id: Ie79ee23452574fd883c7f9425b8614346e46fdd7
> Signed-off-by: Patrick Georgi <pgeorgi@google.com>
> Reviewed-on: https://chromium-review.googlesource.com/1077207
> Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
> Tested-by: Patrick Georgi <pgeorgi@chromium.org>
> Reviewed-by: Stefan Reinauer <reinauer@google.com>
Bug: b:65441143
Change-Id: I1c37701be9c40d3a4b5a77e2e04e96c37150ca30
Reviewed-on: https://chromium-review.googlesource.com/1098717
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Justin TerAvest <teravest@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/nds32/abort.S | 26 | ||||
| -rw-r--r-- | core/nds32/build.mk | 3 |
2 files changed, 0 insertions, 29 deletions
diff --git a/core/nds32/abort.S b/core/nds32/abort.S deleted file mode 100644 index d7474812af..0000000000 --- a/core/nds32/abort.S +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * abort() handler - */ - -#include "config.h" -#define PSW_INTL_SHIFT 1 /* Interrupt Stack Level */ -#define PSW_INTL_MASK (0x3 << PSW_INTL_SHIFT) - -.text - -.global abort -abort: - movi55 $r6, 3 // assert - movi55 $r7, 0 // no info. doubles for the equality test below - - // in interrupt context -> $r5 != 0 - mfsr $r5, $PSW - andi $r5, $r5, PSW_INTL_MASK - - beq $r5, $r7, .L1 - j excep_handler -.L1: - break 0 diff --git a/core/nds32/build.mk b/core/nds32/build.mk index 6043ef9831..db2a52d1b1 100644 --- a/core/nds32/build.mk +++ b/core/nds32/build.mk @@ -20,8 +20,5 @@ CFLAGS_CPU+=-flto LDFLAGS_EXTRA+=-flto endif -LDFLAGS_EXTRA+=-Wl,--relax - core-y=cpu.o init.o panic.o task.o switch.o __muldi3.o math.o __builtin.o -core-y+=abort.o core-$(CONFIG_FPU)+=__libsoftfpu.o |