/hg/icedtea6: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Dec 26 04:28:13 PST 2013
changeset da280d788a9e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=da280d788a9e
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Dec 26 11:58:53 2013 +0000
Only default to using system libraries on GNU/Linux systems.
2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
* acinclude.m4:
(IT_SET_ARCH_SETTINGS): Use target, not host.
(IT_SET_OS_DIRS): Likewise.
(IT_CHECK_FOR_LCMS): Only default to system LCMS
is using GNU/Linux.
(IT_CHECK_FOR_ZLIB): Likewise.
(IT_CHECK_FOR_JPEG): Likewise.
(IT_CHECK_FOR_PNG): Likewise.
(IT_CHECK_FOR_GIF): Likewise.
* configure.ac:
Add AC_CANONICAL_TARGET after AC_CANONICAL_HOST
and move earlier in file, before Automake
initialisation.
changeset 6fd523a02ef8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6fd523a02ef8
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Dec 26 12:24:07 2013 +0000
Add Windows fixes following 6585765 backport.
2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches.
* AUTHORS: Add Alex Kasko.
2013-07-21 Alex Kasko <alex.kasko.lists at gmail.com>
* patches/windows-awt.patch,
* patches/windows-jdk-sizecalc.patch:
Fix Windows build following backport of 6585765.
changeset 8b6b7d640684 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8b6b7d640684
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Dec 26 12:27:55 2013 +0000
Backport EliminateNestedLocks definition for Shark from 8003868 in OpenJDK 8.
2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add patch.
* patches/shark_fixes_from_8003868.patch:
Backport EliminateNestedLocks definition
for Shark from 8003868 in OpenJDK 8.
diffstat:
AUTHORS | 1 +
ChangeLog | 36 +++++++++
Makefile.am | 5 +-
acinclude.m4 | 36 +++++++--
configure.ac | 4 +-
patches/shark_fixes_from_8003868.patch | 27 ++++++
patches/windows-awt.patch | 130 +++++++++++++++++++++++++++++++++
patches/windows-jdk-sizecalc.patch | 14 +++
8 files changed, 242 insertions(+), 11 deletions(-)
diffs (365 lines):
diff -r 58bdfe3bc688 -r 8b6b7d640684 AUTHORS
--- a/AUTHORS Thu Dec 26 11:24:46 2013 +0000
+++ b/AUTHORS Thu Dec 26 12:27:55 2013 +0000
@@ -20,6 +20,7 @@
Tomas Hurka <tomas.hurka at sun.com>
Ioana Ivan <iivan at redhat.com>
C. K. Jester-Young (cky944 at gmail.com)
+Alex Kasko (alex.kasko.lists at gmail.com)
Matthias Klose <doko at ubuntu.com>
Francis Kung <fkung at redhat.com>
Denis Lila <dlila at redhat.com>
diff -r 58bdfe3bc688 -r 8b6b7d640684 ChangeLog
--- a/ChangeLog Thu Dec 26 11:24:46 2013 +0000
+++ b/ChangeLog Thu Dec 26 12:27:55 2013 +0000
@@ -1,3 +1,39 @@
+2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patch.
+ * patches/shark_fixes_from_8003868.patch:
+ Backport EliminateNestedLocks definition
+ for Shark from 8003868 in OpenJDK 8.
+
+2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patches.
+ * AUTHORS: Add Alex Kasko.
+
+2013-07-21 Alex Kasko <alex.kasko.lists at gmail.com>
+
+ * patches/windows-awt.patch,
+ * patches/windows-jdk-sizecalc.patch:
+ Fix Windows build following backport of 6585765.
+
+2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * acinclude.m4:
+ (IT_SET_ARCH_SETTINGS): Use target, not host.
+ (IT_SET_OS_DIRS): Likewise.
+ (IT_CHECK_FOR_LCMS): Only default to system LCMS
+ is using GNU/Linux.
+ (IT_CHECK_FOR_ZLIB): Likewise.
+ (IT_CHECK_FOR_JPEG): Likewise.
+ (IT_CHECK_FOR_PNG): Likewise.
+ (IT_CHECK_FOR_GIF): Likewise.
+ * configure.ac:
+ Add AC_CANONICAL_TARGET after AC_CANONICAL_HOST
+ and move earlier in file, before Automake
+ initialisation.
+
2013-12-26 Andrew John Hughes <gnu.andrew at redhat.com>
* acinclude.m4:
diff -r 58bdfe3bc688 -r 8b6b7d640684 Makefile.am
--- a/Makefile.am Thu Dec 26 11:24:46 2013 +0000
+++ b/Makefile.am Thu Dec 26 12:27:55 2013 +0000
@@ -630,7 +630,10 @@
patches/openjdk/7025066-embedded_build.patch \
patches/s390_casts.patch \
patches/openjdk/8025255-tzdata2013g.patch \
- patches/d729448-32_bit_alignment.patch
+ patches/d729448-32_bit_alignment.patch \
+ patches/windows-awt.patch \
+ patches/windows-jdk-sizecalc.patch \
+ patches/shark_fixes_from_8003868.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 58bdfe3bc688 -r 8b6b7d640684 acinclude.m4
--- a/acinclude.m4 Thu Dec 26 11:24:46 2013 +0000
+++ b/acinclude.m4 Thu Dec 26 12:27:55 2013 +0000
@@ -1,6 +1,6 @@
AC_DEFUN([IT_SET_ARCH_SETTINGS],
[
- case "${host_cpu}" in
+ case "${target_cpu}" in
x86_64)
BUILD_ARCH_DIR=amd64
INSTALL_ARCH_DIR=amd64
@@ -108,7 +108,7 @@
AC_DEFUN([IT_SET_OS_DIRS],
[
- case "${host_os}" in
+ case "${target_os}" in
*linux*)
BUILD_OS_DIR=linux
OS_PATH=
@@ -122,7 +122,7 @@
OS_PATH=
;;
*)
- AC_MSG_ERROR([unsupported operating system ${host_os}])
+ AC_MSG_ERROR([unsupported operating system ${target_os}])
;;
esac
AC_SUBST(BUILD_OS_DIR)
@@ -1544,7 +1544,11 @@
ENABLE_SYSTEM_LCMS="${enableval}"
],
[
- ENABLE_SYSTEM_LCMS="yes"
+ if test x"${target_os}" = "xlinux-gnu"; then
+ ENABLE_SYSTEM_LCMS="yes" ;
+ else
+ ENABLE_SYSTEM_LCMS="no" ;
+ fi;
])
AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then
@@ -1570,7 +1574,11 @@
ENABLE_SYSTEM_ZLIB="${enableval}"
],
[
- ENABLE_SYSTEM_ZLIB="yes"
+ if test x"${target_os}" = "xlinux-gnu"; then
+ ENABLE_SYSTEM_ZLIB="yes" ;
+ else
+ ENABLE_SYSTEM_ZLIB="no" ;
+ fi
])
AC_MSG_RESULT(${ENABLE_SYSTEM_ZLIB})
if test x"${ENABLE_SYSTEM_ZLIB}" = "xyes"; then
@@ -1597,7 +1605,11 @@
ENABLE_SYSTEM_JPEG="${enableval}"
],
[
- ENABLE_SYSTEM_JPEG="yes"
+ if test x"${target_os}" = "xlinux-gnu"; then
+ ENABLE_SYSTEM_JPEG="yes" ;
+ else
+ ENABLE_SYSTEM_JPEG="no" ;
+ fi
])
AC_MSG_RESULT(${ENABLE_SYSTEM_JPEG})
if test x"${ENABLE_SYSTEM_JPEG}" = "xyes"; then
@@ -1622,7 +1634,11 @@
ENABLE_SYSTEM_PNG="${enableval}"
],
[
- ENABLE_SYSTEM_PNG="yes"
+ if test x"${target_os}" = "xlinux-gnu"; then
+ ENABLE_SYSTEM_PNG="yes" ;
+ else
+ ENABLE_SYSTEM_PNG="no" ;
+ fi
])
AC_MSG_RESULT(${ENABLE_SYSTEM_PNG})
if test x"${ENABLE_SYSTEM_PNG}" = "xyes"; then
@@ -1648,7 +1664,11 @@
ENABLE_SYSTEM_GIF="${enableval}"
],
[
- ENABLE_SYSTEM_GIF="yes"
+ if test x"${target_os}" = "xlinux-gnu"; then
+ ENABLE_SYSTEM_GIF="yes" ;
+ else
+ ENABLE_SYSTEM_GIF="no" ;
+ fi
])
AC_MSG_RESULT(${ENABLE_SYSTEM_GIF})
if test x"${ENABLE_SYSTEM_GIF}" = "xyes"; then
diff -r 58bdfe3bc688 -r 8b6b7d640684 configure.ac
--- a/configure.ac Thu Dec 26 11:24:46 2013 +0000
+++ b/configure.ac Thu Dec 26 12:27:55 2013 +0000
@@ -1,4 +1,6 @@
AC_INIT([icedtea6],[1.13.0pre],[distro-pkg-dev at openjdk.java.net])
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
@@ -11,8 +13,6 @@
cd $abs_top_builddir
AC_SUBST(abs_top_srcdir)
-AC_CANONICAL_HOST
-
AC_PREFIX_DEFAULT([bootstrap])
AC_PROG_CC
diff -r 58bdfe3bc688 -r 8b6b7d640684 patches/shark_fixes_from_8003868.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/shark_fixes_from_8003868.patch Thu Dec 26 12:27:55 2013 +0000
@@ -0,0 +1,27 @@
+diff -r beebba0acc11 -r 2cd5e15048e6 src/share/vm/shark/shark_globals.hpp
+--- openjdk/hotspot/src/share/vm/shark/shark_globals.hpp Mon Nov 26 17:25:11 2012 -0800
++++ openjdk/hotspot/src/share/vm/shark/shark_globals.hpp Tue Nov 27 12:48:52 2012 -0800
+@@ -40,6 +40,12 @@
+ product(intx, SharkMaxInlineSize, 32, \
+ "Maximum bytecode size of methods to inline when using Shark") \
+ \
++ product(bool, EliminateNestedLocks, true, \
++ "Eliminate nested locks of the same object when possible") \
++ \
++ product(ccstr, SharkOptimizationLevel, "Default", \
++ "The optimization level passed to LLVM, possible values: None, Less, Default and Agressive") \
++ \
+ /* compiler debugging */ \
+ develop(ccstr, SharkPrintTypeflowOf, NULL, \
+ "Print the typeflow of the specified method") \
+@@ -58,6 +64,10 @@
+ \
+ diagnostic(bool, SharkPerformanceWarnings, false, \
+ "Warn about things that could be made faster") \
++ \
++ develop(ccstr, SharkVerifyFunction, NULL, \
++ "Runs LLVM verify over LLVM IR") \
++
+
+ SHARK_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_NOTPRODUCT_FLAG)
+
diff -r 58bdfe3bc688 -r 8b6b7d640684 patches/windows-awt.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/windows-awt.patch Thu Dec 26 12:27:55 2013 +0000
@@ -0,0 +1,130 @@
+diff --git a/jdk/src/windows/native/sun/windows/awt_Component.cpp b/jdk/src/windows/native/sun/windows/awt_Component.cpp
+index 7490b4e..660efe7 100644
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.cpp
++++ openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp
+@@ -218,6 +218,10 @@ static UINT lastShiftKeyPressed = 0; // init to safe value
+ // Added by waleed to initialize the RTL Flags
+ BOOL AwtComponent::sm_rtl = PRIMARYLANGID(GetInputLanguage()) == LANG_ARABIC ||
+ PRIMARYLANGID(GetInputLanguage()) == LANG_HEBREW;
++
++UINT AwtComponent::sm_95WheelMessage = WM_NULL;
++UINT AwtComponent::sm_95WheelSupport = WM_NULL;
++
+ BOOL AwtComponent::sm_rtlReadingOrder =
+ PRIMARYLANGID(GetInputLanguage()) == LANG_ARABIC;
+
+diff --git a/jdk/src/windows/native/sun/windows/awt_Component.h b/jdk/src/windows/native/sun/windows/awt_Component.h
+index ac60aec..3d02235 100644
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.h
++++ openjdk/jdk/src/windows/native/sun/windows/awt_Component.h
+@@ -423,6 +423,10 @@ public:
+ /* Functions for MouseWheel support on Windows95
+ * These should only be called if running on 95
+ */
++ static void Wheel95Init();
++ INLINE static UINT Wheel95GetMsg() {return sm_95WheelMessage;}
++ static UINT Wheel95GetScrLines();
++
+
+ /* Determines whether the component is obscured by another window */
+ // Called on Toolkit thread
+@@ -718,6 +722,10 @@ protected:
+ virtual void SetDragCapture(UINT flags);
+ virtual void ReleaseDragCapture(UINT flags);
+
++ // 95 support for mouse wheel
++ static UINT sm_95WheelMessage;
++ static UINT sm_95WheelSupport;
++
+ //These functions are overridden in AwtWindow to handle non-opaque windows.
+ virtual void FillBackground(HDC hMemoryDC, SIZE &size);
+ virtual void FillAlpha(void *bitmapBits, SIZE &size, BYTE alpha);
+diff --git a/jdk/src/windows/native/sun/windows/awt_MMStub.h b/jdk/src/windows/native/sun/windows/awt_MMStub.h
+index 802899b..18afeeb 100644
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_MMStub.h
++++ openjdk/jdk/src/windows/native/sun/windows/awt_MMStub.h
+@@ -74,6 +74,12 @@ extern "C" {
+ #define DEV_STR_LEN 128
+
+
++#define ULW_ALPHA 0x00000002
++#define LWA_ALPHA 0x00000002
++#define WS_EX_LAYERED 0x00080000
++#define WS_EX_NOACTIVATE 0x08000000L
++
++
+ // Datatypes
+ typedef HANDLE MHND;
+ typedef BOOL (CALLBACK* MON_ENUM_CALLBACK_PROC)(MHND,HDC,LPRECT,LPARAM);
+@@ -105,6 +111,15 @@ typedef struct tagDISPLAY_DEVICE
+ WCHAR deviceKey[128];
+ } _DISPLAY_DEVICE, *P_DISPLAY_DEVICE;
+
++typedef struct tagMSLLHOOKSTRUCT
++{
++ POINT pt;
++ DWORD mouseData;
++ DWORD flags;
++ DWORD time;
++ ULONG_PTR dwExtraInfo;
++} MSLLHOOKSTRUCT, *PMSLLHOOKSTRUCT, *LPMSLLHOOKSTRUCT;
++
+ /* Basic API's */
+ BOOL WINAPI _enumDisplayMonitors(HDC,LPCRECT,MON_ENUM_CALLBACK_PROC,LPARAM);
+ BOOL WINAPI _enumDisplayDevices (LPVOID,int,P_DISPLAY_DEVICE,DWORD);
+@@ -122,6 +137,10 @@ HDC WINAPI _makeDCFromMonitor (MHND);
+ HWND WINAPI _createWindowOM (MHND,LPCTSTR,LPCTSTR,DWORD,int,int,int,
+ int,HWND,HMENU,HANDLE,LPVOID);
+
++WINUSERAPI BOOL WINAPI SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD);
++WINUSERAPI BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD);
++
++
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
+diff --git a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp b/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
+index d407c92..940db1f 100644
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
++++ openjdk/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
+@@ -1602,13 +1602,13 @@ BOOL AwtToolkit::GetScreenInsets(int screenNum, RECT * rect)
+ }
+ /* if additional display */
+ else {
+- MONITORINFO *miInfo;
++ MONITOR_INFO *miInfo;
+ miInfo = AwtWin32GraphicsDevice::GetMonitorInfo(screenNum);
+ if (miInfo) {
+- rect->top = miInfo->rcWork.top - miInfo->rcMonitor.top;
+- rect->left = miInfo->rcWork.left - miInfo->rcMonitor.left;
+- rect->bottom = miInfo->rcMonitor.bottom - miInfo->rcWork.bottom;
+- rect->right = miInfo->rcMonitor.right - miInfo->rcWork.right;
++ rect->top = miInfo->rWork.top - miInfo->rMonitor.top;
++ rect->left = miInfo->rWork.left - miInfo->rMonitor.left;
++ rect->bottom = miInfo->rMonitor.bottom - miInfo->rWork.bottom;
++ rect->right = miInfo->rMonitor.right - miInfo->rWork.right;
+ return TRUE;
+ }
+ }
+diff --git a/jdk/src/windows/native/sun/windows/awt_Window.cpp b/jdk/src/windows/native/sun/windows/awt_Window.cpp
+index c7ead09..863967f 100644
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.cpp
++++ openjdk/jdk/src/windows/native/sun/windows/awt_Window.cpp
+@@ -417,7 +417,7 @@ bool AwtWindow::IsWarningWindow(HWND hWnd)
+ return 0 == _tcsncmp(windowClassName,
+ AwtWindow::GetWarningWindowClassName(), len);
+ }
+-+
++
+ LRESULT CALLBACK AwtWindow::CBTFilter(int nCode, WPARAM wParam, LPARAM lParam)
+ {
+ if (nCode == HCBT_ACTIVATE || nCode == HCBT_SETFOCUS) {
+@@ -703,7 +703,7 @@ void AwtWindow::CalculateWarningWindowBounds(JNIEnv *env, LPRECT rect)
+ y = min(y, windowBounds.bottom + (int)warningWindowHeight + 2);
+
+ // Now make sure the warning window is visible on the screen
+- HMONITOR hmon = MonitorFromWindow(GetHWnd(), MONITOR_DEFAULTTOPRIMARY);
++ MHND hmon = MonitorFromWindow(GetHWnd(), MONITOR_DEFAULTTOPRIMARY);
+ DASSERT(hmon != NULL);
+
+ RECT monitorBounds;
diff -r 58bdfe3bc688 -r 8b6b7d640684 patches/windows-jdk-sizecalc.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/windows-jdk-sizecalc.patch Thu Dec 26 12:27:55 2013 +0000
@@ -0,0 +1,14 @@
+diff --git a/jdk/src/share/native/common/sizecalc.h b/jdk/src/share/native/common/sizecalc.h
+index 675750e..f88c27c 100644
+--- openjdk.orig/jdk/src/share/native/common/sizecalc.h
++++ openjdk/jdk/src/share/native/common/sizecalc.h
+@@ -38,7 +38,9 @@
+ * helper macros throw the std::bad_alloc instead of returning NULL.
+ */
+
++#ifndef _WIN32
+ #include <stdint.h> /* SIZE_MAX for C99+ */
++#endif /* _WIN32 */
+ /* http://stackoverflow.com/questions/3472311/what-is-a-portable-method-to-find-the-maximum-value-of-size-t */
+ #ifndef SIZE_MAX
+ #define SIZE_MAX ((size_t)-1)
More information about the distro-pkg-dev
mailing list