From owner-p4-projects@FreeBSD.ORG Sun Aug 26 10:34:24 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 134741065679; Sun, 26 Aug 2012 10:34:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B63F0106564A for ; Sun, 26 Aug 2012 10:34:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 9CCF28FC17 for ; Sun, 26 Aug 2012 10:34:22 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q7QAYMZO039623 for ; Sun, 26 Aug 2012 10:34:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7QAYMJc039620 for perforce@freebsd.org; Sun, 26 Aug 2012 10:34:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Aug 2012 10:34:22 GMT Message-Id: <201208261034.q7QAYMJc039620@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 216524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Aug 2012 10:34:24 -0000 http://p4web.freebsd.org/@@216524?ac=10 Change 216524 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/08/26 10:34:10 Integrate ctsrd_beribsd through @216522, looping back isf(4), isfctl(8), terasic_mtl(4), terasic_de4led(4), kernel configuration file updates. FreeBSD/beri support in the base FreeBSD tree is now roughly in sync with FreeBSD/beri, excluding BERI demonstration applications and mtlctl. Affected files ... .. //depot/projects/ctsrd/beribsd/src/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/ctsrd/beribsd/src/gnu/lib/libsupc++/Makefile#3 integrate .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/FARSI%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/GREEK%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/INUIT%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/THAI%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25FARSI.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25GREEK.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25INUIT.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25THAI.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP037%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP038%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP10000%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP10006%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP10007%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP10029%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1006%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP10079%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP10081%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1026%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1046%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1124%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1125%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1129%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1131%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1133%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1161%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1162%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1163%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1250%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1251%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1252%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1253%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1254%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1255%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1256%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1257%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP1258%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP273%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP274%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP275%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP277%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP278%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP280%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP281%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP284%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP285%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP290%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP297%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP420%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP423%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP424%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP437%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP500%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP737%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP775%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP850%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP851%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP852%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP853%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP855%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP856%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP857%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP858%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP860%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP861%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP862%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP863%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP864%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP865%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP866%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP868%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP869%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP870%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP871%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP874%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP875%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP880%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP891%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP903%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP904%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP905%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP918%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP922%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP932UDA%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP936EXT%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP942EXT%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP949EXT%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/CP950%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP037.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP038.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP10000.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP10006.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP10007.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP10029.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1006.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP10079.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP10081.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1026.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1046.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1124.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1125.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1129.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1131.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1133.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1161.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1162.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1163.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1250.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1251.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1252.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1253.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1254.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1255.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1256.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1257.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP1258.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP273.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP274.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP275.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP277.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP278.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP280.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP281.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP284.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP285.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP290.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP297.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP420.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP423.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP424.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP437.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP500.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP737.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP775.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP850.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP851.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP852.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP853.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP855.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP856.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP857.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP858.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP860.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP861.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP862.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP863.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP864.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP865.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP866.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP868.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP869.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP870.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP871.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP874.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP875.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP880.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP891.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP903.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP904.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP905.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP918.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP922.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP932UDA.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP936EXT.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP942EXT.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP949EXT.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/CP/UCS%25CP950.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-ES%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-FR%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-IT%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-PT%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/EBCDIC-UK%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE-A.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-CA-FR.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO-A.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-A.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-S.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE-A.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FR.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-IT.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-PT.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-UK.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/GB12345%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/GB2312%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/GB2312EXT%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/GB2312GBK%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/GB2312UDA1%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/GB2312UDA2%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/GBKEXT%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/GBKUDA%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/ISO-IR-165EXT%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/UCS%25GB12345.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/UCS%25GB2312.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/UCS%25GB2312EXT.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/UCS%25GB2312UDA1.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/UCS%25GB2312UDA2.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/UCS%25GBKEXT.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/UCS%25GBKUDA.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GB/UCS%25ISO-IR-165EXT.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-ACADEMY.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-PS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-10%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-11%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-13%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-14%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-15%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-16%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-2%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-3%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-4%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-5%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-6%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-7%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-8%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/ISO-8859-9%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-10.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-11.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-13.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-14.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-15.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-16.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-2.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-3.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-4.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-5.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-6.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-7.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-8.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-9.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-CA%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-CA2%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-CN%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-CU%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-DE%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-DK%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-ES%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-ES2%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-FI%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-FR%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-FR1%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-GB%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-HU%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-IT%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-JP%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-KR%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-NO%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-NO2%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-PT%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-PT2%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-SE%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-SE2%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-US%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/ISO646/ISO646-YU%25UCS.646#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/JIS/JISX0201-KANA%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/JIS/JISX0208UDC%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/JIS/JISX0212%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/JIS/JISX0212UDC%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/JIS/UCS%25JISX0201-KANA.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/JIS/UCS%25JISX0208UDC.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/JIS/UCS%25JISX0212.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/JIS/UCS%25JISX0212UDC.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KAZAKH/KZ1048%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KAZAKH/PTCP154%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KAZAKH/UCS%25KZ1048.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KAZAKH/UCS%25PTCP154.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/GOST19768-74%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/ISO-5427%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/KOI7%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/KOI8%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/KOI8-C%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/KOI8-CyrillicOld%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/KOI8-E%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/KOI8-R%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/KOI8-RU%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/KOI8-T%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/KOI8-U%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/UCS%25GOST19768-74.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/UCS%25ISO-5427.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/UCS%25KOI7.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/UCS%25KOI8-C.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/UCS%25KOI8-CyrillicOld.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/UCS%25KOI8-E.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/UCS%25KOI8-R.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/UCS%25KOI8-RU.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/UCS%25KOI8-T.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/UCS%25KOI8-U.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KOI/UCS%25KOI8.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KS/JOHAB%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KS/KSC5601HANGUL%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KS/KSC5601HANJA%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KS/UCS%25JOHAB.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KS/UCS%25KSC5601HANGUL.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/KS/UCS%25KSC5601HANJA.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/ATARIST%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/DECMCS%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/HP-ROMAN8%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/MULELAO-1%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/NEXTSTEP%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/RISCOS-LATIN1%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/TDS565%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/UCS%25ATARIST.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/UCS%25DECMCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/UCS%25HP-ROMAN8.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/UCS%25MULELAO-1.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/UCS%25NEXTSTEP.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/UCS%25RISCOS-LATIN1.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/MISC/UCS%25TDS565.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/TCVN/TCVN5712-1%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/TCVN/UCS%25TCVN5712-1.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/TCVN/UCS%25VISCII.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/i18n/csmapper/TCVN/VISCII%25UCS.src#3 branch .. //depot/projects/ctsrd/beribsd/src/share/man/man4/Makefile#10 integrate .. //depot/projects/ctsrd/beribsd/src/share/man/man4/isf.4#2 integrate .. //depot/projects/ctsrd/beribsd/src/share/man/man4/terasic_mtl.4#3 integrate .. //depot/projects/ctsrd/beribsd/src/share/mk/bsd.prog.mk#2 integrate .. //depot/projects/ctsrd/beribsd/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/cpufunc_asm_arm11.S#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/cpufunc_asm_armv6.S#1 branch .. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/disassem.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/sc_machdep.c#1 branch .. //depot/projects/ctsrd/beribsd/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/conf/CAMBRIA#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/include/intr.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/include/sc_machdep.h#1 branch .. //depot/projects/ctsrd/beribsd/src/sys/arm/ti/ti_machdep.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/sys/conf/files#8 integrate .. //depot/projects/ctsrd/beribsd/src/sys/conf/files.arm#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/conf/options.arm#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/ahci/ahciem.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/ath/ath_hal/ah_eeprom_9287.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/fb/fbreg.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/fdt_common.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.c#11 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.h#8 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf_nexus.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/syscons/schistory.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/syscons/scterm-teken.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led_nexus.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#7 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_nexus.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_pixel.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#8 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_syscons.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#7 integrate .. //depot/projects/ctsrd/beribsd/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/ctsrd/beribsd/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/atheros/ar724x_pci.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#21 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/AR724X_BASE#1 branch .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/AR724X_BASE.hints#1 branch .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#13 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_MDROOT#8 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_SDROOT#9 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/include/pmap.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/include/sc_machdep.h#2 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/ctsrd/beribsd/src/sys/powerpc/aim/machdep.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/vm/uma_core.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/usr.sbin/Makefile#5 integrate .. //depot/projects/ctsrd/beribsd/src/usr.sbin/isfctl/Makefile#3 integrate .. //depot/projects/ctsrd/beribsd/src/usr.sbin/isfctl/isfctl.8#2 integrate .. //depot/projects/ctsrd/beribsd/src/usr.sbin/isfctl/isfctl.c#3 integrate Differences ... ==== //depot/projects/ctsrd/beribsd/src/gnu/lib/libstdc++/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.68 2012/03/31 14:25:12 theraven Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.69 2012/08/25 23:08:24 dim Exp $ GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc @@ -22,6 +22,7 @@ CFLAGS+= -frandom-seed=RepeatabilityConsideredGood CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \ -Wno-deprecated +CXXFLAGS:= ${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]} PO_CXXFLAGS= ${CXXFLAGS:N-ffunction-sections} DPADD= ${LIBM} ==== //depot/projects/ctsrd/beribsd/src/gnu/lib/libsupc++/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.12 2012/03/31 14:25:12 theraven Exp $ +# $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.13 2012/08/25 23:08:24 dim Exp $ GCCVER= 4.2 GCCDIR= ${.CURDIR}/../../../contrib/gcc @@ -24,6 +24,7 @@ CFLAGS+= -I${.CURDIR}/../libstdc++ -I. CFLAGS+= -frandom-seed=RepeatabilityConsideredGood CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections +CXXFLAGS:= ${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]} PO_CXXFLAGS= ${CXXFLAGS:N-ffunction-sections} HDRS= exception new typeinfo cxxabi.h exception_defines.h ==== //depot/projects/ctsrd/beribsd/src/share/man/man4/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.541 2012/08/25 11:30:36 rwatson Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.543 2012/08/25 22:35:29 rwatson Exp $ MAN= aac.4 \ acpi.4 \ ==== //depot/projects/ctsrd/beribsd/src/share/man/man4/isf.4#2 (text+ko) ==== ==== //depot/projects/ctsrd/beribsd/src/share/man/man4/terasic_mtl.4#3 (text+ko) ==== ==== //depot/projects/ctsrd/beribsd/src/share/mk/bsd.prog.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.162 2011/11/30 18:11:49 fjoe Exp $ +# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.163 2012/08/25 19:30:15 dim Exp $ .include @@ -126,10 +126,14 @@ .else echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE} .if defined(PROG_CXX) +.if !empty(CXXFLAGS:M-stdlib=libc++) + echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE} +.else echo ${PROG}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE} .endif .endif .endif +.endif .if !target(install) ==== //depot/projects/ctsrd/beribsd/src/sys/amd64/conf/GENERIC#4 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.592 2012/07/01 08:10:49 delphij Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.593 2012/08/26 01:21:02 gjb Exp $ cpu HAMMER ident GENERIC @@ -270,7 +270,7 @@ device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm device an # Aironet 4500/4800 802.11 wireless NICs. -device ath # Atheros NIC's +device ath # Atheros NICs device ath_pci # Atheros pci/cardbus glue device ath_hal # pci/cardbus chip support options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors ==== //depot/projects/ctsrd/beribsd/src/sys/arm/arm/cpufunc.c#3 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.35 2012/08/15 03:03:03 gonzo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.36 2012/08/26 02:23:21 gonzo Exp $"); #include #include @@ -968,6 +968,68 @@ }; #endif /* CPU_FA526 || CPU_FA626TE */ +#if defined(CPU_ARM11) +struct cpu_functions arm11_cpufuncs = { + /* CPU functions */ + + cpufunc_id, /* id */ + arm11_drain_writebuf, /* cpwait */ + + /* MMU functions */ + + cpufunc_control, /* control */ + cpufunc_domains, /* Domain */ + arm11_setttb, /* Setttb */ + cpufunc_faultstatus, /* Faultstatus */ + cpufunc_faultaddress, /* Faultaddress */ + + /* TLB functions */ + + arm11_tlb_flushID, /* tlb_flushID */ + arm11_tlb_flushID_SE, /* tlb_flushID_SE */ + arm11_tlb_flushI, /* tlb_flushI */ + arm11_tlb_flushI_SE, /* tlb_flushI_SE */ + arm11_tlb_flushD, /* tlb_flushD */ + arm11_tlb_flushD_SE, /* tlb_flushD_SE */ + + /* Cache operations */ + + armv6_icache_sync_all, /* icache_sync_all */ + armv6_icache_sync_range, /* icache_sync_range */ + + armv6_dcache_wbinv_all, /* dcache_wbinv_all */ + armv6_dcache_wbinv_range, /* dcache_wbinv_range */ + armv6_dcache_inv_range, /* dcache_inv_range */ + armv6_dcache_wb_range, /* dcache_wb_range */ + + armv6_idcache_wbinv_all, /* idcache_wbinv_all */ + armv6_idcache_wbinv_range, /* idcache_wbinv_range */ + + (void*)cpufunc_nullop, /* l2cache_wbinv_all */ + (void *)cpufunc_nullop, /* l2cache_wbinv_range */ + (void *)cpufunc_nullop, /* l2cache_inv_range */ + (void *)cpufunc_nullop, /* l2cache_wb_range */ + + /* Other functions */ + + cpufunc_nullop, /* flush_prefetchbuf */ + arm11_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ + + arm11_sleep, /* sleep */ + + /* Soft functions */ + + cpufunc_null_fixup, /* dataabt_fixup */ + cpufunc_null_fixup, /* prefetchabt_fixup */ + + arm11_context_switch, /* context_switch */ + + arm11_setup /* cpu setup */ +}; +#endif /* CPU_ARM11 */ + #if defined(CPU_CORTEXA) struct cpu_functions cortexa_cpufuncs = { /* CPU functions */ @@ -1324,6 +1386,15 @@ goto out; } #endif /* CPU_ARM10 */ +#ifdef CPU_ARM11 + cpufuncs = arm11_cpufuncs; + cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */ + get_cachetype_cp15(); + + pmap_pte_init_mmu_v6(); + + goto out; +#endif /* CPU_ARM11 */ #ifdef CPU_CORTEXA if (cputype == CPU_ID_CORTEXA8R1 || cputype == CPU_ID_CORTEXA8R2 || @@ -2197,38 +2268,36 @@ arm11_setup(args) char *args; { - int cpuctrl, cpuctrlmask; + int cpuctrl; - cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_SYST_ENABLE - | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE - /* | CPU_CONTROL_BPRD_ENABLE */; - cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_SYST_ENABLE - | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE - | CPU_CONTROL_ROM_ENABLE | CPU_CONTROL_BPRD_ENABLE - | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE - | CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK; - + cpuctrl = CPU_CONTROL_MMU_ENABLE; #ifndef ARM32_DISABLE_ALIGNMENT_FAULTS cpuctrl |= CPU_CONTROL_AFLT_ENABLE; #endif - + cpuctrl |= CPU_CONTROL_DC_ENABLE; + cpuctrl |= (0xf << 3); cpuctrl = parse_cpu_options(args, arm11_options, cpuctrl); - #ifdef __ARMEB__ cpuctrl |= CPU_CONTROL_BEND_ENABLE; #endif + cpuctrl |= CPU_CONTROL_SYST_ENABLE; + cpuctrl |= CPU_CONTROL_BPRD_ENABLE; + cpuctrl |= CPU_CONTROL_IC_ENABLE; + if (vector_page == ARM_VECTORS_HIGH) + cpuctrl |= CPU_CONTROL_VECRELOC; + cpuctrl |= (0x5 << 16); + cpuctrl |= CPU_CONTROL_V6_EXTPAGE; - /* Clear out the cache */ + /* Make sure caches are clean. */ cpu_idcache_wbinv_all(); + cpu_l2cache_wbinv_all(); - /* Now really make sure they are clean. */ - __asm __volatile ("mcr\tp15, 0, r0, c7, c7, 0" : : ); - /* Set the control register */ + ctrl = cpuctrl; cpu_control(0xffffffff, cpuctrl); - /* And again. */ cpu_idcache_wbinv_all(); + cpu_l2cache_wbinv_all(); } #endif /* CPU_ARM11 */ ==== //depot/projects/ctsrd/beribsd/src/sys/arm/arm/cpufunc_asm_arm11.S#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm11.S,v 1.3 2012/08/15 03:03:03 gonzo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc_asm_arm11.S,v 1.4 2012/08/26 00:46:57 gonzo Exp $"); /* * Functions to set the MMU Translation Table Base register @@ -44,9 +44,11 @@ * addresses that are about to change. */ ENTRY(arm11_setttb) +#ifdef PMAP_CACHE_VIVT stmfd sp!, {r0, lr} bl _C_LABEL(armv5_idcache_wbinv_all) ldmfd sp!, {r0, lr} +#endif mcr p15, 0, r0, c2, c0, 0 /* load new TTB */ ==== //depot/projects/ctsrd/beribsd/src/sys/arm/arm/disassem.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/disassem.c,v 1.3 2012/06/13 04:59:55 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/disassem.c,v 1.4 2012/08/25 20:01:31 gonzo Exp $"); #include @@ -130,6 +130,17 @@ { 0x0c500000, 0x04100000, "ldr", "daW" }, { 0x0c500000, 0x04400000, "strb", "daW" }, { 0x0c500000, 0x04500000, "ldrb", "daW" }, +#ifdef __FreeBSD_ARCH_armv6__ + { 0xffffffff, 0xf57ff01f, "clrex", "c" }, + { 0x0ff00ff0, 0x01800f90, "strex", "dmo" }, + { 0x0ff00fff, 0x01900f9f, "ldrex", "do" }, + { 0x0ff00ff0, 0x01a00f90, "strexd", "dmo" }, + { 0x0ff00fff, 0x01b00f9f, "ldrexd", "do" }, + { 0x0ff00ff0, 0x01c00f90, "strexb", "dmo" }, + { 0x0ff00fff, 0x01d00f9f, "ldrexb", "do" }, + { 0x0ff00ff0, 0x01e00f90, "strexh", "dmo" }, + { 0x0ff00fff, 0x01f00f9f, "ldrexh", "do" }, +#endif { 0x0e1f0000, 0x080d0000, "stm", "YnWl" },/* separate out r13 base */ { 0x0e1f0000, 0x081d0000, "ldm", "YnWl" },/* separate out r13 base */ { 0x0e100000, 0x08000000, "stm", "XnWl" }, ==== //depot/projects/ctsrd/beribsd/src/sys/arm/arm/elf_trampoline.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ #include "opt_kernname.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.32 2012/08/15 03:03:03 gonzo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.33 2012/08/26 02:34:03 gonzo Exp $"); #include #include #include @@ -63,6 +63,8 @@ #define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all #elif defined(CPU_ARM10) #define cpu_idcache_wbinv_all arm10_idcache_wbinv_all +#elif defined(CPU_ARM11) +#define cpu_idcache_wbinv_all armv6_idcache_wbinv_all #elif defined(CPU_SA110) || defined(CPU_SA1110) || defined(CPU_SA1100) || \ defined(CPU_IXP12X0) #define cpu_idcache_wbinv_all sa1_cache_purgeID ==== //depot/projects/ctsrd/beribsd/src/sys/arm/arm/machdep.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ #include "opt_timer.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.50 2012/08/15 03:03:03 gonzo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.51 2012/08/26 00:53:00 gonzo Exp $"); #include #include @@ -791,7 +791,7 @@ void pcpu0_init(void) { -#if ARM_ARCH_7A || defined(CPU_MV_PJ4B) +#if ARM_ARCH_6 || ARM_ARCH_7A || defined(CPU_MV_PJ4B) set_pcpu(pcpup); #endif pcpu_init(pcpup, 0, sizeof(struct pcpu)); ==== //depot/projects/ctsrd/beribsd/src/sys/arm/conf/AVILA#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.43 2012/06/13 04:40:29 imp Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.44 2012/08/26 01:21:02 gjb Exp $ ident AVILA @@ -119,7 +119,7 @@ device wlan_tkip # 802.11 TKIP support device wlan_xauth -device ath # Atheros NIC's +device ath # Atheros NICs device ath_pci # Atheros pci/cardbus glue options ATH_DEBUG options ATH_DIAGAPI ==== //depot/projects/ctsrd/beribsd/src/sys/arm/conf/AVILA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.9 2010/11/07 20:33:39 thompsa Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.10 2012/08/26 01:21:02 gjb Exp $ # # Device wiring for the Gateworks Avila 2384. @@ -19,7 +19,7 @@ # NPE Hardware Queue Manager hint.ixpqmgr.0.at="ixp0" -# NPE wired NIC's, requires ixpqmgr +# NPE wired NICs, requires ixpqmgr hint.npe.0.at="ixp0" hint.npe.0.npeid="B" hint.npe.0.mac="B" ==== //depot/projects/ctsrd/beribsd/src/sys/arm/conf/CAMBRIA#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.26 2012/06/13 04:40:29 imp Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.27 2012/08/26 01:21:02 gjb Exp $ ident CAMBRIA @@ -122,7 +122,7 @@ device wlan_tkip # 802.11 TKIP support device wlan_xauth -device ath # Atheros NIC's +device ath # Atheros NICs device ath_pci # Atheros pci/cardbus glue options ATH_DEBUG options ATH_DIAGAPI ==== //depot/projects/ctsrd/beribsd/src/sys/arm/conf/CAMBRIA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.11 2010/11/11 20:18:33 thompsa Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.12 2012/08/26 01:21:02 gjb Exp $ # # Device wiring for the Gateworks Cambria 2358. @@ -28,7 +28,7 @@ # NPE Hardware Queue Manager hint.ixpqmgr.0.at="ixp0" -# NPE wired NIC's, requires ixpqmgr +# NPE wired NICs, requires ixpqmgr hint.npe.0.at="ixp0" hint.npe.0.npeid="C" hint.npe.0.mac="C" ==== //depot/projects/ctsrd/beribsd/src/sys/arm/include/cpufunc.h#3 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.20 2012/08/15 03:03:03 gonzo Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.21 2012/08/26 02:23:21 gonzo Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -495,8 +495,15 @@ void pj4b_sleep (int); void armv6_icache_sync_all (void); +void armv6_icache_sync_range (vm_offset_t, vm_size_t); + void armv6_dcache_wbinv_all (void); +void armv6_dcache_wbinv_range (vm_offset_t, vm_size_t); +void armv6_dcache_inv_range (vm_offset_t, vm_size_t); +void armv6_dcache_wb_range (vm_offset_t, vm_size_t); + void armv6_idcache_wbinv_all (void); +void armv6_idcache_wbinv_range (vm_offset_t, vm_size_t); void armv7_setttb (u_int); void armv7_tlb_flushID (void); ==== //depot/projects/ctsrd/beribsd/src/sys/arm/include/intr.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/intr.h,v 1.15 2012/08/15 03:03:03 gonzo Exp $ + * $FreeBSD: src/sys/arm/include/intr.h,v 1.16 2012/08/25 20:13:19 gonzo Exp $ * */ @@ -52,6 +52,8 @@ #define NIRQ 64 #elif defined(CPU_CORTEXA) #define NIRQ 128 +#elif defined(CPU_ARM11) +#define NIRQ 128 #else #define NIRQ 32 #endif ==== //depot/projects/ctsrd/beribsd/src/sys/arm/ti/ti_machdep.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_global.h" #include -__FBSDID("$FreeBSD: src/sys/arm/ti/ti_machdep.c,v 1.1 2012/08/15 06:31:32 gonzo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/ti/ti_machdep.c,v 1.2 2012/08/25 21:13:00 gonzo Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -339,9 +339,6 @@ &memsize) != 0) while(1); -// if (fdt_immr_addr(OMAP44XX_L4_PERIPH_VBASE) != 0) -// while (1); - /* Platform-specific initialisation */ pmap_bootstrap_lastaddr = DEVMAP_BOOTSTRAP_MAP_START - ARM_NOCACHE_KVA_SIZE; @@ -522,7 +519,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - init_proc0(kernelstack.pv_va); + init_proc0(kernelstack.pv_va); arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); arm_dump_avail_init(memsize, sizeof(dump_avail) / sizeof(dump_avail[0])); ==== //depot/projects/ctsrd/beribsd/src/sys/conf/files#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1700 2012/08/25 11:19:20 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1701 2012/08/25 18:08:20 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/ctsrd/beribsd/src/sys/conf/files.arm#3 (text+ko) ==== @@ -1,4 +1,9 @@ -# $FreeBSD: src/sys/conf/files.arm,v 1.31 2012/08/15 03:03:03 gonzo Exp $ +# $FreeBSD: src/sys/conf/files.arm,v 1.32 2012/08/25 23:59:31 gonzo Exp $ +font.h optional sc \ + compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ + no-obj no-implicit-rule before-depend \ + clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" + crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb arm/arm/autoconf.c standard @@ -37,6 +42,7 @@ arm/arm/pl310.c optional pl310 arm/arm/pmap.c optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_sa1100 | cpu_sa1110 | cpu_xscale_80219 | cpu_xscale_80321 | cpu_xscale_81342 | cpu_xscale_ixp425 | cpu_xscale_ixp435 | cpu_xscale_pxa2x0 arm/arm/pmap-v6.c optional cpu_arm11 | cpu_cortexa | cpu_mv_pj4b +arm/arm/sc_machdep.c optional sc arm/arm/setcpsr.S standard arm/arm/setstack.s standard arm/arm/stack_machdep.c optional ddb | stack @@ -53,13 +59,18 @@ arm/fpe-arm/armfpe_init.c optional armfpe arm/fpe-arm/armfpe.S optional armfpe cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs compile-with "${ZFS_C}" +dev/fb/fb.c optional sc dev/hwpmc/hwpmc_arm.c optional hwpmc +dev/kbd/kbd.c optional sc dev/ofw/openfirm.c optional fdt dev/ofw/openfirmio.c optional fdt dev/ofw/ofw_bus_if.m optional fdt dev/ofw/ofw_if.m optional fdt dev/ofw/ofw_bus_subr.c optional fdt dev/ofw/ofw_fdt.c optional fdt +dev/syscons/scgfbrndr.c optional sc +dev/syscons/scterm-teken.c optional sc +dev/syscons/scvtb.c optional sc geom/geom_bsd.c optional geom_bsd geom/geom_bsd_enc.c optional geom_bsd >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 26 10:43:04 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85516106574E; Sun, 26 Aug 2012 10:43:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33F4A106574C for ; Sun, 26 Aug 2012 10:43:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1BAF28FC08 for ; Sun, 26 Aug 2012 10:43:02 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q7QAh1JY041664 for ; Sun, 26 Aug 2012 10:43:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7QAh1ik041661 for perforce@freebsd.org; Sun, 26 Aug 2012 10:43:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 26 Aug 2012 10:43:01 GMT Message-Id: <201208261043.q7QAh1ik041661@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 216526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Aug 2012 10:43:04 -0000 http://p4web.freebsd.org/@@216526?ac=10 Change 216526 by rwatson@rwatson_cinnamon on 2012/08/26 10:41:58 Manually merge downstream some cosmetic changes to BERI_DE4.hints introduced during the upstream merge of these changes to FreeBSD Subversion. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#14 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#14 (text+ko) ==== @@ -2,7 +2,7 @@ # # Altera JTAG UARTs configured for console, debugging, and data putput on the -# DE-4. +# Terasic DE-4. # hint.altera_jtag_uart.0.at="nexus0" hint.altera_jtag_uart.0.maddr=0x7f000000 @@ -51,7 +51,7 @@ hint.terasic_mtl.0.text_msize=0x2000 # -# BERI Hardware Version Rom +# BERI Hardware Version ROM # hint.altera_avgen.0.at="nexus0" hint.altera_avgen.0.maddr=0x7F00A000 From owner-p4-projects@FreeBSD.ORG Sun Aug 26 11:52:05 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFB15106566C; Sun, 26 Aug 2012 11:52:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6BCEC106564A for ; Sun, 26 Aug 2012 11:52:03 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 54B608FC08 for ; Sun, 26 Aug 2012 11:52:03 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q7QBq35I044716 for ; Sun, 26 Aug 2012 11:52:03 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7QBq3SD044713 for perforce@freebsd.org; Sun, 26 Aug 2012 11:52:03 GMT (envelope-from brooks@freebsd.org) Date: Sun, 26 Aug 2012 11:52:03 GMT Message-Id: <201208261152.q7QBq3SD044713@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 216529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Aug 2012 11:52:05 -0000 http://p4web.freebsd.org/@@216529?ac=10 Change 216529 by brooks@brooks_zenith on 2012/08/26 11:51:41 Add a LOCAL_MTREE variable to Makefile.inc1 to allow things built by LOCAL_*_DIRS to install things in directories not in the base hierarchy without resorting to gross hacks. Affected files ... .. //depot/projects/ctsrd/beribsd/src/Makefile.inc1#6 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/Makefile.inc1#6 (text+ko) ==== @@ -388,6 +388,9 @@ mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \ -p ${WORLDTMP}/usr/include >/dev/null .endif +.for _mtree in ${LOCAL_MTREE} + mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null +.endfor _legacy: @echo @echo "--------------------------------------------------------------" @@ -1199,6 +1202,10 @@ # hierarchy hier: cd ${.CURDIR}/etc; ${MAKE} distrib-dirs +.for _mtree in ${LOCAL_MTREE} + mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/${_mtree} \ + -p ${DESTDIR}/ +.endfor # # libraries - build all libraries, and install them under ${DESTDIR}. From owner-p4-projects@FreeBSD.ORG Sun Aug 26 11:53:10 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBF3C106566C; Sun, 26 Aug 2012 11:53:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 82DE5106566B for ; Sun, 26 Aug 2012 11:53:09 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 6CA7C8FC0C for ; Sun, 26 Aug 2012 11:53:09 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q7QBr9Ug044749 for ; Sun, 26 Aug 2012 11:53:09 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7QBr9np044746 for perforce@freebsd.org; Sun, 26 Aug 2012 11:53:09 GMT (envelope-from brooks@freebsd.org) Date: Sun, 26 Aug 2012 11:53:09 GMT Message-Id: <201208261153.q7QBr9np044746@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 216530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Aug 2012 11:53:10 -0000 http://p4web.freebsd.org/@@216530?ac=10 Change 216530 by brooks@brooks_zenith on 2012/08/26 11:52:48 Use LOCAL_MTREE to avoid patching BSD.usr.dist since we are highly unlikely to merge the usr/share/images directory. Affected files ... .. //depot/projects/ctsrd/beribsd/src/ctsrd/ctsrd.mtree#1 add .. //depot/projects/ctsrd/beribsd/src/etc/mtree/BSD.usr.dist#4 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/etc/mtree/BSD.usr.dist#4 (text+ko) ==== @@ -330,8 +330,6 @@ fortune .. .. - images - .. info .. i18n From owner-p4-projects@FreeBSD.ORG Tue Aug 28 16:23:41 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05F5B106566C; Tue, 28 Aug 2012 16:23:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BC598106564A for ; Tue, 28 Aug 2012 16:23:40 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A596B8FC16 for ; Tue, 28 Aug 2012 16:23:40 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q7SGNepa075526 for ; Tue, 28 Aug 2012 16:23:40 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7SGNe2H075523 for perforce@freebsd.org; Tue, 28 Aug 2012 16:23:40 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 28 Aug 2012 16:23:40 GMT Message-Id: <201208281623.q7SGNe2H075523@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 216629 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2012 16:23:41 -0000 http://p4web.freebsd.org/@@216629?ac=10 Change 216629 by lz@gnehzuil-desktop on 2012/08/28 16:23:39 Obsolete htree code should be removed because we will re-implement it accroding to NetBSD's implementation. It brings some bennifits for us. First, the code almost the same between these two OSs. Second, the hash function are in BSD-license, and they are consistent with our other files. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.c#4 delete .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_htree.c#3 delete .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/hash.h#2 delete .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/htree.h#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 28 16:31:22 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75F241065673; Tue, 28 Aug 2012 16:31:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38A2F106564A for ; Tue, 28 Aug 2012 16:31:22 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 21D158FC08 for ; Tue, 28 Aug 2012 16:31:22 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q7SGVLe0076056 for ; Tue, 28 Aug 2012 16:31:21 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7SGVLoP076053 for perforce@freebsd.org; Tue, 28 Aug 2012 16:31:21 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 28 Aug 2012 16:31:21 GMT Message-Id: <201208281631.q7SGVLoP076053@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 216630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2012 16:31:22 -0000 http://p4web.freebsd.org/@@216630?ac=10 Change 216630 by lz@gnehzuil-desktop on 2012/08/28 16:30:45 Some hash functions are defined for htree directory index according to NetBSD's version. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_dinode.h#7 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_extern.h#8 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.c#5 add .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/htree.h#5 add .. //depot/projects/soc2010/extfs/src/sys/modules/ext2fs/Makefile#5 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_dinode.h#7 (text+ko) ==== @@ -72,7 +72,7 @@ #define E2DI_HAS_XTIME(ip) (EXT2_INODE_SIZE((ip)->i_e2fs) > \ E2FS_REV0_INODE_SIZE) -#define EXT2_INDEX 0x00001000 /* Hash-indexed directory */ +#define EXT2_DIR_INDEX 0x00001000 /* Hash-indexed directory */ /* * Structure of an inode on the disk ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_extern.h#8 (text+ko) ==== @@ -82,6 +82,10 @@ int cg_has_sb(int i); int ext2_inactive(struct vop_inactive_args *); +/* ext2_hash.c */ +int ext2_htree_hash(const char *, int, uint32_t *, int, + uint32_t *, uint32_t *); + /* Flags to low-level allocation routines. * The low 16-bits are reserved for IO_ flags from vnode.h. */ ==== //depot/projects/soc2010/extfs/src/sys/modules/ext2fs/Makefile#5 (text+ko) ==== @@ -4,7 +4,7 @@ KMOD= ext2fs SRCS= opt_ddb.h opt_directio.h opt_quota.h opt_suiddir.h vnode_if.h \ ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_hash.c \ - ext2_htree.c ext2_inode.c ext2_inode_cnv.c ext2_lookup.c \ + ext2_inode.c ext2_inode_cnv.c ext2_lookup.c \ ext2_prealloc.c ext2_subr.c ext2_vfsops.c ext2_vnops.c .include From owner-p4-projects@FreeBSD.ORG Tue Aug 28 16:36:52 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 928711065673; Tue, 28 Aug 2012 16:36:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 54586106564A for ; Tue, 28 Aug 2012 16:36:52 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3C1BB8FC18 for ; Tue, 28 Aug 2012 16:36:52 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q7SGaqYI076213 for ; Tue, 28 Aug 2012 16:36:52 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7SGapvg076210 for perforce@freebsd.org; Tue, 28 Aug 2012 16:36:51 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 28 Aug 2012 16:36:51 GMT Message-Id: <201208281636.q7SGapvg076210@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 216632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2012 16:36:52 -0000 http://p4web.freebsd.org/@@216632?ac=10 Change 216632 by lz@gnehzuil-desktop on 2012/08/28 16:36:39 In ext2_lookup we firstly try to find a dir entry. If it fails, it will fall back to linear search. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_dir.h#3 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_extern.h#9 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_htree.c#4 add .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_inode_cnv.c#3 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_lookup.c#7 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/htree.h#6 edit .. //depot/projects/soc2010/extfs/src/sys/modules/ext2fs/Makefile#6 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_dir.h#3 (text+ko) ==== @@ -53,6 +53,17 @@ uint8_t e2d_type; /* file type */ char e2d_name[EXT2FS_MAXNAMLEN];/* name with length<=EXT2FS_MAXNAMLEN */ }; + +enum slotstatus {NONE, COMPACT, FOUND}; + +struct ext2fs_searchslot { + enum slotstatus slotstatus; + doff_t slotoffset; /* offset of area with free space */ + int slotsize; /* size of area at slotoffset */ + int slotfreespace; /* amount of space free in slot */ + int slotneeded; /* size of the entry we 're seeking */ +}; + /* * Ext2 directory file types. Only the low 3 bits are used. The * other bits are reserved for now. ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_extern.h#9 (text+ko) ==== @@ -40,6 +40,7 @@ #define _FS_EXT2FS_EXT2_EXTERN_H_ struct ext2fs_dinode; +struct ext2fs_searchslot; struct indir; struct inode; struct mount; @@ -86,6 +87,16 @@ int ext2_htree_hash(const char *, int, uint32_t *, int, uint32_t *, uint32_t *); +/* ext2_htree.c */ +int ext2_htree_has_idx(struct inode *); +int ext2_htree_lookup(struct inode *, const char *, int, struct buf **, + int *, doff_t *, doff_t *, doff_t *, struct ext2fs_searchslot *); + +/* ext2_lookup.c */ +int ext2_search_dirblock(struct inode *, void *, int *, const char *, + int, int *, doff_t *, doff_t *, doff_t *, + struct ext2fs_searchslot *); + /* Flags to low-level allocation routines. * The low 16-bits are reserved for IO_ flags from vnode.h. */ ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_inode_cnv.c#3 (text+ko) ==== @@ -93,7 +93,7 @@ ip->i_birthtime = ei->e2di_crtime; ip->i_birthnsec = XTIME_TO_NSEC(ei->e2di_crtime_extra); } - ip->i_flags = 0; + ip->i_flags = ei->e2di_flags; ip->i_flags |= (ei->e2di_flags & EXT2_APPEND) ? SF_APPEND : 0; ip->i_flags |= (ei->e2di_flags & EXT2_IMMUTABLE) ? SF_IMMUTABLE : 0; ip->i_flags |= (ei->e2di_flags & EXT2_NODUMP) ? UF_NODUMP : 0; @@ -139,7 +139,6 @@ ei->e2di_crtime_extra = NSEC_TO_XTIME(ip->i_birthnsec); } ei->e2di_flags = ip->i_flags; - ei->e2di_flags = 0; ei->e2di_flags |= (ip->i_flags & SF_APPEND) ? EXT2_APPEND: 0; ei->e2di_flags |= (ip->i_flags & SF_IMMUTABLE) ? EXT2_IMMUTABLE: 0; ei->e2di_flags |= (ip->i_flags & UF_NODUMP) ? EXT2_NODUMP: 0; ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_lookup.c#7 (text+ko) ==== @@ -115,9 +115,19 @@ static int ext2_dirbadentry(struct vnode *dp, struct ext2fs_direct_2 *de, int entryoffsetinblock); +static int ext2_is_dot_entry(struct componentname *cnp); static int ext2_lookup_ino(struct vnode *vdp, struct vnode **vpp, struct componentname *cnp, ino_t *dd_ino); +static int +ext2_is_dot_entry(struct componentname *cnp) +{ + if (cnp->cn_namelen <= 2 && cnp->cn_nameptr[0] == '.' && + (cnp->cn_nameptr[1] == '.' || cnp->cn_nameptr[1] == '0')) + return (1); + return (0); +} + /* * Vnode op for reading directories. * @@ -299,13 +309,9 @@ struct buf *bp; /* a buffer of directory entries */ struct ext2fs_direct_2 *ep; /* the current directory entry */ int entryoffsetinblock; /* offset of ep in bp's buffer */ - enum {NONE, COMPACT, FOUND} slotstatus; - doff_t slotoffset; /* offset of area with free space */ - int slotsize; /* size of area at slotoffset */ + struct ext2fs_searchslot ss; doff_t i_diroff; /* cached i_diroff value */ doff_t i_offset; /* cached i_offset value */ - int slotfreespace; /* amount of space free in slot */ - int slotneeded; /* size of the entry we're seeking */ int numdirpasses; /* strategy for directory search */ doff_t endsearch; /* offset to end directory search */ doff_t prevoff; /* prev entry dp->i_offset */ @@ -313,12 +319,13 @@ struct vnode *tdp; /* returned by VFS_VGET */ doff_t enduseful; /* pointer past last used dir slot */ u_long bmask; /* block offset mask */ - int namlen, error; + int error; struct ucred *cred = cnp->cn_cred; int flags = cnp->cn_flags; int nameiop = cnp->cn_nameiop; ino_t ino, ino1; int ltype; + int entry_found = 0; int DIRBLKSIZ = VTOI(vdp)->i_e2fs->e2fs_bsize; @@ -329,13 +336,11 @@ bmask = VFSTOEXT2(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1; restart: bp = NULL; - slotoffset = -1; + ss.slotoffset = -1; /* * We now have a segment name to search for, and a directory to search. - */ - - /* + * * Suppress search for slots unless creating * file and at end of pathname, in which case * we watch for a place to put the new file in @@ -343,18 +348,45 @@ */ ino = 0; i_diroff = dp->i_diroff; - slotstatus = FOUND; - slotfreespace = slotsize = slotneeded = 0; + ss.slotstatus = FOUND; + ss.slotfreespace = ss.slotsize = ss.slotneeded = 0; if ((nameiop == CREATE || nameiop == RENAME) && (flags & ISLASTCN)) { - slotstatus = NONE; - slotneeded = EXT2_DIR_REC_LEN(cnp->cn_namelen); + ss.slotstatus = NONE; + ss.slotneeded = EXT2_DIR_REC_LEN(cnp->cn_namelen); /* was - slotneeded = (sizeof(struct direct) - MAXNAMLEN + + ss.slotneeded = (sizeof(struct direct) - MAXNAMLEN + cnp->cn_namelen + 3) &~ 3; */ } /* + * Try to lookup dir entry using HTree directory index. + * If we got an error or we want to find '.' and '..' entry, + * We will fall back to linear search. + */ + if (!ext2_is_dot_entry(cnp) && ext2_htree_has_idx(dp)) { + numdirpasses = 1; + entryoffsetinblock = 0; + switch (ext2_htree_lookup(dp, cnp->cn_nameptr, cnp->cn_namelen, + &bp, &entryoffsetinblock, &i_offset, &prevoff, + &enduseful, &ss)) { + case 0: + ep = (struct ext2fs_direct_2 *)((char *)bp->b_data + + (i_offset & bmask)); + goto foundentry; + case ENOENT: + i_offset = roundup2(dp->i_size, DIRBLKSIZ); + goto notfound; + default: + /* + * Something failed; just fall back to do a linear + * search. + */ + break; + } + } + + /* * If there is cached information on a previous search of * this directory, pick up where we last left off. * We cache only lookups as these are the most common @@ -388,96 +420,37 @@ /* * If necessary, get the next directory block. */ - if ((i_offset & bmask) == 0) { - if (bp != NULL) - brelse(bp); - if ((error = - ext2_blkatoff(vdp, (off_t)i_offset, NULL, - &bp)) != 0) - return (error); - entryoffsetinblock = 0; - } + if (bp != NULL) + brelse(bp); + error = ext2_blkatoff(vdp, (off_t)i_offset, NULL, &bp); + if (error != 0) + return (error); + entryoffsetinblock = 0; /* * If still looking for a slot, and at a DIRBLKSIZE * boundary, have to start looking for free space again. */ - if (slotstatus == NONE && + if (ss.slotstatus == NONE && (entryoffsetinblock & (DIRBLKSIZ - 1)) == 0) { - slotoffset = -1; - slotfreespace = 0; + ss.slotoffset = -1; + ss.slotfreespace = 0; } - /* - * Get pointer to next entry. - * Full validation checks are slow, so we only check - * enough to insure forward progress through the - * directory. Complete checks can be run by setting - * "vfs.e2fs.dirchk" to be true. - */ - ep = (struct ext2fs_direct_2 *) - ((char *)bp->b_data + entryoffsetinblock); - if (ep->e2d_reclen == 0 || - (dirchk && ext2_dirbadentry(vdp, ep, entryoffsetinblock))) { - int i; - ext2_dirbad(dp, i_offset, "mangled entry"); - i = DIRBLKSIZ - (entryoffsetinblock & (DIRBLKSIZ - 1)); - i_offset += i; - entryoffsetinblock += i; - continue; + error = ext2_search_dirblock(dp, bp->b_data, &entry_found, + cnp->cn_nameptr, cnp->cn_namelen, + &entryoffsetinblock, &i_offset, &prevoff, &enduseful, &ss); + if (error != 0) { + brelse(bp); + return (error); } - - /* - * If an appropriate sized slot has not yet been found, - * check to see if one is available. Also accumulate space - * in the current block so that we can determine if - * compaction is viable. - */ - if (slotstatus != FOUND) { - int size = ep->e2d_reclen; - - if (ep->e2d_ino != 0) - size -= EXT2_DIR_REC_LEN(ep->e2d_namlen); - if (size > 0) { - if (size >= slotneeded) { - slotstatus = FOUND; - slotoffset = i_offset; - slotsize = ep->e2d_reclen; - } else if (slotstatus == NONE) { - slotfreespace += size; - if (slotoffset == -1) - slotoffset = i_offset; - if (slotfreespace >= slotneeded) { - slotstatus = COMPACT; - slotsize = i_offset + - ep->e2d_reclen - slotoffset; - } - } - } - } - - /* - * Check for a name match. - */ - if (ep->e2d_ino) { - namlen = ep->e2d_namlen; - if (namlen == cnp->cn_namelen && - !bcmp(cnp->cn_nameptr, ep->e2d_name, - (unsigned)namlen)) { - /* - * Save directory entry's inode number and - * reclen in ndp->ni_ufs area, and release - * directory buffer. - */ - ino = ep->e2d_ino; - goto found; - } + if (entry_found) { + ep = (struct ext2fs_direct_2 *)((char *)bp->b_data + + (entryoffsetinblock & bmask)); +foundentry: + ino = ep->e2d_ino; + goto found; } - prevoff = i_offset; - i_offset += ep->e2d_reclen; - entryoffsetinblock += ep->e2d_reclen; - if (ep->e2d_ino) - enduseful = i_offset; } -/* notfound: */ +notfound: /* * If we started in the middle of the directory and failed * to find our target, we must check the beginning as well. @@ -513,15 +486,15 @@ * can be put in the range from dp->i_offset to * dp->i_offset + dp->i_count. */ - if (slotstatus == NONE) { + if (ss.slotstatus == NONE) { dp->i_offset = roundup2(dp->i_size, DIRBLKSIZ); dp->i_count = 0; enduseful = dp->i_offset; } else { - dp->i_offset = slotoffset; - dp->i_count = slotsize; - if (enduseful < slotoffset + slotsize) - enduseful = slotoffset + slotsize; + dp->i_offset = ss.slotoffset; + dp->i_count = ss.slotsize; + if (enduseful < ss.slotoffset + ss.slotsize) + enduseful = ss.slotoffset + ss.slotsize; } dp->i_endoff = roundup2(enduseful, DIRBLKSIZ); dp->i_flag |= IN_CHANGE | IN_UPDATE; @@ -723,6 +696,103 @@ return (0); } +int +ext2_search_dirblock(struct inode *ip, void *data, int *foundp, + const char *name, int namelen, + int *entryoffsetinblockp, doff_t *offp, + doff_t *prevoffp,doff_t *endusefulp, + struct ext2fs_searchslot *ssp) +{ + struct vnode *vdp; + struct ext2fs_direct_2 *ep, *top; + uint32_t bsize = ip->i_e2fs->e2fs_bsize; + int offset = *entryoffsetinblockp; + int namlen; + + vdp = ITOV(ip); + + ep = (struct ext2fs_direct_2 *)((char *)data + offset); + top = (struct ext2fs_direct_2 *)((char *)data + + bsize - EXT2_DIR_REC_LEN(0)); + + while (ep < top) { + /* + * Full validation checks are slow, so we only check + * enough to insure forward progress through the + * directory. Complete checks can be run by setting + * "vfs.e2fs.dirchk" to be true. + */ + if (ep->e2d_reclen == 0 || + (dirchk && ext2_dirbadentry(vdp, ep, offset))) { + int i; + ext2_dirbad(ip, *offp, "mangled entry"); + i = bsize - (offset & (bsize - 1)); + *offp += i; + offset += i; + continue; + } + + /* + * If an appropriate sized slot has not yet been found, + * check to see if one is available. Also accumulate space + * in the current block so that we can determine if + * compaction is viable. + */ + if (ssp->slotstatus != FOUND) { + int size = ep->e2d_reclen; + + if (ep->e2d_ino != 0) + size -= EXT2_DIR_REC_LEN(ep->e2d_namlen); + if (size > 0) { + if (size >= ssp->slotneeded) { + ssp->slotstatus = FOUND; + ssp->slotoffset = *offp; + ssp->slotsize = ep->e2d_reclen; + } else if (ssp->slotstatus == NONE) { + ssp->slotfreespace += size; + if (ssp->slotoffset == -1) + ssp->slotoffset = *offp; + if (ssp->slotfreespace >= ssp->slotneeded) { + ssp->slotstatus = COMPACT; + ssp->slotsize = *offp + + ep->e2d_reclen - + ssp->slotoffset; + } + } + } + } + + /* + * Check for a name match. + */ + if (ep->e2d_ino) { + namlen = ep->e2d_namlen; + if (namlen == namelen && + !bcmp(name, ep->e2d_name, (unsigned)namlen)) { + /* + * Save directory entry's inode number and + * reclen in ndp->ni_ufs area, and release + * directory buffer. + */ + *foundp = 1; + return (0); + } + } + *prevoffp = *offp; + *offp += ep->e2d_reclen; + offset += ep->e2d_reclen; + *entryoffsetinblockp = offset; + if (ep->e2d_ino) + *endusefulp = *offp; + /* + * Get pointer to the next entry. + */ + ep = (struct ext2fs_direct_2 *)((char *)data + offset); + } + + return (0); +} + void ext2_dirbad(ip, offset, how) struct inode *ip; ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/htree.h#6 (text+ko) ==== @@ -40,4 +40,54 @@ #define EXT2_HTREE_EOF 0x7FFFFFFF +struct ext2fs_fake_direct { + uint32_t e2d_ino; /* inode number of entry */ + uint16_t e2d_reclen; /* length of this record */ + uint8_t e2d_namlen; /* length of string in d_name */ + uint8_t e2d_type; /* file type */ +}; + +struct ext2fs_htree_count { + uint16_t h_entries_max; + uint16_t h_entries_num; +}; + +struct ext2fs_htree_entry { + uint32_t h_hash; + uint32_t h_blk; +}; + +struct ext2fs_htree_root_info { + uint32_t h_reserved1; + uint8_t h_hash_version; + uint8_t h_info_len; + uint8_t h_ind_levels; + uint8_t h_reserved2; +}; + +struct ext2fs_htree_root { + struct ext2fs_fake_direct h_dot; + char h_dot_name[4]; + struct ext2fs_fake_direct h_dotdot; + char h_dotdot_name[4]; + struct ext2fs_htree_root_info h_info; + struct ext2fs_htree_entry h_entries[0]; +}; + +struct ext2fs_htree_node { + struct ext2fs_fake_direct h_fake_dirent; + struct ext2fs_htree_entry h_entries[0]; +}; + +struct ext2fs_htree_lookup_level { + struct buf *h_bp; + struct ext2fs_htree_entry *h_entries; + struct ext2fs_htree_entry *h_entry; +}; + +struct ext2fs_htree_lookup_info { + struct ext2fs_htree_lookup_level h_levels[2]; + uint32_t h_levels_num; +}; + #endif /* !_FS_EXT2FS_HTREE_H_ */ ==== //depot/projects/soc2010/extfs/src/sys/modules/ext2fs/Makefile#6 (text+ko) ==== @@ -4,7 +4,7 @@ KMOD= ext2fs SRCS= opt_ddb.h opt_directio.h opt_quota.h opt_suiddir.h vnode_if.h \ ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_hash.c \ - ext2_inode.c ext2_inode_cnv.c ext2_lookup.c \ + ext2_htree.c ext2_inode.c ext2_inode_cnv.c ext2_lookup.c \ ext2_prealloc.c ext2_subr.c ext2_vfsops.c ext2_vnops.c .include From owner-p4-projects@FreeBSD.ORG Fri Aug 31 21:24:30 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BF08106566C; Fri, 31 Aug 2012 21:24:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7020106566B for ; Fri, 31 Aug 2012 21:24:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 9FDE48FC14 for ; Fri, 31 Aug 2012 21:24:28 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q7VLOS1Z077277 for ; Fri, 31 Aug 2012 21:24:28 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7VLOSZw077274 for perforce@freebsd.org; Fri, 31 Aug 2012 21:24:28 GMT (envelope-from jhb@freebsd.org) Date: Fri, 31 Aug 2012 21:24:28 GMT Message-Id: <201208312124.q7VLOSZw077274@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 216792 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Aug 2012 21:24:30 -0000 http://p4web.freebsd.org/@@216792?ac=10 Change 216792 by jhb@jhb_jhbbsd on 2012/08/31 21:23:41 Fix mismerges. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#27 edit .. //depot/projects/smpng/sys/i386/isa/npx.c#77 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#27 (text+ko) ==== @@ -115,7 +115,6 @@ #define start_emulating() load_cr0(rcr0() | CR0_TS) #define stop_emulating() clts() - CTASSERT(sizeof(struct savefpu) == 512); CTASSERT(sizeof(struct xstate_hdr) == 64); CTASSERT(sizeof(struct savefpu_ymm) == 832); ==== //depot/projects/smpng/sys/i386/isa/npx.c#77 (text+ko) ==== @@ -100,6 +100,7 @@ #define fxrstor(addr) __asm __volatile("fxrstor %0" : : "m" (*(addr))) #define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr))) #define stmxcsr(addr) __asm __volatile("stmxcsr %0" : : "m" (*(addr))) +#endif #else /* !(__GNUCLIKE_ASM && !lint) */ void fldcw(u_short cw);