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.

Sign up for GitHub

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

Jump to bottom

enable build on Arm64 #4809

Closed
wants to merge 1 commit into from
Closed

enable build on Arm64 #4809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ci/build_container/build_recipes/luajit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

set -e

VERSION=2.0.5
SHA256=8bb29d84f06eb23c7ea4aa4794dbb248ede9fcb23b6989cbef81dc79352afc97
VERSION=2.1.0-beta3
SHA256=409f7fe570d3c16558e594421c47bdd130238323c9d6fd6c83dedd2aaeb082a8

curl https://github.com/LuaJIT/LuaJIT/archive/v"$VERSION".tar.gz -sLo LuaJIT-"$VERSION".tar.gz \
&& echo "$SHA256" LuaJIT-"$VERSION".tar.gz | sha256sum --check
Expand Down
4 changes: 2 additions & 2 deletions ci/prebuilt/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ cc_library(
":windows_x86_64": ["thirdparty_build/lib/luajit.lib"],
"//conditions:default": ["thirdparty_build/lib/libluajit-5.1.a"],
}),
hdrs = glob(["thirdparty_build/include/luajit-2.0/*"]),
hdrs = glob(["thirdparty_build/include/luajit-2.1/*"]),
includes = ["thirdparty_build/include"],
# TODO(mattklein123): We should strip luajit-2.0 here for consumers. However, if we do that
# TODO(mattklein123): We should strip luajit-2.1 here for consumers. However, if we do that
# the headers get included using -I vs. -isystem which then causes old-style-cast warnings.
)

Expand Down
4 changes: 4 additions & 0 deletions source/exe/signal_action.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ void SignalAction::sigHandler(int sig, siginfo_t* info, void* context) {
error_pc = reinterpret_cast<void*>(ucontext->uc_mcontext->__ss.__rip);
#elif defined(__powerpc__)
error_pc = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->nip);
#elif defined(__aarch64__)
error_pc = reinterpret_cast<void*>(ucontext->uc_mcontext.pc);
#elif defined(__arm__)
error_pc = reinterpret_cast<void*>(ucontext->uc_mcontext.arm_pc);
#else
#warning "Please enable and test PC retrieval code for your arch in signal_action.cc"
// x86 Classic: reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[REG_EIP]);
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/filters/common/lua/lua.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "common/common/c_smart_ptr.h"
#include "common/common/logger.h"

#include "luajit-2.0/lua.hpp"
#include "luajit-2.1/lua.hpp"

namespace Envoy {
namespace Extensions {
Expand Down