about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-03-11 21:57:45 +0000
committerUlrich Drepper <drepper@redhat.com>2004-03-11 21:57:45 +0000
commit2e560877034a299f8c430d5cb3ab093c6977d4dc (patch)
treee211f4ce1b1439e959b063dd670e124c534419af
parent9852f6dcfff04f9ab05ab1d19845108b5a4783ab (diff)
downloadglibc-2e560877034a299f8c430d5cb3ab093c6977d4dc.tar.gz
glibc-2e560877034a299f8c430d5cb3ab093c6977d4dc.tar.xz
glibc-2e560877034a299f8c430d5cb3ab093c6977d4dc.zip
(JB_SIZE): Undefine before including __longjmp-common.S again.
-rw-r--r--sysdeps/powerpc/powerpc32/__longjmp.S3
-rw-r--r--sysdeps/powerpc/powerpc64/__longjmp.S3
2 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/powerpc/powerpc32/__longjmp.S b/sysdeps/powerpc/powerpc32/__longjmp.S
index 4218619a8c..79c50deacd 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 88b6cfcd78..834ccb1691 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"