Skip to content

Commit 125d16c

Browse files
emberianemberian
committed
---
yaml --- r: 129252 b: refs/heads/try c: 8af051e h: refs/heads/master v: v3
1 parent d5f8fdf commit 125d16c

File tree

7 files changed

+73
-1
lines changed

7 files changed

+73
-1
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 1cad4089ba0dc46248da2459af904e38243f294d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a86d9ad15e339ab343a12513f9c90556f677b9ca
5-
refs/heads/try: 0955f98f33509ff705fc0a18162fcc99efed92ab
5+
refs/heads/try: 8af051e3f9a2f2b4bf3233bb26abae2a533e736e
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/configure

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ case $CFG_OSTYPE in
311311
then
312312
CFG_CPUTYPE=x86_64
313313
fi
314+
;;
314315

315316
MSYS*)
316317
CFG_OSTYPE=pc-windows-gnu

‎branches/try/mk/platform.mk

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,36 @@ CFG_RUN_TARG_i686-pc-windows-gnu=$(call CFG_RUN_i686-pc-windows-gnu,$(HLIB$(1)_H
475475
RUSTC_CROSS_FLAGS_i686-pc-windows-gnu :=
476476
CFG_GNU_TRIPLE_i686-pc-windows-gnu=i686-w64-mingw32
477477

478+
CROSS_PREFIX_i686-w64-mingw32=i686-pc-windows-gnu-
479+
CC_i686-w64-mingw32=gcc
480+
CXX_i686-w64-mingw32=g++
481+
CPP_i686-w64-mingw32=gcc -E
482+
AR_i686-w64-mingw32=ar
483+
CFG_LIB_NAME_i686-w64-mingw32=$(1).dll
484+
CFG_STATIC_LIB_NAME_i686-w64-mingw32=$(1).lib
485+
CFG_LIB_GLOB_i686-w64-mingw32=$(1)-*.dll
486+
CFG_LIB_DSYM_GLOB_i686-w64-mingw32=$(1)-*.dylib.dSYM
487+
CFG_CFLAGS_i686-w64-mingw32 := -march=i586 -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
488+
CFG_GCCISH_CFLAGS_i686-w64-mingw32 := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
489+
CFG_GCCISH_CXXFLAGS_i686-w64-mingw32 := -fno-rtti $(CXXFLAGS)
490+
CFG_GCCISH_LINK_FLAGS_i686-w64-mingw32 := -shared -g -m32
491+
CFG_GCCISH_DEF_FLAG_i686-w64-mingw32 :=
492+
CFG_GCCISH_PRE_LIB_FLAGS_i686-w64-mingw32 :=
493+
CFG_GCCISH_POST_LIB_FLAGS_i686-w64-mingw32 :=
494+
CFG_DEF_SUFFIX_i686-w64-mingw32 := .windows.def
495+
CFG_LLC_FLAGS_i686-w64-mingw32 :=
496+
CFG_INSTALL_NAME_i686-w64-mingw32 =
497+
CFG_LIBUV_LINK_FLAGS_i686-w64-mingw32 := -lws2_32 -lpsapi -liphlpapi
498+
CFG_EXE_SUFFIX_i686-w64-mingw32 := .exe
499+
CFG_WINDOWSY_i686-w64-mingw32 := 1
500+
CFG_UNIXY_i686-w64-mingw32 :=
501+
CFG_PATH_MUNGE_i686-w64-mingw32 :=
502+
CFG_LDPATH_i686-w64-mingw32 :=$(CFG_LDPATH_i686-w64-mingw32):$(PATH)
503+
CFG_RUN_i686-w64-mingw32=PATH="$(CFG_LDPATH_i686-w64-mingw32):$(1)" $(2)
504+
CFG_RUN_TARG_i686-w64-mingw32=$(call CFG_RUN_i686-w64-mingw32,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
505+
RUSTC_CROSS_FLAGS_i686-w64-mingw32 :=
506+
CFG_GNU_TRIPLE_i686-w64-mingw32=i686-w64-mingw32
507+
478508
# x86_64-pc-windows-gnu configuration
479509
CROSS_PREFIX_x86_64-pc-windows-gnu=x86_64-pc-windows-gnu-
480510
CC_x86_64-pc-windows-gnu=gcc
@@ -506,6 +536,37 @@ CFG_RUN_TARG_x86_64-pc-windows-gnu=$(call CFG_RUN_x86_64-pc-windows-gnu,$(HLIB$(
506536
RUSTC_CROSS_FLAGS_x86_64-pc-windows-gnu :=
507537
CFG_GNU_TRIPLE_x86_64-pc-windows-gnu=x86_64-w64-mingw32
508538

539+
# x86_64-w64-mingw32 configuration
540+
CROSS_PREFIX_x86_64-w64-mingw32=x86_64-w64-mingw32-
541+
CC_x86_64-w64-mingw32=gcc
542+
CXX_x86_64-w64-mingw32=g++
543+
CPP_x86_64-w64-mingw32=gcc -E
544+
AR_x86_64-w64-mingw32=ar
545+
CFG_LIB_NAME_x86_64-w64-mingw32=$(1).dll
546+
CFG_STATIC_LIB_NAME_x86_64-w64-mingw32=$(1).lib
547+
CFG_LIB_GLOB_x86_64-w64-mingw32=$(1)-*.dll
548+
CFG_LIB_DSYM_GLOB_x86_64-w64-mingw32=$(1)-*.dylib.dSYM
549+
CFG_CFLAGS_x86_64-w64-mingw32 := -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
550+
CFG_GCCISH_CFLAGS_x86_64-w64-mingw32 := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
551+
CFG_GCCISH_CXXFLAGS_x86_64-w64-mingw32 := -fno-rtti $(CXXFLAGS)
552+
CFG_GCCISH_LINK_FLAGS_x86_64-w64-mingw32 := -shared -g -m64
553+
CFG_GCCISH_DEF_FLAG_x86_64-w64-mingw32 :=
554+
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-w64-mingw32 :=
555+
CFG_GCCISH_POST_LIB_FLAGS_x86_64-w64-mingw32 :=
556+
CFG_DEF_SUFFIX_x86_64-w64-mingw32 := .windows.def
557+
CFG_LLC_FLAGS_x86_64-w64-mingw32 :=
558+
CFG_INSTALL_NAME_x86_64-w64-mingw32 =
559+
CFG_LIBUV_LINK_FLAGS_x86_64-w64-mingw32 := -lws2_32 -lpsapi -liphlpapi
560+
CFG_EXE_SUFFIX_x86_64-w64-mingw32 := .exe
561+
CFG_WINDOWSY_x86_64-w64-mingw32 := 1
562+
CFG_UNIXY_x86_64-w64-mingw32 :=
563+
CFG_PATH_MUNGE_x86_64-w64-mingw32 :=
564+
CFG_LDPATH_x86_64-w64-mingw32 :=$(CFG_LDPATH_x86_64-w64-mingw32):$(PATH)
565+
CFG_RUN_x86_64-w64-mingw32=PATH="$(CFG_LDPATH_x86_64-w64-mingw32):$(1)" $(2)
566+
CFG_RUN_TARG_x86_64-w64-mingw32=$(call CFG_RUN_x86_64-w64-mingw32,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
567+
RUSTC_CROSS_FLAGS_x86_64-w64-mingw32 :=
568+
CFG_GNU_TRIPLE_x86_64-w64-mingw32=x86_64-w64-mingw32
569+
509570
# x86_64-unknown-freebsd configuration
510571
CC_x86_64-unknown-freebsd=$(CC)
511572
CXX_x86_64-unknown-freebsd=$(CXX)

‎branches/try/src/librustc_back/target/mod.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,13 @@ impl Target {
314314
return Ok(t);
315315
}
316316
)*
317+
else if target == "x86_64-w64-mingw32" {
318+
let t = x86_64_pc_windows_gnu::target();
319+
return Ok(t);
320+
} else if target == "i686-w64-mingw32" {
321+
let t = i686_pc_windows_gnu::target();
322+
return Ok(t);
323+
}
317324
}
318325
)
319326
)

‎branches/try/src/test/run-make/target-specs/my-awesome-platform.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"target-endian": "little",
55
"target-word-size": "32",
66
"arch": "x86",
7+
"os": "linux",
78
"morestack": false
89
}

‎branches/try/src/test/run-make/target-specs/my-incomplete-platform.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"target-endian": "little",
44
"target-word-size": "32",
55
"arch": "x86",
6+
"os": "foo",
67
"morestack": false
78
}

‎branches/try/src/test/run-make/target-specs/x86_64-unknown-linux-gnu.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"target-endian": "little",
55
"target-word-size": "32",
66
"arch": "x86",
7+
"os": "linux",
78
"morestack": false
89
}

0 commit comments

Comments
 (0)