diff options
author | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2019-06-19 21:06:57 +1200 |
---|---|---|
committer | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2019-06-19 23:30:04 +1200 |
commit | d17344cfc56edc4599252041b3ec0d46af0851fd (patch) | |
tree | 5f454cf938013797138b68579d51af03c97afbcb /win32 | |
parent | 40f8c82b960041d29aba028cc9fe01177bdc4f84 (diff) | |
download | ruby-d17344cfc56edc4599252041b3ec0d46af0851fd.tar.gz |
Remove IA64 support.
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile.sub | 12 | ||||
-rw-r--r-- | win32/README.win32 | 4 | ||||
-rwxr-xr-x | win32/configure.bat | 3 | ||||
-rw-r--r-- | win32/setup.mak | 5 |
4 files changed, 9 insertions, 15 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 756ee7a280..d79a16bddb 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -399,7 +399,7 @@ RUBY = ruby DTRACE_EXT = dmyh !if !defined(STACK) -!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" +!if "$(ARCH)" == "x64" STACK = 0x400000 !else STACK = 0x200000 @@ -646,7 +646,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub !else #define SIZEOF_OFF_T 4 !endif -!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" +!if "$(ARCH)" == "x64" #define SIZEOF_VOIDP 8 !else #define SIZEOF_VOIDP 4 @@ -668,7 +668,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define NUM2CLOCKID(v) NUM2INT(v) #define SIZEOF_CLOCK_T 4 #define SIZEOF_RLIM_T 0 -!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" +!if "$(ARCH)" == "x64" #define SIZEOF_SIZE_T 8 #define SIZEOF_PTRDIFF_T 8 #define SIZEOF_INTPTR_T 8 @@ -712,7 +712,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub !else #define PACKED_STRUCT(x) x !endif -!if "$(ARCH)" == "x86" || "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" +!if "$(ARCH)" == "x86" || "$(ARCH)" == "x64" #define PACKED_STRUCT_UNALIGNED(x) PACKED_STRUCT(x) !else #define PACKED_STRUCT_UNALIGNED(x) x @@ -778,7 +778,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define HAVE_INTPTR_T 1 #define HAVE_UINTPTR_T 1 #define HAVE_SSIZE_T 1 -!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" +!if "$(ARCH)" == "x64" #define ssize_t __int64 #define PRI_PTR_PREFIX "I64" !else @@ -868,7 +868,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define restrict /* not supported */ !endif #define NEED_IO_SEEK_BETWEEN_RW 1 -!if "$(MACHINE)" == "x86" || "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" +!if "$(MACHINE)" == "x86" || "$(ARCH)" == "x64" #define STACK_GROW_DIRECTION -1 !endif !if "$(COROUTINE_OBJ)" != "" diff --git a/win32/README.win32 b/win32/README.win32 index 18d03815b2..eae6cdce9a 100644 --- a/win32/README.win32 +++ b/win32/README.win32 @@ -8,8 +8,8 @@ 2. Visual C++ 12.0 (2013) or later. - [Note] if you want to build x64 or ia64 version, use native compiler for - x64/ia64. + [Note] if you want to build x64 version, use native compiler for + x64. 3. Please set environment variable +INCLUDE+, +LIB+, +PATH+ to run required commands properly from the command line. diff --git a/win32/configure.bat b/win32/configure.bat index fa8966e0c9..b141bfc546 100755 --- a/win32/configure.bat +++ b/win32/configure.bat @@ -101,8 +101,7 @@ goto :loop ; :target
echo>> ~tmp~.mak "%~2" \
echo>>confargs.tmp --target=%2 \
- if "%~2" == "x64-mswin64" goto target2
- if NOT "%~2" == "ia64-mswin64" goto target3
+ if NOT "%~2" == "x64-mswin64" goto target3
:target2
echo>> ~tmp~.mak "TARGET_OS=mswin64" \
:target3
diff --git a/win32/setup.mak b/win32/setup.mak index 043edbeb66..d67b6843a4 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -31,7 +31,6 @@ i586-mswin32: -prologue- -i586- -epilogue- i686-mswin32: -prologue- -i686- -epilogue- alpha-mswin32: -prologue- -alpha- -epilogue- x64-mswin64: -prologue- -x64- -epilogue- -ia64-mswin64: -prologue- -ia64- -epilogue- -prologue-: -basic-vars- -generic-: -osname- @@ -178,8 +177,6 @@ RUBY_SO_NAME = $(RUBY_SO_NAME) @$(CPP) <<conftest.c 2>nul | findstr = >>$(MAKEFILE) #if defined _M_X64 MACHINE = x64 -#elif defined _M_IA64 -MACHINE = ia64 #else MACHINE = x86 #endif @@ -192,8 +189,6 @@ MACHINE = x86 @echo MACHINE = alpha>>$(MAKEFILE) -x64-: -osname64- @echo MACHINE = x64>>$(MAKEFILE) --ia64-: -osname64- - @echo MACHINE = ia64>>$(MAKEFILE) -ix86-: -osname32- @echo MACHINE = x86>>$(MAKEFILE) |