Skip to content

Commit 48b717d

Browse files
committed
---
yaml --- r: 152559 b: refs/heads/try2 c: cc30abb h: refs/heads/master i: 152557: 2bf5d8a 152555: 196c2dd 152551: 50ac49b 152543: 62f3fd2 v: v3
1 parent 7aa62ed commit 48b717d

File tree

630 files changed

+14139
-9442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

630 files changed

+14139
-9442
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 15f65bae65a78c9fd72c509c2a99e8f898409edb
8+
refs/heads/try2: cc30abbcad282634fb99089eb9297e7cc4f26729
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ before_script:
2727
- ln -nsf /usr/bin/llvm-dis-$LLVM_VERSION local-llvm/bin/llvm-dis
2828
- ln -nsf /usr/bin/llc-$LLVM_VERSION local-llvm/bin/llc
2929
- ln -nsf /usr/include/llvm-$LLVM_VERSION local-llvm/include
30-
- ./configure --disable-optimize-tests --llvm-root=`pwd`/local-llvm --enable-fast-make --enable-clang
30+
- ./configure --disable-optimize-tests --llvm-root=`pwd`/local-llvm
31+
--enable-fast-make --enable-clang
3132

3233
# Tidy everything up first, then build a few things, and then run a few tests.
3334
# Note that this is meant to run in a "fairly small" amount of time, so this

branches/try2/configure

Lines changed: 23 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,6 @@ opt mingw-cross 0 "cross-compile for win32 using mingw"
416416
opt clang 0 "prefer clang to gcc for building the runtime"
417417
opt ccache 0 "invoke gcc/clang via ccache to reuse object files between builds"
418418
opt local-rust 0 "use an installed rustc rather than downloading a snapshot"
419-
opt pax-flags 0 "apply PaX flags to rustc binaries (required for GRSecurity/PaX-patched kernels)"
420419
opt inject-std-version 1 "inject the current compiler version of libstd into programs"
421420
opt llvm-static-stdcpp 0 "statically link to libstdc++ for LLVM"
422421
opt rpath 1 "build rpaths into rustc itself"
@@ -425,6 +424,8 @@ opt verify-install 1 "verify installed binaries work"
425424
valopt prefix "/usr/local" "set installation prefix"
426425
valopt local-rust-root "/usr/local" "set prefix for local rust binary"
427426
valopt llvm-root "" "set LLVM root"
427+
valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located"
428+
valopt libuv-root "" "set directory where libuv.a is located"
428429
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path"
429430
valopt mingw32-cross-path "" "MinGW32 cross compiler path"
430431

@@ -516,12 +517,6 @@ then
516517
fi
517518
fi
518519

519-
if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
520-
then
521-
probe CFG_PAXCTL paxctl /sbin/paxctl
522-
probe CFG_ZCAT zcat
523-
fi
524-
525520
step_msg "looking for target specific programs"
526521

527522
probe CFG_ADB adb
@@ -544,51 +539,6 @@ then
544539
fi
545540
fi
546541

547-
if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
548-
then
549-
if [ ! -z "$CFG_ENABLE_PAX_FLAGS" -a -z "$CFG_PAXCTL" ]
550-
then
551-
err "enabled PaX markings but no paxctl binary found"
552-
fi
553-
554-
if [ -z "$CFG_DISABLE_PAX_FLAGS" ]
555-
then
556-
# GRSecurity/PaX detection. This can be very flaky.
557-
GRSEC_DETECTED=
558-
559-
# /dev/grsec only exists if CONFIG_GRKERNSEC_NO_RBAC is not set.
560-
# /proc/sys/kernel/grsecurity is not available if ÇONFIG_GRKERNSEC_SYSCTL is not set.
561-
if [ -e /dev/grsec -o -d /proc/sys/kernel/grsecurity ]
562-
then
563-
GRSEC_DETECTED=1
564-
# /proc/config.gz is normally only available to root, and only if CONFIG_IKCONFIG_PROC has been set.
565-
elif [ -r /proc/config.gz -a ! -z "$CFG_ZCAT" ]
566-
then
567-
if "$CFG_ZCAT" /proc/config.gz | grep --quiet "CONFIG_GRKERNSEC=y"
568-
then
569-
GRSEC_DETECTED=1
570-
fi
571-
# Flaky.
572-
elif grep --quiet grsec /proc/version
573-
then
574-
GRSEC_DETECTED=1
575-
fi
576-
577-
if [ ! -z "$GRSEC_DETECTED" ]
578-
then
579-
step_msg "GRSecurity: yes"
580-
if [ ! -z "$CFG_PAXCTL" ]
581-
then
582-
CFG_ENABLE_PAX_FLAGS=1
583-
else
584-
warn "GRSecurity kernel detected but no paxctl binary found: not setting CFG_ENABLE_PAX_FLAGS"
585-
fi
586-
else
587-
step_msg "GRSecurity: no"
588-
fi
589-
fi
590-
fi
591-
592542
BIN_SUF=
593543
if [ "$CFG_OSTYPE" = "pc-mingw32" ] || [ "$CFG_OSTYPE" = "w64-mingw32" ]
594544
then
@@ -940,16 +890,33 @@ then
940890
msg "git: submodule sync"
941891
"${CFG_GIT}" submodule sync
942892

