This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge branch 'master' of https://github.com/freebsd/freebsd

Conflicts:
	sys/conf/newvers.sh
  • Loading branch information...
kmoore134 committed Oct 7, 2013
2 parents 5002c59 + 774f6b0 commit 404ef10fa5c6f4218edb0fa3bc3f1901aacf9943
Showing with 2,560 additions and 26,755 deletions.
  1. +23 −0 ObsoleteFiles.inc
  2. +1 −0 cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  3. +3 −3 contrib/libc++/include/memory
  4. +4 −0 contrib/llvm/lib/Target/X86/X86InstrInfo.cpp
  5. +4 −2 etc/ftpusers
  6. +0 −5 gnu/usr.bin/Makefile
  7. +0 −24 gnu/usr.bin/rcs/CREDITS
  8. +0 −3 gnu/usr.bin/rcs/Makefile
  9. +0 −3 gnu/usr.bin/rcs/Makefile.inc
  10. +0 −548 gnu/usr.bin/rcs/NEWS
  11. +0 −90 gnu/usr.bin/rcs/REFS
  12. +0 −8 gnu/usr.bin/rcs/ci/Makefile
  13. +0 −898 gnu/usr.bin/rcs/ci/ci.1
  14. +0 −1,318 gnu/usr.bin/rcs/ci/ci.c
  15. +0 −8 gnu/usr.bin/rcs/co/Makefile
  16. +0 −736 gnu/usr.bin/rcs/co/co.1
  17. +0 −826 gnu/usr.bin/rcs/co/co.c
  18. +0 −1,518 gnu/usr.bin/rcs/doc/rcs.ms
  19. +0 −95 gnu/usr.bin/rcs/doc/rcs_func.ms
  20. +0 −8 gnu/usr.bin/rcs/ident/Makefile
  21. +0 −182 gnu/usr.bin/rcs/ident/ident.1
  22. +0 −270 gnu/usr.bin/rcs/ident/ident.c
  23. +0 −14 gnu/usr.bin/rcs/lib/Makefile
  24. +0 −400 gnu/usr.bin/rcs/lib/conf.h
  25. +0 −344 gnu/usr.bin/rcs/lib/maketime.c
  26. +0 −39 gnu/usr.bin/rcs/lib/maketime.h
  27. +0 −148 gnu/usr.bin/rcs/lib/merger.c
  28. +0 −701 gnu/usr.bin/rcs/lib/partime.c
  29. +0 −71 gnu/usr.bin/rcs/lib/partime.h
  30. +0 −762 gnu/usr.bin/rcs/lib/rcsbase.h
  31. +0 −1,958 gnu/usr.bin/rcs/lib/rcsedit.c
  32. +0 −354 gnu/usr.bin/rcs/lib/rcsfcmp.c
  33. +0 −1,132 gnu/usr.bin/rcs/lib/rcsfnms.c
  34. +0 −681 gnu/usr.bin/rcs/lib/rcsgen.c
  35. +0 −452 gnu/usr.bin/rcs/lib/rcskeep.c
  36. +0 −186 gnu/usr.bin/rcs/lib/rcskeys.c
  37. +0 −1,568 gnu/usr.bin/rcs/lib/rcslex.c
  38. +0 −69 gnu/usr.bin/rcs/lib/rcsmap.c
  39. +0 −911 gnu/usr.bin/rcs/lib/rcsrev.c
  40. +0 −681 gnu/usr.bin/rcs/lib/rcssyn.c
  41. +0 −191 gnu/usr.bin/rcs/lib/rcstime.c
  42. +0 −1,398 gnu/usr.bin/rcs/lib/rcsutil.c
  43. +0 −2 gnu/usr.bin/rcs/lib/version.c
  44. +0 −8 gnu/usr.bin/rcs/merge/Makefile
  45. +0 −137 gnu/usr.bin/rcs/merge/merge.1
  46. +0 −113 gnu/usr.bin/rcs/merge/merge.c
  47. +0 −10 gnu/usr.bin/rcs/rcs/Makefile
  48. +0 −454 gnu/usr.bin/rcs/rcs/rcs.1
  49. +0 −1,629 gnu/usr.bin/rcs/rcs/rcs.c
  50. +0 −425 gnu/usr.bin/rcs/rcs/rcsfile.5
  51. +0 −302 gnu/usr.bin/rcs/rcs/rcsintro.1
  52. +0 −8 gnu/usr.bin/rcs/rcsclean/Makefile
  53. +0 −203 gnu/usr.bin/rcs/rcsclean/rcsclean.1
  54. +0 −333 gnu/usr.bin/rcs/rcsclean/rcsclean.c
  55. +0 −8 gnu/usr.bin/rcs/rcsdiff/Makefile
  56. +0 −158 gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
  57. +0 −480 gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
  58. +0 −7 gnu/usr.bin/rcs/rcsfreeze/Makefile
  59. +0 −68 gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
  60. +0 −99 gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
  61. +0 −8 gnu/usr.bin/rcs/rcsmerge/Makefile
  62. +0 −189 gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
  63. +0 −286 gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
  64. +0 −454 gnu/usr.bin/rcs/rcstest
  65. +0 −8 gnu/usr.bin/rcs/rlog/Makefile
  66. +0 −318 gnu/usr.bin/rcs/rlog/rlog.1
  67. +0 −1,290 gnu/usr.bin/rcs/rlog/rlog.c
  68. +24 −1 lib/libvmmapi/vmmapi.c
  69. +3 −1 lib/libvmmapi/vmmapi.h
  70. +1 −0 libexec/Makefile
  71. +21 −0 libexec/freebsd-version/Makefile
  72. +124 −0 libexec/freebsd-version/freebsd-version.1
  73. +126 −0 libexec/freebsd-version/freebsd-version.sh.in
  74. +32 −2 libexec/rtld-elf/rtld.c
  75. +1 −0 libexec/rtld-elf/rtld.h
  76. +0 −6 share/doc/psd/13.rcs/Makefile
  77. +0 −5 share/doc/psd/13.rcs/Makefile.inc
  78. +0 −7 share/doc/psd/13.rcs/rcs/Makefile
  79. +0 −6 share/doc/psd/13.rcs/rcs_func/Makefile
  80. +0 −1 share/doc/psd/Makefile
  81. +1 −13 share/man/man4/urtwn.4
  82. +11 −3 share/man/man9/lock.9
  83. +0 −1 share/mk/bsd.own.mk
  84. +1 −1 sys/amd64/amd64/machdep.c
  85. +916 −137 sys/amd64/amd64/pmap.c
  86. +10 −1 sys/amd64/amd64/trap.c
  87. +2 −1 sys/amd64/include/pcpu.h
  88. +89 −26 sys/amd64/include/pmap.h
  89. +30 −13 sys/amd64/include/vmm.h
  90. +11 −1 sys/amd64/include/vmm_dev.h
  91. +4 −0 sys/amd64/include/vmm_instruction_emul.h
  92. +21 −22 sys/amd64/vmm/amd/amdv.c
  93. +54 −250 sys/amd64/vmm/intel/ept.c
  94. +4 −8 sys/amd64/vmm/intel/ept.h
  95. +2 −3 sys/amd64/vmm/intel/vmcs.c
  96. +12 −1 sys/amd64/vmm/intel/vmcs.h
  97. +105 −70 sys/amd64/vmm/intel/vmx.c
  98. +14 −2 sys/amd64/vmm/intel/vmx.h
  99. +9 −0 sys/amd64/vmm/intel/vmx_genassym.c
  100. +82 −7 sys/amd64/vmm/intel/vmx_support.S
  101. +38 −8 sys/amd64/vmm/io/ppt.c
  102. +10 −4 sys/amd64/vmm/io/ppt.h
  103. +490 −174 sys/amd64/vmm/vmm.c
  104. +33 −27 sys/amd64/vmm/vmm_dev.c
  105. +15 −13 sys/amd64/vmm/vmm_instruction_emul.c
  106. +80 −61 sys/amd64/vmm/vmm_mem.c
  107. +8 −2 sys/amd64/vmm/vmm_mem.h
  108. +0 −1 sys/conf/files
  109. +3 −0 sys/dev/e1000/if_igb.c
  110. +10 −0 sys/dev/hyperv/vmbus/hv_hv.c
  111. +26 −0 sys/dev/ixgbe/ixgbe.c
  112. +2 −2 sys/dev/xen/timer/timer.c
  113. +4 −3 sys/i386/include/pcpu.h
  114. +1 −7 sys/i386/xen/mp_machdep.c
  115. +1 −1 sys/i386/xen/mptable.c
  116. +2 −3 sys/kern/kern_malloc.c
  117. +0 −182 sys/kern/uipc_cow.c
  118. +1 −1 sys/netinet6/ip6_mroute.c
  119. +1 −0 sys/sys/elf_common.h
  120. +1 −1 sys/x86/acpica/madt.c
  121. +2 −0 sys/x86/include/stdarg.h
  122. +19 −1 sys/x86/xen/hvm.c
  123. +11 −11 sys/x86/xen/xen_intr.c
  124. +0 −25 tools/build/mk/OptionalObsoleteFiles.inc
  125. +0 −4 tools/build/options/WITHOUT_RCS
  126. +9 −4 usr.bin/kdump/kdump.c
  127. +13 −15 usr.sbin/bhyve/bhyverun.c
  128. +1 −1 usr.sbin/bhyve/pci_emul.c
  129. +2 −2 usr.sbin/bhyve/rtc.c
  130. +30 −9 usr.sbin/bhyvectl/bhyvectl.c
  131. +2 −2 usr.sbin/bhyveload/bhyveload.c
