CURRENT state of acpi and -O'ptimisations in buildworld

Hi to all.

Tonight I cvsup'ed to fresh current source tree and found in newvers.sh that 
it's 5.2-CURRENT already, not 5.2-BETA :)
My first question is about acpi. Does it still required to be included as a 
'device acpi' in kernel, as mentioned at 20031103 in UPDATING file or are 
those days gone now and I can use acpi as module again?
The second is about buildworld. Usually I use this opimisaton flags to build 
world and userland (putting them to /etc/make.conf):

CFLAGS= -O3 -pipe -ffast-math -funroll-loops -mno-sse2 -march=pentium4
COPTFLAGS= -O2 -pipe -march=pentium4 -ffast-math -funroll-loops
CPUTYPE= p4

But tonight it cause problems. Some pieces of code were not compile, finishing 
buildworld with fatal gcc warnings, and it cause me to put appropriate 
changes in make.conf:

.if ${.CURDIR:N*/src/lib/libpam/libpam} == ""
CFLAGS= -O -pipe -ffast-math -funroll-loops -mno-sse2 -march=pentium4
.endif

.if ${.CURDIR:N*/src/lib/libc} == ""
CFLAGS= -O -pipe -ffast-math -funroll-loops -mno-sse2 -march=pentium4
.endif

.if ${.CURDIR:N*/src/usr.sbin/kldxref} == ""
CFLAGS= -O -pipe -ffast-math -funroll-loops -mno-sse2 -march=pentium4
.endif

.if ${.CURDIR:N*/src/usr.sbin/rpc.yppasswdd} == ""
CFLAGS= -O -pipe -ffast-math -funroll-loops -mno-sse2 -march=pentium4
.endif

As you can see, now only -O flag makes libpam, libc, kldxref and rpc.yppaswdd 
happy. So my question is it temporary bugs or is it features related with 
last code changes and it will require only -O in future, as tonight?

Thanks a lot for your help.