changeset 60858:43f1c60d4c61

8241587: Aarch64: remove x86 specifics from os_linux.cpp/hpp/inline.hpp Reviewed-by: dholmes
author smonteith
date Fri, 10 Apr 2020 09:41:20 +0800
parents da27f941f86c
children 4b76f0cc11c4
files src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp
diffstat 3 files changed, 1 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp	Thu Apr 09 14:16:17 2020 -0700
+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp	Fri Apr 10 09:41:20 2020 +0800
@@ -462,12 +462,6 @@
 void os::Linux::set_fpu_control_word(int fpu_control) {
 }
 
-// Check that the linux kernel version is 2.4 or higher since earlier
-// versions do not support SSE without patches.
-bool os::supports_sse() {
-  return true;
-}
-
 bool os::is_allocatable(size_t bytes) {
   return true;
 }
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp	Thu Apr 09 14:16:17 2020 -0700
+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp	Fri Apr 10 09:41:20 2020 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,9 +27,6 @@
 #define OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_HPP
 
   static void setup_fpu();
-  static bool supports_sse();
-
-  static jlong rdtsc();
 
   static bool is_allocatable(size_t bytes);
 
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp	Thu Apr 09 14:16:17 2020 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_INLINE_HPP
-#define OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_INLINE_HPP
-
-#include "runtime/os.hpp"
-
-// See http://www.technovelty.org/code/c/reading-rdtsc.htl for details
-inline jlong os::rdtsc() {
-  uint64_t res;
-  uint32_t ts1, ts2;
-  __asm__ __volatile__ ("rdtsc" : "=a" (ts1), "=d" (ts2));
-  res = ((uint64_t)ts1 | (uint64_t)ts2 << 32);
-  return (jlong)res;
-}
-
-#endif // OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_INLINE_HPP