summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2016-03-16 16:50:13 +0000
committerian <ian@FreeBSD.org>2016-03-16 16:50:13 +0000
commit3447873832ec31f84783d63e26a3d2fb7332c56a (patch)
treebf78dff701a800514f4b3ca6403ba8a04a9de832
parent6f44a5bccb40d37e6a4af7d8e341bde6c55ff8dc (diff)
downloadFreeBSD-src-3447873832ec31f84783d63e26a3d2fb7332c56a.zip
FreeBSD-src-3447873832ec31f84783d63e26a3d2fb7332c56a.tar.gz
Revert r296940, it contained unintended changes, and will be redone.
-rw-r--r--contrib/llvm/tools/clang/lib/Driver/Tools.cpp2
-rwxr-xr-xetc/rc.d/netwait2
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/llvm/tools/clang/lib/Driver/Tools.cpp b/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
index 83d3447..86d046b 100644
--- a/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
+++ b/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
@@ -5777,7 +5777,7 @@ void freebsd::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
}
} else if (getToolChain().getArch() == llvm::Triple::arm ||
getToolChain().getArch() == llvm::Triple::thumb) {
- CmdArgs.push_back("-mfpu=vfpv3");
+ CmdArgs.push_back("-mfpu=softvfp");
switch(getToolChain().getTriple().getEnvironment()) {
case llvm::Triple::GNUEABI:
case llvm::Triple::EABI:
diff --git a/etc/rc.d/netwait b/etc/rc.d/netwait
index e9c23ca..6ccca04 100755
--- a/etc/rc.d/netwait
+++ b/etc/rc.d/netwait
@@ -3,7 +3,7 @@
# $FreeBSD$
#
# PROVIDE: netwait
-# REQUIRE: devd ipfilter ipfw pf routing
+# REQUIRE: devd routing
# KEYWORD: nojail
#
# The netwait script helps handle two situations:
OpenPOWER on IntegriCloud