From patchwork Wed Oct 21 07:23:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1385402 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CGMSv2qFXz9sPB for ; Wed, 21 Oct 2020 18:24:47 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 95542397243B; Wed, 21 Oct 2020 07:23:44 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTP id 0BF6F3971C48 for ; Wed, 21 Oct 2020 07:23:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0BF6F3971C48 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=derodat@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 6F36411651B; Wed, 21 Oct 2020 03:23:34 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id yUctwvJBtbpd; Wed, 21 Oct 2020 03:23:34 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) by rock.gnat.com (Postfix) with ESMTP id 5E21E1164F3; Wed, 21 Oct 2020 03:23:34 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 59FB1F8; Wed, 21 Oct 2020 03:23:34 -0400 (EDT) Date: Wed, 21 Oct 2020 03:23:34 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Fix bootstrap with old GCC Message-ID: <20201021072334.GA73683@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dmitriy Anisimkov Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Some gcc versions (4 or less) support the __builtin_*_overflow routines while corresponding g++ compilers do not. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * adaint.c (__gnat_file_time): Use regular arithmetic instead of __builtin_*_overflow routines if GCC version 4 or less and compiler is g++. diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -1503,6 +1503,9 @@ extern long long __gnat_file_time(char* name) t_write.ft_time = fad.ftLastWriteTime; +#if defined(__GNUG__) && __GNUG__ <= 4 + result = (t_write.ll_time - w32_epoch_offset) * 100; +#else /* Next code similar to (t_write.ll_time - w32_epoch_offset) * 100 but on overflow returns LLONG_MIN value. */ @@ -1513,6 +1516,7 @@ extern long long __gnat_file_time(char* name) if (__builtin_smulll_overflow(result, 100, &result)) { return LLONG_MIN; } +#endif #else @@ -1521,6 +1525,12 @@ extern long long __gnat_file_time(char* name) return LLONG_MIN; } +#if defined(__GNUG__) && __GNUG__ <= 4 + result = (sb.st_mtime - ada_epoch_offset) * 1E9; +#if defined(st_mtime) + result += sb.st_mtim.tv_nsec; +#endif +#else /* Next code similar to (sb.st_mtime - ada_epoch_offset) * 1E9 + sb.st_mtim.tv_nsec but on overflow returns LLONG_MIN value. */ @@ -1538,7 +1548,7 @@ extern long long __gnat_file_time(char* name) return LLONG_MIN; } #endif - +#endif #endif return result; }