diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-05-28 09:23:57 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-28 09:23:57 -0700 |
| commit | 80001b1d2acc06b33bb6de05474ce54682dacfb6 (patch) | |
| tree | a320dc9767a953d435ef9d3c951ebd2d97acf4dd /com32 | |
| parent | 6699cb66d4456f2d61b3ac3f8d14ce81df2437eb (diff) | |
| parent | 1bd7c31844a7b946c5d2d85a21e913fa81460930 (diff) | |
| download | syslinux-80001b1d2acc06b33bb6de05474ce54682dacfb6.tar.gz | |
Merge commit 'origin/master' into gpxe-added
Conflicts:
NEWS
version
Diffstat (limited to 'com32')
| -rw-r--r-- | com32/lib/MCONFIG | 4 | ||||
| -rw-r--r-- | com32/libutil/Makefile | 2 | ||||
| -rw-r--r-- | com32/menu/Makefile | 2 | ||||
| -rw-r--r-- | com32/modules/Makefile | 2 | ||||
| -rw-r--r-- | com32/modules/chain.c | 2 | ||||
| -rw-r--r-- | com32/samples/Makefile | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/com32/lib/MCONFIG b/com32/lib/MCONFIG index 7f88055a..2e36597b 100644 --- a/com32/lib/MCONFIG +++ b/com32/lib/MCONFIG @@ -1,13 +1,13 @@ # -*- makefile -*- TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX) +CC = gcc -gcc_ok = $(shell tmpf=$(TMPFILE); if gcc $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \ +gcc_ok = $(shell tmpf=$(TMPFILE); if $(CC) $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \ then echo $(1); else echo $(2); fi; rm -f $$tmpf) GCCOPT := $(call gcc_ok,-m32,) $(call gcc_ok,-fno-stack-protector,) -CC = gcc LD = ld INCLUDE = -I. AR = ar diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile index 5514f8b6..01de06a3 100644 --- a/com32/libutil/Makefile +++ b/com32/libutil/Makefile @@ -30,13 +30,13 @@ ## TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX) +CC = gcc gcc_ok = $(shell tmpf=$(TMPFILE); if $(CC) $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \ then echo $(1); else echo $(2); fi; rm -f $$tmpf) M32 := $(call gcc_ok,-m32,) $(call gcc_ok,-fno-stack-protector,) -CC = gcc LD = ld -m elf_i386 AR = ar NASM = nasm diff --git a/com32/menu/Makefile b/com32/menu/Makefile index 4e0abc55..8d7b69f4 100644 --- a/com32/menu/Makefile +++ b/com32/menu/Makefile @@ -15,13 +15,13 @@ ## TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX) +CC = gcc gcc_ok = $(shell tmpf=$(TMPFILE); if $(CC) $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \ then echo $(1); else echo $(2); fi; rm -f $$tmpf) M32 := $(call gcc_ok,-m32,) $(call gcc_ok,-fno-stack-protector,) -CC = gcc LD = ld -m elf_i386 AR = ar NASM = nasm diff --git a/com32/modules/Makefile b/com32/modules/Makefile index ff42a348..9890228f 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -15,13 +15,13 @@ ## TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX) +CC = gcc gcc_ok = $(shell tmpf=$(TMPFILE); if $(CC) $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \ then echo $(1); else echo $(2); fi; rm -f $$tmpf) M32 := $(call gcc_ok,-m32,) $(call gcc_ok,-fno-stack-protector,) -CC = gcc LD = ld -m elf_i386 AR = ar NASM = nasm diff --git a/com32/modules/chain.c b/com32/modules/chain.c index b790bd0b..ec92cd0c 100644 --- a/com32/modules/chain.c +++ b/com32/modules/chain.c @@ -228,7 +228,7 @@ find_logical_partition(int whichpart, char *table, struct part_entry *self, struct part_entry *found; int i; - if ( *(uint16_t *)(ptab + 0x1fe) != 0xaa55 ) + if ( *(uint16_t *)(table + 0x1fe) != 0xaa55 ) return NULL; /* Signature missing */ /* We are assumed to already having enumerated all the data partitions diff --git a/com32/samples/Makefile b/com32/samples/Makefile index 189dc187..77feb58c 100644 --- a/com32/samples/Makefile +++ b/com32/samples/Makefile @@ -15,13 +15,13 @@ ## TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX) +CC = gcc gcc_ok = $(shell tmpf=$(TMPFILE); if $(CC) $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \ then echo $(1); else echo $(2); fi; rm -f $$tmpf) M32 := $(call gcc_ok,-m32,) $(call gcc_ok,-fno-stack-protector,) -CC = gcc LD = ld -m elf_i386 AR = ar NASM = nasm |