diff options
| -rw-r--r-- | sysdeps/generic/Makefile | 10 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/Makefile | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/Makefile | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/Makefile | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/Makefile | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/Makefile | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/Makefile | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/Makefile | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/Makefile | 8 |
9 files changed, 13 insertions, 56 deletions
diff --git a/sysdeps/generic/Makefile b/sysdeps/generic/Makefile index 980fc42fb0..b9ee959c5e 100644 --- a/sysdeps/generic/Makefile +++ b/sysdeps/generic/Makefile @@ -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 @@ -34,3 +34,11 @@ 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 diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile index 61fac29c9a..56fcba8fb9 100644 --- a/sysdeps/mach/hurd/i386/Makefile +++ b/sysdeps/mach/hurd/i386/Makefile @@ -1,7 +1,5 @@ -ifeq ($(subdir),elf) -ifeq (yes,$(build-shared)) -# This is needed to support g++ v2 and v3. -sysdep_routines += framestate -shared-only-routines += framestate -endif +ifeq ($(subdir),misc) +sysdep_routines += ioperm +sysdep_headers += sys/io.h endif + diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile index 5c04677086..62536ae1ae 100644 --- a/sysdeps/unix/sysv/linux/alpha/Makefile +++ b/sysdeps/unix/sysv/linux/alpha/Makefile @@ -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 diff --git a/sysdeps/unix/sysv/linux/arm/Makefile b/sysdeps/unix/sysv/linux/arm/Makefile index 66a93ba8f3..aeaaa39fce 100644 --- a/sysdeps/unix/sysv/linux/arm/Makefile +++ b/sysdeps/unix/sysv/linux/arm/Makefile @@ -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 diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile index e4b9dc293d..4afb7f90e0 100644 --- a/sysdeps/unix/sysv/linux/i386/Makefile +++ b/sysdeps/unix/sysv/linux/i386/Makefile @@ -7,11 +7,6 @@ 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) diff --git a/sysdeps/unix/sysv/linux/m68k/Makefile b/sysdeps/unix/sysv/linux/m68k/Makefile index 83ea370afa..55eeeabe10 100644 --- a/sysdeps/unix/sysv/linux/m68k/Makefile +++ b/sysdeps/unix/sysv/linux/m68k/Makefile @@ -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) diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile index e46cfef7a5..1f9fc2dd03 100644 --- a/sysdeps/unix/sysv/linux/mips/Makefile +++ b/sysdeps/unix/sysv/linux/mips/Makefile @@ -9,11 +9,3 @@ sysdep_routines += cachectl cacheflush sysmips _test_and_set 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 diff --git a/sysdeps/unix/sysv/linux/powerpc/Makefile b/sysdeps/unix/sysv/linux/powerpc/Makefile index 889df40fe8..931611f4db 100644 --- a/sysdeps/unix/sysv/linux/powerpc/Makefile +++ b/sysdeps/unix/sysv/linux/powerpc/Makefile @@ -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 diff --git a/sysdeps/unix/sysv/linux/sparc/Makefile b/sysdeps/unix/sysv/linux/sparc/Makefile index 7059a1a31b..9b46a7ea72 100644 --- a/sysdeps/unix/sysv/linux/sparc/Makefile +++ b/sysdeps/unix/sysv/linux/sparc/Makefile @@ -42,11 +42,3 @@ $(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/sys/syscal 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 |