From 73fab2e6bef6cf3afc39d113aff3139d3d2a5f9f Mon Sep 17 00:00:00 2001
From: Giacomo Tesio <giacomo@tesio.it>
Date: Fri, 17 Jan 2020 01:39:21 +0100
Subject: [PATCH] gcc native: cleanup cross-compiler wrappers (needed to
 specify -lc and stuffs)

---
 cross/wrappers/x86_64-jehanne-g++ | 6 +-----
 cross/wrappers/x86_64-jehanne-gcc | 2 +-
 cross/wrappers/x86_64-jehanne-ld  | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/cross/wrappers/x86_64-jehanne-g++ b/cross/wrappers/x86_64-jehanne-g++
index 4413855..56044c8 100755
--- a/cross/wrappers/x86_64-jehanne-g++
+++ b/cross/wrappers/x86_64-jehanne-g++
@@ -14,11 +14,7 @@ echo >> $WRAPPER_LOG
 
 if echo $ARGS|grep -e '\.cpp\b' -e '\b\-o\b' -e ' -o ' > /dev/null; then
 	TOINCLUDE="-isystem$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/ -isystem$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/x86_64-jehanne -isystem$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/backward -isystem$JEHANNE_TOOLCHAIN/cross/posix/lib/gcc/x86_64-jehanne/9.2.0/include -isystem$JEHANNE/posix/include"
-	TOLINK="-L$JEHANNE/posix/lib -lstdc++ -lm -lnewlibc -lposix"
-	if echo $ARGS|grep -e ' -o cc1' -e ' -o xg[c+][c+]' -e ' -o cpp ' -e ' -o lto1' > /dev/null; then
-		TOLINK="jehanne.o $TOLINK"
-		#CXXFLAGS_FOR_WRAPPER="-Wl,--require-defined=__application_newlib_init"
-	fi
+	TOLINK="-L$JEHANNE/posix/lib -lstdc++ -lm -lc"
 	date --rfc-3339="ns"  |tee -a $WRAPPER_LOG
 	export >> $WRAPPER_LOG
 echo	$WORKING_DIR/cross/posix/bin/x86_64-jehanne-g++ "$@" $TOINCLUDE $TOLINK >> $WRAPPER_LOG
diff --git a/cross/wrappers/x86_64-jehanne-gcc b/cross/wrappers/x86_64-jehanne-gcc
index c8ec575..fdc1cd0 100755
--- a/cross/wrappers/x86_64-jehanne-gcc
+++ b/cross/wrappers/x86_64-jehanne-gcc
@@ -14,7 +14,7 @@ echo >> $WRAPPER_LOG
 
 if echo $ARGS|grep -e '\.c\b' -e '\b\-o\b' -e ' -o ' > /dev/null; then
 	TOINCLUDE="-isystem$JEHANNE_TOOLCHAIN/cross/posix/lib/gcc/x86_64-jehanne/9.2.0/include -isystem$JEHANNE/posix/include"
-	TOLINK="-L$JEHANNE/posix/lib -lnewlibc -lposix"
+	TOLINK="-L$JEHANNE/posix/lib -lc"
 	date --rfc-3339="ns"  |tee -a $WRAPPER_LOG
 	export >> $WRAPPER_LOG
 echo	$WORKING_DIR/cross/posix/bin/x86_64-jehanne-gcc "$@" $TOINCLUDE $TOLINK >> $WRAPPER_LOG
diff --git a/cross/wrappers/x86_64-jehanne-ld b/cross/wrappers/x86_64-jehanne-ld
index b2afe80..d3c50fb 100755
--- a/cross/wrappers/x86_64-jehanne-ld
+++ b/cross/wrappers/x86_64-jehanne-ld
@@ -13,7 +13,7 @@ echo >> $WRAPPER_LOG
 echo >> $WRAPPER_LOG
 
 if echo $ARGS|grep -e '\b\-o\b' -e ' -o ' > /dev/null; then
-	TOLINK="-L$JEHANNE/posix/lib -lnewlibc -lposix -lc"
+	TOLINK="-L$JEHANNE/posix/lib -lc"
 	date --rfc-3339="ns"  |tee -a $WRAPPER_LOG
 	export >> $WRAPPER_LOG
 echo	$WORKING_DIR/cross/posix/bin/x86_64-jehanne-ld "$@" $TOLINK >> $WRAPPER_LOG