Changeset 313


Ignore:
Timestamp:
Feb 15, 2012, 3:45:07 PM (9 years ago)
Author:
dmik
Message:

Adopt to the new platform dispatching defines.

Location:
trunk/openjdk/hotspot
Files:
4 added
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/openjdk/hotspot/make/os2/makefiles/compile.make

    r311 r313  
    5656endif
    5757
    58 # Used for platform dispatching
     58# Used for platform dispatching. Note that on OS/2 we pretend to be 'windows'
     59# (it works in most cases and all differences are usually handled by
     60# TARGET_COMPILER_gcc).
    5961CPP_FLAGS += -DTARGET_OS_FAMILY_windows
    6062CPP_FLAGS += -DTARGET_ARCH_$(Platform_arch)
     
    6365CPP_FLAGS += -DTARGET_OS_ARCH_MODEL_windows_$(Platform_arch_model)
    6466CPP_FLAGS += -DTARGET_COMPILER_gcc
     67
     68# Additional define for differences not covered by TARGET_COMPILER_gcc
     69CPP_FLAGS += -DTARGET_OS_FAMILY_os2
    6570
    6671# Generic linker settings
  • trunk/openjdk/hotspot/src/cpu/x86/vm/bytes_x86.hpp

    r309 r313  
    8080#endif
    8181#ifdef TARGET_OS_ARCH_windows_x86
    82 # include "bytes_windows_x86.inline.hpp"
     82# ifdef TARGET_OS_FAMILY_os2
     83#  include "bytes_os2_x86.inline.hpp"
     84# else
     85#  include "bytes_windows_x86.inline.hpp"
     86# endif
    8387#endif
    8488
  • trunk/openjdk/hotspot/src/cpu/x86/vm/copy_x86.hpp

    r309 r313  
    3636#endif
    3737#ifdef TARGET_OS_ARCH_windows_x86
    38 # include "copy_windows_x86.inline.hpp"
     38# ifdef TARGET_OS_FAMILY_os2
     39#  include "copy_os2_x86.inline.hpp"
     40# else
     41#  include "copy_windows_x86.inline.hpp"
     42# endif
    3943#endif
    4044
  • trunk/openjdk/hotspot/src/os/windows/vm/os_windows.inline.hpp

    r309 r313  
    2929#include "runtime/os.hpp"
    3030#ifdef TARGET_OS_ARCH_windows_x86
    31 # include "atomic_windows_x86.inline.hpp"
    32 # include "orderAccess_windows_x86.inline.hpp"
     31# ifdef TARGET_OS_FAMILY_os2
     32#  include "atomic_os2_x86.inline.hpp"
     33#  include "orderAccess_os2_x86.inline.hpp"
     34# else
     35#  include "atomic_windows_x86.inline.hpp"
     36#  include "orderAccess_windows_x86.inline.hpp"
     37# endif
    3338#endif
    3439
  • trunk/openjdk/hotspot/src/os/windows/vm/thread_windows.inline.hpp

    r309 r313  
    3131#include "runtime/threadLocalStorage.hpp"
    3232#ifdef TARGET_OS_ARCH_windows_x86
    33 # include "atomic_windows_x86.inline.hpp"
    34 # include "orderAccess_windows_x86.inline.hpp"
     33# ifdef TARGET_OS_FAMILY_os2
     34#  include "atomic_os2_x86.inline.hpp"
     35#  include "orderAccess_os2_x86.inline.hpp"
     36# else
     37#  include "atomic_windows_x86.inline.hpp"
     38#  include "orderAccess_windows_x86.inline.hpp"
     39# endif
    3540# include "prefetch_windows_x86.inline.hpp"
    3641#endif
  • trunk/openjdk/hotspot/src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp

    r309 r313  
    2525#ifndef OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_INLINE_HPP
    2626#define OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_INLINE_HPP
    27 
    28 #ifdef __EMX__
    29 
    30 #include "../../linux_x86/vm/atomic_linux_x86.inline.hpp"
    31 
    32 #else // __EMX__
    3327
    3428#include "orderAccess_windows_x86.inline.hpp"
     
    292286#pragma warning(default: 4035) // Enables warnings reporting missing return statement
    293287
    294 #endif // __EMX__
    295 
    296288#endif // OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_INLINE_HPP
  • trunk/openjdk/hotspot/src/os_cpu/windows_x86/vm/bytes_windows_x86.inline.hpp

    r309 r313  
    2525#ifndef OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP
    2626#define OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP
    27 
    28 #ifdef __EMX__
    29 
    30 #include "../../linux_x86/vm/bytes_linux_x86.inline.hpp"
    31 
    32 #else // __EMX__
    3327
    3428#pragma warning(disable: 4035) // Disable warning 4035: no return value
     
    9185#pragma warning(default: 4035) // Enable warning 4035: no return value
    9286
    93 #endif // __EMX__
    94 
    9587#endif // OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP
  • trunk/openjdk/hotspot/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp

    r309 r313  
    2525#ifndef OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP
    2626#define OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP
    27 
    28 #ifdef __EMX__
    29 
    30 #include "../../linux_x86/vm/copy_linux_x86.inline.hpp"
    31 
    32 #else // __EMX__
    3327
    3428static void pd_conjoint_words(HeapWord* from, HeapWord* to, size_t count) {
     
    175169}
    176170
    177 #endif // __EMX__
    178 
    179171#endif // OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP
  • trunk/openjdk/hotspot/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp

    r309 r313  
    2525#ifndef OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP
    2626#define OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP
    27 
    28 #ifdef __EMX__
    29 
    30 #include "../../linux_x86/vm/orderAccess_linux_x86.inline.hpp"
    31 
    32 #else // __EMX__
    3327
    3428#include "runtime/atomic.hpp"
     
    223217#pragma warning(default: 4035) // Enables warnings reporting missing return statement
    224218
    225 #endif // __EMX__
    226 
    227219#endif // OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP
  • trunk/openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp

    r309 r313  
    5858#endif
    5959#ifdef TARGET_OS_ARCH_windows_x86
    60 # include "orderAccess_windows_x86.inline.hpp"
     60# ifdef TARGET_OS_FAMILY_os2
     61#  include "orderAccess_os2_x86.inline.hpp"
     62# else
     63#  include "orderAccess_windows_x86.inline.hpp"
     64# endif
    6165#endif
    6266
  • trunk/openjdk/hotspot/src/share/vm/oops/typeArrayOop.hpp

    r309 r313  
    4444#endif
    4545#ifdef TARGET_OS_ARCH_windows_x86
    46 # include "orderAccess_windows_x86.inline.hpp"
     46# ifdef TARGET_OS_FAMILY_os2
     47#  include "orderAccess_os2_x86.inline.hpp"
     48# else
     49#  include "orderAccess_windows_x86.inline.hpp"
     50# endif
    4751#endif
    4852
  • trunk/openjdk/hotspot/src/share/vm/runtime/atomic.cpp

    r309 r313  
    5050#endif
    5151#ifdef TARGET_OS_ARCH_windows_x86
    52 # include "atomic_windows_x86.inline.hpp"
     52# ifdef TARGET_OS_FAMILY_os2
     53#  include "atomic_os2_x86.inline.hpp"
     54# else
     55#  include "atomic_windows_x86.inline.hpp"
     56# endif
    5357#endif
    5458
  • trunk/openjdk/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp

    r309 r313  
    4343#endif
    4444#ifdef TARGET_OS_ARCH_windows_x86
    45 # include "orderAccess_windows_x86.inline.hpp"
     45# ifdef TARGET_OS_FAMILY_os2
     46#  include "orderAccess_os2_x86.inline.hpp"
     47# else
     48#  include "orderAccess_windows_x86.inline.hpp"
     49# endif
    4650#endif
    4751//
  • trunk/openjdk/hotspot/src/share/vm/utilities/taskqueue.hpp

    r309 r313  
    4646#endif
    4747#ifdef TARGET_OS_ARCH_windows_x86
    48 # include "orderAccess_windows_x86.inline.hpp"
     48# ifdef TARGET_OS_FAMILY_os2
     49#  include "orderAccess_os2_x86.inline.hpp"
     50# else
     51#  include "orderAccess_windows_x86.inline.hpp"
     52# endif
    4953#endif
    5054
Note: See TracChangeset for help on using the changeset viewer.