diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2002-08-06 00:51:40 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2002-08-06 00:51:40 +0000 |
| commit | 7692acb2ad979082e1ea30a871ad39f545c9b094 (patch) | |
| tree | 590d13bd40432b7b0e0a4bcb4e9ec6afb2e6fbec /app-emulation | |
| parent | Modified make line to be less ambiguous - was breaking between versions (diff) | |
| download | gentoo-2-7692acb2ad979082e1ea30a871ad39f545c9b094.tar.gz gentoo-2-7692acb2ad979082e1ea30a871ad39f545c9b094.tar.bz2 gentoo-2-7692acb2ad979082e1ea30a871ad39f545c9b094.zip | |
Some gcc compat patches
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/vmware-workstation/files/vmmon-gcc-3.1-smp.patch | 41 | ||||
| -rw-r--r-- | app-emulation/vmware-workstation/files/vmnet-gcc-3.1-smp.patch | 35 |
2 files changed, 76 insertions, 0 deletions
diff --git a/app-emulation/vmware-workstation/files/vmmon-gcc-3.1-smp.patch b/app-emulation/vmware-workstation/files/vmmon-gcc-3.1-smp.patch new file mode 100644 index 000000000000..4917b9d1cdfc --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmmon-gcc-3.1-smp.patch @@ -0,0 +1,41 @@ +--- Makefile Sun Aug 4 17:34:28 2002 ++++ Makefile.new Wed Jul 24 23:19:58 2002 +@@ -13,7 +13,7 @@ + #### you don't, and you're lucky, the driver won't compile. Otherwise + #### it'll compile but just be potentially rather broken. + #### +-#SUPPORT_SMP=1 ++SUPPORT_SMP=1 + + # Header directory for the running kernel + HEADER_DIR = /usr/src/linux/include +@@ -47,8 +47,8 @@ + ECHO = @echo + endif + +-COMPILER_VERSION := $(shell $(CC) --version) +-IS_GCC_30 := $(shell if echo $(COMPILER_VERSION) | $(GREP) -q '^3\.0'; then echo yes; else echo no; fi) ++COMPILER_VERSION := $(shell $(CC) -dumpversion) ++IS_GCC_30 := $(shell if echo $(COMPILER_VERSION) | $(GREP) -q '^3\.'; then echo yes; else echo no; fi) + + #### + #### You must compile with at least -O level of optimization +@@ -58,14 +58,14 @@ + #### + CC_WARNINGS = -Wall -Wstrict-prototypes + # Don't use -pipe or egcs-2.91.66 (shipped with RedHat) will die +-CC_KFLAGS = -D__KERNEL__ -fno-strength-reduce -malign-loops=2 \ +- -malign-jumps=2 -malign-functions=2 -fno-omit-frame-pointer \ ++CC_KFLAGS = -D__KERNEL__ -fno-strength-reduce \ ++ -fno-omit-frame-pointer \ + -DCPU=586 + # Gcc 3.0 deprecates -m486 --hpreg + ifeq ($(IS_GCC_30),yes) +-CC_KFLAGS += -march=i586 ++CC_KFLAGS += -march=i586 -falign-loops=2 -falign-jumps=2 -falign-functions=2 + else +-CC_KFLAGS += -m486 ++CC_KFLAGS += -m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 + endif + CC_OPTS = -O2 -DMODULE $(GLOBAL_DEFS) $(CC_KFLAGS) $(CC_WARNINGS) + diff --git a/app-emulation/vmware-workstation/files/vmnet-gcc-3.1-smp.patch b/app-emulation/vmware-workstation/files/vmnet-gcc-3.1-smp.patch new file mode 100644 index 000000000000..219a1f3fa7ab --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmnet-gcc-3.1-smp.patch @@ -0,0 +1,35 @@ +--- Makefile Fri Apr 5 14:58:22 2002 ++++ Makefile.new Sun Aug 4 18:08:56 2002 +@@ -19,7 +19,7 @@ + #### kernel (i.e. uniprocessor but with SMP support or more than + #### one processor) please uncomment the SUPPORT_SMP line. + #### +-#SUPPORT_SMP=1 ++SUPPORT_SMP=1 + + # Header directory for the running kernel + HEADER_DIR = /usr/src/linux/include +@@ -33,18 +33,17 @@ + DRIVERNAME = $(DRIVER)-up-$(shell uname -r) + endif + +-COMPILER_VERSION := $(shell $(CC) --version) +-IS_GCC_30 := $(shell if echo $(COMPILER_VERSION) | $(GREP) -q '^3\.0'; then echo yes; else echo no; fi) ++COMPILER_VERSION := $(shell $(CC) -dumpversion) ++IS_GCC_30 := $(shell if echo $(COMPILER_VERSION) | $(GREP) -q '^3\.'; then echo yes; else echo no; fi) + + CC_WARNINGS = -Wall -Wstrict-prototypes + # Don't use -pipe or egcs-2.91.66 (shipped with RedHat) will die +-CC_KFLAGS = -D__KERNEL__ -DMODULE -fomit-frame-pointer -fno-strength-reduce \ +- -malign-loops=2 -malign-jumps=2 -malign-functions=2 -DCPU=586 ++CC_KFLAGS = -D__KERNEL__ -DMODULE -fomit-frame-pointer -fno-strength-reduce -DCPU=586 + # Gcc 3.0 deprecates -m486 --hpreg + ifeq ($(IS_GCC_30),yes) +-CC_KFLAGS += -march=i586 ++CC_KFLAGS += -march=i586 -falign-loops=2 -falign-jumps=2 -falign-functions=2 + else +-CC_KFLAGS += -m486 ++CC_KFLAGS += -m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2 + endif + INCLUDE = -I. -I$(HEADER_DIR) + |