On 2015-01-01 12:44, Oliver Pinter wrote: > No difference between FreeBSD's and our dis_tables.c file, and we > added the following modification to "master" Makefile: > > op_at_robot hardenedBSD.git.opntr> git diff origin/master > origin/hardened/current/master -- sys/cddl/dev/dtrace/x86/dis_tables.c > op_at_robot hardenedBSD.git.opntr> git diff origin/master > origin/hardened/current/master -- us > usr.bin/ usr.sbin/ > op_at_robot hardenedBSD.git.opntr> git diff origin/master > origin/hardened/current/master -- share/mk > mk/ mklocale/ > op_at_robot hardenedBSD.git.opntr> git diff origin/master > origin/hardened/current/master -- share/mk > diff --git a/share/mk/Makefile b/share/mk/Makefile > index cd69ca8..7e1b51f 100644 > --- a/share/mk/Makefile > +++ b/share/mk/Makefile > _at__at_ -13,6 +13,7 _at__at_ FILES= \ > bsd.doc.mk \ > bsd.endian.mk \ > bsd.files.mk \ > + bsd.hardenedbsd.mk \ > bsd.incs.mk \ > bsd.info.mk \ > bsd.init.mk \ > diff --git a/share/mk/bsd.hardenedbsd.mk b/share/mk/bsd.hardenedbsd.mk > new file mode 100644 > index 0000000..9d5bcd3 > --- /dev/null > +++ b/share/mk/bsd.hardenedbsd.mk > _at__at_ -0,0 +1,2 _at__at_ > +CFLAGS+= -DHARDENEDBSD > +CXXFLAGS+= -DHARDENEDBSD > diff --git a/share/mk/sys.mk b/share/mk/sys.mk > index f691820..1edb4d8 100644 > --- a/share/mk/sys.mk > +++ b/share/mk/sys.mk > _at__at_ -368,3 +368,5 _at__at_ SHELL= ${__MAKE_SHELL} > .include <bsd.cpu.mk> > > .endif # ! Posix > + > +.include <bsd.hardenedbsd.mk> > > and our origin/master is a vanilla copy of FreeBSD's master: > > op_at_robot hardenedBSD.git.opntr> git fetch freebsd > remote: Counting objects: 2753, done. > remote: Compressing objects: 100% (1653/1653), done. > remote: Total 2753 (delta 1379), reused 1987 (delta 1088) > Receiving objects: 100% (2753/2753), 6.19 MiB | 556.00 KiB/s, done. > Resolving deltas: 100% (1379/1379), done. > From https://github.com/freebsd/freebsd > 1daffcf..16bfeff master -> freebsd/master > 4ce956b..2786226 projects/arm_intrng -> freebsd/projects/arm_intrng > 8afde97..e891a45 projects/building-blocks -> > freebsd/projects/building-blocks > ae94017..79b9044 projects/clang350-import -> > freebsd/projects/clang350-import > * [new branch] projects/elftoolchain-update-r3130 -> > freebsd/projects/elftoolchain-update-r3130 > 191c3a1..ef329bf projects/ifnet -> freebsd/projects/ifnet > + f39bd7c...33c47ad projects/ino64 -> freebsd/projects/ino64 (forced > update) > * [new branch] projects/paravirt -> freebsd/projects/paravirt > fdb4571..637702c projects/routing -> freebsd/projects/routing > e3732e9..6970b8a projects/sendfile -> freebsd/projects/sendfile > 73a106c..4bbc2e1 releng/10.0 -> freebsd/releng/10.0 > 29f4af5..8bdb2f8 releng/10.1 -> freebsd/releng/10.1 > 93a7c22..6c98ecd releng/8.4 -> freebsd/releng/8.4 > 18b185b..42bd402 releng/9.1 -> freebsd/releng/9.1 > 62fc296..81febb2 releng/9.2 -> freebsd/releng/9.2 > 587e3b5..825bd30 releng/9.3 -> freebsd/releng/9.3 > f3fce3a..f0fc25a stable/10 -> freebsd/stable/10 > 038c20d..2a2bb65 stable/7 -> freebsd/stable/7 > ab2b3fb..4ece3be stable/8 -> freebsd/stable/8 > cd6870d..4c08e33 stable/9 -> freebsd/stable/9 > dab26aa..b4e212b svn_head -> freebsd/svn_head > 947b121..2d9be08 user/cperciva/freebsd-update-build -> > freebsd/user/cperciva/freebsd-update-build > e94160d..f74291e user/marcel/libvdsk -> freebsd/user/marcel/libvdsk > aeef35a..7a5b8d5 user/pho/stress2 -> freebsd/user/pho/stress2 > op_at_robot hardenedBSD.git.opntr> git diff freebsd/master origin/master > op_at_robot hardenedBSD.git.opntr> > > > > And I started a new instance of build/ > > On Thu, Jan 1, 2015 at 7:20 PM, Oliver Pinter > <oliver.pinter_at_hardenedbsd.org> wrote: >> No, we don't touch them. Only added -DHARDEBEDBSD into make >> environment. I will schedule a new round of build to recheck them, >> >> On Thu, Jan 1, 2015 at 6:53 PM, Dimitry Andric <dim_at_freebsd.org> >> wrote: >>> On 01 Jan 2015, at 18:35, Oliver Pinter >>> <oliver.pinter_at_hardenedbsd.org> wrote: >>>> We at HardenedBSD got this error, with out jenkins instance: >>>> >>>> --- dis_tables.o --- >>>> /jenkins/workspace/HardenedBSD_Master/sys/cddl/dev/dtrace/x86/dis_tables.c:3025:25: >>>> error: '&&' within '||' [-Werror,-Wlogical-op-parentheses] >>>> if (cpu_mode == SIZE64 && dp->it_invalid64 || >>> I can't reproduce this warning here, at least not with pristine head. >>> >>> Did you change any of the -Wno-xxx flags in your customized source >>> tree? >>> >>> -Dimitry >>> I was seeing the same failure. r276496 seems(!) to have moved some of the warning / error suppressions and fixed my issue. -- Larry Rosenman http://www.lerctr.org/~ler Phone: +1 214-642-9640 E-Mail: ler_at_lerctr.org US Mail: 108 Turvey Cove, Hutto, TX 78634-5688Received on Thu Jan 01 2015 - 23:27:49 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:40:54 UTC