public inbox for libc-hacker@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] Fix __REDIRECT_NTH [BZ #377]
@ 2004-09-10 17:21 Jakub Jelinek
  2004-09-10 17:44 ` [PATCH] Fix __REDIRECT_NTH [BZ #377] (take 2) Jakub Jelinek
  0 siblings, 1 reply; 4+ messages in thread
From: Jakub Jelinek @ 2004-09-10 17:21 UTC (permalink / raw)
  To: Ulrich Drepper; +Cc: Richard Henderson, Glibc hackers

Hi!

This seems to work for me in both C++ and C.

2004-09-10  Jakub Jelinek  <jakub@redhat.com>

	* misc/sys/cdefs.h (__REDIRECT_NTH): Change order of __THROW and
	__asm__.  [BZ #377]

--- libc/misc/sys/cdefs.h.jj	2004-09-10 19:10:03.000000000 +0200
+++ libc/misc/sys/cdefs.h	2004-09-10 19:18:36.796737517 +0200
@@ -160,7 +160,7 @@
 
 # define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias))
 # define __REDIRECT_NTH(name, proto, alias) \
-     name proto __asm__ (__ASMNAME (#alias)) __THROW
+     name proto __THROW __asm__ (__ASMNAME (#alias))
 # define __ASMNAME(cname)  __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
 # define __ASMNAME2(prefix, cname) __STRING (prefix) cname
 

	Jakub

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] Fix __REDIRECT_NTH [BZ #377] (take 2)
  2004-09-10 17:21 [PATCH] Fix __REDIRECT_NTH [BZ #377] Jakub Jelinek
@ 2004-09-10 17:44 ` Jakub Jelinek
  2004-09-10 21:06   ` Richard Henderson
  2004-09-10 21:16   ` Ulrich Drepper
  0 siblings, 2 replies; 4+ messages in thread
From: Jakub Jelinek @ 2004-09-10 17:44 UTC (permalink / raw)
  To: Ulrich Drepper; +Cc: Richard Henderson, Glibc hackers

On Fri, Sep 10, 2004 at 07:21:12PM +0200, Jakub Jelinek wrote:
> Hi!
> 
> This seems to work for me in both C++ and C.

Argh, testing error, it breaks C.

2004-09-10  Jakub Jelinek  <jakub@redhat.com>

	* misc/sys/cdefs.h (__REDIRECT_NTH): Change order of __THROW and
	__asm__ for C++.  [BZ #377]

--- libc/misc/sys/cdefs.h.jj	2004-09-10 19:10:03.000000000 +0200
+++ libc/misc/sys/cdefs.h	2004-09-10 19:42:06.806340737 +0200
@@ -159,8 +159,13 @@
 #if defined __GNUC__ && __GNUC__ >= 2
 
 # define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias))
-# define __REDIRECT_NTH(name, proto, alias) \
+# ifdef __cplusplus
+#  define __REDIRECT_NTH(name, proto, alias) \
+     name proto __THROW __asm__ (__ASMNAME (#alias))
+# else
+#  define __REDIRECT_NTH(name, proto, alias) \
      name proto __asm__ (__ASMNAME (#alias)) __THROW
+# endif
 # define __ASMNAME(cname)  __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
 # define __ASMNAME2(prefix, cname) __STRING (prefix) cname
 


	Jakub

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] Fix __REDIRECT_NTH [BZ #377] (take 2)
  2004-09-10 17:44 ` [PATCH] Fix __REDIRECT_NTH [BZ #377] (take 2) Jakub Jelinek
@ 2004-09-10 21:06   ` Richard Henderson
  2004-09-10 21:16   ` Ulrich Drepper
  1 sibling, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2004-09-10 21:06 UTC (permalink / raw)
  To: Jakub Jelinek; +Cc: Ulrich Drepper, Richard Henderson, Glibc hackers

On Fri, Sep 10, 2004 at 07:44:27PM +0200, Jakub Jelinek wrote:
> 	* misc/sys/cdefs.h (__REDIRECT_NTH): Change order of __THROW and
> 	__asm__ for C++.  [BZ #377]

I can confirm that I can once again build libjava with this.  Thanks.


r~

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] Fix __REDIRECT_NTH [BZ #377] (take 2)
  2004-09-10 17:44 ` [PATCH] Fix __REDIRECT_NTH [BZ #377] (take 2) Jakub Jelinek
  2004-09-10 21:06   ` Richard Henderson
@ 2004-09-10 21:16   ` Ulrich Drepper
  1 sibling, 0 replies; 4+ messages in thread
From: Ulrich Drepper @ 2004-09-10 21:16 UTC (permalink / raw)
  To: Jakub Jelinek; +Cc: Glibc hackers

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied.

- --
➧ Ulrich Drepper ➧ Red Hat, Inc. ➧ 444 Castro St ➧ Mountain View, CA ❖
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)

iD8DBQFBQhmK2ijCOnn/RHQRAvbVAJ0WmlKWgD/oQGFTw0sbOklbax3LJwCeNN9A
J9kbSujJ8RLMXAgs6ntEEWc=
=ruWw
-----END PGP SIGNATURE-----

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2004-09-10 21:16 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-09-10 17:21 [PATCH] Fix __REDIRECT_NTH [BZ #377] Jakub Jelinek
2004-09-10 17:44 ` [PATCH] Fix __REDIRECT_NTH [BZ #377] (take 2) Jakub Jelinek
2004-09-10 21:06   ` Richard Henderson
2004-09-10 21:16   ` Ulrich Drepper

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).