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

4 files changed, 9 insertions, 186 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a47ca453032..a81bf0877f6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-09  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* 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  <aesok@post.ru>
 
 	* config/mmix/mmix.h (REGISTER_MOVE_COST): Remove macro.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index fd9c0c1d620..4e97ea536e1 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 fa3949a2026..772b05ac45e 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/gcc/config/sync.c b/gcc/config/sync.c
deleted file mode 100644
index eacdce6644e..00000000000
--- a/gcc/config/sync.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* Out-of-line libgcc versions of __sync_* builtins.  */
-/* Copyright (C) 2008, 2009  Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 3, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-Under Section 7 of GPL version 3, you are granted additional
-permissions described in the GCC Runtime Library Exception, version
-3.1, as published by the Free Software Foundation.
-
-You should have received a copy of the GNU General Public License and
-a copy of the GCC Runtime Library Exception along with this program;
-see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-<http://www.gnu.org/licenses/>.  */
-
-/* This file is used by targets whose makefiles define LIBGCC_SYNC
-   to "yes".  It is compiled with LIBGCC_SYNC_CFLAGS and provides
-   out-of-line versions of all relevant __sync_* primitives.
-
-   These routines are intended for targets like MIPS that have two
-   ISA encodings (the "normal" ISA and the MIPS16 ISA).  The normal
-   ISA provides full synchronization capabilities but the MIPS16 ISA
-   has no encoding for them.  MIPS16 code must therefore call external
-   non-MIPS16 implementations of the __sync_* routines.
-
-   The file is compiled once for each routine.  The following __foo
-   routines are selected by defining a macro called L<foo>:
-
-       __sync_synchronize
-
-   The following __foo_N routines are selected by defining FN=foo
-   and SIZE=N:
-
-       __sync_fetch_and_add_N
-       __sync_fetch_and_sub_N
-       __sync_fetch_and_or_N
-       __sync_fetch_and_and_N
-       __sync_fetch_and_xor_N
-       __sync_fetch_and_nand_N
-       __sync_add_and_fetch_N
-       __sync_sub_and_fetch_N
-       __sync_or_and_fetch_N
-       __sync_and_and_fetch_N
-       __sync_xor_and_fetch_N
-       __sync_nand_and_fetch_N
-       __sync_bool_compare_and_swap_N
-       __sync_val_compare_and_swap_N
-       __sync_lock_test_and_set_N
-
-   SIZE can be 1, 2, 4, 8 or 16.  __foo_N is omitted if the target does
-   not provide __sync_compare_and_swap_N.
-
-   Note that __sync_lock_release does not fall back on external
-   __sync_lock_release_N functions.  The default implementation
-   of __sync_lock_release is a call to __sync_synchronize followed
-   by a store of zero, so we don't need separate library functions
-   for it.  */
-
-#if defined FN
-
-/* Define macros for each __sync_* function type.  Each macro defines a
-   local function called <NAME>_<UNITS> that acts like __<NAME>_<UNITS>.
-   TYPE is a type that has UNITS bytes.  */
-
-#define DEFINE_V_PV(NAME, UNITS, TYPE)					\
-  static TYPE								\
-  NAME##_##UNITS (TYPE *ptr, TYPE value)				\
-  {									\
-    return __##NAME (ptr, value);					\
-  }
-
-#define DEFINE_V_PVV(NAME, UNITS, TYPE)				\
-  static TYPE								\
-  NAME##_##UNITS (TYPE *ptr, TYPE value1, TYPE value2)			\
-  {									\
-    return __##NAME (ptr, value1, value2);				\
-  }
-
-#define DEFINE_BOOL_PVV(NAME, UNITS, TYPE)				\
-  static _Bool								\
-  NAME##_##UNITS (TYPE *ptr, TYPE value1, TYPE value2)			\
-  {									\
-    return __##NAME (ptr, value1, value2);				\
-  }
-
-/* Map function names to the appropriate DEFINE_* macro.  */
-
-#define local_sync_fetch_and_add DEFINE_V_PV
-#define local_sync_fetch_and_sub DEFINE_V_PV
-#define local_sync_fetch_and_or DEFINE_V_PV
-#define local_sync_fetch_and_and DEFINE_V_PV
-#define local_sync_fetch_and_xor DEFINE_V_PV
-#define local_sync_fetch_and_nand DEFINE_V_PV
-
-#define local_sync_add_and_fetch DEFINE_V_PV
-#define local_sync_sub_and_fetch DEFINE_V_PV
-#define local_sync_or_and_fetch DEFINE_V_PV
-#define local_sync_and_and_fetch DEFINE_V_PV
-#define local_sync_xor_and_fetch DEFINE_V_PV
-#define local_sync_nand_and_fetch DEFINE_V_PV
-
-#define local_sync_bool_compare_and_swap DEFINE_BOOL_PVV
-#define local_sync_val_compare_and_swap DEFINE_V_PVV
-
-#define local_sync_lock_test_and_set DEFINE_V_PV
-
-/* Define the function __<NAME>_<UNITS>, given that TYPE is a type with
-   UNITS bytes.  */
-#define DEFINE1(NAME, UNITS, TYPE) \
-  static int unused[sizeof (TYPE) == UNITS ? 1 : -1]	\
-    __attribute__((unused));				\
-  local_##NAME (NAME, UNITS, TYPE);			\
-  typeof (NAME##_##UNITS) __##NAME##_##UNITS		\
-    __attribute__((alias (#NAME "_" #UNITS)));
-
-/* As above, but performing macro expansion on the arguments.  */
-#define DEFINE(NAME, UNITS, TYPE) DEFINE1 (NAME, UNITS, TYPE)
-
-/* Find an appropriate type TYPE for SIZE and invoke DEFINE (FN, SIZE, TYPE).
-
-   The types chosen here may be incorrect for some targets.
-   For example, targets with 16-byte atomicity support might not
-   support OImode.  We would need some kind of target-specific
-   override if that becomes a problem.  */
-
-#if SIZE == 1 && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1
-
-typedef unsigned int UQItype __attribute__((mode (QI)));
-DEFINE (FN, 1, UQItype)
-
-#elif SIZE == 2 && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2
-
-typedef unsigned int UHItype __attribute__((mode (HI)));
-DEFINE (FN, 2, UHItype)
-
-#elif SIZE == 4 && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
-
-typedef unsigned int USItype __attribute__((mode (SI)));
-DEFINE (FN, 4, USItype)
-
-#elif SIZE == 8 && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8
-
-typedef unsigned int UDItype __attribute__((mode (DI)));
-DEFINE (FN, 8, UDItype)
-
-#elif SIZE == 16 && __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16
-
-typedef unsigned int UOItype __attribute__((mode (OI)));
-DEFINE (FN, 8, UOItype)
-
-#endif
-
-#elif __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 \
-      || __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 \
-      || __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 \
-      || __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 \
-      || __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16
-
-#if defined Lsync_synchronize
-
-static void
-sync_synchronize (void)
-{
-  __sync_synchronize ();
-}
-typeof (sync_synchronize) __sync_synchronize \
-  __attribute__((alias ("sync_synchronize")));
-
-#endif
-
-#endif