stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8166748: Clean out Windows IA64 support

Browse Source 
Reviewed-by: kbarrett, coleenp, bobv, mdoerr
This commit is contained in:
George Triantafillou 2017-06-12 13:22:48 -04:00
parent db7a9c5b60
commit 3aaa47204a
3 changed files with 5 additions and 20 deletions
jdk/src
java.base
share/native/libfdlibm
fdlibm.h
windows/native/libjava
java_props_md.c
java.desktop/share/native/libjavajpeg
jpegdecoder.c

4
jdk/src/java.base/share/native/libfdlibm/fdlibm.h

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. 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
@ -34,7 +34,7 @@
#ifdef __NEWVALID /* special setup for Sun test regime */
#if defined(i386) || defined(i486) || \
defined(intel) || defined(x86) || defined(arm) || \
defined(i86pc) || defined(_M_IA64) || defined(ia64)
defined(i86pc) || defined(ia64)
#define _LITTLE_ENDIAN
#endif
#endif

6
jdk/src/java.base/windows/native/libjava/java_props_md.c

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2017, Oracle and/or its affiliates. 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
@ -559,9 +559,7 @@ GetJavaProperties(JNIEnv* env)
}
sprintf(buf, "%d.%d", majorVersion, minorVersion);
sprops.os_version = _strdup(buf);
#if _M_IA64
sprops.os_arch = "ia64";
#elif _M_AMD64
#if _M_AMD64
sprops.os_arch = "amd64";
#elif _X86_
sprops.os_arch = "x86";

15
jdk/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2017, Oracle and/or its affiliates. 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
@ -483,15 +483,6 @@ Java_sun_awt_image_JPEGImageDecoder_initIDs(JNIEnv *env, jclass cls,
"available", "()I"));
}
/*
* The Windows Itanium Aug 2002 SDK generates bad code
* for this routine. Disable optimization for now.
*/
#ifdef _M_IA64
#pragma optimize ("", off)
#endif
JNIEXPORT void JNICALL
Java_sun_awt_image_JPEGImageDecoder_readImage(JNIEnv *env,
jobject this,
@ -745,10 +736,6 @@ Java_sun_awt_image_JPEGImageDecoder_readImage(JNIEnv *env,
RELEASE_ARRAYS(env, &jsrc);
return;
}
#ifdef _M_IA64
#pragma optimize ("", on)
#endif
/*
* SOME FINE POINTS: