From 21889c08c8a8952bd924bb6646fc9934982f1485 Mon Sep 17 00:00:00 2001 From: ro Date: Tue, 9 Aug 2011 15:40:30 +0000 Subject: [PATCH] gcc: * config/sync.c: Move to ../libgcc. * Makefile.in (libgcc.mvars): Remove LIBGCC_SYNC, LIBGCC_SYNC_CFLAGS. * config/mips/t-libgcc-mips16 (LIBGCC_SYNC, LIBGCC_SYNC_CFLAGS): Remove. libgcc: * sync.c: New file. * config/mips/t-mips16: New file. * config.host (mips64*-*-linux*): Add mips/t-mips16 to tmake_file. (mips*-*-linux*): Likewise. (mips*-sde-elf*): Likewise. (mipsisa32-*-elf*): Join with mipsisa32r2-*-elf*, mipsisa64-*-elf*, mipsisa64r2-*-elf*. Add mips/t-mips16 to tmake_file. (mipsisa64sb1-*-elf*): Add mips/t-mips16 to tmake_file. (mips-*-elf*): Likewise. (mips64-*-elf*): Likewise. (mips64orion-*-elf*): Likewise. (mips*-*-rtems*): Likewise. (mipstx39-*-elf*): Likewise. * Makefile.in: Use SYNC instead of LIBGCC_SYNC. ($(libgcc-sync-size-funcs-o)): Use SYNC_CFLAGS instead of LIBGCC_SYNC_CFLAGS. Use $(srcdir) to refer to sync.c. Use $<. ($(libgcc-sync-funcs-o)): Likewise. ($(libgcc-sync-size-funcs-s-o)): Likewise. ($(libgcc-sync-funcs-s-o)): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177601 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 8 ++++++++ gcc/Makefile.in | 2 -- gcc/config/mips/t-libgcc-mips16 | 5 +---- libgcc/ChangeLog | 25 +++++++++++++++++++++++++ libgcc/Makefile.in | 26 +++++++++++++------------- libgcc/config.host | 21 +++++++++++++-------- libgcc/config/mips/t-mips16 | 2 ++ {gcc/config => libgcc}/sync.c | 6 +++--- 8 files changed, 65 insertions(+), 30 deletions(-) create mode 100644 libgcc/config/mips/t-mips16 rename {gcc/config => libgcc}/sync.c (96%) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a47ca45..a81bf08 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2011-08-09 Rainer Orth + + * config/sync.c: Move to ../libgcc. + * Makefile.in (libgcc.mvars): Remove LIBGCC_SYNC, + LIBGCC_SYNC_CFLAGS. + * config/mips/t-libgcc-mips16 (LIBGCC_SYNC, LIBGCC_SYNC_CFLAGS): + Remove. + 2011-08-09 Anatoly Sokolov * config/mmix/mmix.h (REGISTER_MOVE_COST): Remove macro. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index fd9c0c1..4e97ea5 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1911,8 +1911,6 @@ libgcc.mvars: config.status Makefile $(LIB2ADD) $(LIB2ADD_ST) specs \ echo SHLIB_NM_FLAGS = '$(SHLIB_NM_FLAGS)' >> tmp-libgcc.mvars echo LIBGCC2_CFLAGS = '$(LIBGCC2_CFLAGS)' >> tmp-libgcc.mvars echo TARGET_LIBGCC2_CFLAGS = '$(TARGET_LIBGCC2_CFLAGS)' >> tmp-libgcc.mvars - echo LIBGCC_SYNC = '$(LIBGCC_SYNC)' >> tmp-libgcc.mvars - echo LIBGCC_SYNC_CFLAGS = '$(LIBGCC_SYNC_CFLAGS)' >> tmp-libgcc.mvars echo CRTSTUFF_CFLAGS = '$(CRTSTUFF_CFLAGS)' >> tmp-libgcc.mvars echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS)' >> tmp-libgcc.mvars echo CRTSTUFF_T_CFLAGS_S = '$(CRTSTUFF_T_CFLAGS_S)' >> tmp-libgcc.mvars diff --git a/gcc/config/mips/t-libgcc-mips16 b/gcc/config/mips/t-libgcc-mips16 index fa3949a..772b05a 100644 --- a/gcc/config/mips/t-libgcc-mips16 +++ b/gcc/config/mips/t-libgcc-mips16 @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2007, 2008, 2011 Free Software Foundation, Inc. # # This file is part of GCC. # @@ -38,8 +38,5 @@ LIB1ASMFUNCS = _m16addsf3 _m16subsf3 _m16mulsf3 _m16divsf3 \ _m16stubdc0 _m16stubdc1 _m16stubdc2 _m16stubdc5 _m16stubdc6 \ _m16stubdc9 _m16stubdc10 -LIBGCC_SYNC = yes -LIBGCC_SYNC_CFLAGS = -mno-mips16 - # Version these symbols if building libgcc.so. SHLIB_MAPFILES += $(srcdir)/config/mips/libgcc-mips16.ver diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 4ce6e92..5311815 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,28 @@ +2011-08-09 Rainer Orth + + * sync.c: New file. + * config/mips/t-mips16: New file. + * config.host (mips64*-*-linux*): Add mips/t-mips16 to tmake_file. + (mips*-*-linux*): Likewise. + (mips*-sde-elf*): Likewise. + (mipsisa32-*-elf*): Join with mipsisa32r2-*-elf*, + mipsisa64-*-elf*, mipsisa64r2-*-elf*. + Add mips/t-mips16 to tmake_file. + (mipsisa64sb1-*-elf*): Add mips/t-mips16 to tmake_file. + (mips-*-elf*): Likewise. + (mips64-*-elf*): Likewise. + (mips64orion-*-elf*): Likewise. + (mips*-*-rtems*): Likewise. + (mipstx39-*-elf*): Likewise. + * Makefile.in: Use SYNC instead of LIBGCC_SYNC. + ($(libgcc-sync-size-funcs-o)): Use SYNC_CFLAGS instead of + LIBGCC_SYNC_CFLAGS. + Use $(srcdir) to refer to sync.c. + Use $<. + ($(libgcc-sync-funcs-o)): Likewise. + ($(libgcc-sync-size-funcs-s-o)): Likewise. + ($(libgcc-sync-funcs-s-o)): Likewise. + 2011-08-09 Andreas Schwab * config.host (ia64*-*-linux*): Move ia64/t-glibc after diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index 4a75a37..0d3818e 100644 --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -651,7 +651,7 @@ endif endif -ifeq ($(LIBGCC_SYNC),yes) +ifeq ($(SYNC),yes) libgcc-sync-size-funcs := $(foreach op, add sub or and xor nand, \ sync_fetch_and_$(op) \ sync_$(op)_and_fetch) \ @@ -664,37 +664,37 @@ libgcc-sync-size-funcs := $(foreach prefix, $(libgcc-sync-size-funcs), \ $(prefix)_$(suffix))) libgcc-sync-size-funcs-o = $(patsubst %,%$(objext),$(libgcc-sync-size-funcs)) -$(libgcc-sync-size-funcs-o): %$(objext): $(gcc_srcdir)/config/sync.c - $(gcc_compile) $(LIBGCC_SYNC_CFLAGS) \ +$(libgcc-sync-size-funcs-o): %$(objext): $(srcdir)/sync.c + $(gcc_compile) $(SYNC_CFLAGS) \ -DFN=`echo "$*" | sed 's/_[^_]*$$//'` \ -DSIZE=`echo "$*" | sed 's/.*_//'` \ - -c $(gcc_srcdir)/config/sync.c $(vis_hide) + -c $< $(vis_hide) libgcc-objects += $(libgcc-sync-size-funcs-o) libgcc-sync-funcs := sync_synchronize libgcc-sync-funcs-o = $(patsubst %,%$(objext),$(libgcc-sync-funcs)) -$(libgcc-sync-funcs-o): %$(objext): $(gcc_srcdir)/config/sync.c - $(gcc_compile) $(LIBGCC_SYNC_CFLAGS) \ +$(libgcc-sync-funcs-o): %$(objext): $(srcdir)/sync.c + $(gcc_compile) $(SYNC_CFLAGS) \ -DL$* \ - -c $(gcc_srcdir)/config/sync.c $(vis_hide) + -c $< $(vis_hide) libgcc-objects += $(libgcc-sync-funcs-o) ifeq ($(enable_shared),yes) libgcc-sync-size-funcs-s-o = $(patsubst %,%_s$(objext), \ $(libgcc-sync-size-funcs)) -$(libgcc-sync-size-funcs-s-o): %_s$(objext): $(gcc_srcdir)/config/sync.c - $(gcc_s_compile) $(LIBGCC_SYNC_CFLAGS) \ +$(libgcc-sync-size-funcs-s-o): %_s$(objext): $(srcdir)/sync.c + $(gcc_s_compile) $(SYNC_CFLAGS) \ -DFN=`echo "$*" | sed 's/_[^_]*$$//'` \ -DSIZE=`echo "$*" | sed 's/.*_//'` \ - -c $(gcc_srcdir)/config/sync.c + -c $< libgcc-s-objects += $(libgcc-sync-size-funcs-s-o) libgcc-sync-funcs-s-o = $(patsubst %,%_s$(objext),$(libgcc-sync-funcs)) -$(libgcc-sync-funcs-s-o): %_s$(objext): $(gcc_srcdir)/config/sync.c - $(gcc_s_compile) $(LIBGCC_SYNC_CFLAGS) \ +$(libgcc-sync-funcs-s-o): %_s$(objext): $(srcdir)/sync.c + $(gcc_s_compile) $(SYNC_CFLAGS) \ -DL$* \ - -c $(gcc_srcdir)/config/sync.c + -c $< libgcc-s-objects += $(libgcc-sync-funcs-s-o) endif endif diff --git a/libgcc/config.host b/libgcc/config.host index 9972bf0..24252e07 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -539,12 +539,12 @@ mips*-*-netbsd*) # NetBSD/mips, either endian. ;; mips64*-*-linux* | mipsisa64*-*-linux*) extra_parts="$extra_parts crtfastmath.o" - tmake_file="${tmake_file} t-crtfm mips/t-tpbit" + tmake_file="${tmake_file} t-crtfm mips/t-mips16 mips/t-tpbit" md_unwind_header=mips/linux-unwind.h ;; mips*-*-linux*) # Linux MIPS, either endian. extra_parts="$extra_parts crtfastmath.o" - tmake_file="${tmake_file} t-crtfm" + tmake_file="${tmake_file} t-crtfm mips/t-mips16" md_unwind_header=mips/linux-unwind.h ;; mips*-*-openbsd*) @@ -559,33 +559,38 @@ mips*-sde-elf*) tmake_file=mips/t-sdemtk ;; esac + tmake_file="$tmake_file mips/t-mips16" ;; -mipsisa32-*-elf* | mipsisa32el-*-elf*) - ;; -mipsisa32r2-*-elf* | mipsisa32r2el-*-elf*) - ;; -mipsisa64-*-elf* | mipsisa64el-*-elf*) - ;; +mipsisa32-*-elf* | mipsisa32el-*-elf* | \ +mipsisa32r2-*-elf* | mipsisa32r2el-*-elf* | \ +mipsisa64-*-elf* | mipsisa64el-*-elf* | \ mipsisa64r2-*-elf* | mipsisa64r2el-*-elf*) + tmake_file="$tmake_file mips/t-mips16" ;; mipsisa64sr71k-*-elf*) tmake_file=t-fdpbit ;; mipsisa64sb1-*-elf* | mipsisa64sb1el-*-elf*) + tmake_file="$tmake_file mips/t-mips16" ;; mips-*-elf* | mipsel-*-elf*) + tmake_file="$tmake_file mips/t-mips16" ;; mips64-*-elf* | mips64el-*-elf*) + tmake_file="$tmake_file mips/t-mips16" ;; mips64vr-*-elf* | mips64vrel-*-elf*) ;; mips64orion-*-elf* | mips64orionel-*-elf*) + tmake_file="$tmake_file mips/t-mips16" ;; mips*-*-rtems*) + tmake_file="$tmake_file mips/t-mips16" ;; mips-wrs-vxworks) ;; mipstx39-*-elf* | mipstx39el-*-elf*) + tmake_file="$tmake_file mips/t-mips16" ;; mmix-knuth-mmixware) extra_parts="crti.o crtn.o crtbegin.o crtend.o" diff --git a/libgcc/config/mips/t-mips16 b/libgcc/config/mips/t-mips16 new file mode 100644 index 0000000..94fa0e9 --- /dev/null +++ b/libgcc/config/mips/t-mips16 @@ -0,0 +1,2 @@ +SYNC = yes +SYNC_CFLAGS = -mno-mips16 diff --git a/gcc/config/sync.c b/libgcc/sync.c similarity index 96% rename from gcc/config/sync.c rename to libgcc/sync.c index eacdce6..3bc0e4a 100644 --- a/gcc/config/sync.c +++ b/libgcc/sync.c @@ -1,5 +1,5 @@ /* Out-of-line libgcc versions of __sync_* builtins. */ -/* Copyright (C) 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -22,8 +22,8 @@ a copy of the GCC Runtime Library Exception along with this program; see the files COPYING3 and COPYING.RUNTIME respectively. If not, see . */ -/* This file is used by targets whose makefiles define LIBGCC_SYNC - to "yes". It is compiled with LIBGCC_SYNC_CFLAGS and provides +/* This file is used by targets whose makefiles define SYNC + to "yes". It is compiled with SYNC_CFLAGS and provides out-of-line versions of all relevant __sync_* primitives. These routines are intended for targets like MIPS that have two -- 2.7.4