foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-13 11:25:02 -05:00
Code Issues Activity

Add risc-v 64-bit to gitian

Browse source
This commit is contained in:
Chun Kuan Lee 2018-07-14 01:39:24 +00:00
parent 96dda8b058
commit c4aecd1d80
2 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
contrib/gitian-descriptors/gitian-linux.yml
View file

@ -8,15 +8,19 @@ architectures:
packages: packages:
- "curl" - "curl"
- "g++-aarch64-linux-gnu" - "g++-aarch64-linux-gnu"
- "g++-7-aarch64-linux-gnu" - "g++-8-aarch64-linux-gnu"
- "gcc-7-aarch64-linux-gnu" - "gcc-8-aarch64-linux-gnu"
- "binutils-aarch64-linux-gnu" - "binutils-aarch64-linux-gnu"
- "g++-arm-linux-gnueabihf" - "g++-arm-linux-gnueabihf"
- "g++-7-arm-linux-gnueabihf" - "g++-8-arm-linux-gnueabihf"
- "gcc-7-arm-linux-gnueabihf" - "gcc-8-arm-linux-gnueabihf"
- "binutils-arm-linux-gnueabihf" - "binutils-arm-linux-gnueabihf"
- "g++-7-multilib" - "g++-riscv64-linux-gnu"
- "gcc-7-multilib" - "g++-8-riscv64-linux-gnu"
- "gcc-8-riscv64-linux-gnu"
- "binutils-riscv64-linux-gnu"
- "g++-8-multilib"
- "gcc-8-multilib"
- "binutils-gold" - "binutils-gold"
- "git" - "git"
- "pkg-config" - "pkg-config"
@ -34,9 +38,9 @@ files: []
script: | script: |
WRAP_DIR=$HOME/wrapped WRAP_DIR=$HOME/wrapped
HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu" HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu"
CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests" CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
FAKETIME_HOST_PROGS="" FAKETIME_HOST_PROGS="gcc g++"
FAKETIME_PROGS="date ar ranlib nm" FAKETIME_PROGS="date ar ranlib nm"
HOST_CFLAGS="-O2 -g" HOST_CFLAGS="-O2 -g"
HOST_CXXFLAGS="-O2 -g" HOST_CXXFLAGS="-O2 -g"
@ -69,12 +73,15 @@ script: |
function create_per-host_faketime_wrappers { function create_per-host_faketime_wrappers {
for i in $HOSTS; do for i in $HOSTS; do
for prog in ${FAKETIME_HOST_PROGS}; do for prog in ${FAKETIME_HOST_PROGS}; do
if which ${i}-${prog}-8
then
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog} echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog} echo "REAL=\`which -a ${i}-${prog}-8 | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog} echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog} echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog} echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
chmod +x ${WRAP_DIR}/${i}-${prog} chmod +x ${WRAP_DIR}/${i}-${prog}
fi
done done
done done
} }
@ -100,7 +107,7 @@ script: |
rm -f ${WRAP_DIR}/${prog} rm -f ${WRAP_DIR}/${prog}
cat << EOF > ${WRAP_DIR}/${prog} cat << EOF > ${WRAP_DIR}/${prog}
#!/usr/bin/env bash #!/usr/bin/env bash
REAL="`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1`" REAL="`which -a ${prog}-8 | grep -v ${WRAP_DIR}/${prog} | head -1`"
for var in "\$@" for var in "\$@"
do do
if [ "\$var" = "-m32" ]; then if [ "\$var" = "-m32" ]; then
@ -174,6 +181,7 @@ script: |
case $i in case $i in
aarch64-*) : ;; aarch64-*) : ;;
arm-*) : ;; arm-*) : ;;
riscv64-*) : ;;
*) make ${MAKEOPTS} -C src check-symbols ;; *) make ${MAKEOPTS} -C src check-symbols ;;
esac esac

2
src/compat/glibc_compat.cpp
View file

@ -67,6 +67,8 @@ __asm(".symver log2f_old,log2f@GLIBC_2.2.5");
__asm(".symver log2f_old,log2f@GLIBC_2.4"); __asm(".symver log2f_old,log2f@GLIBC_2.4");
#elif defined(__aarch64__) #elif defined(__aarch64__)
__asm(".symver log2f_old,log2f@GLIBC_2.17"); __asm(".symver log2f_old,log2f@GLIBC_2.17");
#elif defined(__riscv)
__asm(".symver log2f_old,log2f@GLIBC_2.27");
#endif #endif
extern "C" float __wrap_log2f(float x) extern "C" float __wrap_log2f(float x)
{ {