This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

fix to avoid compiling framestate.c when not needed


Here is a patch that fixes the build when the oldest ABI < 2.2.5
by cleaning up the makefiles.  Ok to commit to both branches?


Thanks,
Roland



2002-03-23  Roland McGrath  <roland@frob.com>

	* sysdeps/mach/hurd/i386/Makefile
	(sysdep_routines, shared-only-routines): Don't add framestate,
	reverting 2001-10-02 change.
	* sysdeps/unix/sysv/linux/arm/Makefile: Likewise.
	* sysdeps/unix/sysv/linux/alpha/Makefile: Likewise.
	* sysdeps/unix/sysv/linux/i386/Makefile: Likewise.
	* sysdeps/unix/sysv/linux/m68k/Makefile: Likewise.
	* sysdeps/unix/sysv/linux/mips/Makefile: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/Makefile: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-32/Makefile: Likewise.
	* sysdeps/unix/sysv/linux/sparc/Makefile: Likewise.
	* sysdeps/generic/Makefile (sysdep_routines, shared-only-routines):
	Do it here instead, only if [$(unwind-find-fde) = yes].


Index: sysdeps/mach/hurd/i386/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/i386/Makefile,v
retrieving revision 1.7
diff -p -u -r1.7 Makefile
--- sysdeps/mach/hurd/i386/Makefile 2001/11/16 01:21:39 1.7
+++ sysdeps/mach/hurd/i386/Makefile 2002/03/23 19:55:43
@@ -1,7 +0,0 @@
-ifeq ($(subdir),elf)
-ifeq (yes,$(build-shared))
-# This is needed to support g++ v2 and v3.
-sysdep_routines += framestate
-shared-only-routines += framestate
-endif
-endif
Index: sysdeps/generic/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/generic/Makefile,v
retrieving revision 1.34
diff -p -u -r1.34 Makefile
--- sysdeps/generic/Makefile 2001/07/06 04:55:48 1.34
+++ sysdeps/generic/Makefile 2002/03/23 19:55:43
@@ -1,4 +1,4 @@
-# Copyright (C) 1992,93,94,95,96,97,99 Free Software Foundation, Inc.
+# Copyright (C) 1992,93,94,95,96,97,99,2002 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -33,4 +33,12 @@ endif
 
 ifeq ($(subdir),string)
 CFLAGS-wordcopy.c += -Wno-uninitialized
+endif
+
+ifeq ($(subdir),elf)
+ifeq (yes:yes,$(build-shared):$(unwind-find-fde))
+# This is needed to support g++ v2 and v3.
+sysdep_routines += framestate
+shared-only-routines += framestate
+endif
 endif
Index: sysdeps/unix/sysv/linux/alpha/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/alpha/Makefile,v
retrieving revision 1.19
diff -p -u -r1.19 Makefile
--- sysdeps/unix/sysv/linux/alpha/Makefile 2001/11/16 01:24:04 1.19
+++ sysdeps/unix/sysv/linux/alpha/Makefile 2002/03/23 19:55:43
@@ -23,11 +23,3 @@ ifeq ($(subdir),signal)
 sysdep_routines += rt_sigsuspend rt_sigprocmask rt_sigtimedwait	\
 		   rt_sigqueueinfo rt_sigaction rt_sigpending
 endif
-
-ifeq ($(subdir),elf)
-ifeq (yes,$(build-shared))
-# This is needed to support g++ v2 and v3.
-sysdep_routines += framestate
-shared-only-routines += framestate
-endif
-endif
Index: sysdeps/unix/sysv/linux/arm/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/arm/Makefile,v
retrieving revision 1.13
diff -p -u -r1.13 Makefile
--- sysdeps/unix/sysv/linux/arm/Makefile 2001/11/16 01:24:04 1.13
+++ sysdeps/unix/sysv/linux/arm/Makefile 2002/03/23 19:55:43
@@ -19,10 +19,4 @@ sysdep-dl-routines += dl-procinfo
 sysdep_routines += dl-procinfo
 # extra shared linker files to link only into dl-allobjs.so
 sysdep-rtld-routines += dl-procinfo
