From: Kai Tietz <ktietz@gcc.gnu.org>
Date: Wed, 13 Feb 2013 09:59:43 +0000 (+0100)
Subject: Revert rev. 195981
X-Git-Tag: releases/gcc-4.7.3~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0eda4821b13007ce6d586319a37c63929dc9dad5;p=thirdparty%2Fgcc.git

Revert rev. 195981

From-SVN: r196000
---

diff --git a/libada/ChangeLog b/libada/ChangeLog
index 2927bf116bda..6fec9657929c 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,10 +1,3 @@
-2013-02-12  Kai Tietz  <ktietz@redhat.com>
-
-	Backport from mainline
-	PR target/52122
-	* Makefile.in (LN_S_RECUSIVE): New.
-	(adainclude, adalib): Use LN_S_RECURSIVE for copy.
-
 2012-09-20  Release Manager
 
 	* GCC 4.7.2 released.
diff --git a/libada/Makefile.in b/libada/Makefile.in
index 0beb42ca6133..389a2fb2f799 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -43,12 +43,6 @@ enable_shared = @enable_shared@
 LN_S=@LN_S@
 AWK=@AWK@
 
-ifeq (cp -p,$(LN_S))
-LN_S_RECURSIVE = cp -pR
-else
-LN_S_RECURSIVE = $(LN_S)
-endif
-
 # Variables for the user (or the top level) to override.
 objext=.o
 THREAD_KIND=native
@@ -106,8 +100,8 @@ gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile
 	&& touch stamp-libada
 	-rm -rf adainclude
 	-rm -rf adalib
-	$(LN_S_RECURSIVE) $(ADA_RTS_DIR) adainclude
-	$(LN_S_RECURSIVE) $(ADA_RTS_DIR) adalib
+	$(LN_S) $(ADA_RTS_DIR) adainclude
+	$(LN_S) $(ADA_RTS_DIR) adalib
 
 gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
 	test -f stamp-libada || \
@@ -115,8 +109,8 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
 	&& touch stamp-libada
 	-rm -rf adainclude
 	-rm -rf adalib
-	$(LN_S_RECUSIVE) $(ADA_RTS_DIR) adainclude
-	$(LN_S_RECUSIVE) $(ADA_RTS_DIR) adalib
+	$(LN_S) $(ADA_RTS_DIR) adainclude
+	$(LN_S) $(ADA_RTS_DIR) adalib
 
 osconstool:
 	$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons