OpenJDK / jdk / hs
changeset 46870:942b678b7869
8166748: Clean out Windows IA64 support
Reviewed-by: kbarrett, coleenp, bobv, mdoerr
| author | gtriantafill |
|---|---|
| date | Mon, 12 Jun 2017 13:22:48 -0400 |
| parents | 8360163ddb7f |
| children | 98c30b33c936 |
| files | jdk/src/java.base/share/native/libfdlibm/fdlibm.h jdk/src/java.base/windows/native/libjava/java_props_md.c jdk/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c |
| diffstat | 3 files changed, 5 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/java.base/share/native/libfdlibm/fdlibm.h Thu Jun 08 14:49:07 2017 +0200 +++ b/jdk/src/java.base/share/native/libfdlibm/fdlibm.h Mon Jun 12 13:22:48 2017 -0400 @@ -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
--- a/jdk/src/java.base/windows/native/libjava/java_props_md.c Thu Jun 08 14:49:07 2017 +0200 +++ b/jdk/src/java.base/windows/native/libjava/java_props_md.c Mon Jun 12 13:22:48 2017 -0400 @@ -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 @@ } 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";
--- a/jdk/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c Thu Jun 08 14:49:07 2017 +0200 +++ b/jdk/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c Mon Jun 12 13:22:48 2017 -0400 @@ -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 @@ "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 @@ RELEASE_ARRAYS(env, &jsrc); return; } -#ifdef _M_IA64 -#pragma optimize ("", on) -#endif - /* * SOME FINE POINTS: