mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Remove "-mno-schedule-prologue" when compiling under linux/i386 as the

Browse Source 
current gcc cvs-snapshot seems to no longer accept this option.

committer: mfx <mfx> 974916395 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2000-11-22 18:06:35 +00:00
parent cab6e01c64
commit 7a5b0a09e0
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Makefile
View File

@ -3,9 +3,10 @@
# usage: # usage:
# `make target=linux' # linux # `make target=linux' # linux
# `make target=djggp2' # djggp2 # `make target=djggp2' # djggp2
# `make target=cygwin' # cygwin
# `make target=mingw32' # mingw32 # `make target=mingw32' # mingw32
# `make target=no-cygwin' # mingw32 as of cygwin b20.1 # `make target=no-cygwin' # mingw32 as included in cygwin
# `make target=msc' # Visual C++ 6.0 # `make target=vc6' # Visual C++ 6.0
# #
@ -42,6 +43,9 @@ endif
ifneq ($(strip $(wildcard /platform/sun4?/kernel/unix)),) ifneq ($(strip $(wildcard /platform/sun4?/kernel/unix)),)
target = sparc target = sparc
endif endif
ifeq ($(target),msc)
target = vc6
endif
# /*********************************************************************** # /***********************************************************************
@ -73,7 +77,7 @@ OBJECTS = $(OBJECTS1) $(OBJECTS2) $(OBJECTS3)
# // compiler settings # // compiler settings
# ************************************************************************/ # ************************************************************************/
# default to a unix-type compiler # default to a gcc unix-type compiler
CC = gcc CC = gcc
CXX = $(CC) CXX = $(CC)
DEFS = DEFS =
@ -155,8 +159,9 @@ LDFLAGS += $(LDLIBDIRS)
ifeq ($(target),linux) ifeq ($(target),linux)
e = e =
###CC = /usr/local/packages/gcc-cvs/bin/g++
DEFS += '-DUPX_CONFIG_H="config_h/linux.h"' DEFS += '-DUPX_CONFIG_H="config_h/linux.h"'
CFLAGS_M += -mno-schedule-prologue ##CFLAGS_M += -mno-schedule-prologue
CFLAGS_M += -march=i386 -mcpu=pentium CFLAGS_M += -march=i386 -mcpu=pentium
CFLAGS_WERROR = -Werror CFLAGS_WERROR = -Werror
LDLIBS += -lmcheck LDLIBS += -lmcheck
@ -203,7 +208,7 @@ CFLAGS_M += -mno-schedule-prologue
CFLAGS_M += -march=i386 -mcpu=pentium CFLAGS_M += -march=i386 -mcpu=pentium
endif endif
# mingw32 as included in cygwin b20.1 # mingw32 as included in cygwin
ifeq ($(target),no-cygwin) ifeq ($(target),no-cygwin)
CC = gcc -mno-cygwin CC = gcc -mno-cygwin
CFLAGS_M += -mno-schedule-prologue CFLAGS_M += -mno-schedule-prologue
@ -215,7 +220,7 @@ endif
### Microsoft 32-bit C/C++ Compiler 12.00 (aka Visual C++ 6) ### Microsoft 32-bit C/C++ Compiler 12.00 (aka Visual C++ 6)
### ###
ifeq ($(target),msc) ifeq ($(target),vc6)
o = .obj o = .obj
a = .lib a = .lib
CC = cl -nologo CC = cl -nologo
@ -252,7 +257,7 @@ endif
##LINK_LDFLAGS += /verbose ##LINK_LDFLAGS += /verbose
LINK_EXE = $(CC) $(LDFLAGS) -Fe$@ $^ $(LDLIBS) $(LINK_LDFLAGS) LINK_EXE = $(CC) $(LDFLAGS) -Fe$@ $^ $(LDLIBS) $(LINK_LDFLAGS)
endif # msc endif # vc6
### ###
@ -357,7 +362,7 @@ $(upx_exe): $(OBJECTS) $(LIBS)
$(STUBEDIT_EXE) $(STUBEDIT_EXE)
unupx: unupx:
$(MAKE) target=msc unupx.dll $(MAKE) target=vc6 unupx.dll
unupx.dll: $(OBJECTS) $(LIBS) unupx.dll: $(OBJECTS) $(LIBS)
$(LINK_DLL) $(LINK_DLL)