Mercurial > hg > openjdk > jigsaw > jdk
changeset 5745:4eac56f073ea jdk8-b41
Merge
author | katleman |
---|---|
date | Wed, 30 May 2012 15:59:25 -0700 |
parents | 7def50698e78 (current diff) 8b4dd321b8a2 (diff) |
children | cf5c1f6fbc5b |
files | |
diffstat | 6 files changed, 31 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/make/sun/xawt/Makefile Thu May 24 16:15:58 2012 -0700 +++ b/make/sun/xawt/Makefile Wed May 30 15:59:25 2012 -0700 @@ -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 @@ 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_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)
--- a/makefiles/sun/xawt/Makefile Thu May 24 16:15:58 2012 -0700 +++ b/makefiles/sun/xawt/Makefile Wed May 30 15:59:25 2012 -0700 @@ -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 @@ 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_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)
--- a/src/share/native/sun/awt/image/cvutils/img_dcm.h Thu May 24 16:15:58 2012 -0700 +++ b/src/share/native/sun/awt/image/cvutils/img_dcm.h Wed May 30 15:59:25 2012 -0700 @@ -52,8 +52,6 @@ #define DecodeDeclared #endif -#include "java_awt_image_DirectColorModel.h" - #define DeclareDCMVars \ IfAlpha(int alpha_mask; \ int alpha_scale; \
--- a/src/share/native/sun/awt/image/cvutils/img_dcm8.h Thu May 24 16:15:58 2012 -0700 +++ b/src/share/native/sun/awt/image/cvutils/img_dcm8.h Wed May 30 15:59:25 2012 -0700 @@ -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;
--- a/src/share/native/sun/java2d/pipe/SpanClipRenderer.c Thu May 24 16:15:58 2012 -0700 +++ b/src/share/native/sun/java2d/pipe/SpanClipRenderer.c Wed May 30 15:59:25 2012 -0700 @@ -31,7 +31,6 @@ #include "jni_util.h" #include "sun_java2d_pipe_SpanClipRenderer.h" -#include "sun_java2d_pipe_RegionIterator.h" jfieldID pBandsArrayID; jfieldID pEndIndexID;
--- a/src/solaris/native/sun/awt/initIDs.c Thu May 24 16:15:58 2012 -0700 +++ b/src/solaris/native/sun/awt/initIDs.c Wed May 30 15:59:25 2012 -0700 @@ -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"