cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable old ASM code on ARM that doesn't build and isn't PIC either.

Browse Source 
from Brad
This commit is contained in:
ajacoutot 2020-06-21 09:31:56 +00:00
parent 67510ddea5
commit 5ea127c121
2 changed files with 4 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
graphics/libmpeg2/patches/patch-configure_ac
View File

@ -1,6 +1,4 @@
$OpenBSD: patch-configure_ac,v 1.2 2018/09/16 06:08:04 ajacoutot Exp $
check for available arm optimizations
$OpenBSD: patch-configure_ac,v 1.3 2020/06/21 09:31:56 ajacoutot Exp $
Index: configure.ac
--- configure.ac.orig
@ -19,12 +17,9 @@ Index: configure.ac
AC_ARG_ENABLE([debug],
[ --enable-debug debug mode configuration])
if test x"$enable_debug" = x"yes"; then
@@ -59,51 +52,21 @@ elif test x"$GCC" = x"yes"; then
AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
@@ -61,49 +54,12 @@ elif test x"$GCC" = x"yes"; then
dnl arch-specific flags
- arm_conditional=false
+ build_arm_opt=false
arm_conditional=false
case "$host" in
- i?86-* | k?-* | x86_64-* | amd64-*)
- AC_DEFINE([ARCH_X86],,[x86 architecture])
@ -67,24 +62,9 @@ Index: configure.ac
AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"]);;
alpha*)
AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);;
arm*)
- arm*)
- arm_conditional=:
- AC_DEFINE([ARCH_ARM],,[ARM architecture]);;
+ AC_LANG(C)
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE([[
+ void foo(void) { __asm__ volatile("pld [r1]"); }]])],
+ build_arm_opt=true; AC_DEFINE([ARCH_ARM],,[ARM architecture]),
+ build_arm_opt=false);;
esac
elif test x"$CC" = x"tendracc"; then
dnl TenDRA portability checking compiler
@@ -123,7 +86,7 @@ else
esac
fi
-AM_CONDITIONAL(ARCH_ARM, ${arm_conditional})
+AM_CONDITIONAL(ARCH_ARM, test x$build_arm_opt = xtrue)
dnl Checks for libtool - this must be done after we set cflags
AC_LIBTOOL_WIN32_DLL

47
graphics/libmpeg2/patches/patch-libmpeg2_motion_comp_arm_s_S
View File

@ -1,47 +0,0 @@
$OpenBSD: patch-libmpeg2_motion_comp_arm_s_S,v 1.1 2018/09/16 06:08:04 ajacoutot Exp $
Set visibility of global symbols used in ARM specific assembly file to internal
Index: libmpeg2/motion_comp_arm_s.S
--- libmpeg2/motion_comp_arm_s.S.orig
+++ libmpeg2/motion_comp_arm_s.S
@@ -23,7 +23,8 @@
@ ----------------------------------------------------------------
.align
- .global MC_put_o_16_arm
+ .global MC_put_o_16_arm
+ .internal MC_put_o_16_arm
MC_put_o_16_arm:
@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
pld [r1]
@@ -83,7 +84,8 @@ MC_put_o_16_arm_align_jt:
@ ----------------------------------------------------------------
.align
- .global MC_put_o_8_arm
+ .global MC_put_o_8_arm
+ .internal MC_put_o_8_arm
MC_put_o_8_arm:
@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
pld [r1]
@@ -152,7 +154,8 @@ MC_put_o_8_arm_align_jt:
.endm
.align
- .global MC_put_x_16_arm
+ .global MC_put_x_16_arm
+ .internal MC_put_x_16_arm
MC_put_x_16_arm:
@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
pld [r1]
@@ -244,7 +247,8 @@ MC_put_x_16_arm_align_jt:
@ ----------------------------------------------------------------
.align
- .global MC_put_x_8_arm
+ .global MC_put_x_8_arm
+ .internal MC_put_x_8_arm
MC_put_x_8_arm:
@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
pld [r1]