View
@@ -38,6 +38,29 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20131015: removal of RCS from base
+OLD_FILES+=usr/bin/ci
+OLD_FILES+=usr/bin/co
+OLD_FILES+=usr/bin/ident
+OLD_FILES+=usr/bin/merge
+OLD_FILES+=usr/bin/rcs
+OLD_FILES+=usr/bin/rcsclean
+OLD_FILES+=usr/bin/rcsdiff
+OLD_FILES+=usr/bin/rcsfreeze
+OLD_FILES+=usr/bin/rcsmerge
+OLD_FILES+=usr/bin/rlog
+OLD_FILES+=usr/share/man/man1/ci.1.gz
+OLD_FILES+=usr/share/man/man1/co.1.gz
+OLD_FILES+=usr/share/man/man1/ident.1.gz
+OLD_FILES+=usr/share/man/man1/merge.1.gz
+OLD_FILES+=usr/share/man/man1/rcs.1.gz
+OLD_FILES+=usr/share/man/man1/rcsclean.1.gz
+OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz
+OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz
+OLD_FILES+=usr/share/man/man1/rcsintro.1.gz
+OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz
+OLD_FILES+=usr/share/man/man1/rlog.1.gz
+OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
# 20131001: ar and ranlib from binutils not used
OLD_FILES+=usr/bin/gnu-ar
OLD_FILES+=usr/bin/gnu-ranlib
@@ -58,6 +58,7 @@
#include <sys/types.h>
#include <time.h>
#include <err.h>
+#include <jail.h>
#include <libzfs.h>
#include <libzfs_core.h>
@@ -965,13 +965,13 @@ public:
namespace __has_pointer_type_imp
{
- template <class _Up> static __two test(...);
- template <class _Up> static char test(typename _Up::pointer* = 0);
+ template <class _Up> static __two __test(...);
+ template <class _Up> static char __test(typename _Up::pointer* = 0);
}
template <class _Tp>
struct __has_pointer_type
- : public integral_constant<bool, sizeof(__has_pointer_type_imp::test<_Tp>(0)) == 1>
+ : public integral_constant<bool, sizeof(__has_pointer_type_imp::__test<_Tp>(0)) == 1>
{
};
@@ -3881,6 +3881,10 @@ MachineInstr* X86InstrInfo::foldMemoryOperandImpl(MachineFunction &MF,
const MachineFrameInfo *MFI = MF.getFrameInfo();
unsigned Size = MFI->getObjectSize(FrameIndex);
unsigned Alignment = MFI->getObjectAlignment(FrameIndex);
+ // If the function stack isn't realigned we don't want to fold instructions
+ // that need increased alignment.
+ if (!RI.needsStackRealignment(MF))
+ Alignment = std::min(Alignment, TM.getFrameLowering()->getStackAlignment());
if (Ops.size() == 2 && Ops[0] == 0 && Ops[1] == 1) {
unsigned NewOpc = 0;
unsigned RCSize = 0;
View
@@ -13,7 +13,11 @@ games
news
man
sshd
+smmsp
+mailnull
+_atf
bind
+unbound
proxy
_pflogd
_dhcp
@@ -23,5 +27,3 @@ auditdistd
www
hast
nobody
-mailnull
-smmsp
View
@@ -12,7 +12,6 @@ SUBDIR= ${_binutils} \
${_gperf} \
grep \
${_groff} \
- ${_rcs} \
sdiff \
send-pr \
${_texinfo}
@@ -32,10 +31,6 @@ _dtc= dtc
_texinfo= texinfo
.endif
-.if ${MK_RCS} != "no"
-_rcs= rcs
-.endif
-
.if ${MK_BINUTILS} != "no"
_binutils= binutils
.endif
View
@@ -1,24 +0,0 @@
-RCS was designed and built by Walter F. Tichy of Purdue University.
-RCS version 3 was released in 1983.
-
-Adam Hammer, Thomas Narten, and Daniel Trinkle of Purdue supported RCS through
-version 4.3, released in 1990. Guy Harris of Sun contributed many porting
-fixes. Paul Eggert of System Development Corporation contributed bug fixes
-and tuneups. Jay Lepreau contributed 4.3BSD support.
-
-Paul Eggert of Twin Sun wrote the changes for RCS versions 5.5 and 5.6 (1991).
-Rich Braun of Kronos and Andy Glew of Intel contributed ideas for new options.
-Bill Hahn of Stratus contributed ideas for setuid support.
-Ideas for piece tables came from Joe Berkovitz of Stratus and Walter F. Tichy.
-Matt Cross of Stratus contributed test case ideas.
-Adam Hammer of Purdue QAed.
-
-Paul Eggert wrote most of the changes for this version of RCS,
-currently in beta test. K. Richard Pixley of Cygnus Support
-contributed several bug fixes. Robert Lupton of Princeton
-and Daniel Trinkle contributed ideas for $Name expansion.
-Brendan Kehoe of Cygnus Support suggested rlog's -N option.
-Paul D. Smith of Data General suggested improvements in option
-and error processing. Adam Hammer of Purdue QAed.
-
-$FreeBSD$
View
@@ -1,3 +0,0 @@
-SUBDIR= lib ci co ident merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze
-
-.include <bsd.subdir.mk>
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-LIBRCS= ${.OBJDIR}/../lib/librcs.a
Oops, something went wrong.

0 comments on commit 404ef10

Please sign in to comment.