From patchwork Tue Apr 19 12:56:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Huber X-Patchwork-Id: 612116 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qq4lw74jBz9t8y for ; Tue, 19 Apr 2016 22:56:59 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=P30ZQRfN; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; q=dns; s=default; b=vhxjTNNDpAlA MELC8YEJ0Z0DrNgW9oIEm7A1YqpN5aS3wzruDryrv4YYoLIm6T/F37+kYf3uJDTL 5SV9zHmjeA8fJenRTTxLeg+iVNyyS+f04ahb4z8dHeqMqj+X86Cq3hym7zkVF41q XhwO04k2BYmo1pmwAODnLuw5BoQA/UA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; s=default; bh=DxpLZDbVLMkN1OB612 V2VkEKnfc=; b=P30ZQRfNovU2L6N7kd4f7g9vZe0Lcx8BgMuPfivXSvmFd3FmyF 1/0VihPkzIqUXUmiI87ZJghXyKH+kzXWhpOwfzlfgFb1DQI+G9j/oqkbot7vrvge gdqJNsJY3H7S5LPRYgTVt/JoAq59EBdcjGG0US/1JVNbIWOvBCP8uIA6c= Received: (qmail 53650 invoked by alias); 19 Apr 2016 12:56:49 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 53635 invoked by uid 89); 19 Apr 2016 12:56:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:5208, opportunity X-HELO: mail.embedded-brains.de Received: from mail.embedded-brains.de (HELO mail.embedded-brains.de) (82.135.62.35) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 19 Apr 2016 12:56:38 +0000 Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id EBC392A1858; Tue, 19 Apr 2016 14:57:00 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id AJLZN-gxNDq1; Tue, 19 Apr 2016 14:56:58 +0200 (CEST) Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 77CAF2A183C; Tue, 19 Apr 2016 14:56:58 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id M2PsLZBBGrrY; Tue, 19 Apr 2016 14:56:58 +0200 (CEST) Received: from huber-linux.eb.localhost (unknown [192.168.96.129]) by mail.embedded-brains.de (Postfix) with ESMTP id 5261C2A1835; Tue, 19 Apr 2016 14:56:58 +0200 (CEST) From: Sebastian Huber To: gcc-patches@gcc.gnu.org Cc: devel@rtems.org, Sebastian Huber Subject: [PATCH v2] [libatomic] Add RTEMS support Date: Tue, 19 Apr 2016 14:56:30 +0200 Message-Id: <1461070590-12172-1-git-send-email-sebastian.huber@embedded-brains.de> X-IsSubscribed: yes v2: Do not use architecture configuration due to broken ARM libatomic support. gcc/ * config/rtems.h (LIB_SPEC): Add -latomic. libatomic/ * configure.tgt (*-*-rtems*): New supported target. * config/rtems/host-config.h: New file. * config/rtems/lock.c: Likewise. --- gcc/config/rtems.h | 2 +- libatomic/config/rtems/host-config.h | 41 ++++++++++++++++++++++++++++++++++++ libatomic/config/rtems/lock.c | 37 ++++++++++++++++++++++++++++++++ libatomic/configure.tgt | 10 +++++++++ 4 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 libatomic/config/rtems/host-config.h create mode 100644 libatomic/config/rtems/lock.c diff --git a/gcc/config/rtems.h b/gcc/config/rtems.h index f13f72f..e005547 100644 --- a/gcc/config/rtems.h +++ b/gcc/config/rtems.h @@ -45,6 +45,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define LIB_SPEC "%{!qrtems: " STD_LIB_SPEC "} " \ "%{!nostdlib: %{qrtems: --start-group \ -lrtemsbsp -lrtemscpu \ - -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}}" + -latomic -lc -lgcc --end-group %{!qnolinkcmds: -T linkcmds%s}}}" #define TARGET_POSIX_IO diff --git a/libatomic/config/rtems/host-config.h b/libatomic/config/rtems/host-config.h new file mode 100644 index 0000000..d11e9ef --- /dev/null +++ b/libatomic/config/rtems/host-config.h @@ -0,0 +1,41 @@ +/* Copyright (C) 2016 Free Software Foundation, Inc. + Contributed by Sebastian Huber . + + This file is part of the GNU Atomic Library (libatomic). + + Libatomic is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + Libatomic is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + +/* Included after all more target-specific host-config.h. */ + +#include + +static inline UWORD +protect_start (void *ptr) +{ + return _Libatomic_Protect_start (ptr); +} + +static inline void +protect_end (void *ptr, UWORD isr_level) +{ + _Libatomic_Protect_end (ptr, isr_level); +} + +#include_next diff --git a/libatomic/config/rtems/lock.c b/libatomic/config/rtems/lock.c new file mode 100644 index 0000000..f999f9b --- /dev/null +++ b/libatomic/config/rtems/lock.c @@ -0,0 +1,37 @@ +/* Copyright (C) 2016 Free Software Foundation, Inc. + Contributed by Sebastian Huber . + + This file is part of the GNU Atomic Library (libatomic). + + Libatomic is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + Libatomic is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + +#include "libatomic_i.h" + +void +libat_lock_n (void *ptr, size_t n) +{ + _Libatomic_Lock_n (ptr, n); +} + +void +libat_unlock_n (void *ptr, size_t n) +{ + _Libatomic_Unlock_n (ptr, n); +} diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt index c5470d7..eab2765 100644 --- a/libatomic/configure.tgt +++ b/libatomic/configure.tgt @@ -26,6 +26,10 @@ # Map the target cpu to an ARCH sub-directory. At the same time, # work out any special compilation flags as necessary. +# Give operating systems the opportunity to discard XCFLAGS modifications based +# on ${target_cpu}. For example to allow proper use of multilibs. +configure_tgt_pre_target_cpu_XCFLAGS="${XCFLAGS}" + case "${target_cpu}" in alpha*) # fenv.c needs this option to generate inexact exceptions. @@ -128,6 +132,12 @@ case "${target}" in ;; esac ;; + + *-*-rtems*) + XCFLAGS="${configure_tgt_pre_target_cpu_XCFLAGS}" + config_path="rtems" + ;; + *-*-elf*) # ??? No target OS. We could be targeting bare-metal kernel-mode, # or user-mode for some custom OS. If the target supports TAS,