From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 6 Jan 2020 23:46:20 +0000 (-0800)
Subject: Tools: More support for "VMware Tools for Linux-arm64"
X-Git-Tag: stable-11.1.0~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91cbb2154acd9a677554e163395496e41bc777ce;p=thirdparty%2Fopen-vm-tools.git

Tools: More support for "VMware Tools for Linux-arm64"

Preliminary touch-ups in the main branch to support the upcoming upstreaming
of the "VMware Tools for Linux-arm64" build code.

bora-vmsoft/vgauth/service/servicePosix.c:
  The glibc on arm64 does not have <sys/io.h>.  It makes sense because I/O
  ports are an x86-ism (for more details, sees
   https://bugzilla.redhat.com/show_bug.cgi?id=1116162#c1 ).  Instead of
  making the inclusion conditions more complex, It was noticed that none
  of the symbols defined in <sys/io.h> and <sys/sysinfo.h> are used in
  this C file.  So these inclusions are not necessary.
---

diff --git a/open-vm-tools/vgauth/service/servicePosix.c b/open-vm-tools/vgauth/service/servicePosix.c
index 7bb719a19..ad275efd0 100644
--- a/open-vm-tools/vgauth/service/servicePosix.c
+++ b/open-vm-tools/vgauth/service/servicePosix.c
@@ -60,14 +60,6 @@
 #     define RLIMIT_AS RLIMIT_RSS
 #  endif
 #endif
-#else
-#if !defined(sun) && (!defined(USING_AUTOCONF) || (defined(HAVE_SYS_IO_H) && defined(HAVE_SYS_SYSINFO_H)))
-#include <sys/io.h>
-#include <sys/sysinfo.h>
-#ifndef HAVE_SYSINFO
-#define HAVE_SYSINFO 1
-#endif
-#endif
 #endif
 
 #if defined(__APPLE__) || defined(__FreeBSD__)