[packages/Glide_VG] - pass AR to remove 'l' option, which changed meaning - added asm fix to morearchs patch - added -Wn

qboosh qboosh at pld-linux.org
Mon Sep 26 21:31:37 CEST 2022


commit 7441da6ee3c79e51e7fa5bfb25efbefb180b57c1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Sep 26 21:32:03 2022 +0200

    - pass AR to remove 'l' option, which changed meaning
    - added asm fix to morearchs patch
    - added -Wno-missing-braces to avoid massive warning messages

 Glide_VG-morearchs.patch | 6 ++++--
 Glide_VG.spec            | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/Glide_VG.spec b/Glide_VG.spec
index 20e7abe..aad4314 100644
--- a/Glide_VG.spec
+++ b/Glide_VG.spec
@@ -82,8 +82,9 @@ chmod +x swlibs/include/make/ostype
 
 %build
 %{__make} -j1 -f makefile.unix \
+	AR="ar rcs" \
 	CC="%{__cc}" \
-	CNODEBUG="%{rpmcflags} -fPIC %{!?debug:-fomit-frame-pointer} \
+	CNODEBUG="%{rpmcflags} -fPIC -Wno-missing-braces %{!?debug:-fomit-frame-pointer} \
 	%{!?debug:-funroll-loops -fexpensive-optimizations -ffast-math}" \
 %ifnarch %{ix86}
 	FX_GLIDE_CTRISETUP=1
diff --git a/Glide_VG-morearchs.patch b/Glide_VG-morearchs.patch
index 3eb438c..1029fcb 100644
--- a/Glide_VG-morearchs.patch
+++ b/Glide_VG-morearchs.patch
@@ -87,9 +87,11 @@
  
  
  void double_precision_asm() {
+-  asm("push %eax \n fnclex \n fstcw (%esp) \n movw (%esp), %eax \n "
+-      "and $0x0000fcff, %eax \n or $0x000002ff, %eax \n mov %eax, (%esp) \n "
 +#ifdef __i386__
-   asm("push %eax \n fnclex \n fstcw (%esp) \n movw (%esp), %eax \n "
-       "and $0x0000fcff, %eax \n or $0x000002ff, %eax \n mov %eax, (%esp) \n "
++  asm("push %eax \n fnclex \n fstcw (%esp) \n movl (%esp), %eax \n "
++      "and $0x0000fcff, %eax \n or $0x000002ff, %eax \n movl %eax, (%esp) \n "
        "fldcw (%esp) \n pop %eax");
 +#endif
  }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Glide_VG.git/commitdiff/7441da6ee3c79e51e7fa5bfb25efbefb180b57c1



More information about the pld-cvs-commit mailing list