From owner-svn-src-projects@FreeBSD.ORG Thu Feb 26 07:51:45 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A270E949; Thu, 26 Feb 2015 07:51:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8C9ADAA8; Thu, 26 Feb 2015 07:51:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1Q7pj4u037298; Thu, 26 Feb 2015 07:51:45 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1Q7phql037292; Thu, 26 Feb 2015 07:51:43 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502260751.t1Q7phql037292@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 26 Feb 2015 07:51:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r279313 - in projects/clang360-import: contrib/libcxxrt sys/arm/arm sys/arm/ti sys/arm/ti/am335x sys/arm/ti/omap4 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Feb 2015 07:51:45 -0000 Author: dim Date: Thu Feb 26 07:51:43 2015 New Revision: 279313 URL: https://svnweb.freebsd.org/changeset/base/279313 Log: Merge ^/head r279309 through r279312. Modified: projects/clang360-import/contrib/libcxxrt/unwind-arm.h projects/clang360-import/sys/arm/arm/disassem.c projects/clang360-import/sys/arm/ti/am335x/am335x_rtc.c projects/clang360-import/sys/arm/ti/am335x/am335x_scm_padconf.c projects/clang360-import/sys/arm/ti/omap4/omap4_scm_padconf.c projects/clang360-import/sys/arm/ti/ti_scm.h Directory Properties: projects/clang360-import/ (props changed) projects/clang360-import/contrib/libcxxrt/ (props changed) projects/clang360-import/sys/ (props changed) Modified: projects/clang360-import/contrib/libcxxrt/unwind-arm.h ============================================================================== --- projects/clang360-import/contrib/libcxxrt/unwind-arm.h Thu Feb 26 07:47:35 2015 (r279312) +++ projects/clang360-import/contrib/libcxxrt/unwind-arm.h Thu Feb 26 07:51:43 2015 (r279313) @@ -36,6 +36,8 @@ _URC_FATAL_PHASE1_ERROR = _URC_FAILURE } _Unwind_Reason_Code; +typedef int _Unwind_Action; + typedef uint32_t _Unwind_State; #ifdef __clang__ static const _Unwind_State _US_VIRTUAL_UNWIND_FRAME = 0; Modified: projects/clang360-import/sys/arm/arm/disassem.c ============================================================================== --- projects/clang360-import/sys/arm/arm/disassem.c Thu Feb 26 07:47:35 2015 (r279312) +++ projects/clang360-import/sys/arm/arm/disassem.c Thu Feb 26 07:51:43 2015 (r279313) @@ -289,7 +289,7 @@ static void disassemble_printaddr(u_int vm_offset_t disasm(const disasm_interface_t *di, vm_offset_t loc, int altfmt) { - struct arm32_insn *i_ptr = (struct arm32_insn *)&arm32_i; + const struct arm32_insn *i_ptr = arm32_i; u_int insn; int matchp; Modified: projects/clang360-import/sys/arm/ti/am335x/am335x_rtc.c ============================================================================== --- projects/clang360-import/sys/arm/ti/am335x/am335x_rtc.c Thu Feb 26 07:47:35 2015 (r279312) +++ projects/clang360-import/sys/arm/ti/am335x/am335x_rtc.c Thu Feb 26 07:51:43 2015 (r279313) @@ -137,7 +137,7 @@ am335x_rtc_detach(device_t dev) struct am335x_rtc_softc *sc; sc = device_get_softc(dev); - if (sc->sc_irq_res) + if (sc->sc_irq_res[0] != NULL) bus_release_resources(dev, am335x_rtc_irq_spec, sc->sc_irq_res); if (sc->sc_mem_res) bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res); Modified: projects/clang360-import/sys/arm/ti/am335x/am335x_scm_padconf.c ============================================================================== --- projects/clang360-import/sys/arm/ti/am335x/am335x_scm_padconf.c Thu Feb 26 07:47:35 2015 (r279312) +++ projects/clang360-import/sys/arm/ti/am335x/am335x_scm_padconf.c Thu Feb 26 07:51:43 2015 (r279313) @@ -298,6 +298,6 @@ const static struct ti_scm_padconf ti_pa const struct ti_scm_device ti_scm_dev = { .padconf_muxmode_mask = 0x7, .padconf_sate_mask = 0x78, - .padstate = (struct ti_scm_padstate *) &ti_padstate_devmap, - .padconf = (struct ti_scm_padconf *) &ti_padconf_devmap, + .padstate = ti_padstate_devmap, + .padconf = ti_padconf_devmap, }; Modified: projects/clang360-import/sys/arm/ti/omap4/omap4_scm_padconf.c ============================================================================== --- projects/clang360-import/sys/arm/ti/omap4/omap4_scm_padconf.c Thu Feb 26 07:47:35 2015 (r279312) +++ projects/clang360-import/sys/arm/ti/omap4/omap4_scm_padconf.c Thu Feb 26 07:51:43 2015 (r279313) @@ -298,6 +298,6 @@ const static struct ti_scm_padconf ti_pa const struct ti_scm_device ti_scm_dev = { .padconf_muxmode_mask = CONTROL_PADCONF_MUXMODE_MASK, .padconf_sate_mask = CONTROL_PADCONF_SATE_MASK, - .padstate = (struct ti_scm_padstate *) &ti_padstate_devmap, - .padconf = (struct ti_scm_padconf *) &ti_padconf_devmap, + .padstate = ti_padstate_devmap, + .padconf = ti_padconf_devmap, }; Modified: projects/clang360-import/sys/arm/ti/ti_scm.h ============================================================================== --- projects/clang360-import/sys/arm/ti/ti_scm.h Thu Feb 26 07:47:35 2015 (r279312) +++ projects/clang360-import/sys/arm/ti/ti_scm.h Thu Feb 26 07:51:43 2015 (r279313) @@ -59,8 +59,8 @@ struct ti_scm_padstate { struct ti_scm_device { uint16_t padconf_muxmode_mask; uint16_t padconf_sate_mask; - struct ti_scm_padstate *padstate; - struct ti_scm_padconf *padconf; + const struct ti_scm_padstate *padstate; + const struct ti_scm_padconf *padconf; }; struct ti_scm_softc {