893+
msg "git: submodule init"
894+
"${CFG_GIT}" submodule init
895+
896+
# Disable submodules that we're not using
897+
if [ ! -z "${CFG_LLVM_ROOT}" ]; then
898+
msg "git: submodule deinit src/llvm"
899+
"${CFG_GIT}" submodule deinit src/llvm
900+
fi
901+
if [ ! -z "${CFG_JEMALLOC_ROOT}" ]; then
902+
msg "git: submodule deinit src/jemalloc"
903+
"${CFG_GIT}" submodule deinit src/jemalloc
904+
fi
905+
if [ ! -z "${CFG_LIBUV_ROOT}" ]; then
906+
msg "git: submodule deinit src/libuv"
907+
"${CFG_GIT}" submodule deinit src/libuv
908+
fi
909+
943910
msg "git: submodule update"
944-
"${CFG_GIT}" submodule update --init
911+
"${CFG_GIT}" submodule update
945912
need_ok "git failed"
946913

947914
msg "git: submodule foreach sync"
948915
"${CFG_GIT}" submodule foreach --recursive 'if test -e .gitmodules; then git submodule sync; fi'
949916
need_ok "git failed"
950917

951918
msg "git: submodule foreach update"
952-
"${CFG_GIT}" submodule update --init --recursive
919+
"${CFG_GIT}" submodule update --recursive
953920
need_ok "git failed"
954921

955922
# NB: this is just for the sake of getting the submodule SHA1 values
@@ -1198,6 +1165,8 @@ putvar CFG_ANDROID_CROSS_PATH
11981165
putvar CFG_MINGW32_CROSS_PATH
11991166
putvar CFG_MANDIR
12001167
putvar CFG_DISABLE_INJECT_STD_VERSION
1168+
putvar CFG_JEMALLOC_ROOT
1169+
putvar CFG_LIBUV_ROOT
12011170

12021171
# Avoid spurious warnings from clang by feeding it original source on
12031172
# ccache-miss rather than preprocessed input.

branches/try2/mk/crates.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ DEPS_rlibc :=
6161
DEPS_alloc := core libc native:jemalloc
6262
DEPS_debug := std
6363
DEPS_rustrt := alloc core libc collections native:rustrt_native
64-
DEPS_std := core libc rand alloc collections rustrt \
64+
DEPS_std := core libc rand alloc collections rustrt sync \
6565
native:rust_builtin native:backtrace
6666
DEPS_graphviz := std
6767
DEPS_green := std native:context_switch
6868
DEPS_rustuv := std native:uv native:uv_support
6969
DEPS_native := std
7070
DEPS_syntax := std term serialize log fmt_macros debug
71-
DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
71+
DEPS_rustc := syntax native:rustllvm flate arena serialize getopts \
7272
time log graphviz debug
73-
DEPS_rustdoc := rustc native:hoedown serialize sync getopts \
73+
DEPS_rustdoc := rustc native:hoedown serialize getopts \
7474
test time debug
7575
DEPS_flate := std native:miniz
7676
DEPS_arena := std
@@ -80,17 +80,17 @@ DEPS_serialize := std log
8080
DEPS_term := std log
8181
DEPS_semver := std
8282
DEPS_uuid := std serialize
83-
DEPS_sync := std alloc
83+
DEPS_sync := core alloc rustrt collections
8484
DEPS_getopts := std
8585
DEPS_collections := core alloc
8686
DEPS_fourcc := rustc syntax std
8787
DEPS_hexfloat := rustc syntax std
8888
DEPS_num := std
8989
DEPS_test := std getopts serialize term time regex native:rust_test_helpers
90-
DEPS_time := std serialize sync
90+
DEPS_time := std serialize
9191
DEPS_rand := core
9292
DEPS_url := std
93-
DEPS_log := std sync
93+
DEPS_log := std
9494
DEPS_regex := std
9595
DEPS_regex_macros = rustc syntax std regex
9696
DEPS_fmt_macros = std

