Skip to content

Commit

Permalink
fix(npm): support compiling on linux/aarch64 (#16208)
Browse files Browse the repository at this point in the history
Changes introduced in #13633 have broken the ability to compile for
linux/aarch64 - specifically the use of a `i8` as a char type, which is
an `u8` on linux/aarch64.

This PR:
- Replaces instances of `i8` with the architecture-aware wrapper type
`c_char`
- Skips the use of `--export-dynamic-symbol` on linux-aarch64, because
the target environments often rely on older libc/binutils versions
  • Loading branch information
LukeChannings authored and bartlomieju committed Oct 17, 2022
1 parent 68c793c commit 6426be8
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 12 deletions.
3 changes: 3 additions & 0 deletions cli/bench/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ pub fn benchmark(
#[cfg(target_vendor = "apple")]
#[cfg(target_arch = "aarch64")]
let bun_exe = test_util::prebuilt_tool_path("bun-aarch64");
#[cfg(target_os = "linux")]
#[cfg(target_arch = "aarch64")]
let bun_exe = test_util::prebuilt_tool_path("bun-aarch64");

// bun <path> <port>
res.insert(
Expand Down
9 changes: 8 additions & 1 deletion cli/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,10 @@ fn main() {
.display(),
);

#[cfg(not(target_os = "windows"))]
#[cfg(all(
not(target_os = "windows"),
not(all(target_os = "linux", target_arch = "aarch64"))
))]
{
// Load the symbols file generated by the `napi_sym` macro.
#[derive(serde::Deserialize)]
Expand Down Expand Up @@ -375,6 +378,10 @@ fn main() {
}
}

// Linux + aarch64 does not support a glibc version that supports `--export-dynamic-symbol`.
#[cfg(all(target_os = "linux", target_arch = "aarch64"))]
println!("cargo:rustc-link-arg-bin=deno=-rdynamic");

// To debug snapshot issues uncomment:
// op_fetch_asset::trace_serializer();

Expand Down
3 changes: 2 additions & 1 deletion cli/napi/env.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.

use deno_runtime::deno_napi::*;
use std::os::raw::c_char;

/// # Safety
///
Expand Down Expand Up @@ -125,7 +126,7 @@ const NODE_VERSION: napi_node_version = napi_node_version {
major: 17,
minor: 4,
patch: 0,
release: "Deno\0".as_ptr() as *const i8,
release: "Deno\0".as_ptr() as *const c_char,
};

#[napi_sym::napi_sym]
Expand Down
4 changes: 2 additions & 2 deletions test_napi/src/async.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use napi_sys::Status::napi_ok;
use napi_sys::ValueType::napi_function;
use napi_sys::*;
use std::os::raw::c_void;
use std::os::raw::{c_char, c_void};
use std::ptr;

pub struct Baton {
Expand Down Expand Up @@ -62,7 +62,7 @@ extern "C" fn test_async_work(
unsafe {
napi_create_string_utf8(
env,
"test_async_resource\0".as_ptr() as *const i8,
"test_async_resource\0".as_ptr() as *const c_char,
usize::MAX,
&mut resource_name,
)
Expand Down
2 changes: 1 addition & 1 deletion test_napi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ macro_rules! get_callback_info {
macro_rules! new_property {
($env: expr, $name: expr, $value: expr) => {
napi_property_descriptor {
utf8name: $name.as_ptr() as *const i8,
utf8name: $name.as_ptr() as *const std::os::raw::c_char,
name: ptr::null_mut(),
method: Some($value),
getter: None,
Expand Down
4 changes: 2 additions & 2 deletions test_napi/src/object_wrap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use napi_sys::Status::napi_ok;
use napi_sys::ValueType::napi_number;
use napi_sys::*;
use std::os::raw::c_void;
use std::os::raw::{c_char, c_void};
use std::ptr;

pub struct NapiObject {
Expand Down Expand Up @@ -146,7 +146,7 @@ pub fn init(env: napi_env, exports: napi_value) {
napi_set_named_property(
env,
exports,
"NapiObject\0".as_ptr() as *const i8,
"NapiObject\0".as_ptr() as *const c_char,
cons,
)
} == napi_ok
Expand Down
9 changes: 5 additions & 4 deletions test_napi/src/properties.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use napi_sys::PropertyAttributes::*;
use napi_sys::Status::napi_ok;
use napi_sys::*;
use std::os::raw::c_char;
use std::ptr;

pub fn init(env: napi_env, exports: napi_value) {
Expand All @@ -15,7 +16,7 @@ pub fn init(env: napi_env, exports: napi_value) {
unsafe {
napi_create_string_utf8(
env,
"key_v8_string".as_ptr() as *const i8,
"key_v8_string".as_ptr() as *const c_char,
usize::MAX,
&mut name_value,
)
Expand All @@ -29,7 +30,7 @@ pub fn init(env: napi_env, exports: napi_value) {
unsafe {
napi_create_string_utf8(
env,
"key_v8_symbol".as_ptr() as *const i8,
"key_v8_symbol".as_ptr() as *const c_char,
usize::MAX,
&mut symbol_description,
)
Expand All @@ -42,7 +43,7 @@ pub fn init(env: napi_env, exports: napi_value) {

let properties = &[
napi_property_descriptor {
utf8name: "test_property_rw\0".as_ptr() as *const i8,
utf8name: "test_property_rw\0".as_ptr() as *const c_char,
name: ptr::null_mut(),
method: None,
getter: None,
Expand All @@ -52,7 +53,7 @@ pub fn init(env: napi_env, exports: napi_value) {
value: number,
},
napi_property_descriptor {
utf8name: "test_property_r\0".as_ptr() as *const i8,
utf8name: "test_property_r\0".as_ptr() as *const c_char,
name: ptr::null_mut(),
method: None,
getter: None,
Expand Down
2 changes: 1 addition & 1 deletion third_party

0 comments on commit 6426be8

Please sign in to comment.