Fix the compile issue on arm64 (#387)

CalvinNeo · web-flow · commit 92b2b8e6daee · 2024-08-09T13:51:51.000+08:00
diff --git a/Makefile b/Makefile
@@ -193,13 +193,21 @@ endif
 build:
 	PROXY_ENABLE_FEATURES="${ENABLE_FEATURES}" ./proxy_scripts/build.sh
 
+# Do not call make build which could duplicate ENABLE_FEATURES
+ifeq ($(PROXY_FRAME_POINTER),1)
+debug: ENABLE_FEATURES += pprof-fp
+endif
 debug: export PROXY_PROFILE=debug
 debug:
-	make build
+	PROXY_ENABLE_FEATURES="${ENABLE_FEATURES}" ./proxy_scripts/build.sh
+
 
+ifeq ($(PROXY_FRAME_POINTER),1)
+release: ENABLE_FEATURES += pprof-fp
+endif
 release: export PROXY_PROFILE=release
 release:
-	make build
+	PROXY_ENABLE_FEATURES="${ENABLE_FEATURES}" ./proxy_scripts/build.sh
 
 ## Testing
 ## -------
diff --git a/proxy_components/engine_store_ffi/Cargo.toml b/proxy_components/engine_store_ffi/Cargo.toml
@@ -3,7 +3,7 @@ name = "engine_store_ffi"
 version = "0.0.1"
 authors = ["The TiKV Authors"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]
diff --git a/proxy_components/engine_tiflash/Cargo.toml b/proxy_components/engine_tiflash/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "engine_tiflash"
 version = "0.0.1"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]
diff --git a/proxy_components/mock-engine-store/Cargo.toml b/proxy_components/mock-engine-store/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mock-engine-store"
 version = "0.0.1"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]
diff --git a/proxy_components/proxy_ffi/src/jemalloc_utils.rs b/proxy_components/proxy_ffi/src/jemalloc_utils.rs
@@ -20,8 +20,6 @@ extern "C" {
     ) -> ::std::os::raw::c_int;
 }
 
-extern crate libc;
-
 #[allow(unused_variables)]
 #[allow(unused_mut)]
 #[allow(unused_unsafe)]
diff --git a/proxy_components/proxy_ffi/src/lib.rs b/proxy_components/proxy_ffi/src/lib.rs
@@ -1,5 +1,4 @@
 // Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.
-#![feature(rustc_private)]
 #![feature(thread_id_value)]
 
 /// All mods end up with `_impls` impl structs defined in interface.
diff --git a/proxy_components/proxy_server/Cargo.toml b/proxy_components/proxy_server/Cargo.toml
@@ -2,7 +2,7 @@
 name = "proxy_server"
 version = "0.0.1"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]
diff --git a/proxy_tests/Cargo.toml b/proxy_tests/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "proxy_tests"
 version = "0.0.1"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [[test]]
diff --git a/raftstore-proxy-main/Cargo.toml b/raftstore-proxy-main/Cargo.toml
@@ -2,7 +2,7 @@
 name = "raftstore-proxy-main"
 version = "0.0.1"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]
diff --git a/raftstore-proxy/Cargo.toml b/raftstore-proxy/Cargo.toml
@@ -2,7 +2,7 @@
 name = "raftstore-proxy"
 version = "0.0.1"
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [features]

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@ extern "C" {`
`20`	`20`	`) -> ::std::os::raw::c_int;`
`21`	`21`	`}`
`22`	`22`
`23`		`-extern crate libc;`
`24`		`-`
`25`	`23`	`#[allow(unused_variables)]`
`26`	`24`	`#[allow(unused_mut)]`
`27`	`25`	`#[allow(unused_unsafe)]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// Copyright 2022 TiKV Project Authors. Licensed under Apache-2.0.`
`2`		`-#![feature(rustc_private)]`
`3`	`2`	`#![feature(thread_id_value)]`
`4`	`3`
`5`	`4`	/// All mods end up with `_impls` impl structs defined in interface.