JehanneOS/devtools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge branch 'posix-dir' into port-gcc

Browse Source
This commit is contained in:
Giacomo Tesio 2018-11-26 23:30:31 +01:00
commit 169b4f7374
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cross/patch/gcc/gcc/config/jehanne.h
View File

@ -30,10 +30,10 @@
#define MD_STARTFILE_PREFIX "/arch/amd64/lib/" #define MD_STARTFILE_PREFIX "/arch/amd64/lib/"
#undef GPLUSPLUS_INCLUDE_DIR #undef GPLUSPLUS_INCLUDE_DIR
#define GPLUSPLUS_INCLUDE_DIR "/sys/posix/g++" #define GPLUSPLUS_INCLUDE_DIR "/posix/g++"
#undef GCC_INCLUDE_DIR #undef GCC_INCLUDE_DIR
#define GCC_INCLUDE_DIR "/sys/posix/gcc" #define GCC_INCLUDE_DIR "/posix/gcc"
/* Architecture specific header (u.h) goes here (from config.gcc) */ /* Architecture specific header (u.h) goes here (from config.gcc) */
#define ARCH_INCLUDE_DIR NATIVE_SYSTEM_HEADER_DIR #define ARCH_INCLUDE_DIR NATIVE_SYSTEM_HEADER_DIR
@ -41,6 +41,8 @@
/* The default include dir is /sys/include but... */ /* The default include dir is /sys/include but... */
#define PORTABLE_INCLUDE_DIR "/sys/include" #define PORTABLE_INCLUDE_DIR "/sys/include"
#define POSIX_INCLUDE_DIR "/posix/include"
/* ...we have to wrap libc.h and stdio.h with basic POSIX headers */ /* ...we have to wrap libc.h and stdio.h with basic POSIX headers */
#define BASIC_POSIX_INCLUDE_DIR "/sys/include/apw" #define BASIC_POSIX_INCLUDE_DIR "/sys/include/apw"
@ -49,6 +51,7 @@
{ \ { \
{ GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1, 0 }, \ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1, 0 }, \
{ GCC_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \ { GCC_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \
{ POSIX_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \
{ BASIC_POSIX_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \ { BASIC_POSIX_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \
{ ARCH_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \ { ARCH_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \
{ PORTABLE_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \ { PORTABLE_INCLUDE_DIR, 0, 0, 0, 1, 0 }, \
@ -85,4 +88,3 @@
builtin_define ("__jehanne__"); \ builtin_define ("__jehanne__"); \
builtin_assert ("system=jehanne"); \ builtin_assert ("system=jehanne"); \
} while(0); } while(0);

4
cross/pkgs/mksh/build.sh
View File

@ -27,8 +27,8 @@ export MKSH=$CROSS_DIR/pkgs/mksh/
export MKSH_SRC=$MKSH/src/ export MKSH_SRC=$MKSH/src/
export MKSH_BUILD=$MKSH/out/ export MKSH_BUILD=$MKSH/out/
export MKSHRC_PATH='~/lib/mkshrc' export MKSHRC_PATH='~/lib/mkshrc'
export LIBS="$JEHANNE/arch/$ARCH/lib/newlib/libc.a $JEHANNE/arch/$ARCH/lib/newlib/libm.a $JEHANNE/arch/$ARCH/lib/newlib/libg.a -lposix -lc" export LIBS="$JEHANNE/posix/lib/libc.a $JEHANNE/posix/lib/libm.a $JEHANNE/posix/lib/libg.a -lposix -lc"
export CPPFLAGS="-I$JEHANNE/sys/posix/newlib/ '-DMKSHRC_PATH=\"$MKSHRC_PATH\"' '-DARCH=\"$ARCH\"'" export CPPFLAGS="'-DMKSHRC_PATH=\"$MKSHRC_PATH\"' '-DARCH=\"$ARCH\"'"
export LD_PRELOAD= export LD_PRELOAD=

12
cross/pkgs/newlib/build.sh
View File

@ -71,7 +71,7 @@ export CC=gcc
# NOTE: we use -O0 because apparently vsprintf functions do not # NOTE: we use -O0 because apparently vsprintf functions do not
# work with -O2. # work with -O2.
export CFLAGS_FOR_TARGET="-g -gdwarf-2 -ggdb -O$NEWLIB_OPTIMIZATION" export CFLAGS_FOR_TARGET="-g -gdwarf-2 -ggdb -O$NEWLIB_OPTIMIZATION -std=gnu11"
( (
rm -fr $NEWLIB_BUILD && rm -fr $NEWLIB_BUILD &&
@ -79,14 +79,12 @@ export CFLAGS_FOR_TARGET="-g -gdwarf-2 -ggdb -O$NEWLIB_OPTIMIZATION"
mkdir $NEWLIB_BUILD && mkdir $NEWLIB_BUILD &&
mkdir $NEWLIB_PREFIX && mkdir $NEWLIB_PREFIX &&
cd $NEWLIB_BUILD && cd $NEWLIB_BUILD &&
$NEWLIB_SRC/configure --enable-newlib-mb --disable-newlib-fvwrite-in-streamio --prefix=$NEWLIB_PREFIX --target=x86_64-jehanne && $NEWLIB_SRC/configure --enable-newlib-mb --disable-newlib-fvwrite-in-streamio --prefix=/pkgs/newlib --target=x86_64-jehanne &&
make all && make install && make all && make DESTDIR=$NEWLIB_PREFIX install &&
rm -fr $JEHANNE/sys/posix/newlib && rm -fr $JEHANNE/sys/posix/newlib &&
rm -fr $JEHANNE/arch/amd64/lib/newlib && rm -fr $JEHANNE/arch/amd64/lib/newlib &&
mv $NEWLIB_PREFIX/x86_64-jehanne/include/ $JEHANNE/sys/posix/newlib && cp -fr $NEWLIB_PREFIX/pkgs/newlib/ $JEHANNE/pkgs/ &&
echo "Newlib headers installed at $JEHANNE/sys/posix/newlib/" && echo "Newlib headers installed at $JEHANNE/pkgs/newlib/"
mv $NEWLIB_PREFIX/x86_64-jehanne/lib/ $JEHANNE/arch/amd64/lib/newlib/ &&
echo "Newlib libraries installed at $JEHANNE/arch/amd64/lib/newlib/"
) >> $NEWLIB/newlib.build.log 2>&1 ) >> $NEWLIB/newlib.build.log 2>&1
failOnError $? "building newlib" failOnError $? "building newlib"

2
cross/pkgs/newlib/src

@ -1 +1 @@
Subproject commit 699179a66987482b0156645ee6fc7ea318c40d01 Subproject commit 266d2c4d3456b39c1a989c9808499865bf6b1364