Changeset 315


Ignore:
Timestamp:
Feb 15, 2012, 4:20:05 PM (9 years ago)
Author:
dmik
Message:

Use TARGET_COMPILER_gcc instead of EMX when appropriate.

Location:
trunk/openjdk/hotspot/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/openjdk/hotspot/src/cpu/x86/vm/jni_x86.h

    r309 r315  
    4646
    4747  typedef int jint;
    48 #ifdef __EMX__
     48#ifdef TARGET_COMPILER_gcc
    4949  typedef __int64_t jlong;
    5050#else
  • trunk/openjdk/hotspot/src/os/os2/vm/os_os2_init.cpp

    r246 r315  
    3333
    3434#include <types.h>
    35 #ifdef __EMX__
     35#ifdef TARGET_COMPILER_gcc
    3636#include <emx/startup.h>
    3737#endif
     
    5858    switch (ulFlag) {
    5959    case 0 :
    60 #ifdef __EMX__
     60#ifdef TARGET_COMPILER_gcc
    6161        // initialize the C library
    6262        if (_CRT_init())
     
    8585          UnregisterLxDll(dllHandle);
    8686        }
    87 #ifdef __EMX__
     87#ifdef TARGET_COMPILER_gcc
    8888        // destroy C++ statics
    8989        __ctordtorTerm();
  • trunk/openjdk/hotspot/src/os/windows/vm/attachListener_windows.cpp

    r309 r315  
    151151
    152152 public:
    153 #ifdef __EMX__
     153#ifdef TARGET_COMPILER_gcc
    154154  void complete(jint result, bufferedStream* result_stream);
    155155#else
  • trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp

    r309 r315  
    34993499  void *code_ptr = (void *)code;
    35003500  __try {
    3501 #ifdef __EMX__
     3501#ifdef TARGET_COMPILER_gcc
    35023502    __asm__("call *%0" : : "m"(code_ptr));
    35033503#else
     
    36063606#ifndef  _WIN64
    36073607    static long fp_control_word = 0;
    3608 #ifdef __EMX__
     3608#ifdef TARGET_COMPILER_gcc
    36093609    __asm__("fstcw %0" : "=m"(fp_control_word));
    36103610#else
     
    36193619    const long invalid   = 0x01;
    36203620    fp_control_word |= invalid;
    3621 #ifdef __EMX__
     3621#ifdef TARGET_COMPILER_gcc
    36223622    __asm__("fldcw %0" : : "m"(fp_control_word));
    36233623#else
  • trunk/openjdk/hotspot/src/os/windows/vm/os_windows.inline.hpp

    r313 r315  
    4343inline const char* os::dll_file_extension()            { return ".dll"; }
    4444
    45 #ifdef __EMX__
     45#ifdef TARGET_COMPILER_gcc
    4646inline const char* os::jlong_format_specifier()        { return "%lld"; }
    4747inline const char* os::julong_format_specifier()       { return "%llu"; }
  • trunk/openjdk/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp

    r309 r315  
    9393    if ( ThreadLocalStorage::get_thread_ptr_offset() == 0 ) {
    9494      int thread_ptr_offset;
    95 #ifdef __EMX__
     95#ifdef TARGET_COMPILER_gcc
    9696      __asm__("leal %1, %%eax; "
    9797              "subl %%fs:0, %%eax; "
     
    113113    else {
    114114      int test_thread_ptr_offset;
    115 #ifdef __EMX__
     115#ifdef TARGET_COMPILER_gcc
    116116      __asm__("leal %1, %%eax; "
    117117              "subl %%fs:0, %%eax; "
     
    389389intptr_t* _get_previous_fp() {
    390390  intptr_t **frameptr;
    391 #ifdef __EMX__
     391#ifdef TARGET_COMPILER_gcc
    392392  __asm("movl %%ebp, %0" : "=m"(frameptr));
    393393#else
     
    551551   // On systems that don't support pause a rep:nop
    552552   // is executed as a nop.  The rep: prefix is ignored.
    553 #ifdef __EMX__
     553#ifdef TARGET_COMPILER_gcc
    554554   __asm__("pause; ");
    555555#else
     
    566566#ifndef AMD64
    567567  int fpu_cntrl_word = StubRoutines::fpu_cntrl_wrd_std();
    568 #ifdef __EMX__
     568#ifdef TARGET_COMPILER_gcc
    569569  __asm__("fldcw %0; " : : "m"(fpu_cntrl_word));
    570570#else 
  • trunk/openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp

    r309 r315  
    240240inline address_word  castable_address(void* x)                { return address_word(x) ; }
    241241
    242 #ifdef __EMX__
     242#ifdef TARGET_COMPILER_gcc
    243243// GCC 4.4.4 forbids implicit cast from function pointers to void*
    244244template <class T>
Note: See TracChangeset for help on using the changeset viewer.