mirror of
https://github.com/genodelabs/genode.git
synced 2024-12-27 01:11:06 +00:00
ca971bbfd8
This patch changes the top-level directory layout as a preparatory step for improving the tools for managing 3rd-party source codes. The rationale is described in the issue referenced below. Issue #1082
67 lines
1.8 KiB
Diff
67 lines
1.8 KiB
Diff
diff --git a/buildrump.sh b/buildrump.sh
|
|
index f600b6a..f6bb302 100755
|
|
--- a/buildrump.sh
|
|
+++ b/buildrump.sh
|
|
@@ -570,6 +570,16 @@ evaltools ()
|
|
: ${NM:=nm}
|
|
: ${OBJCOPY:=objcopy}
|
|
else
|
|
+ if [ "${MACH_ARCH}" = 'x86_64' ] ; then
|
|
+ cc_target=genode-x86
|
|
+ elif [ "${MACH_ARCH}" = 'arm' ] ; then
|
|
+ cc_target=genode-arm
|
|
+ else
|
|
+ die Unsupported architectur ${MACH_ARCH}
|
|
+ fi
|
|
+
|
|
+ echo "MACH_ARCH cc ${MACH_ARCH}"
|
|
+
|
|
: ${AR:=${cc_target}-ar}
|
|
: ${NM:=${cc_target}-nm}
|
|
: ${OBJCOPY:=${cc_target}-objcopy}
|
|
@@ -600,6 +610,8 @@ evaltools ()
|
|
;;
|
|
esac
|
|
|
|
+ TARGET=freebsd
|
|
+
|
|
# check if we're running from a tarball, i.e. is checkout possible
|
|
BRDIR=$(dirname $0)
|
|
unset TARBALLMODE
|
|
@@ -872,26 +884,6 @@ evaltarget ()
|
|
ccdefault=32
|
|
fi
|
|
|
|
- # step 2: if the user specified 32/64, try to establish if it will work
|
|
- if ${THIRTYTWO} && [ "${ccdefault}" -ne 32 ] ; then
|
|
- echo 'int main() {return 0;}' | ${CC} ${EXTRA_CFLAGS} -o /dev/null -x c - \
|
|
- ${EXTRA_RUMPUSER} ${EXTRA_RUMPCOMMON} > /dev/null 2>&1
|
|
- [ $? -eq 0 ] || ${ANYTARGETISGOOD} || \
|
|
- die 'Gave -32, but probe shows it will not work. Try -H?'
|
|
- elif ${SIXTYFOUR} && [ "${ccdefault}" -ne 64 ] ; then
|
|
- echo 'int main() {return 0;}' | ${CC} ${EXTRA_CFLAGS} -o /dev/null -x c - \
|
|
- ${EXTRA_RUMPUSER} ${EXTRA_RUMPCOMMON} > /dev/null 2>&1
|
|
- [ $? -eq 0 ] || ${ANYTARGETISGOOD} || \
|
|
- die 'Gave -64, but probe shows it will not work. Try -H?'
|
|
- else
|
|
- # not specified. use compiler default
|
|
- if [ "${ccdefault}" -eq 64 ]; then
|
|
- SIXTYFOUR=true
|
|
- else
|
|
- THIRTYTWO=true
|
|
- fi
|
|
- fi
|
|
-
|
|
TOOLABI=''
|
|
case ${MACH_ARCH} in
|
|
"amd64"|"x86_64")
|
|
@@ -918,6 +910,8 @@ evaltarget ()
|
|
MACHINE="evbarm"
|
|
MACH_ARCH="arm"
|
|
TOOLABI="elf"
|
|
+ EXTRA_CFLAGS='-march=armv7-a'
|
|
+ EXTRA_AFLAGS='-march=armv7-a'
|
|
probearm
|
|
;;
|
|
"sparc")
|