about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-11-21 04:10:59 +0000
committerRoland McGrath <roland@gnu.org>2002-11-21 04:10:59 +0000
commitab9ba655e1b0ee621baddd45e7421762e4f2ba70 (patch)
treef61c2e39b40afd500057ca26fd9828282ffcca8d
parent5d0bbaaf3a253601974ec9bc30f49fc4452d12ed (diff)
downloadglibc-ab9ba655e1b0ee621baddd45e7421762e4f2ba70.tar.gz
glibc-ab9ba655e1b0ee621baddd45e7421762e4f2ba70.tar.xz
glibc-ab9ba655e1b0ee621baddd45e7421762e4f2ba70.zip
* sysdeps/powerpc/powerpc32/dl-machine.c [! SHARED]: Further
	conditionalize [! DO_VERSIONING] #error.
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/powerpc/powerpc32/dl-machine.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9faa4cb93a..259145923e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-11-20  Roland McGrath  <roland@redhat.com>
 
+	* sysdeps/powerpc/powerpc32/dl-machine.c [! SHARED]: Further
+	conditionalize [! DO_VERSIONING] #error.
+
 	* scripts/abilist.awk: Grok function descriptor symbols.
 
 	* intl/tst-gettext.c (main): Check return values from setlocale.
diff --git a/sysdeps/powerpc/powerpc32/dl-machine.c b/sysdeps/powerpc/powerpc32/dl-machine.c
index 6443608886..065a1db6df 100644
--- a/sysdeps/powerpc/powerpc32/dl-machine.c
+++ b/sysdeps/powerpc/powerpc32/dl-machine.c
@@ -29,7 +29,7 @@
 /* Because ld.so is now versioned, these functions can be in their own file;
    no relocations need to be done to call them.
    Of course, if ld.so is not versioned...  */
-#if !(DO_VERSIONING - 0)
+#if defined SHARED && !(DO_VERSIONING - 0)
 #error This will not work with versioning turned off, sorry.
 #endif