mirror of
https://github.com/AngelAuraMC/angelauramc-openjdk-build.git
synced 2025-09-14 06:36:48 -04:00
Merge branch 'master' of https://github.com/khanhduytran0/boardwalk2-openjdk-build-arm64.git
This commit is contained in:
commit
45dd91c938
@ -19,16 +19,11 @@ cp -R -f openjdk-mobile-aarch64-patch/* openjdk/
|
||||
# Remove generated script to regenerate aarch64 build
|
||||
# rm openjdk/autoconf/generated-configure.sh
|
||||
|
||||
echo BEGINls
|
||||
ls
|
||||
ls *
|
||||
ls */*
|
||||
echo ENDEDls
|
||||
|
||||
cd openjdk
|
||||
rm -rf build
|
||||
# --build=x86_64-linux-gnu \
|
||||
# --hostt=aarch64-linux-android \
|
||||
# --with-toolchain-type=clang \
|
||||
bash ./configure \
|
||||
--enable-option-checking=fatal \
|
||||
--openjdk-target=aarch64-linux-android \
|
||||
@ -40,7 +35,6 @@ bash ./configure \
|
||||
--with-debug-level=release \
|
||||
--with-freetype-lib=$FREETYPE_DIR/lib \
|
||||
--with-freetype-include=$FREETYPE_DIR/include/freetype2 \
|
||||
--with-toolchain-type=clang \
|
||||
--x-includes=/usr/include \
|
||||
--x-libraries=/usr/lib \
|
||||
|| error_code=$?
|
||||
|
@ -154,8 +154,8 @@ AC_DEFUN_ONCE([FLAGS_SETUP_USER_SUPPLIED_FLAGS],
|
||||
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -mthumb -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -DFLOAT_ARCH=-vfp-sflt -fPIE"
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,--unresolved-symbols=ignore-all -Wl,--gc-sections -fPIE"
|
||||
elif test "x$OPENJDK_TARGET_CPU" = xarm64 || test "x$OPENJDK_TARGET_CPU" = xaarch64; then
|
||||
EXTRA_CFLAGS="$EXTRA_CFLAGS -mthumb -march=armv8-a -fno-short-enums -D__GLIBC__ -D_GNU_SOURCE -Wno-psabi -fPIE"
|
||||
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -mthumb -march=armv8-a -fPIE"
|
||||
EXTRA_CFLAGS="$EXTRA_CFLAGS -march=armv8-a -fno-short-enums -D__GLIBC__ -D_GNU_SOURCE -Wno-psabi -fPIE"
|
||||
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -march=armv8-a -fPIE"
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,--unresolved-symbols=ignore-all -Wl,--gc-sections -fPIE"
|
||||
else
|
||||
EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-short-enums -D__GLIBC__ -D_GNU_SOURCE -Wno-psabi -march=i686 -msse3 -mstackrealign -mfpmath=sse -fPIE"
|
||||
|
@ -16,8 +16,8 @@ export LDFLAGS="-L$NDK/platforms/android-21/arch-arm64/usr/lib"
|
||||
# Deprecated...
|
||||
export AR=$TOOLCHAIN/bin/$TARGET-ar
|
||||
export AS=$TOOLCHAIN/bin/$TARGET-as
|
||||
export CC=$TOOLCHAIN/bin/$TARGET-clang
|
||||
export CXX=$TOOLCHAIN/bin/$TARGET-clang++
|
||||
export CC=$TOOLCHAIN/bin/$TARGET-gcc
|
||||
export CXX=$TOOLCHAIN/bin/$TARGET-g++
|
||||
export LD=$TOOLCHAIN/bin/$TARGET-ld
|
||||
export RANLIB=$TOOLCHAIN/bin/$TARGET-ranlib
|
||||
export STRIP=$TOOLCHAIN/bin/$TARGET-strip
|
||||
|
Loading…
x
Reference in New Issue
Block a user