Skip to content

Commit

Permalink
Merge pull request #7 from M4xi1m3/khicas-src
Browse files Browse the repository at this point in the history
Updates GIAC to 1.6.0, now builds from sources.
  • Loading branch information
zardam authored Jul 9, 2020
2 parents 733a47c + 2ff6fc7 commit 8f3a93f
Show file tree
Hide file tree
Showing 10,861 changed files with 6,624,040 additions and 3 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
12 changes: 9 additions & 3 deletions apps/KhiCAS/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@ CFLAGS=-DNDEBUG -ggdb3 -I$(API) -Os -mcpu=cortex-m7 -mthumb -mfpu=fpv5-sp-d16 -m
LDFLAGS=-Wl,-L$(API) -Wl,--gc-sections -Wl,--entry=entrypoint --specs=nano.specs -nostartfiles -Wl,-Ur -lc -lstdc++ -lm -lapi -lnosys

%.o: %.cpp
$(CC) $(CFLAGS) -c $<
$(CC) $(CFLAGS) -c $< -o $@

app.elf: main.o libgiac.a libmpfi.a libmpfr.a libgmp.a
app.elf: src/main.o src/lib/libgiac.a src/lib/libmpfi.a src/lib/libmpfr.a src/lib/libgmp.a
$(CC) $^ -o $@ $(CFLAGS) $(LDFLAGS)

src/lib/libgmp.a src/lib/libmpfi.a src/lib/libmpfr.a src/include/gmp.h src/include/mpfi.h src/include/mpfr.h:
./buildDeps

src/lib/libgiac.a: src/lib/libgmp.a src/lib/libmpfi.a src/lib/libmpfr.a src/include/gmp.h src/include/mpfi.h src/include/mpfr.h
./buildGiac

clean:
rm -f *.elf *.o
rm -f *.elf src/*.o src/include/*.h src/lib/*.a
Binary file modified apps/KhiCAS/app.elf
Binary file not shown.
60 changes: 60 additions & 0 deletions apps/KhiCAS/buildDeps
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#!/usr/bin/env bash

set -e

function build {
(
cd src/gmp-6.2.0
./configure --host=arm-none-eabi --disable-assembly CFLAGS="$2"
make -j $(nproc)
cp .libs/libgmp.a ../lib/
cp gmp.h ../include/gmp.h
make distclean
)

(
cd src/mpfr-4.0.2
./configure --with-gmp=../ --host=arm-none-eabi --disable-shared CFLAGS="$2"
make -j $(nproc)
cp src/.libs/libmpfr.a ../lib/
cp src/mpfr.h ../include/mpfr.h
make distclean
)

(
cd src/mpfi-1.5.4

# Quick and dirty hack for github pages to work
# Setup symlinks manually
mkdir build-aux
mkdir m4

ln -s /usr/share/libtool/build-aux/ltmain.sh build-aux/ltmain.sh
ln -s /usr/share/automake-1.16/missing build-aux/missing
ln -s /usr/share/automake-1.16/config.sub build-aux/config.sub
ln -s /usr/share/automake-1.16/compile build-aux/compile
ln -s /usr/share/automake-1.16/config.guess build-aux/config.guess
ln -s /usr/share/automake-1.16/test-driver build-aux/test-driver
ln -s /usr/share/automake-1.16/install-sh build-aux/install-sh
ln -s /usr/share/automake-1.16/ar-lib build-aux/ar-lib
ln -s /usr/share/automake-1.16/depcomp build-aux/depcomp
ln -s /usr/share/aclocal/ltoptions.m4 m4/ltoptions.m4
ln -s /usr/share/aclocal/ltsugar.m4 m4/ltsugar.m4
ln -s /usr/share/aclocal/libtool.m4 m4/libtool.m4
ln -s /usr/share/aclocal/lt~obsolete.m4 m4/lt~obsolete.m4
ln -s /usr/share/aclocal/ltversion.m4 m4/ltversion.m4


./configure --with-mpfr=$(pwd)/../ --with-gmp=$(pwd)/../ --host=arm-none-eabi CFLAGS="$2"
make -j $(nproc)
cp src/.libs/libmpfi.a ../lib/
cp src/mpfi.h ../include/mpfi.h
make distclean

rm -r build-aux
rm -r m4
)
}

# build n0100 "-Os -fdata-sections -ffunction-sections -DNDEBUG -mthumb -march=armv7e-m -mfloat-abi=hard -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -fno-strict-aliasing --specs=nosys.specs"
build n0110 "-Os -fdata-sections -ffunction-sections -DNDEBUG -mthumb -march=armv7e-m -mfloat-abi=hard -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -fno-strict-aliasing --specs=nosys.specs"
17 changes: 17 additions & 0 deletions apps/KhiCAS/buildGiac
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env bash

set -e

function build {
(
cd src/giac-1.6.0/src
rm -f *.o *.a
make -f Makefile.numworks.$1 -j $(nproc)
cp libgiac.a ../../lib/
rm -f *.o *.a
)
}

#build n0100
build n0110
#build simulator
Binary file removed apps/KhiCAS/libgmp.a
Binary file not shown.
Binary file removed apps/KhiCAS/libmpfi.a
Binary file not shown.
Binary file removed apps/KhiCAS/libmpfr.a
Binary file not shown.
996 changes: 996 additions & 0 deletions apps/KhiCAS/src/giac-1.6.0/ABOUT-NLS

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions apps/KhiCAS/src/giac-1.6.0/AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
B. Parisse,
Institut Fourier, 100 rue des maths,
F-38402 St Martin d'Heres Cedex
<parisse@fourier.ujf-grenoble.fr>
ifactor, isom, mkisom, gauss: R. De Graeve
<degraeve@fourier.ujf-grenoble.fr>
Loading

0 comments on commit 8f3a93f

Please sign in to comment.