From acbe166dac9d1db752ee95f61e65ca82bb875afb Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Tue, 16 May 2023 13:46:48 -0700 Subject: Revert "[GCC]: Fix fence.i bug (#296)" This reverts commit 54de960a5e4c91734fcfd454fdc7e593c6ac571d. See #298 for explanation. --- Makefile.in | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/Makefile.in b/Makefile.in index cdb6007..05e3a4d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -57,27 +57,16 @@ endif # *** If --with-abi is given but --with-arch is not, then the ISA uses the # compiler's default. - -ifneq (@WITH_ARCH@,) - is_32bit := $(findstring 32,@WITH_ARCH@) -else -ifneq (@host_alias@,) - is_32bit := $(findstring 32,@host_alias@) -else - is_32bit := "" -endif -endif - ifneq (@WITH_ARCH@,) march := -march=@WITH_ARCH@ -else - march := -march=$(if $(is_32bit),rv32,rv64)im_zicsr_zifencei + is_32bit := $(findstring 32,$(march)) + ifeq (@WITH_ABI@,) + mabi := -mabi=$(if $(is_32bit),ilp32,lp64) + endif endif ifneq (@WITH_ABI@,) mabi := -mabi=@WITH_ABI@ -else - mabi := -mabi=$(if $(is_32bit),ilp32,lp64) endif # Installation directories -- cgit v1.1