From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by sourceware.org (Postfix) with ESMTPS id AE65F3858D1E; Mon, 6 May 2024 15:22:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AE65F3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AE65F3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::62a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715008953; cv=none; b=VVNWBtToFkJflo8IOjJSSc6Kh+vgpfLs50r+fuEJNuVJXiai5xhwgdNnJNBqtgzjO1VMcqJPTgl0+sQcRvts0xy0UiqpYGj2jqtB3G4qoXrflOEb+EqnRkprkqN9uk72X6x/sLrY1bDDGPpCuUwCPzvs6z+MGPXXQvQVx405ojo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715008953; c=relaxed/simple; bh=f+jLwOls8j7XMHhbun0uNZk8YYkr38kaceN6NbgEjJo=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=FAd/6XrWD1I5nCkC6fAhw80TiPsmCKyD9WE4JuyiGhiRPQZahzSprSyDKjmHhbaTjtaZ131gf2hmFkiCnbVF95WBN5aq3Y8KhJdDlQI05Z2SPE+9XjOWAh8VfQfGa9dT/7wyHXPDVYxStFSGfVmpnUUs/Gy03bcxDX50DIemzIM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a59cdd185b9so167288766b.1; Mon, 06 May 2024 08:22:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715008947; x=1715613747; darn=gcc.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=rct3HiWg1gYIATdU1BJMh/a3E7IO93V+3Bvdi2/E/Ho=; b=JCtkXhD+w4iugdBVeCSLLtVaRiy+1ijFSpmO6ol/XK4cwtfu85cRlf5BJnZBxXHVim FxTi48vUzJM6SpIERxEW4YvP2oIEeMEaAEcj0a3+OcNYrdfXicUOCtBG2VbHrJxlemcj 8jnniKxZMkvA6ynJ7cwJVur8xUKFrrgSwgB38PT746QgtnPpadl3qscsZGeQCTSL+xs+ H8OX3vtHEyhjJUxHEDDW1A1pWEVHVyu9njEwmxF3uG2qkuQ/yN+asCx1A3eLE9FiUTK4 RASRc0uUZyVu01QHLQ6jzD0VVZtPDkz9OkHr6wAwHTfnKVfMRk8+LT0ENRHJ98wC03Fw +tkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715008947; x=1715613747; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=rct3HiWg1gYIATdU1BJMh/a3E7IO93V+3Bvdi2/E/Ho=; b=HT302p5DRXZnPnbo3dKigQHHwZMtJ4EHuxUyNqNpdi4ql1/k9FO1Yz4tgcOPkGGxc2 qjCS59sgReGqxu/bITH2zRpFR3AvJIb+KgRs65lY+DsTvUpRtOiGNAqDc9Ej7p+/+Fkc Dzo51dtxqxT/IbBFfbkLe+r2ouPmD+W7eMGgj2MHbwtMAs+t4lmErnTZHUg94vgPrSiU x8aN3fzM7nTKRP/VPIByL0gg7xLuZnNLu4eNtPgJTkgSFnDAL+WMutXPBJittGbOajIe pjiSAQkqcyvxd+BHRSDfyKCyJwtc7sLQkIun8s4AHd6L9A5lvhP51+1hhC0MHL6/tqlr vBSA== X-Forwarded-Encrypted: i=1; AJvYcCXgBwh+KvZTuHI2bQAtzcJjwoZkPyU1dTqdmnQBWs3PK/i4u3G+Q71j4jD3C+BgznhF7XjuycvzNMV40YR3NkI1fT4XzIO0Yy2gLj/xah79bx+Wa21V0exEuxRgjA== X-Gm-Message-State: AOJu0Yxn+6UjA5A2vkwGxOOIRsduWYn+5boxnoWQSjUt6p/EozskpBps kmBlCqCw5arvqwdDrF4mvDxLpVsuz/WGE8pCXFKl1fYnFItKphz7b0YLYea4rfYs2Doe94sF+uN BIi8GRjqLNQRL93C5MbaxmsSgoOkvGc0Y X-Google-Smtp-Source: AGHT+IEEXMkq9vhyv19ikcTAP5W4BzqUE81E1E6iQE/8CFQSV3rwzv18e/jm6i4dLd5tO+fmlXnTCVeAKjKiLTknIjY= X-Received: by 2002:a17:906:2b41:b0:a55:b67c:bd04 with SMTP id b1-20020a1709062b4100b00a55b67cbd04mr10469678ejg.4.1715008947097; Mon, 06 May 2024 08:22:27 -0700 (PDT) MIME-Version: 1.0 From: David Edelsohn Date: Mon, 6 May 2024 11:22:15 -0400 Message-ID: Subject: [PATCH, libgfortran] aix: Fix building fat library for AIX To: FX , GCC Patches , Fortran List Content-Type: multipart/alternative; boundary="000000000000141af60617caa3cc" X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --000000000000141af60617caa3cc Content-Type: text/plain; charset="UTF-8" aix: Fix building fat library for AIX With the change in subdirectories, the code for libgfortran fat libraries needs to be adjusted to explicitly reference the subdirectory. AIX creates fat library archives and the compiler itself can be built as either 32 bit or 64 bit application and default code generation. For the two, alternate versions of the compiler to interoperate, GCC needs to construct the fat libraries manually. The Makefile fragment had been trying to leverage as much of the existing targets and macros as possible. With the subdirectory change, the location of single.o is more obscured and cannot be determined without libtool. This patch references the location of the real object file more explicitly. Utilizing subst seems like overkill and unnecessary obscuration for a single object file. Either way, it's digging below the libtool abstraction layer. This also fixes Fortran bootstrap on AIX. Bootstrapped on powerpc-ibm-aix7.3.0.0 libgfortran/ChangeLog: * config/t-aix (all-local, libcaf_single): Explicitly reference caf/.libs/single.o diff --git a/libgfortran/config/t-aix b/libgfortran/config/t-aix index 0e50501d10e..099fc5d8b3a 100644 --- a/libgfortran/config/t-aix +++ b/libgfortran/config/t-aix @@ -7,6 +7,6 @@ ARX=$(shell echo $(AR) | sed -e 's/-X[^ ]*//g') all-local: $(ARX) -X$(BITS) rc .libs/$(PACKAGE).a ../ppc$(BITS)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR) $(ARX) -X$(BITS) rc ../pthread/$(PACKAGE)/.libs/$(PACKAGE).a ../pthread/ppc$(BITS)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR) - $(ARX) -X$(BITS) rc .libs/libcaf_single.a ../ppc$(BITS)/$(PACKAGE)/.libs/$(libcaf_single_la_OBJECTS:.lo=.o) - $(ARX) -X$(BITS) rc ../pthread/$(PACKAGE)/.libs/libcaf_single.a ../pthread/ppc$(BITS)/$(PACKAGE)/.libs/$(libcaf_single_la_OBJECTS:.lo=.o) + $(ARX) -X$(BITS) rc .libs/libcaf_single.a ../ppc$(BITS)/$(PACKAGE)/caf/.libs/single.o + $(ARX) -X$(BITS) rc ../pthread/$(PACKAGE)/.libs/libcaf_single.a ../pthread/ppc$(BITS)/$(PACKAGE)/caf/.libs/single.o endif --000000000000141af60617caa3cc--