Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
6767659: Conversion from i486 to x86 missed some entries in makefiles
Thu, 13 Nov 2008 14:50:04 -0800
- author
- kvn
- date
- Thu, 13 Nov 2008 14:50:04 -0800
- changeset 868
- c1345e85f901
- parent 867
- 275a3b7ff0d6
- child 869
- de78b80cedec
6767659: Conversion from i486 to x86 missed some entries in makefiles
Summary: Fixed missed entries.
Reviewed-by: never
1.1 --- a/make/linux/makefiles/top.make Wed Nov 12 23:26:45 2008 -0800 1.2 +++ b/make/linux/makefiles/top.make Thu Nov 13 14:50:04 2008 -0800 1.3 @@ -85,9 +85,9 @@ 1.4 1.5 AD_Dir = $(GENERATED)/adfiles 1.6 ADLC = $(AD_Dir)/adlc 1.7 -AD_Spec = $(GAMMADIR)/src/cpu/$(Platform_arch)/vm/$(Platform_arch).ad 1.8 +AD_Spec = $(GAMMADIR)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad 1.9 AD_Src = $(GAMMADIR)/src/share/vm/adlc 1.10 -AD_Names = ad_$(Platform_arch).hpp ad_$(Platform_arch).cpp 1.11 +AD_Names = ad_$(Platform_arch_model).hpp ad_$(Platform_arch_model).cpp 1.12 AD_Files = $(AD_Names:%=$(AD_Dir)/%) 1.13 1.14 # AD_Files_If_Required/COMPILER1 = ad_stuff
2.1 --- a/make/solaris/makefiles/amd64.make Wed Nov 12 23:26:45 2008 -0800 2.2 +++ b/make/solaris/makefiles/amd64.make Thu Nov 13 14:50:04 2008 -0800 2.3 @@ -26,7 +26,6 @@ 2.4 CFLAGS += -DVM_LITTLE_ENDIAN 2.5 2.6 # Not included in includeDB because it has no dependencies 2.7 -# Obj_Files += solaris_amd64.o 2.8 Obj_Files += solaris_x86_64.o 2.9 2.10 #
3.1 --- a/make/solaris/makefiles/dtrace.make Wed Nov 12 23:26:45 2008 -0800 3.2 +++ b/make/solaris/makefiles/dtrace.make Thu Nov 13 14:50:04 2008 -0800 3.3 @@ -87,17 +87,16 @@ 3.4 3.5 XLIBJVM_DB = 64/$(LIBJVM_DB) 3.6 XLIBJVM_DTRACE = 64/$(LIBJVM_DTRACE) 3.7 -XARCH = $(subst sparcv9,v9,$(shell echo $(ISA))) 3.8 3.9 $(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE) 3.10 @echo Making $@ 3.11 $(QUIETLY) mkdir -p 64/ ; \ 3.12 - $(CC) $(SYMFLAG) $(ARCHFLAG/$(XARCH)) -D$(TYPE) -I. -I$(GENERATED) \ 3.13 + $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \ 3.14 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc 3.15 $(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE) 3.16 @echo Making $@ 3.17 $(QUIETLY) mkdir -p 64/ ; \ 3.18 - $(CC) $(SYMFLAG) $(ARCHFLAG/$(XARCH)) -D$(TYPE) -I. \ 3.19 + $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \ 3.20 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor 3.21 endif # ifneq ("${ISA}","${BUILDARCH}") 3.22
4.1 --- a/make/solaris/makefiles/fastdebug.make Wed Nov 12 23:26:45 2008 -0800 4.2 +++ b/make/solaris/makefiles/fastdebug.make Thu Nov 13 14:50:04 2008 -0800 4.3 @@ -54,39 +54,33 @@ 4.4 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \<= 504), 1) 4.5 # Compilation of *_<arch>.cpp can take an hour or more at O3. Use O2 4.6 # See comments at top of sparc.make. 4.7 -OPT_CFLAGS/ad_$(Platform_arch).o = $(OPT_CFLAGS/SLOWER) 4.8 -OPT_CFLAGS/dfa_$(Platform_arch).o = $(OPT_CFLAGS/SLOWER) 4.9 +OPT_CFLAGS/ad_$(Platform_arch_model).o = $(OPT_CFLAGS/SLOWER) 4.10 +OPT_CFLAGS/dfa_$(Platform_arch_model).o = $(OPT_CFLAGS/SLOWER) 4.11 endif # COMPILER_REV_NUMERIC <= 504 4.12 4.13 -ifeq (${COMPILER_REV_NUMERIC}, 500) 4.14 -# Avoid a compiler bug caused by using -xO<level> -g<level> 4.15 -# Since the bug also occurs with -xO0, use an innocuous value (must not be null) 4.16 -OPT_CFLAGS/c1_LIROptimizer_i486.o = -c 4.17 -endif 4.18 - 4.19 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \< 505), 1) 4.20 -# Same problem with Solaris/x86 compiler (both 5.0 and 5.2) on ad_i486.cpp. 4.21 -# CC build time is also too long for ad_i486_{gen,misc}.o 4.22 -OPT_CFLAGS/ad_i486.o = -c 4.23 -OPT_CFLAGS/ad_i486_gen.o = -c 4.24 -OPT_CFLAGS/ad_i486_misc.o = -c 4.25 -ifeq ($(Platform_arch), i486) 4.26 +# Same problem with Solaris/x86 compiler (both 5.0 and 5.2) on ad_x86_{32,64}.cpp. 4.27 +# CC build time is also too long for ad_$(Platform_arch_model)_{gen,misc}.o 4.28 +OPT_CFLAGS/ad_$(Platform_arch_model).o = -c 4.29 +OPT_CFLAGS/ad_$(Platform_arch_model)_gen.o = -c 4.30 +OPT_CFLAGS/ad_$(Platform_arch_model)_misc.o = -c 4.31 +ifeq ($(Platform_arch), x86) 4.32 # Same problem for the wrapper roosts: jni.o jvm.o 4.33 OPT_CFLAGS/jni.o = -c 4.34 OPT_CFLAGS/jvm.o = -c 4.35 # Same problem in parse2.o (probably the Big Switch over bytecodes) 4.36 OPT_CFLAGS/parse2.o = -c 4.37 -endif # Platform_arch == i486 4.38 +endif # Platform_arch == x86 4.39 endif 4.40 4.41 # Frame size > 100k if we allow inlining via -g0! 4.42 DEBUG_CFLAGS/bytecodeInterpreter.o = -g 4.43 DEBUG_CFLAGS/bytecodeInterpreterWithChecks.o = -g 4.44 -ifeq ($(Platform_arch), i486) 4.45 +ifeq ($(Platform_arch), x86) 4.46 # ube explodes on x86 4.47 OPT_CFLAGS/bytecodeInterpreter.o = -xO1 4.48 OPT_CFLAGS/bytecodeInterpreterWithChecks.o = -xO1 4.49 -endif # Platform_arch == i486 4.50 +endif # Platform_arch == x86 4.51 4.52 endif # Platform_compiler == sparcWorks 4.53
5.1 --- a/make/solaris/makefiles/i486.make Wed Nov 12 23:26:45 2008 -0800 5.2 +++ b/make/solaris/makefiles/i486.make Thu Nov 13 14:50:04 2008 -0800 5.3 @@ -35,13 +35,13 @@ 5.4 ifeq ("${Platform_compiler}", "sparcWorks") 5.5 5.6 # _lwp_create_interpose must have a frame 5.7 -OPT_CFLAGS/os_solaris_i486.o = -xO1 5.8 +OPT_CFLAGS/os_solaris_x86.o = -xO1 5.9 else 5.10 5.11 ifeq ("${Platform_compiler}", "gcc") 5.12 # gcc 5.13 # _lwp_create_interpose must have a frame 5.14 -OPT_CFLAGS/os_solaris_i486.o = -fno-omit-frame-pointer 5.15 +OPT_CFLAGS/os_solaris_x86.o = -fno-omit-frame-pointer 5.16 # 5.17 else 5.18 # error
6.1 --- a/make/solaris/makefiles/sparc.make Wed Nov 12 23:26:45 2008 -0800 6.2 +++ b/make/solaris/makefiles/sparc.make Thu Nov 13 14:50:04 2008 -0800 6.3 @@ -26,7 +26,7 @@ 6.4 ASFLAGS += $(AS_ARCHFLAG) 6.5 6.6 ifeq ("${Platform_compiler}", "sparcWorks") 6.7 -ifeq ($(shell expr $(COMPILER_REV_NUMARIC) \< 505), 1) 6.8 +ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \< 505), 1) 6.9 # For 5.2 ad_sparc file is compiled with -O2 %%%% remove when adlc is fixed 6.10 OPT_CFLAGS/ad_sparc.o = $(OPT_CFLAGS/SLOWER) 6.11 OPT_CFLAGS/dfa_sparc.o = $(OPT_CFLAGS/SLOWER) 6.12 @@ -39,7 +39,7 @@ 6.13 OPT_CFLAGS/jniHandles.o = $(OPT_CFLAGS/O2) 6.14 # CC brings an US-II to its knees compiling the vmStructs asserts under -xO4 6.15 OPT_CFLAGS/vmStructs.o = $(OPT_CFLAGS/O2) 6.16 -endif 6.17 +endif # COMPILER_REV_NUMERIC < 505 6.18 else 6.19 # Options for gcc 6.20 OPT_CFLAGS/ad_sparc.o = $(OPT_CFLAGS/SLOWER)
7.1 --- a/make/solaris/makefiles/top.make Wed Nov 12 23:26:45 2008 -0800 7.2 +++ b/make/solaris/makefiles/top.make Thu Nov 13 14:50:04 2008 -0800 7.3 @@ -83,9 +83,9 @@ 7.4 7.5 AD_Dir = $(GENERATED)/adfiles 7.6 ADLC = $(AD_Dir)/adlc 7.7 -AD_Spec = $(GAMMADIR)/src/cpu/$(Platform_arch)/vm/$(Platform_arch).ad 7.8 +AD_Spec = $(GAMMADIR)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad 7.9 AD_Src = $(GAMMADIR)/src/share/vm/adlc 7.10 -AD_Names = ad_$(Platform_arch).hpp ad_$(Platform_arch).cpp 7.11 +AD_Names = ad_$(Platform_arch_model).hpp ad_$(Platform_arch_model).cpp 7.12 AD_Files = $(AD_Names:%=$(AD_Dir)/%) 7.13 7.14 # AD_Files_If_Required/COMPILER1 = ad_stuff
8.1 --- a/src/share/vm/adlc/archDesc.cpp Wed Nov 12 23:26:45 2008 -0800 8.2 +++ b/src/share/vm/adlc/archDesc.cpp Thu Nov 13 14:50:04 2008 -0800 8.3 @@ -212,9 +212,9 @@ 8.4 // Initialize I/O Files 8.5 _ADL_file._name = NULL; _ADL_file._fp = NULL; 8.6 // Machine dependent output files 8.7 - _DFA_file._name = "dfa_i486.cpp"; _DFA_file._fp = NULL; 8.8 - _HPP_file._name = "ad_i486.hpp"; _HPP_file._fp = NULL; 8.9 - _CPP_file._name = "ad_i486.cpp"; _CPP_file._fp = NULL; 8.10 + _DFA_file._name = NULL; _DFA_file._fp = NULL; 8.11 + _HPP_file._name = NULL; _HPP_file._fp = NULL; 8.12 + _CPP_file._name = NULL; _CPP_file._fp = NULL; 8.13 _bug_file._name = "bugs.out"; _bug_file._fp = NULL; 8.14 8.15 // Initialize Register & Pipeline Form Pointers
