Fix ARM64 symbol file opens

Author: MarioHewardt

src/sym/bcc_elf.cpp

@@ -19,7 +19,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <sys/syscall.h>
 #include <string.h>
 #include <libgen.h>
 #include <stdio.h>
@@ -142,7 +141,7 @@ static int bcc_elf_file_open(const char *path, struct bcc_elf_file *out) {
   struct bcc_zip_entry entry;
   int fd = -1;
 
-  fd = syscall(SYS_open, path, O_RDONLY, 0);
+  fd = open(path, O_RDONLY);
   if (fd >= 0) {
     if (bcc_elf_file_open_fd(fd, out)) {
       close(fd);
@@ -601,7 +600,7 @@ static int verify_checksum(const char *file, unsigned int crc) {
   unsigned int actual;
 
 
-  fd = syscall(SYS_open, file, O_RDONLY, 0);
+  fd = open(file, O_RDONLY);
   if (fd < 0)
     return 0;
 

src/sym/bcc_syms.cc

@@ -26,7 +26,6 @@
 #include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/syscall.h>
 
 #include <cstdio>
 #include <cstring>
@@ -56,7 +55,7 @@ ProcSyms::ModulePath::ModulePath(const std::string &ns_path, int root_fd,
     ;
   trimmed_path = ns_path.substr(non_slash_pos);
 
-  int fd_ = syscall(SYS_openat, root_fd, trimmed_path.c_str(), O_RDONLY);
+  fd_ = openat(root_fd, trimmed_path.c_str(), O_RDONLY);
   if (fd_ > 0)
     path_ = tfm::format("/proc/self/fd/%d", fd_);
   else
@@ -93,7 +92,7 @@ bool ProcStat::refresh_root() {
   // re-open root note: when /proc/.../root changes, the open file descriptor
   // still refers to the old one
   int original_root_fd = root_fd_;
-  int root_fd_ = syscall(SYS_open, root_symlink_.c_str(), O_PATH);
+  root_fd_ = open(root_symlink_.c_str(), O_PATH);
   if (root_fd_ == -1)
     std::cerr << "Opening " << root_symlink_ << " failed: " << strerror(errno)
               << std::endl;

src/sym/bcc_zip.cpp

@@ -23,7 +23,6 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <unistd.h>
-#include <sys/syscall.h>
 
 // Specification of ZIP file format can be found here:
 // https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT
@@ -214,7 +213,7 @@ static int find_central_directory(struct bcc_zip_archive* archive) {
 }
 
 struct bcc_zip_archive* bcc_zip_archive_open(const char* path) {
-  int fd = syscall(SYS_open, path, O_RDONLY, 0);
+  int fd = open(path, O_RDONLY);
   if (fd < 0) {
     return NULL;
   }