Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/linux/makefiles/saproc.make	Tue Apr 09 09:53:29 2019 +0800
     1.2 +++ b/make/linux/makefiles/saproc.make	Tue Apr 09 14:04:58 2019 +0800
     1.3 @@ -23,8 +23,8 @@
     1.4  #
     1.5  
     1.6  #
     1.7 -# This file has been modified by Loongson Technology in 2018. These
     1.8 -# modifications are Copyright (c) 2018 Loongson Technology, and are made
     1.9 +# This file has been modified by Loongson Technology in 2019. These
    1.10 +# modifications are Copyright (c) 2018, 2019, Loongson Technology, and are made
    1.11  # available on the same license terms set forth above.
    1.12  #
    1.13  
    1.14 @@ -83,7 +83,12 @@
    1.15  SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) \
    1.16              $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS)
    1.17  
    1.18 +ifneq (mips64, $(findstring mips64, $(BUILDARCH)))
    1.19  SAARCH ?= $(BUILDARCH)
    1.20 +else
    1.21 +#If -Dmips64 is used, mips64 would be conflict with "struct mips64_watch_regs mips64" in /usr/include/asm/ptrace.h.
    1.22 +SAARCH ?= mips
    1.23 +endif
    1.24  
    1.25  $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
    1.26  	$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
    1.27 @@ -91,7 +96,6 @@
    1.28  	  exit 1; \
    1.29  	fi
    1.30  	@echo Making SA debugger back-end...
    1.31 -ifneq (mips64, $(findstring mips64, $(BUILDARCH)))
    1.32  	$(QUIETLY) $(CC) -D$(SAARCH) -D_GNU_SOURCE                      \
    1.33  		   -D_FILE_OFFSET_BITS=64                               \
    1.34                     $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG)     \
    1.35 @@ -106,24 +110,6 @@
    1.36  	           $(EXTRA_CFLAGS)                                      \
    1.37  	           -o $@                                                \
    1.38  	           -lthread_db -ldl
    1.39 -else
    1.40 -#2016/4/22 aoqi: If -Dmips64 is used, mips64 would be conflict with "struct mips64_watch_regs mips64" in /usr/include/asm/ptrace.h.
    1.41 -	$(QUIETLY) $(CC) -Dmips -D_GNU_SOURCE                      \
    1.42 -		   -D_FILE_OFFSET_BITS=64                               \
    1.43 -                   $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG)     \
    1.44 -	           -I$(SASRCDIR)                                        \
    1.45 -	           -I$(GENERATED)                                       \
    1.46 -	           -I$(BOOT_JAVA_HOME)/include                          \
    1.47 -	           -I$(BOOT_JAVA_HOME)/include/$(Platform_os_family)    \
    1.48 -			   $(ALT_SAINCDIR) 										\
    1.49 -	           $(SASRCFILES)                                        \
    1.50 -	           $(SA_LFLAGS)                                         \
    1.51 -	           $(LDFLAGS_NO_EXEC_STACK)                                         \
    1.52 -	           $(SA_DEBUG_CFLAGS)                                   \
    1.53 -	           $(EXTRA_CFLAGS)                                      \
    1.54 -	           -o $@                                                \
    1.55 -	           -lthread_db -ldl
    1.56 -endif
    1.57  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    1.58    ifneq ($(STRIP_POLICY),no_strip)
    1.59  	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)