archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8000102: Resolve include conflicts

Browse source 
Removing include of c1/c1_runtime.hpp and opto/runtime.hpp from all os-files.

Reviewed-by: kvn
This commit is contained in:
Nils Eliasson 2012-10-04 06:31:07 -07:00 • committed by Nils Eliasson
parent 8d8d00ff00
commit e228ec4078
12 changed files with 0 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/os/bsd/vm/os_bsd.cpp
View file

@ -82,12 +82,6 @@
# include "assembler_ppc.inline.hpp" # include "assembler_ppc.inline.hpp"
# include "nativeInst_ppc.hpp" # include "nativeInst_ppc.hpp"
#endif #endif
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
// put OS-includes here // put OS-includes here
# include <sys/types.h> # include <sys/types.h>

6
hotspot/src/os/linux/vm/os_linux.cpp
View file

@ -82,12 +82,6 @@
# include "assembler_ppc.inline.hpp" # include "assembler_ppc.inline.hpp"
# include "nativeInst_ppc.hpp" # include "nativeInst_ppc.hpp"
#endif #endif
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
// put OS-includes here // put OS-includes here
# include <sys/types.h> # include <sys/types.h>

6
hotspot/src/os/solaris/vm/os_solaris.cpp
View file

@ -70,12 +70,6 @@
# include "assembler_sparc.inline.hpp" # include "assembler_sparc.inline.hpp"
# include "nativeInst_sparc.hpp" # include "nativeInst_sparc.hpp"
#endif #endif
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
// put OS-includes here // put OS-includes here
# include <dlfcn.h> # include <dlfcn.h>

6
hotspot/src/os/windows/vm/os_windows.cpp
View file

@ -69,12 +69,6 @@
# include "assembler_x86.inline.hpp" # include "assembler_x86.inline.hpp"
# include "nativeInst_x86.hpp" # include "nativeInst_x86.hpp"
#endif #endif
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
#ifdef _DEBUG #ifdef _DEBUG
#include <crtdbg.h> #include <crtdbg.h>

6
hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
View file

@ -52,12 +52,6 @@
#include "thread_bsd.inline.hpp" #include "thread_bsd.inline.hpp"
#include "utilities/events.hpp" #include "utilities/events.hpp"
#include "utilities/vmError.hpp" #include "utilities/vmError.hpp"
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
// put OS-includes here // put OS-includes here
# include <sys/types.h> # include <sys/types.h>

6
hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
View file

@ -58,12 +58,6 @@
#include "thread_bsd.inline.hpp" #include "thread_bsd.inline.hpp"
#include "utilities/events.hpp" #include "utilities/events.hpp"
#include "utilities/vmError.hpp" #include "utilities/vmError.hpp"
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
address os::current_stack_pointer() { address os::current_stack_pointer() {
address dummy = (address) &dummy; address dummy = (address) &dummy;

7
hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
View file

@ -52,13 +52,6 @@
#include "thread_linux.inline.hpp" #include "thread_linux.inline.hpp"
#include "utilities/events.hpp" #include "utilities/events.hpp"
#include "utilities/vmError.hpp" #include "utilities/vmError.hpp"
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
// Linux/Sparc has rather obscure naming of registers in sigcontext // Linux/Sparc has rather obscure naming of registers in sigcontext
// different between 32 and 64 bits // different between 32 and 64 bits

6
hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
View file

@ -52,12 +52,6 @@
#include "thread_linux.inline.hpp" #include "thread_linux.inline.hpp"
#include "utilities/events.hpp" #include "utilities/events.hpp"
#include "utilities/vmError.hpp" #include "utilities/vmError.hpp"
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
// put OS-includes here // put OS-includes here
# include <sys/types.h> # include <sys/types.h>

6
hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
View file

@ -53,12 +53,6 @@
#include "thread_linux.inline.hpp" #include "thread_linux.inline.hpp"
#include "utilities/events.hpp" #include "utilities/events.hpp"
#include "utilities/vmError.hpp" #include "utilities/vmError.hpp"
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
address os::current_stack_pointer() { address os::current_stack_pointer() {
address dummy = (address) &dummy; address dummy = (address) &dummy;

7
hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp
View file

@ -52,13 +52,6 @@
#include "thread_solaris.inline.hpp" #include "thread_solaris.inline.hpp"
#include "utilities/events.hpp" #include "utilities/events.hpp"
#include "utilities/vmError.hpp" #include "utilities/vmError.hpp"
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
# include <signal.h> // needed first to avoid name collision for "std" with SC 5.0 # include <signal.h> // needed first to avoid name collision for "std" with SC 5.0

6
hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp
View file

@ -52,12 +52,6 @@
#include "thread_solaris.inline.hpp" #include "thread_solaris.inline.hpp"
#include "utilities/events.hpp" #include "utilities/events.hpp"
#include "utilities/vmError.hpp" #include "utilities/vmError.hpp"
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
// put OS-includes here // put OS-includes here
# include <sys/types.h> # include <sys/types.h>

6
hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp
View file

@ -52,12 +52,6 @@
#include "thread_windows.inline.hpp" #include "thread_windows.inline.hpp"
#include "utilities/events.hpp" #include "utilities/events.hpp"
#include "utilities/vmError.hpp" #include "utilities/vmError.hpp"
#ifdef COMPILER1
#include "c1/c1_Runtime1.hpp"
#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
# include "unwind_windows_x86.hpp" # include "unwind_windows_x86.hpp"
#undef REG_SP #undef REG_SP