Skip to content

Commit c4aecd1

Browse files
committed
Add risc-v 64-bit to gitian
1 parent 96dda8b commit c4aecd1

File tree

2 files changed

+25
-15
lines changed

2 files changed

+25
-15
lines changed

contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,19 @@ architectures:
88
packages:
99
- "curl"
1010
- "g++-aarch64-linux-gnu"
11-
- "g++-7-aarch64-linux-gnu"
12-
- "gcc-7-aarch64-linux-gnu"
11+
- "g++-8-aarch64-linux-gnu"
12+
- "gcc-8-aarch64-linux-gnu"
1313
- "binutils-aarch64-linux-gnu"
1414
- "g++-arm-linux-gnueabihf"
15-
- "g++-7-arm-linux-gnueabihf"
16-
- "gcc-7-arm-linux-gnueabihf"
15+
- "g++-8-arm-linux-gnueabihf"
16+
- "gcc-8-arm-linux-gnueabihf"
1717
- "binutils-arm-linux-gnueabihf"
18-
- "g++-7-multilib"
19-
- "gcc-7-multilib"
18+
- "g++-riscv64-linux-gnu"
19+
- "g++-8-riscv64-linux-gnu"
20+
- "gcc-8-riscv64-linux-gnu"
21+
- "binutils-riscv64-linux-gnu"
22+
- "g++-8-multilib"
23+
- "gcc-8-multilib"
2024
- "binutils-gold"
2125
- "git"
2226
- "pkg-config"
@@ -34,9 +38,9 @@ files: []
3438
script: |
3539
3640
WRAP_DIR=$HOME/wrapped
37-
HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu"
41+
HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu"
3842
CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
39-
FAKETIME_HOST_PROGS=""
43+
FAKETIME_HOST_PROGS="gcc g++"
4044
FAKETIME_PROGS="date ar ranlib nm"
4145
HOST_CFLAGS="-O2 -g"
4246
HOST_CXXFLAGS="-O2 -g"
@@ -69,12 +73,15 @@ script: |
6973
function create_per-host_faketime_wrappers {
7074
for i in $HOSTS; do
7175
for prog in ${FAKETIME_HOST_PROGS}; do
72-
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
73-
echo "REAL=\`which -a ${i}-${prog} | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
74-
echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
75-
echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
76-
echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
77-
chmod +x ${WRAP_DIR}/${i}-${prog}
76+
if which ${i}-${prog}-8
77+
then
78+
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
79+
echo "REAL=\`which -a ${i}-${prog}-8 | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
80+
echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
81+
echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
82+
echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
83+
chmod +x ${WRAP_DIR}/${i}-${prog}
84+
fi
7885
done
7986
done
8087
}
@@ -100,7 +107,7 @@ script: |
100107
rm -f ${WRAP_DIR}/${prog}
101108
cat << EOF > ${WRAP_DIR}/${prog}
102109
#!/usr/bin/env bash
103-
REAL="`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1`"
110+
REAL="`which -a ${prog}-8 | grep -v ${WRAP_DIR}/${prog} | head -1`"
104111
for var in "\$@"
105112
do
106113
if [ "\$var" = "-m32" ]; then
@@ -174,6 +181,7 @@ script: |
174181
case $i in
175182
aarch64-*) : ;;
176183
arm-*) : ;;
184+
riscv64-*) : ;;
177185
*) make ${MAKEOPTS} -C src check-symbols ;;
178186
esac
179187

src/compat/glibc_compat.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ __asm(".symver log2f_old,log2f@GLIBC_2.2.5");
6767
__asm(".symver log2f_old,log2f@GLIBC_2.4");
6868
#elif defined(__aarch64__)
6969
__asm(".symver log2f_old,log2f@GLIBC_2.17");
70+
#elif defined(__riscv)
71+
__asm(".symver log2f_old,log2f@GLIBC_2.27");
7072
#endif
7173
extern "C" float __wrap_log2f(float x)
7274
{

0 commit comments

Comments
 (0)