Merge pull request #285 from cpc/riscv_build_fixes

Riscv build fixes

Author: pjaaskel

README.md

@@ -225,10 +225,6 @@ Make sure your installation directory is added to `PATH` correctly:
 export PATH=$HOME/local/bin:$PATH
 ```
 
-After this the RISC-V support can be enabled by adding `--enable-riscv`
-option to the configure command in the following general
-building and installation instructions.
-
 Building and Installing OpenASIP
 ===========================
 

openasip/Makefile.am

@@ -6,10 +6,7 @@ SUBDIRS += bclib
 SUBDIRS += newlib-1.17.0/tce-llvm 
 SUBDIRS += newlib-1.17.0/tcele-llvm 
 SUBDIRS += newlib-1.17.0/tcele64-llvm
-
-if RISCV
 SUBDIRS += newlib-1.17.0/riscv-llvm
-endif
 
 AUTOMAKE_OPTIONS = foreign
 

openasip/configure.ac

@@ -542,17 +542,6 @@ case $host_os in
   ;;
 esac
 
-AC_ARG_ENABLE(riscv,
-[AS_HELP_STRING([--enable-riscv],[enable the (experimental) RISC-V support])],
-[
- ENABLE_RISCV=true
-],
-[
- ENABLE_RISCV=false
-]
-)
-AM_CONDITIONAL(RISCV, test x$ENABLE_RISCV = xtrue)
-
 # Hack for debian sid packages
 if test x"$LLVM_INCLUDEDIR" == x/usr/include/llvm; then
 LLVM_INCLUDEDIR=/usr/include
@@ -1590,9 +1579,6 @@ $srcdir/newlib-1.17.0/configure --prefix=$prefix --target=tcele64-llvm --disable
 2>&1 | egrep -v "to force reconfigure";
 ])
 
-if test x"$ENABLE_RISCV" = xtrue
-then
-
 AC_CONFIG_COMMANDS_POST ([
 echo "=== Configuring newlib for riscv =====";
 # make srcdir absolute
@@ -1613,8 +1599,6 @@ $srcdir/newlib-1.17.0/configure --prefix=$prefix --target=riscv --disable-multil
 2>&1 | egrep -v "to force reconfigure";
 ])
 
-fi
-
 # Generate config.status and launch it. config.status then
 # performs all configuration actions.
 AC_OUTPUT
@@ -1677,13 +1661,6 @@ else
   echo "Found LLVM version $LLVM_VERSION"
 fi
 
-if test x"$ENABLE_RISCV" = xtrue
-then
-  echo "RISC-V support enabled."
-else
-  echo "RISC-V support not enabled."
-fi
-
 
 #  else
 #     

openasip/data/riscv/RISCVPluginMakefile

@@ -7,9 +7,6 @@ LLVMTCE_INCLUDE_DIR := $(shell llvmtce-config --includedir)
 CXXFLAGS += -I$(LLVMTCE_INCLUDE_DIR) -I .
 TABLEGEN_INCLUDE = -I$(LLVMTCE_INCLUDE_DIR) -I .
 
-# Linking flags
-LDFLAGS := -shared
-
 # Tablegen executable
 TABLEGEN := llvm-tblgen
 
@@ -138,7 +135,7 @@ RISCVGenSubtargetInfo.inc: $(TD_FILE)
 
 # Link object files into shared library
 $(LIBRARY): $(OBJS)
-	$(CXX) $(LDFLAGS) -o $@ $(OBJS)
+	$(CXX) -shared $(LDFLAGS) -o $@ $(OBJS)
 	rm -f $(OBJS) $(TABLEGEN_TARGETS)
 
 # Clean up

openasip/src/bintools/Compiler/Makefile.am

@@ -1,4 +1,9 @@
-SUBDIRS=tceopgen llvm-tce riscv-tdgen
+SUBDIRS = tceopgen llvm-tce riscv-tdgen
 
 bin_SCRIPTS = oacc oacc-riscv
-EXTRA_DIST = ${bin_SCRIPTS}
+EXTRA_DIST = ${bin_SCRIPTS}
+
+all-local:
+	+./oacc-riscv --generate-plugin --tce-build-mode
+
+.PHONY: all-local

openasip/tools/scripts/install_riscv_tools.sh

@@ -21,7 +21,7 @@ function eexit {
 }
 
 function install_gnu_toolchain {
-    version=2023.07.07
+    version=2025.05.30
     repository=https://github.com/riscv-collab/riscv-gnu-toolchain
     name=riscv-gnu-toolchain
     git clone $repository || eexit "git clone $name failed"