Changeset 325


Ignore:
Timestamp:
Feb 16, 2012, 7:52:53 PM (13 years ago)
Author:
dmik
Message:

hotspot: Add C compiler and separate C flags from C++ flags.

Location:
trunk/openjdk/hotspot/make/os2/makefiles
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/hotspot/make/os2/makefiles/adlc.make

    r311 r325  
    2424
    2525# adlc is an internal tool, always generate the debug version with assert()
    26 CXX_FLAGS += -DASSERT
    27 CXX_FLAGS += $(DEBUG_OPT_OPTION)
     26CPP_FLAGS += -DASSERT
     27C_FLAGS += $(DEBUG_OPT_OPTION)
    2828LINK_FLAGS += $(DEBUG_LINK_FLAGS)
    2929

  • trunk/openjdk/hotspot/make/os2/makefiles/compile.make

    r324 r325  
    2424
    2525# Generic compiler settings
     26CC = gcc
    2627CXX = g++
    2728
    28 CXX_FLAGS = $(CPP_FLAGS) -Zomf -march=i486 -mtune=generic
     29CC_FLAGS = $(C_FLAGS) $(CPP_FLAGS)
     30CXX_FLAGS = $(C_FLAGS) $(CPP_FLAGS)
     31
     32C_FLAGS = -Zomf -march=i486 -mtune=generic
    2933
    3034# We compile a lot of MSVC code which seems to silently tolerate these
    31 CXX_FLAGS += -Wno-sign-compare -Wno-write-strings
     35C_FLAGS += -Wno-sign-compare -Wno-write-strings
    3236
    3337CXX_FLAGS += -fno-rtti

  • trunk/openjdk/hotspot/make/os2/makefiles/debug.make

    r311 r325  
    3939include $(WorkSpace)/make/os2/makefiles/compile.make
    4040
    41 CXX_FLAGS += $(DEBUG_OPT_OPTION)
     41C_FLAGS += $(DEBUG_OPT_OPTION)
    4242LINK_FLAGS += $(DEBUG_LINK_FLAGS)
    4343

  • trunk/openjdk/hotspot/make/os2/makefiles/launcher.make

    r324 r325  
    3333        -D_CRT_SECURE_NO_DEPRECATE \
    3434        -DLINK_INTO_LIBJVM \
    35         -I$(WorkSpace)\src\os\windows\launcher \
    36         -I$(WorkSpace)\src\share\tools\launcher \
    37         -I$(WorkSpace)\src\share\vm\prims \
    38         -I$(WorkSpace)\src\share\vm \
    39         -I$(WorkSpace)\src\cpu\$(Platform_arch)\vm \
    40         -I$(WorkSpace)\src\os\windows\vm
     35        -I$(WorkSpace)/src/os/windows/launcher \
     36        -I$(WorkSpace)/src/share/tools/launcher \
     37        -I$(WorkSpace)/src/share/vm/prims \
     38        -I$(WorkSpace)/src/share/vm \
     39        -I$(WorkSpace)/src/cpu/$(Platform_arch)/vm \
     40        -I$(WorkSpace)/src/os/windows/vm
    4141
    4242LAUNCHER_LINK_FLAGS += -l$(HS_INTERNAL_NAME).lib -g -Zlinker /PM:VIO
    … …  
    5656
    5757$(LAUNCHER_OUT)/%.obj: $(LAUNCHERDIR_SHARE)/%.c | launcher-out
    58         $(QUIETLY) $(CXX) $(CXX_FLAGS) -g -o $@ -c $< $(LAUNCHER_FLAGS)
     58        $(QUIETLY) $(CC) $(CC_FLAGS) $(LAUNCHER_FLAGS) -g -o $@ -c $<
    5959
    6060$(LAUNCHER_OUT)/%.obj: $(LAUNCHERDIR)/%.c | launcher-out
    61         $(QUIETLY) $(CXX) $(CXX_FLAGS) -g -o $@ -c $< $(LAUNCHER_FLAGS)
     61        $(QUIETLY) $(CC) $(CC_FLAGS) $(LAUNCHER_FLAGS) -g -o $@ -c $<
    6262
    6363launcher: $(OBJS)

  • trunk/openjdk/hotspot/make/os2/makefiles/product.make

    r311 r325  
    3838include $(WorkSpace)/make/os2/makefiles/compile.make
    3939
    40 CXX_FLAGS += $(PRODUCT_OPT_OPTION)
     40C_FLAGS += $(PRODUCT_OPT_OPTION)
    4141LINK_FLAGS += $(PRODUCT_LINK_FLAGS)
    4242

  • trunk/openjdk/hotspot/make/os2/makefiles/vm.make

    r324 r325  
    181181
    182182%.obj: %.s
    183         $(CXX) $(CXX_FLAGS) -c $< -o $@
     183        $(CXX) $(CPP_FLAGS) -c $< -o $@
    184184
    185185default::
Note: See TracChangeset for help on using the changeset viewer.