1.1 --- a/make/linux/makefiles/saproc.make Tue Jul 03 18:01:40 2018 -0700
1.2 +++ b/make/linux/makefiles/saproc.make Thu Jul 26 16:04:06 2018 +0800
1.3 @@ -21,6 +21,13 @@
1.4 # questions.
1.5 #
1.6 #
1.7 +
1.8 +#
1.9 +# This file has been modified by Loongson Technology in 2015. These
1.10 +# modifications are Copyright (c) 2015 Loongson Technology, and are made
1.11 +# available on the same license terms set forth above.
1.12 +#
1.13 +
1.14 include $(GAMMADIR)/make/defs.make
1.15 include $(GAMMADIR)/make/altsrc.make
1.16
1.17 @@ -83,7 +90,8 @@
1.18 exit 1; \
1.19 fi
1.20 @echo Making SA debugger back-end...
1.21 - $(QUIETLY) $(CC) -D$(SAARCH) -D_GNU_SOURCE \
1.22 +ifneq (mips64, $(findstring mips64, $(BUILDARCH)))
1.23 + $(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE \
1.24 -D_FILE_OFFSET_BITS=64 \
1.25 $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
1.26 -I$(SASRCDIR) \
1.27 @@ -97,6 +105,23 @@
1.28 $(EXTRA_CFLAGS) \
1.29 -o $@ \
1.30 -lthread_db
1.31 +else
1.32 +#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.33 + $(QUIETLY) $(CC) -Dmips -D_GNU_SOURCE \
1.34 + -D_FILE_OFFSET_BITS=64 \
1.35 + $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
1.36 + -I$(SASRCDIR) \
1.37 + -I$(GENERATED) \
1.38 + -I$(BOOT_JAVA_HOME)/include \
1.39 + -I$(BOOT_JAVA_HOME)/include/$(Platform_os_family) \
1.40 + $(ALT_SAINCDIR) \
1.41 + $(SASRCFILES) \
1.42 + $(SA_LFLAGS) \
1.43 + $(SA_DEBUG_CFLAGS) \
1.44 + $(EXTRA_CFLAGS) \
1.45 + -o $@ \
1.46 + -lthread_db
1.47 +endif
1.48 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.49 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
1.50 $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
