From 7da56bf73511359ca53df9d5b0652af9c70fcdec Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Fri, 25 May 2012 18:55:22 -0700 Subject: [PATCH 1/2] 7172014: Remove empty and unused javah include files Reviewed-by: ohair, erikj --- jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h | 2 -- jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h | 2 -- jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c | 1 - jdk/src/solaris/native/sun/awt/initIDs.c | 2 -- 4 files changed, 7 deletions(-) diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h b/jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h index 4bc29f0ee59..a3eb74d5265 100644 --- a/jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h +++ b/jdk/src/share/native/sun/awt/image/cvutils/img_dcm.h @@ -52,8 +52,6 @@ #define DecodeDeclared #endif -#include "java_awt_image_DirectColorModel.h" - #define DeclareDCMVars \ IfAlpha(int alpha_mask; \ int alpha_scale; \ diff --git a/jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h b/jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h index df3d5bf4919..42a29434c81 100644 --- a/jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h +++ b/jdk/src/share/native/sun/awt/image/cvutils/img_dcm8.h @@ -52,8 +52,6 @@ #define DecodeDeclared #endif -#include "java_awt_image_DirectColorModel.h" - #define DeclareDCM8Vars \ IfAlpha(unsigned int alpha_off;) \ unsigned int red_off, green_off, blue_off; diff --git a/jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c b/jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c index addb4ad6e37..ad53574bdeb 100644 --- a/jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c +++ b/jdk/src/share/native/sun/java2d/pipe/SpanClipRenderer.c @@ -31,7 +31,6 @@ #include "jni_util.h" #include "sun_java2d_pipe_SpanClipRenderer.h" -#include "sun_java2d_pipe_RegionIterator.h" jfieldID pBandsArrayID; jfieldID pEndIndexID; diff --git a/jdk/src/solaris/native/sun/awt/initIDs.c b/jdk/src/solaris/native/sun/awt/initIDs.c index 41080d6dcec..3bd1e68903c 100644 --- a/jdk/src/solaris/native/sun/awt/initIDs.c +++ b/jdk/src/solaris/native/sun/awt/initIDs.c @@ -26,14 +26,12 @@ #include "java_awt_Color.h" #include "java_awt_Dimension.h" #include "java_awt_MenuBar.h" -//#include "java_awt_Label.h" #include "java_awt_FontMetrics.h" #include "java_awt_event_MouseEvent.h" #include "java_awt_Rectangle.h" #include "java_awt_ScrollPaneAdjustable.h" #include "java_awt_Toolkit.h" #include "java_awt_CheckboxMenuItem.h" -#include "sun_awt_CharsetString.h" #include "jni_util.h" From 884f00e27eb9135c3a23343b8a7d1f7f03d0b09b Mon Sep 17 00:00:00 2001 From: David Holmes Date: Wed, 30 May 2012 00:37:21 -0400 Subject: [PATCH 2/2] 7171653: 32-bit cross-compile on 64-bit build host generates 64-bit data for awt/X11 leading to crash Reviewed-by: ohair, anthony --- jdk/make/sun/xawt/Makefile | 23 +++++++++++++++-------- jdk/makefiles/sun/xawt/Makefile | 24 ++++++++++++++++-------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/jdk/make/sun/xawt/Makefile b/jdk/make/sun/xawt/Makefile index 6ed7370888f..791bd2dc326 100644 --- a/jdk/make/sun/xawt/Makefile +++ b/jdk/make/sun/xawt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2012, 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 @@ -225,10 +225,16 @@ ifeq ($(ARCH_DATA_MODEL), 32) SIZERS = $(SIZER).32 SIZERS_C = $(SIZER_32_C) SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 +ifdef CROSS_COMPILE_ARCH +CFLAGS_32 = -m32 +endif else # !32 SIZERS = $(SIZER).64 SIZERS_C = $(SIZER_64_C) SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64 +ifdef CROSS_COMPILE_ARCH +CFLAGS_64 = -m64 +endif endif # 32 endif # !macosx endif # solaris @@ -264,15 +270,16 @@ WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt +ifndef CROSS_COMPILE_ARCH +SIZERS_CC = $(CC) +else +SIZERS_CC = $(HOST_CC) +endif + $(SIZERS): $(SIZERS_C) $(prep-target) -ifndef CROSS_COMPILE_ARCH - $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c - $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) -o $@ $(CPPFLAGS) $(SIZER)$(suffix $@).o -else - $(HOST_CC) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c - $(HOST_CC) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).o -endif + $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c + $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) -o $@ $(CPPFLAGS) $(SIZER)$(suffix $@).o $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA) $(prep-target) diff --git a/jdk/makefiles/sun/xawt/Makefile b/jdk/makefiles/sun/xawt/Makefile index 14409bd18f2..14b0651843a 100644 --- a/jdk/makefiles/sun/xawt/Makefile +++ b/jdk/makefiles/sun/xawt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2012, 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 @@ -225,10 +225,16 @@ ifeq ($(ARCH_DATA_MODEL), 32) SIZERS = $(SIZER).32 SIZERS_C = $(SIZER_32_C) SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 +ifdef CROSS_COMPILE_ARCH +CFLAGS_32 = -m32 +endif else # !32 SIZERS = $(SIZER).64 SIZERS_C = $(SIZER_64_C) SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64 +ifdef CROSS_COMPILE_ARCH +CFLAGS_64 = -m64 +endif endif # 32 endif # !macosx endif # solaris @@ -264,15 +270,17 @@ WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt +ifndef CROSS_COMPILE_ARCH +SIZERS_CC = $(CC) +else +SIZERS_CC = $(HOST_CC) +endif + $(SIZERS): $(SIZERS_C) $(prep-target) -ifndef CROSS_COMPILE_ARCH - $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c - $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) -o $@ $(CPPFLAGS) $(SIZER)$(suffix $@).o -else - $(HOST_CC) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c - $(HOST_CC) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).o -endif + + $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c + $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) -o $@ $(CPPFLAGS) $(SIZER)$(suffix $@).o $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA) $(prep-target)