Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
Conflicts:
Makefile.inc1 (unresolved)
share/man/man5/src.conf.5 (unresolved)
targets/pseudo/bootstrap-tools/Makefile (unresolved)
tools/build/options/WITH_OFED_EXTRA (deleted)
Delta | File |
---|
+71,590 | -432 | tools/tools/locale/etc/final-maps/widths.txt |
+52,834 | -0 | contrib/terminus/ter-u32n.bdf |
+52,834 | -0 | contrib/terminus/ter-u32b.bdf |
+0 | -49,485 | contrib/binutils/Makefile.in |
+47,418 | -0 | contrib/terminus/ter-u28b.bdf |
+47,418 | -0 | contrib/terminus/ter-u28n.bdf |
+272,094 | -49,917 | 25,491 files not shown |
+3,013,181 | -3,285,385 | 25,497 files |
Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit
Delta | File |
---|
+0 | -111,817 | contrib/libstdc++/configure |
+72,183 | -0 | lib/clang/liblldb/LLDBWrapLua.cpp |
+71,590 | -432 | tools/tools/locale/etc/final-maps/widths.txt |
+31,726 | -39,305 | share/ctypedef/ja_JP.eucJP.src |
+59,521 | -0 | sys/contrib/dev/iwm/iwm-9000-34.fw.uu |
+59,517 | -0 | sys/contrib/dev/iwm/iwm-9260-34.fw.uu |
+294,537 | -151,554 | 60,534 files not shown |
+10,288,584 | -10,879,881 | 60,540 files |
Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master
Delta | File |
---|
+0 | -49,485 | contrib/binutils/Makefile.in |
+0 | -22,860 | contrib/binutils/bfd/configure |
+0 | -20,907 | contrib/binutils/gas/config/tc-arm.c |
+0 | -17,032 | contrib/binutils/binutils/configure |
+0 | -16,200 | contrib/binutils/gas/configure |
+0 | -15,450 | contrib/binutils/gas/config/tc-mips.c |
+0 | -141,934 | 1,224 files not shown |
+144 | -1,133,496 | 1,230 files |
Remove contrib/binutils, unused after r368667
Delta | File |
---|
+0 | -49,485 | contrib/binutils/Makefile.in |
+0 | -22,860 | contrib/binutils/bfd/configure |
+0 | -20,907 | contrib/binutils/gas/config/tc-arm.c |
+0 | -17,032 | contrib/binutils/binutils/configure |
+0 | -16,200 | contrib/binutils/gas/configure |
+0 | -15,450 | contrib/binutils/gas/config/tc-mips.c |
+0 | -141,934 | 1,076 files not shown |
+0 | -1,110,883 | 1,082 files |
Remove contrib/binutils, unused after r368667
Delta | File |
---|
+0 | -49,485 | contrib/binutils/Makefile.in |
+0 | -22,860 | contrib/binutils/bfd/configure |
+0 | -20,907 | contrib/binutils/gas/config/tc-arm.c |
+0 | -17,032 | contrib/binutils/binutils/configure |
+0 | -16,200 | contrib/binutils/gas/configure |
+0 | -15,450 | contrib/binutils/gas/config/tc-mips.c |
+0 | -141,934 | 1,076 files not shown |
+0 | -1,110,883 | 1,082 files |
Create branch for bhyve graphics import.
Delta | File |
---|
+0 | -250,654 | tools/tools/locale/etc/final-maps/map.UTF-8 |
+0 | -235,924 | share/dict/web2 |
+0 | -209,729 | contrib/ntp/CommitLog |
+0 | -189,304 | contrib/sqlite3/sqlite3.c |
+0 | -148,958 | sys/dev/qlxgbe/ql_fw.c |
+0 | -131,072 | crypto/heimdal/lib/sqlite/sqlite3.c |
+0 | -1,165,641 | 69,516 files not shown |
+19,947 | -30,627,908 | 69,522 files |
Move ^/user/gjb/hacking/release-embedded up one directory, and remove
^/user/gjb/hacking since this is likely to be merged to head/ soon.
Sponsored by: The FreeBSD Foundation
Delta | File |
---|
+235,924 | -0 | share/dict/web2 |
+0 | -235,924 | release-embedded/share/dict/web2 |
+0 | -140,456 | release-embedded/contrib/sqlite3/sqlite3.c |
+140,456 | -0 | contrib/sqlite3/sqlite3.c |
+131,072 | -0 | crypto/heimdal/lib/sqlite/sqlite3.c |
+0 | -131,072 | release-embedded/crypto/heimdal/lib/sqlite/sqlite3.c |
+507,452 | -507,452 | 115,432 files not shown |
+25,340,105 | -25,340,105 | 115,438 files |
Copy head at r259933 -> user/gjb/hacking/release-embedded for initial
inclusion of (at least) arm builds with the release.
Sponsored by: The FreeBSD Foundation
Delta | File |
---|
+0 | -235,924 | share/dict/web2 |
+235,924 | -0 | release-embedded/share/dict/web2 |
+140,456 | -0 | release-embedded/contrib/sqlite3/sqlite3.c |
+0 | -140,456 | contrib/sqlite3/sqlite3.c |
+0 | -131,072 | crypto/heimdal/lib/sqlite/sqlite3.c |
+131,072 | -0 | release-embedded/crypto/heimdal/lib/sqlite/sqlite3.c |
+507,452 | -507,452 | 115,224 files not shown |
+25,135,917 | -25,135,917 | 115,230 files |
Merge from head at 222434.
Delta | File |
---|
+105,495 | -0 | sys/contrib/octeon-sdk/cvmx-csr-db.c |
+46,033 | -20,529 | contrib/binutils/Makefile.in |
+65,519 | -0 | tools/test/iconv/ref/BIG5HKSCS-rev |
+65,431 | -0 | share/i18n/csmapper/ISO-8859/UCS%ISO-8859-3.src |
+65,430 | -0 | share/i18n/csmapper/ISO-8859/UCS%ISO-8859-2.src |
+65,369 | -0 | share/i18n/csmapper/AST/UCS%ARMSCII-8.src |
+413,277 | -20,529 | 20,112 files not shown |
+6,207,071 | -998,126 | 20,118 files |
Merge binutils 2.17.50 to head. This brings a number of improvements to
x86 CPU support, better support for powerpc64, some new directives, and
many other things. Bump __FreeBSD_version, and add a note to UPDATING.
Thanks to the many people that have helped to test this.
Obtained from: projects/binutils-2.17
Delta | File |
---|
+46,033 | -20,529 | contrib/binutils/Makefile.in |
+19,901 | -13,473 | contrib/binutils/gas/config/tc-arm.c |
+20,549 | -5,209 | contrib/binutils/bfd/configure |
+16,285 | -5,334 | contrib/binutils/binutils/configure |
+13,893 | -4,287 | contrib/binutils/ld/configure |
+12,605 | -3,857 | contrib/binutils/opcodes/configure |
+129,266 | -52,689 | 1,072 files not shown |
+424,746 | -242,002 | 1,078 files |
Merge binutils 2.17.50 to head. This brings a number of improvements to
x86 CPU support, better support for powerpc64, some new directives, and
many other things. Bump __FreeBSD_version, and add a note to UPDATING.
Thanks to the many people that have helped to test this.
Obtained from: projects/binutils-2.17
Delta | File |
---|
+46,033 | -20,529 | contrib/binutils/Makefile.in |
+19,901 | -13,473 | contrib/binutils/gas/config/tc-arm.c |
+20,549 | -5,209 | contrib/binutils/bfd/configure |
+16,285 | -5,334 | contrib/binutils/binutils/configure |
+13,893 | -4,287 | contrib/binutils/ld/configure |
+12,605 | -3,857 | contrib/binutils/opcodes/configure |
+129,266 | -52,689 | 1,072 files not shown |
+424,746 | -242,002 | 1,078 files |
Merge ^/vendor/binutils/dist at 214571 into contrib/binutils, which brings
us up to version 2.17.50.20070703, at the last GPLv2 commit.
Amongst others, this added upstream support for some FreeBSD-specific
things that we previously had to manually hack in, such as the OSABI
label support, and so on.
There are also quite a number of new files, some for cpu's (e.g. SPU)
that we may or may not be interested in, but those can be cleaned up
later on, if needed.
Delta | File |
---|
+10,399 | -3,562 | contrib/binutils/bfd/configure |
+8,969 | -4,232 | contrib/binutils/binutils/configure |
+7,645 | -3,678 | contrib/binutils/ld/configure |
+7,293 | -3,711 | contrib/binutils/gas/configure |
+9,654 | -1,280 | contrib/binutils/Makefile.in |
+7,942 | -2,943 | contrib/binutils/configure |
+51,902 | -19,406 | 607 files not shown |
+204,171 | -90,992 | 613 files |
HardenedBSD/src 97d40d3 (r214634) — contrib/binutils Makefile.in configure, contrib/binutils/bfd configure
Merge ^/vendor/binutils/dist at 214571 into contrib/binutils, which brings
us up to version 2.17.50.20070703, at the last GPLv2 commit.
Amongst others, this added upstream support for some FreeBSD-specific
things that we previously had to manually hack in, such as the OSABI
label support, and so on.
There are also quite a number of new files, some for cpu's (e.g. SPU)
that we may or may not be interested in, but those can be cleaned up
later on, if needed.
Delta | File |
---|
+10,399 | -3,562 | contrib/binutils/bfd/configure |
+8,969 | -4,232 | contrib/binutils/binutils/configure |
+7,645 | -3,678 | contrib/binutils/ld/configure |
+7,293 | -3,711 | contrib/binutils/gas/configure |
+9,654 | -1,280 | contrib/binutils/Makefile.in |
+7,942 | -2,943 | contrib/binutils/configure |
+51,902 | -19,406 | 607 files not shown |
+204,171 | -90,992 | 613 files |
Merge ^vendor/binutils/dist at 214082 into contrib/binutils.
Delta | File |
---|
+37,627 | -20,497 | contrib/binutils/Makefile.in |
+13,263 | -13,521 | contrib/binutils/gas/config/tc-arm.c |
+12,572 | -4,044 | contrib/binutils/bfd/configure |
+7,711 | -6,499 | contrib/binutils/opcodes/ia64-asmtab.c |
+9,684 | -3,470 | contrib/binutils/binutils/configure |
+8,880 | -3,241 | contrib/binutils/ld/configure |
+89,737 | -51,272 | 830 files not shown |
+244,225 | -159,284 | 836 files |
Merge ^vendor/binutils/dist at 214082 into contrib/binutils.
Delta | File |
---|
+37,627 | -20,497 | contrib/binutils/Makefile.in |
+13,263 | -13,521 | contrib/binutils/gas/config/tc-arm.c |
+12,572 | -4,044 | contrib/binutils/bfd/configure |
+7,711 | -6,499 | contrib/binutils/opcodes/ia64-asmtab.c |
+9,684 | -3,470 | contrib/binutils/binutils/configure |
+8,880 | -3,241 | contrib/binutils/ld/configure |
+89,737 | -51,272 | 830 files not shown |
+244,225 | -159,284 | 836 files |
A new jail(8) with a configuration file, to replace the work currently done
by /etc/rc.d/jail.
Delta | File |
---|
+0 | -235,924 | share/dict/web2 |
+0 | -111,817 | contrib/libstdc++/configure |
+0 | -76,205 | share/dict/web2a |
+0 | -74,292 | sys/contrib/octeon-sdk/cvmx-csr-db.c |
+0 | -73,991 | sys/contrib/octeon-sdk/cvmx-csr-typedefs.h |
+0 | -59,651 | games/fortune/datfiles/fortunes |
+0 | -631,880 | 44,919 files not shown |
+0 | -17,210,078 | 44,925 files |
A new jail(8) with a configuration file, to replace the work currently done
by /etc/rc.d/jail.
Delta | File |
---|
+0 | -235,924 | share/dict/web2 |
+0 | -111,817 | contrib/libstdc++/configure |
+0 | -76,205 | share/dict/web2a |
+0 | -74,292 | sys/contrib/octeon-sdk/cvmx-csr-db.c |
+0 | -73,991 | sys/contrib/octeon-sdk/cvmx-csr-typedefs.h |
+0 | -59,651 | games/fortune/datfiles/fortunes |
+0 | -631,880 | 44,919 files not shown |
+0 | -17,210,078 | 44,925 files |
Create a custom branch where I will be able to do the merge.
Delta | File |
---|
+0 | -235,883 | share/dict/web2 |
+0 | -111,817 | contrib/libstdc++/configure |
+0 | -76,205 | share/dict/web2a |
+0 | -59,638 | games/fortune/datfiles/fortunes |
+0 | -54,327 | crypto/heimdal/configure |
+0 | -47,880 | contrib/gcc/ChangeLog-2004 |
+0 | -585,750 | 42,159 files not shown |
+13,501 | -15,731,079 | 42,165 files |
Create the altix project branch. The altix project will add support
for the SGI Altix 350 to FreeBSD/ia64. The hardware used for porting
is a two-module system, consisting of a base compute module and a
CPU expansion module. SGI's NUMAFlex architecture can be an excellent
platform to test CPU affinity and NUMA-aware features in FreeBSD.
Delta | File |
---|
+0 | -235,882 | share/dict/web2 |
+0 | -111,817 | contrib/libstdc++/configure |
+0 | -76,205 | share/dict/web2a |
+0 | -59,638 | games/fortune/datfiles/fortunes |
+0 | -54,327 | crypto/heimdal/configure |
+0 | -47,880 | contrib/gcc/ChangeLog-2004 |
+0 | -585,749 | 33,560 files not shown |
+0 | -11,468,241 | 33,566 files |
Make a place for porting the Xen HVM support to 7.x.
Delta | File |
---|
+235,882 | -0 | 7/share/dict/web2 |
+111,817 | -0 | 7/contrib/libstdc++/configure |
+76,205 | -0 | 7/share/dict/web2a |
+59,767 | -0 | 7/games/fortune/datfiles/fortunes |
+54,831 | -0 | 7/crypto/heimdal/configure |
+54,790 | -0 | 7/contrib/ntp/configure |
+593,292 | -0 | 39,383 files not shown |
+14,851,736 | -0 | 39,389 files |
HardenedBSD/src f51ee0a (r187443) — contrib/binutils Makefile.in, contrib/binutils/gas/config tc-mips.c tc-arm.c
Rename vendor/binutils/*/contrib to vendor/binutils/*/x
Binutils has a "contrib" subdirectory - thus flattening cannot happen
without renaming the upper level contrib directory in a first pass.
Also, don't record this move and remove any keyword expansion.
Delta | File |
---|
+0 | -23,981 | contrib/binutils/Makefile.in |
+23,981 | -0 | x/binutils/Makefile.in |
+14,431 | -0 | x/binutils/gas/config/tc-mips.c |
+0 | -14,431 | contrib/binutils/gas/config/tc-mips.c |
+0 | -14,300 | contrib/binutils/gas/config/tc-arm.c |
+14,300 | -0 | x/binutils/gas/config/tc-arm.c |
+52,712 | -52,712 | 2,222 files not shown |
+946,447 | -946,447 | 2,228 files |
Rename vendor/binutils/*/contrib to vendor/binutils/*/x
Binutils has a "contrib" subdirectory - thus flattening cannot happen
without renaming the upper level contrib directory in a first pass.
Also, don't record this move and remove any keyword expansion.
Delta | File |
---|
+0 | -23,981 | contrib/binutils/Makefile.in |
+23,981 | -0 | x/binutils/Makefile.in |
+14,431 | -0 | x/binutils/gas/config/tc-mips.c |
+0 | -14,431 | contrib/binutils/gas/config/tc-mips.c |
+0 | -14,300 | contrib/binutils/gas/config/tc-arm.c |
+14,300 | -0 | x/binutils/gas/config/tc-arm.c |
+52,712 | -52,712 | 2,222 files not shown |
+946,447 | -946,447 | 2,228 files |
Clone Kip's Xen on stable/6 tree so that I can work on improving FreeBSD/amd64
performance in Xen's HVM mode.
Delta | File |
---|
+0 | -235,882 | share/dict/web2 |
+235,882 | -0 | 6/share/dict/web2 |
+0 | -96,401 | contrib/libstdc++/configure |
+96,401 | -0 | 6/contrib/libstdc++/configure |
+0 | -76,205 | share/dict/web2a |
+76,205 | -0 | 6/share/dict/web2a |
+408,488 | -408,488 | 69,894 files not shown |
+13,544,658 | -13,544,658 | 69,900 files |
- Import the HEAD csup code which is the basis for the cvsmode work.
Delta | File |
---|
+0 | -235,882 | share/dict/web2 |
+0 | -111,817 | contrib/libstdc++/configure |
+0 | -76,205 | share/dict/web2a |
+0 | -59,817 | games/fortune/datfiles/fortunes |
+0 | -54,790 | contrib/ntp/configure |
+0 | -54,327 | crypto/heimdal/configure |
+0 | -592,838 | 40,673 files not shown |
+0 | -15,235,868 | 40,679 files |
- Import the HEAD csup code which is the basis for the cvsmode work.
Delta | File |
---|
+0 | -235,882 | share/dict/web2 |
+0 | -111,817 | contrib/libstdc++/configure |
+0 | -76,205 | share/dict/web2a |
+0 | -59,817 | games/fortune/datfiles/fortunes |
+0 | -54,790 | contrib/ntp/configure |
+0 | -54,327 | crypto/heimdal/configure |
+0 | -592,838 | 40,673 files not shown |
+0 | -15,235,868 | 40,679 files |
HardenedBSD/src da03bc7 (r130561) — contrib/binutils Makefile.in, contrib/binutils/bfd ChangeLog-0203 elflink.c
Import of Binutils from the FSF 2.15 branch (just post-.0 release).
These bits are taken from the FSF anoncvs repo on 23-May-2004 04:41:00 UTC.
Delta | File |
---|
+23,585 | -1,688 | contrib/binutils/Makefile.in |
+9,263 | -3,573 | contrib/binutils/gas/configure |
+5,964 | -5,839 | contrib/binutils/opcodes/ia64-asmtab.c |
+11,405 | -0 | contrib/binutils/bfd/ChangeLog-0203 |
+8,508 | -250 | contrib/binutils/bfd/elflink.c |
+5,839 | -2,270 | contrib/binutils/libiberty/configure |
+64,564 | -13,620 | 655 files not shown |
+215,207 | -110,833 | 661 files |
HardenedBSD/src ad6e3f2 (r130562) — contrib/binutils Makefile.in, contrib/binutils/bfd ChangeLog-0203 elflink.c
This commit was generated by cvs2svn to compensate for changes in r130561,
which included commits to RCS files with non-trunk default branches.
Delta | File |
---|
+23,585 | -1,688 | contrib/binutils/Makefile.in |
+5,964 | -5,839 | contrib/binutils/opcodes/ia64-asmtab.c |
+11,405 | -0 | contrib/binutils/bfd/ChangeLog-0203 |
+8,508 | -250 | contrib/binutils/bfd/elflink.c |
+5,839 | -2,270 | contrib/binutils/libiberty/configure |
+7,519 | -0 | contrib/binutils/gas/ChangeLog-0203 |
+62,820 | -10,047 | 638 files not shown |
+200,766 | -103,015 | 644 files |
This commit was generated by cvs2svn to compensate for changes in r130561,
which included commits to RCS files with non-trunk default branches.
Delta | File |
---|
+23,585 | -1,688 | contrib/binutils/Makefile.in |
+5,964 | -5,839 | contrib/binutils/opcodes/ia64-asmtab.c |
+11,405 | -0 | contrib/binutils/bfd/ChangeLog-0203 |
+8,508 | -250 | contrib/binutils/bfd/elflink.c |
+5,839 | -2,270 | contrib/binutils/libiberty/configure |
+7,519 | -0 | contrib/binutils/gas/ChangeLog-0203 |
+62,820 | -10,047 | 638 files not shown |
+200,766 | -103,015 | 644 files |
Import of Binutils from the FSF 2.15 branch (just post-.0 release).
These bits are taken from the FSF anoncvs repo on 23-May-2004 04:41:00 UTC.
Delta | File |
---|
+23,585 | -1,688 | contrib/binutils/Makefile.in |
+9,263 | -3,573 | contrib/binutils/gas/configure |
+5,964 | -5,839 | contrib/binutils/opcodes/ia64-asmtab.c |
+11,405 | -0 | contrib/binutils/bfd/ChangeLog-0203 |
+8,508 | -250 | contrib/binutils/bfd/elflink.c |
+5,839 | -2,270 | contrib/binutils/libiberty/configure |
+64,564 | -13,620 | 655 files not shown |
+215,207 | -110,833 | 661 files |
This commit was generated by cvs2svn to compensate for changes in r107492,
which included commits to RCS files with non-trunk default branches.