44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
--- stable/Makefile.orig 2013-10-17 15:01:34.468068963 +0400
|
|
+++ stable/Makefile 2013-10-17 15:04:22.972077076 +0400
|
|
@@ -3,12 +3,7 @@
|
|
|
|
# Replace x86 by amd64 for a build on x86_64.
|
|
# Use "nojit" for architectures that are not x86 or x86_64.
|
|
-DYNAMIPS_ARCH?=x86
|
|
-#DYNAMIPS_ARCH?=amd64
|
|
-
|
|
-ifeq ($(DYNAMIPS_ARCH),ppc32)
|
|
-DYNAMIPS_ARCH=x86
|
|
-endif
|
|
+DYNAMIPS_ARCH?=nojit
|
|
|
|
# Get include files from the current directory and from the common directory
|
|
INCLUDE+=-I. -I../common
|
|
@@ -47,7 +42,7 @@
|
|
PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\"
|
|
OSNAME=unknown
|
|
|
|
-CFLAGS+= $(INCLUDE) -Wall -O2 -fomit-frame-pointer \
|
|
+CFLAGS+= $(INCLUDE) -Wall \
|
|
-DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" -DJIT_CPU=CPU_$(DYNAMIPS_ARCH) \
|
|
-DMIPS64_ARCH_INC_FILE=$(MIPS64_ARCH_INC_FILE) \
|
|
-DPPC32_ARCH_INC_FILE=$(PPC32_ARCH_INC_FILE) \
|
|
@@ -274,7 +269,7 @@
|
|
|
|
asmdefs$(BIN_EXT): asmdefs.c mips64.h
|
|
@echo "Linking $@"
|
|
- @$(CC) -Wall $(CFLAGS) -o $@ asmdefs.c
|
|
+ @$(CC) -Wall $(CFLAGS) $(LDFLAGS) -o $@ asmdefs.c
|
|
|
|
asmdefs.h: asmdefs$(BIN_EXT)
|
|
@echo "Building assembly definitions header file"
|
|
@@ -282,7 +277,7 @@
|
|
|
|
nvram_export$(BIN_EXT): nvram_export.o fs_nvram.o
|
|
@echo "Linking $@"
|
|
- @$(CC) -Wall $(CFLAGS) $(INCLUDE) -o $@ nvram_export.o fs_nvram.o
|
|
+ @$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCLUDE) -o $@ nvram_export.o fs_nvram.o
|
|
|
|
install: $(PROG) nvram_export$(BIN_EXT)
|
|
@echo "Installing"
|