From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 11 Mar 2004 21:57:45 +0000 (+0000)
Subject: (JB_SIZE): Undefine before including __longjmp-common.S again.
X-Git-Tag: cvs/fedora-base~676
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e560877034a299f8c430d5cb3ab093c6977d4dc;p=thirdparty%2Fglibc.git

(JB_SIZE): Undefine before including __longjmp-common.S again.
---

diff --git a/sysdeps/powerpc/powerpc32/__longjmp.S b/sysdeps/powerpc/powerpc32/__longjmp.S
index 4218619a8c9..79c50deacd6 100644
--- a/sysdeps/powerpc/powerpc32/__longjmp.S
+++ b/sysdeps/powerpc/powerpc32/__longjmp.S
@@ -21,7 +21,7 @@
 #include <shlib-compat.h>
 
 #if defined NOT_IN_libc
-/* Build a none versioned object for rtld-*.  */
+/* Build a non-versioned object for rtld-*.  */
 # include "__longjmp-common.S"
 
 #else /* !NOT_IN_libc */
@@ -32,6 +32,7 @@ default_symbol_version (__vmx__longjmp,__longjmp,GLIBC_2.3.4);
 
 # if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
 #  define __NO_VMX__
+#  undef JB_SIZE
 symbol_version (__novmx__longjmp,__longjmp,GLIBC_2.0);
 #  undef __longjmp
 #  define __longjmp  __novmx__longjmp
diff --git a/sysdeps/powerpc/powerpc64/__longjmp.S b/sysdeps/powerpc/powerpc64/__longjmp.S
index 88b6cfcd78e..834ccb16916 100644
--- a/sysdeps/powerpc/powerpc64/__longjmp.S
+++ b/sysdeps/powerpc/powerpc64/__longjmp.S
@@ -22,7 +22,7 @@
 #include <shlib-compat.h>
 
 #if defined NOT_IN_libc
-/* Build a none versioned object for rtld-*.  */
+/* Build a non-versioned object for rtld-*.  */
 # include "__longjmp-common.S"
 
 #else /* !NOT_IN_libc */
@@ -34,6 +34,7 @@ default_symbol_version (__vmx__longjmp,__longjmp,GLIBC_2.3.4)
 # if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)
 #  define __NO_VMX__
 #  undef __longjmp
+#  undef JB_SIZE
 symbol_version(__novmx__longjmp,__longjmp,GLIBC_2.3)
 #  define __longjmp  __novmx__longjmp
 #  include "__longjmp-common.S"