From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2302 invoked by alias); 8 Aug 2012 21:27:41 -0000 Received: (qmail 2294 invoked by uid 22791); 8 Aug 2012 21:27:40 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from toast.topped-with-meat.com (HELO topped-with-meat.com) (204.197.218.159) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 08 Aug 2012 21:27:06 +0000 Received: by topped-with-meat.com (Postfix, from userid 5281) id 9B4D72C0ED; Wed, 8 Aug 2012 14:27:05 -0700 (PDT) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit From: Roland McGrath To: libc-ports@sourceware.org Subject: [COMMITTED PATCH] ARM: fix build breakage from sysdeps/unix/sysv/linux/arm/dl-machine.h addition Message-Id: <20120808212705.9B4D72C0ED@topped-with-meat.com> Date: Wed, 08 Aug 2012 21:27:00 -0000 X-CMAE-Score: 0 X-CMAE-Analysis: v=2.0 cv=LtfpOghc c=1 sm=1 a=8Fi6Z4to4pgA:10 a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=14OXPxybAAAA:8 a=Lt6k2LCyHTRPGi1KyaMA:9 a=CjuIK1q_8ugA:10 a=WkljmVdYkabdwxfqvArNOQ==:117 X-IsSubscribed: yes Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2012-08/txt/msg00061.txt.bz2 My change to split CLEAR_CACHE out of sysdeps/arm/dl-machine.h actually broke the build. Sorry about that. Apparently nobody else has been testing the ARM build lately either. Committed as obvious. Thanks, Roland ports/ChangeLog.arm * sysdeps/unix/sysv/linux/arm/dl-machine.h: Move #include outside of [!dl_machine_h]. diff --git a/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h b/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h index 7c96cb7..68e8be9 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h +++ b/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h @@ -22,7 +22,9 @@ #define CLEAR_CACHE(BEG,END) \ INTERNAL_SYSCALL_ARM (cacheflush, , 3, (BEG), (END), 0) -/* The rest is just machine-specific. */ -#include - #endif + +/* The rest is just machine-specific. + This #include is outside the #ifndef because the parts of + dl-machine.h used only by dynamic-link.h are outside the guard. */ +#include