-
-ifeq (yes,$(build-shared))
-# This is needed to support g++ v2 and v3.
-sysdep_routines += framestate
-shared-only-routines += framestate
-endif
 endif
Index: sysdeps/unix/sysv/linux/i386/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/Makefile,v
retrieving revision 1.21
diff -p -u -r1.21 Makefile
--- sysdeps/unix/sysv/linux/i386/Makefile 2001/11/16 01:24:04 1.21
+++ sysdeps/unix/sysv/linux/i386/Makefile 2002/03/23 19:55:43
@@ -13,11 +13,6 @@ sysdep_routines += dl-procinfo
 # extra shared linker files to link only into dl-allobjs.so
 sysdep-rtld-routines += dl-procinfo
 
-ifeq (yes,$(build-shared))
-# This is needed to support g++ v2 and v3.
-sysdep_routines += framestate
-shared-only-routines += framestate
-endif
 endif
 
 ifeq ($(subdir),resource)
Index: sysdeps/unix/sysv/linux/m68k/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/m68k/Makefile,v
retrieving revision 1.10
diff -p -u -r1.10 Makefile
--- sysdeps/unix/sysv/linux/m68k/Makefile 2001/11/16 01:24:04 1.10
+++ sysdeps/unix/sysv/linux/m68k/Makefile 2002/03/23 19:55:43
@@ -10,12 +10,6 @@ endif
 ifeq ($(subdir),elf)
 sysdep-others += lddlibc4
 install-bin += lddlibc4
-
-ifeq (yes,$(build-shared))
-# This is needed to support g++ v2 and v3.
-sysdep_routines += framestate
-shared-only-routines += framestate
-endif
 endif
 
 ifeq ($(subdir),resource)
Index: sysdeps/unix/sysv/linux/mips/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/mips/Makefile,v
retrieving revision 1.6
diff -p -u -r1.6 Makefile
--- sysdeps/unix/sysv/linux/mips/Makefile 2001/11/16 01:24:04 1.6
+++ sysdeps/unix/sysv/linux/mips/Makefile 2002/03/23 19:55:43
@@ -9,11 +9,3 @@ sysdep_routines += cachectl cacheflush s
 
 sysdep_headers += sys/cachectl.h sys/sysmips.h sys/tas.h
 endif
-
-ifeq ($(subdir),elf)
-ifeq (yes,$(build-shared))
-# This is needed to support g++ v2 and v3.
-sysdep_routines += framestate
-shared-only-routines += framestate
-endif
-endif
Index: sysdeps/unix/sysv/linux/powerpc/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/Makefile,v
retrieving revision 1.5
diff -p -u -r1.5 Makefile
--- sysdeps/unix/sysv/linux/powerpc/Makefile 2001/11/16 01:24:04 1.5
+++ sysdeps/unix/sysv/linux/powerpc/Makefile 2002/03/23 19:55:43
@@ -6,11 +6,3 @@ endif
 ifeq ($(subdir),resource)
 sysdep_routines += oldgetrlimit64
 endif
-
-ifeq ($(subdir),elf)
-ifeq (yes,$(build-shared))
-# This is needed to support g++ v2 and v3.
-sysdep_routines += framestate
-shared-only-routines += framestate
-endif
-endif
Index: sysdeps/unix/sysv/linux/sparc/Makefile
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/sparc/Makefile,v
retrieving revision 1.6
diff -p -u -r1.6 Makefile
--- sysdeps/unix/sysv/linux/sparc/Makefile 2001/11/16 01:24:04 1.6
+++ sysdeps/unix/sysv/linux/sparc/Makefile 2002/03/23 19:55:43
@@ -42,11 +42,3 @@ $(objpfx)syscall-%.h $(objpfx)syscall-%.
 	mv -f $(@:.h=.d)-t2 $(@:.h=.d)
 
 endif
-
-ifeq ($(subdir),elf)
-ifeq (yes,$(build-shared))
-# This is needed to support g++ v2 and v3.
-sysdep_routines += framestate
-shared-only-routines += framestate
-endif
-endif


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]