Print this page


Split Close
Expand all
Collapse all
          --- old/make/sun/xawt/Makefile
          +++ new/make/sun/xawt/Makefile
   1    1  #
   2      -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
        2 +# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
   3    3  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4    4  #
   5    5  # This code is free software; you can redistribute it and/or modify it
   6    6  # under the terms of the GNU General Public License version 2 only, as
   7    7  # published by the Free Software Foundation.  Oracle designates this
   8    8  # particular file as subject to the "Classpath" exception as provided
   9    9  # by Oracle in the LICENSE file that accompanied this code.
  10   10  #
  11   11  # This code is distributed in the hope that it will be useful, but WITHOUT
  12   12  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
↓ open down ↓ 205 lines elided ↑ open up ↑
 218  218  CFLAGS_32=-arch i386
 219  219  SIZERS = $(SIZER).32 $(SIZER).64
 220  220  SIZERS_C = $(SIZER_32_C) $(SIZER_64_C)
 221  221  SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64
 222  222  CFLAGS_64=-arch x86_64
 223  223  else # !macosx
 224  224  ifeq ($(ARCH_DATA_MODEL), 32)
 225  225  SIZERS = $(SIZER).32
 226  226  SIZERS_C = $(SIZER_32_C)
 227  227  SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
      228 +ifdef CROSS_COMPILE_ARCH
      229 +CFLAGS_32 = -m32
      230 +endif
 228  231  else # !32
 229  232  SIZERS = $(SIZER).64
 230  233  SIZERS_C = $(SIZER_64_C)
 231  234  SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
      235 +ifdef CROSS_COMPILE_ARCH
      236 +CFLAGS_64 = -m64
      237 +endif
 232  238  endif # 32
 233  239  endif # !macosx
 234  240  endif # solaris
 235  241  
 236  242  # XXX Hack for 6185483 - use hard-coded sizes.
 237  243  # Add the 64-bit platforms that need to be included into 32-bit build
 238  244  # and have sizes.64-$(PLATFORM)-$(LIBARCH) hardcoded in the workspace
 239  245  ifeq ($(PLATFORM)-$(LIBARCH), solaris-i386)
 240  246  # If you define DOHACK=true for some combination of $(PLATFORM)-$(LIBARCH),
 241  247  # make sure you have sizes.64-$(PLATFORM)-$(LIBARCH) pre-generated in
↓ open down ↓ 15 lines elided ↑ open up ↑
 257  263  # Do compare manually stored and automatically generated pair(s) 
 258  264  # if DOCOMPARE=true, just after the generation.
 259  265  STORED_SIZES_TMPL_solaris_amd64=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/sizes.64-solaris-i386
 260  266  
 261  267  WRAPPER_GENERATOR_JAVA=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/WrapperGenerator.java
 262  268  WRAPPER_GENERATOR_DIR=$(GENSRCDIR)/sun/awt/X11/generator
 263  269  WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator
 264  270  WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class 
 265  271  XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
 266  272  
 267      -$(SIZERS): $(SIZERS_C) 
 268      -        $(prep-target)
 269  273  ifndef CROSS_COMPILE_ARCH
 270      -        $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c
 271      -        $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) -o $@ $(CPPFLAGS) $(SIZER)$(suffix $@).o
      274 +SIZERS_CC = $(CC)
 272  275  else
 273      -        $(HOST_CC) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c
 274      -        $(HOST_CC) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).o
      276 +SIZERS_CC = $(HOST_CC)
 275  277  endif
 276  278  
      279 +$(SIZERS): $(SIZERS_C) 
      280 +        $(prep-target)
      281 +
      282 +        $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c
      283 +        $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) -o $@ $(CPPFLAGS) $(SIZER)$(suffix $@).o
      284 +
 277  285  $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
 278  286          $(prep-target)
 279  287          $(BOOT_JAVAC_CMD) -d $(WRAPPER_GENERATOR_TEMPDIR) $(WRAPPER_GENERATOR_JAVA)
 280  288  
 281  289  $(SIZERS_C): $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
 282  290          $(prep-target)
 283  291          $(MKDIR) -p $(WRAPPER_GENERATOR_TEMPDIR)
 284  292          $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \
 285  293              $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
 286  294  
↓ open down ↓ 95 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX