[syslinux:master] libcc: move libgcc files into arch-specific directories

syslinux-bot for H. Peter Anvin hpa at zytor.com
Wed Feb 20 17:54:59 PST 2019


Commit-ID:  729ae285595d313dfe0fa4eb339f95947c778630
Gitweb:     http://www.syslinux.org/commit/729ae285595d313dfe0fa4eb339f95947c778630
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Mon, 4 Feb 2019 10:04:12 -0800
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Mon, 4 Feb 2019 10:04:12 -0800

libcc: move libgcc files into arch-specific directories

We would compile these for for x86-64 even though they are
i386-specific; the resulting code was meaningless but nevertheless
included in the output.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>

---
 com32/lib/{ => i386}/libgcc/__ashldi3.S    |  0
 com32/lib/{ => i386}/libgcc/__ashrdi3.S    |  0
 com32/lib/{ => i386}/libgcc/__divdi3.c     |  0
 com32/lib/{ => i386}/libgcc/__lshrdi3.S    |  0
 com32/lib/{ => i386}/libgcc/__moddi3.c     |  0
 com32/lib/{ => i386}/libgcc/__muldi3.S     |  0
 com32/lib/{ => i386}/libgcc/__negdi2.S     |  0
 com32/lib/{ => i386}/libgcc/__udivdi3.c    |  0
 com32/lib/{ => i386}/libgcc/__udivmoddi4.c |  0
 com32/lib/{ => i386}/libgcc/__umoddi3.c    |  0
 mk/lib.mk                                  | 11 +++--------
 11 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/com32/lib/libgcc/__ashldi3.S b/com32/lib/i386/libgcc/__ashldi3.S
similarity index 100%
rename from com32/lib/libgcc/__ashldi3.S
rename to com32/lib/i386/libgcc/__ashldi3.S
diff --git a/com32/lib/libgcc/__ashrdi3.S b/com32/lib/i386/libgcc/__ashrdi3.S
similarity index 100%
rename from com32/lib/libgcc/__ashrdi3.S
rename to com32/lib/i386/libgcc/__ashrdi3.S
diff --git a/com32/lib/libgcc/__divdi3.c b/com32/lib/i386/libgcc/__divdi3.c
similarity index 100%
rename from com32/lib/libgcc/__divdi3.c
rename to com32/lib/i386/libgcc/__divdi3.c
diff --git a/com32/lib/libgcc/__lshrdi3.S b/com32/lib/i386/libgcc/__lshrdi3.S
similarity index 100%
rename from com32/lib/libgcc/__lshrdi3.S
rename to com32/lib/i386/libgcc/__lshrdi3.S
diff --git a/com32/lib/libgcc/__moddi3.c b/com32/lib/i386/libgcc/__moddi3.c
similarity index 100%
rename from com32/lib/libgcc/__moddi3.c
rename to com32/lib/i386/libgcc/__moddi3.c
diff --git a/com32/lib/libgcc/__muldi3.S b/com32/lib/i386/libgcc/__muldi3.S
similarity index 100%
rename from com32/lib/libgcc/__muldi3.S
rename to com32/lib/i386/libgcc/__muldi3.S
diff --git a/com32/lib/libgcc/__negdi2.S b/com32/lib/i386/libgcc/__negdi2.S
similarity index 100%
rename from com32/lib/libgcc/__negdi2.S
rename to com32/lib/i386/libgcc/__negdi2.S
diff --git a/com32/lib/libgcc/__udivdi3.c b/com32/lib/i386/libgcc/__udivdi3.c
similarity index 100%
rename from com32/lib/libgcc/__udivdi3.c
rename to com32/lib/i386/libgcc/__udivdi3.c
diff --git a/com32/lib/libgcc/__udivmoddi4.c b/com32/lib/i386/libgcc/__udivmoddi4.c
similarity index 100%
rename from com32/lib/libgcc/__udivmoddi4.c
rename to com32/lib/i386/libgcc/__udivmoddi4.c
diff --git a/com32/lib/libgcc/__umoddi3.c b/com32/lib/i386/libgcc/__umoddi3.c
similarity index 100%
rename from com32/lib/libgcc/__umoddi3.c
rename to com32/lib/i386/libgcc/__umoddi3.c
diff --git a/mk/lib.mk b/mk/lib.mk
index 54f1fd54..deb2c192 100644
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -128,10 +128,8 @@ LIBENTRY_OBJS = \
 	exit.o
 
 LIBGCC_OBJS = \
-	libgcc/__ashldi3.o libgcc/__udivdi3.o			\
-	libgcc/__negdi2.o libgcc/__ashrdi3.o libgcc/__lshrdi3.o		\
-	libgcc/__muldi3.o libgcc/__udivmoddi4.o libgcc/__umoddi3.o	\
-	libgcc/__divdi3.o libgcc/__moddi3.o
+	  $(patsubst $(com32)/lib/%.c,%.o,$(wildcard $(com32)/lib/$(ARCH)/libgcc/*.c)) \
+	  $(patsubst $(com32)/lib/%.S,%.o,$(wildcard $(com32)/lib/$(ARCH)/libgcc/*.S))
 
 LIBCONSOLE_OBJS = \
 	\
@@ -197,11 +195,8 @@ CORELIBOBJS = \
 	sys/err_read.o sys/err_write.o sys/null_read.o 			\
 	sys/stdcon_write.o						\
 	syslinux/memscan.o strrchr.o strcat.o				\
-	libgcc/__ashldi3.o libgcc/__udivdi3.o				\
-	libgcc/__negdi2.o libgcc/__ashrdi3.o libgcc/__lshrdi3.o		\
-	libgcc/__muldi3.o libgcc/__udivmoddi4.o libgcc/__umoddi3.o	\
-	libgcc/__divdi3.o libgcc/__moddi3.o				\
 	syslinux/debug.o						\
+	$(LIBGCC_OBJS) \
 	$(LIBENTRY_OBJS) \
 	$(LIBMODULE_OBJS)
 


More information about the Syslinux-commits mailing list