Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add libhc submodule #18

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "libhc"]
path = libhc
url = https://github.com/panda-re/libhc.git
125 changes: 0 additions & 125 deletions hypercall.h

This file was deleted.

1 change: 1 addition & 0 deletions libhc
Submodule libhc added at 7fce37
16 changes: 8 additions & 8 deletions package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,42 +9,42 @@ mkdir /app/out
SCRATCH=$(mktemp -d)/libnvram
mkdir $SCRATCH

CC=arm-linux-musleabi-gcc make CFLAGS="-DCONFIG_ARM=1" libnvram.so -C /app
CC=arm-linux-musleabi-gcc make libnvram.so -C /app
mv nvram.o $SCRATCH/nvram.o.armel
mv libnvram.so $SCRATCH/libnvram.so.armel
make clean

CC=arm-linux-musleabihf-gcc make CFLAGS="-DCONFIG_ARM=1 -mfloat-abi=hard" libnvram.so -C /app
CC=arm-linux-musleabihf-gcc make CFLAGS="-mfloat-abi=hard" libnvram.so -C /app
mv nvram.o $SCRATCH/nvram.o.armelhf
mv libnvram.so $SCRATCH/libnvram.so.armelhf
make clean

CC=aarch64-linux-musl-gcc make CFLAGS="-DCONFIG_AARCH64=1" libnvram.so -C /app
caden-kline marked this conversation as resolved.
Show resolved Hide resolved
CC=aarch64-linux-musl-gcc make libnvram.so -C /app
mv nvram.o $SCRATCH/nvram.o.aarch64
mv libnvram.so $SCRATCH/libnvram.so.aarch64
make clean

CC=mipsel-linux-musl-gcc make CFLAGS="-DCONFIG_MIPS=1 -march=mips32r2" libnvram.so -C /app
CC=mipsel-linux-musl-gcc make CFLAGS="-march=mips32r2" libnvram.so -C /app
mv nvram.o $SCRATCH/nvram.o.mipsel
mv libnvram.so $SCRATCH/libnvram.so.mipsel
make clean

CC=mipseb-linux-musl-gcc make CFLAGS="-DCONFIG_MIPS=1 -march=mips32r2" libnvram.so -C /app
CC=mipseb-linux-musl-gcc make CFLAGS="-march=mips32r2" libnvram.so -C /app
mv nvram.o $SCRATCH/nvram.o.mipseb
mv libnvram.so $SCRATCH/libnvram.so.mipseb
make clean

CC=mips64eb-linux-musl-gcc make CFLAGS="-DCONFIG_MIPS=1 -march=mips64r2 -mabi=64" libnvram.so -C /app
CC=mips64eb-linux-musl-gcc make CFLAGS="-march=mips64r2 -mabi=64" libnvram.so -C /app
mv nvram.o $SCRATCH/nvram.o.mips64eb
mv libnvram.so $SCRATCH/libnvram.so.mips64eb
make clean

CC=x86_64-linux-musl-gcc make CFLAGS="-DCONFIG_X86_64=1" libnvram.so -C /app
CC=x86_64-linux-musl-gcc make libnvram.so -C /app
mv nvram.o $SCRATCH/nvram.o.x86_64
mv libnvram.so $SCRATCH/libnvram.so.x86_64
make clean

CC=i686-linux-musl-gcc make CFLAGS="-DCONFIG_I386=1" libnvram.so -C /app
CC=i686-linux-musl-gcc make libnvram.so -C /app
mv nvram.o $SCRATCH/nvram.o.i386
mv libnvram.so $SCRATCH/libnvram.so.i386
make clean
Expand Down
2 changes: 1 addition & 1 deletion strings.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef INCLUDE_STRINGS_H
#define INCLUDE_STRINGS_H

#include "hypercall.h"
#include "libhc/hypercall.h"
#include <stddef.h>

#define PAGE_IN(s) igloo_page_in_str((volatile const char *)(s))
Expand Down