public inbox for libc-ports@sourceware.org
 help / color / mirror / Atom feed
From: Roland McGrath <roland@hack.frob.com>
To: libc-ports@sourceware.org
Subject: [COMMITTED PATCH] ARM: fix build breakage from sysdeps/unix/sysv/linux/arm/dl-machine.h addition
Date: Wed, 08 Aug 2012 21:27:00 -0000	[thread overview]
Message-ID: <20120808212705.9B4D72C0ED@topped-with-meat.com> (raw)

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 <sysdeps/arm/dl-machine.h>
-
 #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 <sysdeps/arm/dl-machine.h>

                 reply	other threads:[~2012-08-08 21:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120808212705.9B4D72C0ED@topped-with-meat.com \
    --to=roland@hack.frob.com \
    --cc=libc-ports@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).