diff options
author | neel <neel@FreeBSD.org> | 2012-12-04 04:37:42 +0000 |
---|---|---|
committer | neel <neel@FreeBSD.org> | 2012-12-04 04:37:42 +0000 |
commit | d8091074f2295a4be6817c9fe8802b9b0db9346d (patch) | |
tree | 6ef29583fd1f17922e7c5b7d49d2d96d8ff38ebb /sys/conf | |
parent | d45d8a8d668a9ee12073939bf775c404be8cf175 (diff) | |
parent | 6b76c5a1b878e8001537fb323cb0c88fca9dc2df (diff) | |
download | FreeBSD-src-d8091074f2295a4be6817c9fe8802b9b0db9346d.zip FreeBSD-src-d8091074f2295a4be6817c9fe8802b9b0db9346d.tar.gz |
IFC @r243836
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/Makefile.arm | 4 | ||||
-rw-r--r-- | sys/conf/NOTES | 4 | ||||
-rw-r--r-- | sys/conf/files | 2 | ||||
-rw-r--r-- | sys/conf/files.mips | 2 | ||||
-rw-r--r-- | sys/conf/kern.pre.mk | 2 | ||||
-rw-r--r-- | sys/conf/options.mips | 1 |
6 files changed, 8 insertions, 7 deletions
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index 6270aef..4145d60 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -43,7 +43,7 @@ STRIP_FLAGS = -S CFLAGS += -mno-apcs-frame .endif -SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader \ +SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader ${LDFLAGS} \ -warn-common -export-dynamic -dynamic-linker /red/herring -o \ ${FULLKERNEL}.noheader -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL +=;sed s/" + SIZEOF_HEADERS"// ldscript.$M\ @@ -127,12 +127,10 @@ MKMODULESENV+= MACHINE=${MACHINE} CLEAN+= ldscript.$M ${KERNEL_KO}.bin ldscript.$M.noheader -.if ${DDB_ENABLED} != "" CLEAN+= ${KERNEL_KO}.tramp ${KERNEL_KO}.tramp.bin ldscript.$M.tramp \ ldscript.$M.tramp.noheader ${KERNEL_KO}.gz.tramp \ ${KERNEL_KO}.gz.tramp.bin -.endif ldscript.$M: $S/conf/ldscript.$M cat $S/conf/ldscript.$M|sed s/KERNPHYSADDR/${KERNPHYSADDR}/g| \ sed s/KERNVIRTADDR/${KERNVIRTADDR}/g > ldscript.$M diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 2fba664..216d2f5 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1007,8 +1007,8 @@ options FUSE #FUSE support module options MSDOSFS #MS DOS File System (FAT, FAT32) options NFSSERVER #Network File System server options NFSLOCKD #Network Lock Manager -options NFSCL #experimental NFS client with NFSv4 -options NFSD #experimental NFS server with NFSv4 +options NFSCL #New Network Filesystem Client +options NFSD #New Network Filesystem Server options KGSSAPI #Kernel GSSAPI implementation options NULLFS #NULL filesystem diff --git a/sys/conf/files b/sys/conf/files index 22df87f..f80f76e 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -294,6 +294,7 @@ contrib/dev/acpica/components/debugger/dbstats.c optional acpi acpi_debug contrib/dev/acpica/components/debugger/dbutils.c optional acpi acpi_debug contrib/dev/acpica/components/debugger/dbxface.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmbuffer.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmdeferred.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmnames.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmopcode.c optional acpi acpi_debug contrib/dev/acpica/components/disassembler/dmobject.c optional acpi acpi_debug @@ -3578,6 +3579,7 @@ ufs/ffs/ffs_tables.c optional ffs ufs/ffs/ffs_vfsops.c optional ffs ufs/ffs/ffs_vnops.c optional ffs ufs/ffs/ffs_rawread.c optional directio +ufs/ffs/ffs_suspend.c optional ffs ufs/ufs/ufs_acl.c optional ffs ufs/ufs/ufs_bmap.c optional ffs ufs/ufs/ufs_dirhash.c optional ffs diff --git a/sys/conf/files.mips b/sys/conf/files.mips index 5479176..8c7a530 100644 --- a/sys/conf/files.mips +++ b/sys/conf/files.mips @@ -81,4 +81,4 @@ dev/nvram2env/nvram2env.c optional nvram2env # hwpmc support dev/hwpmc/hwpmc_mips.c optional hwpmc -dev/hwpmc/hwpmc_mips24k.c optional hwpmc +dev/hwpmc/hwpmc_mips24k.c optional hwpmc_mips24k diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 442eac9..e108ad4 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -167,7 +167,7 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJS} SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o} SYSTEM_OBJS+= hack.So -SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} --no-warn-mismatch \ +SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} ${LDFLAGS} --no-warn-mismatch \ -warn-common -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ diff --git a/sys/conf/options.mips b/sys/conf/options.mips index c4b3bb7..a86a749 100644 --- a/sys/conf/options.mips +++ b/sys/conf/options.mips @@ -71,6 +71,7 @@ MAXMEM opt_global.h # # Options that control the Cavium Simple Executive. # +OCTEON_MODEL opt_cvmx.h OCTEON_VENDOR_LANNER opt_cvmx.h OCTEON_VENDOR_RADISYS opt_cvmx.h OCTEON_BOARD_CAPK_0100ND opt_cvmx.h |