aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2012-10-22 13:44:53 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2012-10-22 13:44:53 -0700
commitc834b8b4c6c7103e35e8b349ab6ac284dd3a7e07 (patch)
treed751ec73f77b5772078b53403e911ae73cac04dd
parent99f5441baa76a44680bf96a2fc01637f64fe3ff5 (diff)
downloadsyslinux-master.tar.gz
syslinux-master.tar.xz
syslinux-master.zip
Revert "win: Add -mno-ms-bitfields"HEADmaster
This reverts commit 7d9ee65cc9577eb69782a49a34895ae80820e9ff. I am concerned that this may cause the Windows ABI header files to be misinterpreted. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--win32/Makefile7
-rw-r--r--win64/Makefile4
2 files changed, 5 insertions, 6 deletions
diff --git a/win32/Makefile b/win32/Makefile
index ef5edac1..f960998a 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -22,8 +22,7 @@ OSTYPE = $(shell uname -msr)
ifeq ($(findstring CYGWIN,$(OSTYPE)),CYGWIN)
## Compiling on Cygwin
WINPREFIX :=
-WINCFLAGS := -mno-cygwin -mno-ms-bitfields $(GCCWARN) -Os \
- -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
+WINCFLAGS := -mno-cygwin $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
WINLDFLAGS := -mno-cygwin -Os -s
else
## Compiling on some variant of MinGW
@@ -32,8 +31,8 @@ WINPREFIX :=
else
WINPREFIX := $(shell ./find-mingw32.sh gcc)
endif
-WINCFLAGS := -mno-ms-bitfields $(GCCWARN) -Wno-sign-compare -Os \
- -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
+WINCFLAGS := $(GCCWARN) -Wno-sign-compare -Os -fomit-frame-pointer \
+ -D_FILE_OFFSET_BITS=64
WINLDFLAGS := -Os -s
endif
WINCFLAGS += -I. -I../win -I.. -I../libfat -I../libinstaller \
diff --git a/win64/Makefile b/win64/Makefile
index 744b0b3d..fe60793c 100644
--- a/win64/Makefile
+++ b/win64/Makefile
@@ -21,8 +21,8 @@
OSTYPE = $(shell uname -msr)
# Don't know how to do a native compile here...
WINPREFIX := $(shell ./find-mingw64.sh gcc)
-WINCFLAGS := -mno-ms-bitfields $(GCCWARN) -Wno-sign-compare -Os \
- -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
+WINCFLAGS := $(GCCWARN) -Wno-sign-compare -Os -fomit-frame-pointer \
+ -D_FILE_OFFSET_BITS=64
WINLDFLAGS := -Os -s
WINCFLAGS += -I. -I../win -I.. -I../libfat -I../libinstaller \