mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-08-03 20:54:41 +02:00
Sync OCTEON fix
1. For OCTEON builds, leave out the "-DCVMX_BUILD_FOR_LINUX_HOST" option from CFLAGS by default so it makes standalone host builds. 2. Add a check of the variable OCTEON_HOST for linux to add back in the "-DCVMX_BUILD_FOR_LINUX_HOST" to CFLAGS.
This commit is contained in:
@@ -3903,6 +3903,7 @@ AC_ARG_WITH([cavium-v],
|
|||||||
# Cavium Octeon
|
# Cavium Octeon
|
||||||
OCTEON_ROOT=""
|
OCTEON_ROOT=""
|
||||||
: ${OCTEON_OBJ="obj-octeon2"}
|
: ${OCTEON_OBJ="obj-octeon2"}
|
||||||
|
: ${OCTEON_HOST="standalone"}
|
||||||
|
|
||||||
AC_ARG_WITH([octeon-sync],
|
AC_ARG_WITH([octeon-sync],
|
||||||
[AS_HELP_STRING([--with-octeon-sync=PATH],[PATH to Cavium Octeon SDK dir (sync)])],
|
[AS_HELP_STRING([--with-octeon-sync=PATH],[PATH to Cavium Octeon SDK dir (sync)])],
|
||||||
@@ -3917,8 +3918,9 @@ AC_ARG_WITH([octeon-sync],
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
AM_CFLAGS="$AM_CFLAGS -DHAVE_CAVIUM_OCTEON_SYNC"
|
AM_CFLAGS="$AM_CFLAGS -DHAVE_CAVIUM_OCTEON_SYNC"
|
||||||
AM_CFLAGS="$AM_CFLAGS -DOCTEON_MODEL=$OCTEON_MODEL -DCVMX_BUILD_FOR_LINUX_HOST"
|
AM_CFLAGS="$AM_CFLAGS -DOCTEON_MODEL=$OCTEON_MODEL"
|
||||||
AM_CFLAGS="$AM_CFLAGS -I$OCTEON_ROOT/executive"
|
AM_CFLAGS="$AM_CFLAGS -I$OCTEON_ROOT/executive"
|
||||||
|
AS_CASE([$OCTEON_HOST],['linux'],[AM_CFLAGS="$AM_CFLAGS -DCVMX_BUILD_FOR_LINUX_HOST"])
|
||||||
|
|
||||||
#-I$OCTEON_ROOT/target/include
|
#-I$OCTEON_ROOT/target/include
|
||||||
AM_LDFLAGS="$AM_LDFLAGS -lrt -Xlinker -T -Xlinker $OCTEON_ROOT/executive/cvmx-shared-linux.ld"
|
AM_LDFLAGS="$AM_LDFLAGS -lrt -Xlinker -T -Xlinker $OCTEON_ROOT/executive/cvmx-shared-linux.ld"
|
||||||
|
Reference in New Issue
Block a user