Mercurial > hg > graal-compiler
changeset 6825:bf2edd3c9b0f
8000102: Resolve include conflicts
Summary: Removing include of c1/c1_runtime.hpp and opto/runtime.hpp from all os-files.
Reviewed-by: kvn
Contributed-by: nils.eliasson@oracle.com
author | neliasso |
---|---|
date | Thu, 04 Oct 2012 06:31:07 -0700 |
parents | f13867c41f73 |
children | 685457683e86 |
files | src/os/bsd/vm/os_bsd.cpp src/os/linux/vm/os_linux.cpp src/os/solaris/vm/os_solaris.cpp src/os/windows/vm/os_windows.cpp src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp src/os_cpu/linux_x86/vm/os_linux_x86.cpp src/os_cpu/linux_zero/vm/os_linux_zero.cpp src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp src/os_cpu/windows_x86/vm/os_windows_x86.cpp |
diffstat | 12 files changed, 0 insertions(+), 74 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os/bsd/vm/os_bsd.cpp Tue Oct 02 14:49:21 2012 -0700 +++ b/src/os/bsd/vm/os_bsd.cpp Thu Oct 04 06:31:07 2012 -0700 @@ -82,12 +82,6 @@ # include "assembler_ppc.inline.hpp" # include "nativeInst_ppc.hpp" #endif -#ifdef COMPILER1 -#include "c1/c1_Runtime1.hpp" -#endif -#ifdef COMPILER2 -#include "opto/runtime.hpp" -#endif // put OS-includes here # include <sys/types.h>
--- a/src/os/linux/vm/os_linux.cpp Tue Oct 02 14:49:21 2012 -0700 +++ b/src/os/linux/vm/os_linux.cpp Thu Oct 04 06:31:07 2012 -0700 @@ -82,12 +82,6 @@ # include "assembler_ppc.inline.hpp" # include "nativeInst_ppc.hpp" #endif -#ifdef COMPILER1 -#include "c1/c1_Runtime1.hpp" -#endif -#ifdef COMPILER2 -#include "opto/runtime.hpp" -#endif // put OS-includes here # include <sys/types.h>
--- a/src/os/solaris/vm/os_solaris.cpp Tue Oct 02 14:49:21 2012 -0700 +++ b/src/os/solaris/vm/os_solaris.cpp Thu Oct 04 06:31:07 2012 -0700 @@ -70,12 +70,6 @@ # include "assembler_sparc.inline.hpp" # include "nativeInst_sparc.hpp" #endif -#ifdef COMPILER1 -#include "c1/c1_Runtime1.hpp" -#endif -#ifdef COMPILER2 -#include "opto/runtime.hpp" -#endif // put OS-includes here # include <dlfcn.h>
--- a/src/os/windows/vm/os_windows.cpp Tue Oct 02 14:49:21 2012 -0700 +++ b/src/os/windows/vm/os_windows.cpp Thu Oct 04 06:31:07 2012 -0700 @@ -69,12 +69,6 @@ # include "assembler_x86.inline.hpp" # include "nativeInst_x86.hpp" #endif -#ifdef COMPILER1 -#include "c1/c1_Runtime1.hpp" -#endif -#ifdef COMPILER2 -#include "opto/runtime.hpp" -#endif #ifdef _DEBUG #include <crtdbg.h>
--- a/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Tue Oct 02 14:49:21 2012 -0700 +++ b/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Thu Oct 04 06:31:07 2012 -0700 @@ -52,12 +52,6 @@ #include "thread_bsd.inline.hpp" #include "utilities/events.hpp" #include "utilities/vmError.hpp" -#ifdef COMPILER1 -#include "c1/c1_Runtime1.hpp" -#endif -#ifdef COMPILER2 -#include "opto/runtime.hpp" -#endif // put OS-includes here # include <sys/types.h>
--- a/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Tue Oct 02 14:49:21 2012 -0700 +++ b/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp Thu Oct 04 06:31:07 2012 -0700 @@ -58,12 +58,6 @@ #include "thread_bsd.inline.hpp" #include "utilities/events.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 dummy = (address) &dummy;
--- a/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp Tue Oct 02 14:49:21 2012 -0700 +++ b/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp Thu Oct 04 06:31:07 2012 -0700 @@ -52,13 +52,6 @@ #include "thread_linux.inline.hpp" #include "utilities/events.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 // different between 32 and 64 bits
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Tue Oct 02 14:49:21 2012 -0700 +++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Thu Oct 04 06:31:07 2012 -0700 @@ -52,12 +52,6 @@ #include "thread_linux.inline.hpp" #include "utilities/events.hpp" #include "utilities/vmError.hpp" -#ifdef COMPILER1 -#include "c1/c1_Runtime1.hpp" -#endif -#ifdef COMPILER2 -#include "opto/runtime.hpp" -#endif // put OS-includes here # include <sys/types.h>
--- a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Tue Oct 02 14:49:21 2012 -0700 +++ b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Thu Oct 04 06:31:07 2012 -0700 @@ -53,12 +53,6 @@ #include "thread_linux.inline.hpp" #include "utilities/events.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 dummy = (address) &dummy;
--- a/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp Tue Oct 02 14:49:21 2012 -0700 +++ b/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp Thu Oct 04 06:31:07 2012 -0700 @@ -52,13 +52,6 @@ #include "thread_solaris.inline.hpp" #include "utilities/events.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
--- a/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Tue Oct 02 14:49:21 2012 -0700 +++ b/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Thu Oct 04 06:31:07 2012 -0700 @@ -52,12 +52,6 @@ #include "thread_solaris.inline.hpp" #include "utilities/events.hpp" #include "utilities/vmError.hpp" -#ifdef COMPILER1 -#include "c1/c1_Runtime1.hpp" -#endif -#ifdef COMPILER2 -#include "opto/runtime.hpp" -#endif // put OS-includes here # include <sys/types.h>
--- a/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Tue Oct 02 14:49:21 2012 -0700 +++ b/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Thu Oct 04 06:31:07 2012 -0700 @@ -52,12 +52,6 @@ #include "thread_windows.inline.hpp" #include "utilities/events.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" #undef REG_SP