⛏️ index : buildtools.git

author Alexander von Gluck IV <kallisti5@unixzen.com> 2019-04-03 20:53:53.0 -05:00:00
committer Alexander von Gluck IV <kallisti5@unixzen.com> 2019-04-03 21:13:19.0 -05:00:00
commit
931a9c38d588f1d05410c371bbec61cc26d8f520 [patch]
tree
d312e318b0c505db761e88589408e3676d40a667
parent
c1627324616fe5b07cae87ae3d907443737606b9
download
931a9c38d588f1d05410c371bbec61cc26d8f520.tar.gz

riscv64: Fix startfile spec which breaks sysroot

* STARTFILE_PREFIX_SPEC is defined to /usr,/lib,etc on riscv.h
  which seems to override the sysroot paths for libraries.

Change-Id: Ia6b785ba1e5421a86227204b73b90496fb1af3ff

Diff

 gcc/gcc/config/riscv/haiku.h |  9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gcc/gcc/config/riscv/haiku.h b/gcc/gcc/config/riscv/haiku.h
index b3568e9..1338375 100644
--- a/gcc/gcc/config/riscv/haiku.h
+++ a/gcc/gcc/config/riscv/haiku.h
@@ -43,10 +43,13 @@
  "%{mabi=lp64f:-sp}" \
  "%{mabi=lp64d:}" \

/* Because RISC-V only has word-sized atomics, it requries libatomic where
   others do not.  So link libatomic by default, as needed.  */
#undef LIB_SPEC
#define LIB_SPEC " -lroot -latomic "
// Linux adds -latomic because RISC-V only has word-sized atomics
// Not sure if we really need it though.
#define LIB_SPEC " -lroot "

// riscv.h defines /lib and friends which breaks the sysroot
#undef STARTFILE_PREFIX_SPEC

#define ICACHE_FLUSH_FUNC "__riscv_flush_icache"