branches/try2/mk/platform.mk

Lines changed: 68 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -155,36 +155,76 @@ CFG_LDPATH_i686-unknown-linux-gnu :=
155155
CFG_RUN_i686-unknown-linux-gnu=$(2)
156156
CFG_RUN_TARG_i686-unknown-linux-gnu=$(call CFG_RUN_i686-unknown-linux-gnu,,$(2))
157157

158-
# arm-apple-darwin configuration
159-
ifeq ($(CFG_OSTYPE),apple-darwin)
158+
# arm-apple-ios configuration
159+
CFG_SDK_NAME_arm-apple-ios = iphoneos
160+
CFG_SDK_ARCHS_arm-apple-ios = armv7
161+
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
160162
CFG_IOS_SDK = $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
161-
CFG_IOS_FLAGS = -target arm-apple-darwin -isysroot $(CFG_IOS_SDK) -I$(CFG_IOS_SDK)/usr/include -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1
162-
CC_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos clang)
163-
CXX_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos clang++)
164-
CPP_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos clang++)
165-
AR_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos ar)
166-
CFG_LIB_NAME_arm-apple-darwin = lib$(1).dylib
167-
CFG_LIB_GLOB_arm-apple-darwin = lib$(1)-*.dylib
168-
CFG_LIB_DSYM_GLOB_arm-apple-darwin = lib$(1)-*.dylib.dSYM
169-
CFG_CFLAGS_arm-apple-darwin := $(CFG_IOS_FLAGS) $(CFLAGS)
170-
CFG_GCCISH_CFLAGS_arm-apple-darwin := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) $(CFLAGS)
171-
CFG_GCCISH_CXXFLAGS_arm-apple-darwin := -fno-rtti $(CFG_IOS_FLAGS) $(CXXFLAGS)
172-
CFG_GCCISH_LINK_FLAGS_arm-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind
173-
CFG_GCCISH_DEF_FLAG_arm-apple-darwin := -Wl,-exported_symbols_list,
174-
CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-darwin :=
175-
CFG_GCCISH_POST_LIB_FLAGS_arm-apple-darwin :=
176-
CFG_DEF_SUFFIX_arm-apple-darwin := .darwin.def
177-
CFG_LLC_FLAGS_arm-apple-darwin :=
178-
CFG_INSTALL_NAME_arm-apple-darwin = -Wl,-install_name,@rpath/$(1)
179-
CFG_LIBUV_LINK_FLAGS_arm-apple-darwin =
180-
CFG_EXE_SUFFIX_arm-apple-darwin :=
181-
CFG_WINDOWSY_arm-apple-darwin :=
182-
CFG_UNIXY_arm-apple-darwin := 1
183-
CFG_PATH_MUNGE_arm-apple-darwin := true
184-
CFG_LDPATH_arm-apple-darwin :=
185-
CFG_RUN_arm-apple-darwin = $(2)
186-
CFG_RUN_TARG_arm-apple-darwin = $(call CFG_RUN_arm-apple-darwin,,$(2))
163+
CFG_IOS_FLAGS = -target armv7-apple-darwin -isysroot $(CFG_IOS_SDK) -mios-version-min=7.0
164+
CC_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
165+
CXX_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
166+
CPP_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
167+
AR_arm-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
187168
endif
169+
CFG_LIB_NAME_arm-apple-ios = lib$(1).a
170+
CFG_LIB_GLOB_arm-apple-ios = lib$(1)-*.a
171+
CFG_STATIC_LIB_NAME_arm-apple-ios=lib$(1).a
172+
CFG_LIB_DSYM_GLOB_arm-apple-ios = lib$(1)-*.a.dSYM
173+
CFG_CFLAGS_arm-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_FLAGS)
174+
CFG_GCCISH_CFLAGS_arm-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) -mfpu=vfp3 -arch armv7
175+
CFG_GCCISH_CXXFLAGS_arm-apple-ios := -fno-rtti $(CFG_IOS_FLAGS) -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1
176+
CFG_GCCISH_LINK_FLAGS_arm-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK) -Wl,-no_compact_unwind
177+
CFG_GCCISH_DEF_FLAG_arm-apple-ios := -Wl,-exported_symbols_list,
178+
CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-ios :=
179+
CFG_GCCISH_POST_LIB_FLAGS_arm-apple-ios :=
180+
CFG_DEF_SUFFIX_arm-apple-ios := .darwin.def
181+
CFG_LLC_FLAGS_arm-apple-ios := -mattr=+vfp3,+v7,+thumb2,+neon -march=arm
182+
CFG_INSTALL_NAME_arm-apple-ios = -Wl,-install_name,@rpath/$(1)
183+
CFG_LIBUV_LINK_FLAGS_arm-apple-ios =
184+
CFG_EXE_SUFFIX_arm-apple-ios :=
185+
CFG_WINDOWSY_arm-apple-ios :=
186+
CFG_UNIXY_arm-apple-ios := 1
187+
CFG_PATH_MUNGE_arm-apple-ios := true
188+
CFG_LDPATH_arm-apple-ios :=
189+
CFG_RUN_arm-apple-ios = $(2)
190+
CFG_RUN_TARG_arm-apple-ios = $(call CFG_RUN_arm-apple-ios,,$(2))
191+
RUSTC_FLAGS_arm-apple-ios := -C relocation_model=pic
192+
RUSTC_CROSS_FLAGS_arm-apple-ios :=-C relocation_model=pic
193+
194+
# i386-apple-ios configuration
195+
CFG_SDK_NAME_i386-apple-ios = iphonesimulator
196+
CFG_SDK_ARCHS_i386-apple-ios = i386
197+
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
198+
CFG_IOSSIM_SDK = $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
199+
CFG_IOSSIM_FLAGS = -target i386-apple-ios -isysroot $(CFG_IOSSIM_SDK) -mios-simulator-version-min=7.0
200+
CC_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang)
201+
CXX_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
202+
CPP_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
203+
AR_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator ar)
204+
endif
205+
CFG_LIB_NAME_i386-apple-ios = lib$(1).a
206+
CFG_LIB_GLOB_i386-apple-ios = lib$(1)-*.dylib
207+
CFG_STATIC_LIB_NAME_i386-apple-ios=lib$(1).a
208+
CFG_LIB_DSYM_GLOB_i386-apple-ios = lib$(1)-*.dylib.dSYM
209+
CFG_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS)
210+
CFG_GCCISH_CFLAGS_i386-apple-ios = -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS)
211+
CFG_GCCISH_CXXFLAGS_i386-apple-ios = -fno-rtti $(CFG_IOSSIM_FLAGS) -I$(CFG_IOSSIM_SDK)/usr/include/c++/4.2.1
212+
CFG_GCCISH_LINK_FLAGS_i386-apple-ios = -lpthread -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK)
213+
CFG_GCCISH_DEF_FLAG_i386-apple-ios = -Wl,-exported_symbols_list,
214+
CFG_GCCISH_PRE_LIB_FLAGS_i386-apple-ios =
215+
CFG_GCCISH_POST_LIB_FLAGS_i386-apple-ios =
216+
CFG_DEF_SUFFIX_i386-apple-ios = .darwin.def
217+
CFG_LLC_FLAGS_i386-apple-ios =
218+
CFG_INSTALL_NAME_i386-apple-ios = -Wl,-install_name,@rpath/$(1)
219+
CFG_LIBUV_LINK_FLAGS_i386-apple-ios =
220+
CFG_EXE_SUFFIX_i386-apple-ios =
221+
CFG_WINDOWSY_i386-apple-ios =
222+
CFG_UNIXY_i386-apple-ios = 1
223+
CFG_PATH_MUNGE_i386-apple-ios = true
224+
CFG_LDPATH_i386-apple-ios =
225+
CFG_RUN_i386-apple-ios = $(2)
226+
CFG_RUN_TARG_i386-apple-ios = $(call CFG_RUN_i386-apple-ios,,$(2))
227+
CFG_JEMALLOC_CFLAGS_i386-apple-ios = -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind
188228

189229
# x86_64-apple-darwin configuration
190230
CC_x86_64-apple-darwin=$(CC)

0 commit comments

Comments
 (0)