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

After feedback from kettenis@, we won't be defining -DPIC on PIE archs per

Browse Source 
default.  Garbage collect the patches that dealt with these issues, and use
the builtin define __PIC__ to detect if we're PIE/PIC.

ok naddy@
This commit is contained in:
pascal 2012-08-20 11:50:59 +00:00
parent ed2039ac0a
commit e051391d3c
21 changed files with 38 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editors/xwpe/patches/patch-edit_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-edit_h,v 1.1 2012/08/11 22:51:13 pascal Exp $
--- edit.h.orig Sat Aug 11 16:37:09 2012
+++ edit.h Sat Aug 11 16:37:26 2012
@@ -65,6 +65,10 @@ struct mouse {
#define DTMD_ISTEXT(x) (x > 'Z')
#define DTMD_ISMARKABLE(x) (x > DTMD_HELP) /* Means end marks can be shown*/
+#ifdef PIC
+#undef PIC
+#endif
+
struct dirfile {
int anz; /* number elements in the list */
char **name; /* the list elements */

13
emulators/dosbox/patches/patch-src_hardware_pic_cpp
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_hardware_pic_cpp,v 1.1 2012/08/11 22:51:13 pascal Exp $
--- src/hardware/pic.cpp.orig Mon May 10 19:43:54 2010
+++ src/hardware/pic.cpp Fri Aug 10 18:55:18 2012
@@ -540,6 +540,9 @@ void TIMER_AddTick(void) {
}
}
+#ifdef PIC
+#undef PIC
+#endif
class PIC:public Module_base{
private:

14
games/widelands/patches/patch-src_map_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_map_h,v 1.1 2012/08/11 22:51:13 pascal Exp $
--- src/map.h.orig Fri Aug 10 21:31:27 2012
+++ src/map.h Fri Aug 10 21:31:46 2012
@@ -29,6 +29,10 @@
#include <string>
#include <vector>
+#ifdef PIC
+#undef PIC
+#endif
+
class BaseImmovable;
class FileRead;
class Player;

14
geo/gpstk/patches/patch-apps_positioning_posInterp_cpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-apps_positioning_posInterp_cpp,v 1.1 2012/08/11 22:51:13 pascal Exp $
--- apps/positioning/posInterp.cpp.orig Fri Aug 10 20:06:27 2012
+++ apps/positioning/posInterp.cpp Fri Aug 10 20:06:49 2012
@@ -49,6 +49,10 @@
#include <fstream>
#include <sstream>
+#ifdef PIC
+#undef PIC
+#endif
+
using namespace std;
using namespace gpstk;
using namespace StringUtils;

13
lang/ghc/patches/patch-compiler_nativeGen_AsmCodeGen_lhs
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-compiler_nativeGen_AsmCodeGen_lhs,v 1.1 2012/08/12 11:31:33 pascal Exp $
--- compiler/nativeGen/AsmCodeGen.lhs.orig Sat Aug 11 22:00:05 2012
+++ compiler/nativeGen/AsmCodeGen.lhs Sat Aug 11 22:00:20 2012
@@ -19,6 +19,9 @@ module AsmCodeGen ( nativeCodeGen ) where
#include "HsVersions.h"
#include "nativeGen/NCG.h"
+#ifdef PIC
+#undef PIC
+#endif
#if alpha_TARGET_ARCH
import Alpha.CodeGen

14
lang/ghc/patches/patch-compiler_nativeGen_PIC_hs
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-compiler_nativeGen_PIC_hs,v 1.1 2012/08/12 11:31:33 pascal Exp $
--- compiler/nativeGen/PIC.hs.orig Sat Aug 11 22:00:37 2012
+++ compiler/nativeGen/PIC.hs Sat Aug 11 22:00:55 2012
@@ -38,6 +38,10 @@
and ppc-linux).
-}
+#ifdef PIC
+#undef PIC
+#endif
+
module PIC (
cmmMakeDynamicReference,
ReferenceKind(..),

14
lang/ghc/patches/patch-compiler_nativeGen_PPC_CodeGen_hs
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-compiler_nativeGen_PPC_CodeGen_hs,v 1.1 2012/08/12 11:31:33 pascal Exp $
--- compiler/nativeGen/PPC/CodeGen.hs.orig Sat Aug 11 22:01:50 2012
+++ compiler/nativeGen/PPC/CodeGen.hs Sat Aug 11 22:02:13 2012
@@ -24,6 +24,10 @@ where
#include "nativeGen/NCG.h"
#include "../includes/MachDeps.h"
+#ifdef PIC
+#undef PIC
+#endif
+
-- NCG stuff:
import PPC.Instr
import PPC.Cond

14
lang/ghc/patches/patch-compiler_nativeGen_SPARC_CodeGen_CCall_hs
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-compiler_nativeGen_SPARC_CodeGen_CCall_hs,v 1.1 2012/08/12 11:31:33 pascal Exp $
--- compiler/nativeGen/SPARC/CodeGen/CCall.hs.orig Sat Aug 11 22:02:33 2012
+++ compiler/nativeGen/SPARC/CodeGen/CCall.hs Sat Aug 11 22:02:48 2012
@@ -5,6 +5,10 @@ module SPARC.CodeGen.CCall (
where
+#ifdef PIC
+#undef PIC
+#endif
+
import SPARC.CodeGen.Gen64
import SPARC.CodeGen.Gen32
import SPARC.CodeGen.Base

14
lang/ghc/patches/patch-compiler_nativeGen_X86_CodeGen_hs
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-compiler_nativeGen_X86_CodeGen_hs,v 1.1 2012/08/12 11:31:33 pascal Exp $
--- compiler/nativeGen/X86/CodeGen.hs.orig Sat Aug 11 22:01:14 2012
+++ compiler/nativeGen/X86/CodeGen.hs Sat Aug 11 22:01:31 2012
@@ -29,6 +29,10 @@ where
#include "nativeGen/NCG.h"
#include "../includes/MachDeps.h"
+#ifdef PIC
+#undef PIC
+#endif
+
-- NCG stuff:
import X86.Instr
import X86.Cond

6
multimedia/avidemux/patches/patch-avidemux_ADM_libraries_ADM_libswscale_yuv2rgb_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-avidemux_ADM_libraries_ADM_libswscale_yuv2rgb_c,v 1.2 2012/08/11 22:58:18 pascal Exp $
$OpenBSD: patch-avidemux_ADM_libraries_ADM_libswscale_yuv2rgb_c,v 1.3 2012/08/20 11:51:00 pascal Exp $
--- avidemux/ADM_libraries/ADM_libswscale/yuv2rgb.c.orig Tue Jul 17 20:49:16 2007
+++ avidemux/ADM_libraries/ADM_libswscale/yuv2rgb.c Fri Aug 10 18:48:29 2012
@@ -161,7 +161,7 @@ const uint8_t __attribute__((aligned(8))) dither_8x8_
@ -6,7 +6,7 @@ $OpenBSD: patch-avidemux_ADM_libraries_ADM_libswscale_yuv2rgb_c,v 1.2 2012/08/11
#endif
-#ifdef HAVE_MMX
+#if defined(HAVE_MMX) && !defined(PIC)
+#if defined(HAVE_MMX) && !defined(__PIC__)
/* hope these constant values are cache line aligned */
static uint64_t attribute_used __attribute__((aligned(8))) mmx_00ffw = 0x00ff00ff00ff00ffULL;
@ -15,7 +15,7 @@ $OpenBSD: patch-avidemux_ADM_libraries_ADM_libswscale_yuv2rgb_c,v 1.2 2012/08/11
SwsFunc yuv2rgb_get_func_ptr (SwsContext *c)
{
-#if defined(HAVE_MMX2) || defined(HAVE_MMX)
+#if (defined(HAVE_MMX2) || defined(HAVE_MMX)) && !defined(PIC)
+#if (defined(HAVE_MMX2) || defined(HAVE_MMX)) && !defined(__PIC__)
if (c->flags & SWS_CPU_CAPS_MMX2){
switch(c->dstFormat){
case PIX_FMT_RGB32: return yuv420_rgb32_MMX2;

14
multimedia/avidemux/patches/patch-avidemux_ADM_libraries_ADM_utilities_ADM_imageUtils_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-avidemux_ADM_libraries_ADM_utilities_ADM_imageUtils_cpp,v 1.1 2012/08/11 22:58:18 pascal Exp $
$OpenBSD: patch-avidemux_ADM_libraries_ADM_utilities_ADM_imageUtils_cpp,v 1.2 2012/08/20 11:51:00 pascal Exp $
--- avidemux/ADM_libraries/ADM_utilities/ADM_imageUtils.cpp.orig Fri Aug 10 18:45:14 2012
+++ avidemux/ADM_libraries/ADM_utilities/ADM_imageUtils.cpp Fri Aug 10 18:46:38 2012
@@ -60,7 +60,7 @@ int a1,a2;
@ -6,7 +6,7 @@ $OpenBSD: patch-avidemux_ADM_libraries_ADM_utilities_ADM_imageUtils_cpp,v 1.1 20
return 1;
}
-#if defined( ARCH_X86 ) || defined (ARCH_X86_64)
+#if (defined( ARCH_X86 ) || defined (ARCH_X86_64)) && !defined(PIC)
+#if (defined( ARCH_X86 ) || defined (ARCH_X86_64)) && !defined(__PIC__)
static uint8_t tinyAverageMMX(uint8_t *dst, uint8_t *src1, uint8_t *src2,uint32_t l)
{
int delta;
@ -15,7 +15,7 @@ $OpenBSD: patch-avidemux_ADM_libraries_ADM_utilities_ADM_imageUtils_cpp,v 1.1 20
uint8_t ADMImage::merge(ADMImage *src1,ADMImage *src2)
{
-#if 1 && defined( ARCH_X86 ) || defined (ARCH_X86_64)
+#if 1 && (defined( ARCH_X86 ) || defined (ARCH_X86_64)) && !defined(PIC)
+#if 1 && (defined( ARCH_X86 ) || defined (ARCH_X86_64)) && !defined(__PIC__)
if(CpuCaps::hasMMX())
{
tinyAverageMMX(YPLANE(this),YPLANE(src1),YPLANE(src2),(_width*_height*3)>>1);
@ -24,7 +24,7 @@ $OpenBSD: patch-avidemux_ADM_libraries_ADM_utilities_ADM_imageUtils_cpp,v 1.1 20
return df;
}
-#if defined( ARCH_X86 ) || defined (ARCH_X86_64)
+#if (defined( ARCH_X86 ) || defined (ARCH_X86_64)) && !defined(PIC)
+#if (defined( ARCH_X86 ) || defined (ARCH_X86_64)) && !defined(__PIC__)
static uint64_t noise64 asm(MANGLE(noise64));
static uint32_t computeDiffMMX(uint8_t *s1,uint8_t *s2,uint32_t noise,uint32_t l)
{
@ -33,7 +33,7 @@ $OpenBSD: patch-avidemux_ADM_libraries_ADM_utilities_ADM_imageUtils_cpp,v 1.1 20
{
-#if 1 && defined( ARCH_X86 ) || defined (ARCH_X86_64)
+#if 1 && (defined( ARCH_X86 ) || defined (ARCH_X86_64)) && !defined(PIC)
+#if 1 && (defined( ARCH_X86 ) || defined (ARCH_X86_64)) && !defined(__PIC__)
uint32_t r1,r2;
if(CpuCaps::hasMMX())
{
@ -42,7 +42,7 @@ $OpenBSD: patch-avidemux_ADM_libraries_ADM_utilities_ADM_imageUtils_cpp,v 1.1 20
return 1;
}
-#if defined( ARCH_X86 ) || defined (ARCH_X86_64)
+#if (defined( ARCH_X86 ) || defined (ARCH_X86_64)) && !defined(PIC)
+#if (defined( ARCH_X86 ) || defined (ARCH_X86_64)) && !defined(__PIC__)
static uint8_t tinySubstractMMX(uint8_t *dst, uint8_t *src1, uint8_t *src2,uint32_t l)
{
int delta;
@ -51,7 +51,7 @@ $OpenBSD: patch-avidemux_ADM_libraries_ADM_utilities_ADM_imageUtils_cpp,v 1.1 20
{
-#if 1 && defined( ARCH_X86 ) || defined (ARCH_X86_64)
+#if 1 && (defined( ARCH_X86 ) || defined (ARCH_X86_64)) && !defined(PIC)
+#if 1 && (defined( ARCH_X86 ) || defined (ARCH_X86_64)) && !defined(__PIC__)
uint32_t r1,r2;
if(CpuCaps::hasMMX())
{

6
multimedia/avidemux/patches/patch-avidemux_ADM_videoFilter_ADM_vidBlend_cpp
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidBlend_cpp,v 1.1 2012/08/11 22:58:18 pascal Exp $
$OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidBlend_cpp,v 1.2 2012/08/20 11:51:00 pascal Exp $
--- avidemux/ADM_videoFilter/ADM_vidBlend.cpp.orig Fri Aug 10 18:41:01 2012
+++ avidemux/ADM_videoFilter/ADM_vidBlend.cpp Fri Aug 10 18:41:49 2012
@@ -39,6 +39,7 @@
#include "admmangle.h"
+#ifndef PIC
+#ifndef __PIC__
#ifdef ARCH_X86_64
static int64_t _l_w asm(MANGLE(_l_w)), _l_h asm(MANGLE(_l_h));
#else
@ -22,7 +22,7 @@ $OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidBlend_cpp,v 1.1 2012/08/11 22:58
}
}
-#if defined( ARCH_X86) || defined(ARCH_X86_64)
+#if defined( ARCH_X86) || defined(ARCH_X86_64) && !defined(PIC)
+#if defined( ARCH_X86) || defined(ARCH_X86_64) && !defined(__PIC__)
void ADMVideoFields::blend_MMX(uint8_t *p,uint8_t *c,
uint8_t *n,
uint8_t *e,

6
multimedia/avidemux/patches/patch-avidemux_ADM_videoFilter_ADM_vidDeintASM_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidDeintASM_cpp,v 1.1 2012/08/11 22:58:18 pascal Exp $
$OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidDeintASM_cpp,v 1.2 2012/08/20 11:51:00 pascal Exp $
--- avidemux/ADM_videoFilter/ADM_vidDeintASM.cpp.orig Fri Aug 10 18:42:31 2012
+++ avidemux/ADM_videoFilter/ADM_vidDeintASM.cpp Fri Aug 10 18:43:10 2012
@@ -37,7 +37,7 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidDeintASM_cpp,v 1.1 2012/08/11 22
#include"ADM_vidField.h"
-#if defined( ARCH_X86) || defined(ARCH_X86_64)
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && !defined(PIC)
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && !defined(__PIC__)
// #define DEBUG_DEINT 1
// #define MMX_TRACE 1
#include "ADM_video/mmx_macros.h"
@ -15,7 +15,7 @@ $OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidDeintASM_cpp,v 1.1 2012/08/11 22
}
}
-#if defined( ARCH_X86) || defined(ARCH_X86_64)
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && !defined(PIC)
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && !defined(__PIC__)
void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c,
uint8_t *n,
uint8_t *e,

6
multimedia/avidemux/patches/patch-avidemux_ADM_videoFilter_ADM_vidFields_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidFields_cpp,v 1.1 2012/08/11 22:58:18 pascal Exp $
$OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidFields_cpp,v 1.2 2012/08/20 11:51:00 pascal Exp $
--- avidemux/ADM_videoFilter/ADM_vidFields.cpp.orig Fri Aug 10 18:49:40 2012
+++ avidemux/ADM_videoFilter/ADM_vidFields.cpp Fri Aug 10 18:50:11 2012
@@ -118,7 +118,8 @@ uint8_t ADMVideoFields::hasMotion(ADMImage *image)
@ -7,7 +7,7 @@ $OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidFields_cpp,v 1.1 2012/08/11 22:5
// other line
-#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && defined(ASM_DEINT)
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && defined(ASM_DEINT) && \
+ !defined(PIC)
+ !defined(__PIC__)
if(CpuCaps::hasMMX())
hasMotion_MMX(p,c,n,e,e2);
else
@ -17,7 +17,7 @@ $OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidFields_cpp,v 1.1 2012/08/11 22:5
}
-#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && defined(ASM_BLEND)
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && defined(ASM_BLEND) && \
+ !defined(PIC)
+ !defined(__PIC__)
if(CpuCaps::hasMMX())
blend_MMX(p,c,n,e2,f);
else

6
multimedia/avidemux/patches/patch-avidemux_ADM_videoFilter_ADM_vidFlux_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidFlux_cpp,v 1.1 2012/08/11 22:58:18 pascal Exp $
$OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidFlux_cpp,v 1.2 2012/08/20 11:51:00 pascal Exp $
--- avidemux/ADM_videoFilter/ADM_vidFlux.cpp.orig Fri Aug 10 18:40:08 2012
+++ avidemux/ADM_videoFilter/ADM_vidFlux.cpp Fri Aug 10 18:40:35 2012
@@ -275,7 +275,8 @@ ADMImage *image,*next,*prev;
@ -7,7 +7,7 @@ $OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidFlux_cpp,v 1.1 2012/08/11 22:58:
- #if (defined( ARCH_X86) || defined(ARCH_X86_64)) && defined(ASM_FLUX)
+ #if (defined( ARCH_X86) || defined(ARCH_X86_64)) && defined(ASM_FLUX) \
+ && !defined(PIC)
+ && !defined(__PIC__)
if(CpuCaps::hasMMX())
{
DoFilter_MMX(currp, prevp, nextp, src_pitch,
@ -16,7 +16,7 @@ $OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidFlux_cpp,v 1.1 2012/08/11 22:58:
}
-#if (defined( ARCH_X86) || defined(ARCH_X86_64))
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && !defined(PIC)
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && !defined(__PIC__)
/*
__asm movq mm2, mm0 \
__asm movq mm3, mm1 \

6
multimedia/avidemux/patches/patch-avidemux_ADM_videoFilter_ADM_vidResampleFPS_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidResampleFPS_cpp,v 1.1 2012/08/11 22:58:18 pascal Exp $
$OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidResampleFPS_cpp,v 1.2 2012/08/20 11:51:00 pascal Exp $
--- avidemux/ADM_videoFilter/ADM_vidResampleFPS.cpp.orig Fri Aug 10 18:38:45 2012
+++ avidemux/ADM_videoFilter/ADM_vidResampleFPS.cpp Fri Aug 10 18:39:11 2012
@@ -171,7 +171,7 @@ uint8_t ADMVideoResampleFPS::getCoupledConf( CONFcoupl
@ -6,7 +6,7 @@ $OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidResampleFPS_cpp,v 1.1 2012/08/11
return 1;
}
-#if (defined( ARCH_X86) || defined(ARCH_X86_64))
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && !defined(PIC)
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && !defined(__PIC__)
static uint64_t low asm(MANGLE(low)), high asm(MANGLE(high));
static void blendMMX(uint8_t *src, uint8_t *src2, uint8_t *dst, uint8_t alpha, uint8_t beta,uint32_t count)
{
@ -15,7 +15,7 @@ $OpenBSD: patch-avidemux_ADM_videoFilter_ADM_vidResampleFPS_cpp,v 1.1 2012/08/11
count = page;
-#if (defined( ARCH_X86) || defined(ARCH_X86_64))
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && !defined(PIC)
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && !defined(__PIC__)
if(CpuCaps::hasMMX())
blendMMX(in1,in2,out,lowweight,highweight,(count*3)>>1);
else

8
multimedia/avidemux/patches/patch-avidemux_ADM_video_ADM_interlaced_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-avidemux_ADM_video_ADM_interlaced_cpp,v 1.1 2012/08/11 22:58:18 pascal Exp $
$OpenBSD: patch-avidemux_ADM_video_ADM_interlaced_cpp,v 1.2 2012/08/20 11:51:00 pascal Exp $
--- avidemux/ADM_video/ADM_interlaced.cpp.orig Fri Aug 10 18:43:45 2012
+++ avidemux/ADM_video/ADM_interlaced.cpp Fri Aug 10 18:44:34 2012
@@ -70,7 +70,8 @@ Skip factor=2
@ -7,7 +7,7 @@ $OpenBSD: patch-avidemux_ADM_video_ADM_interlaced_cpp,v 1.1 2012/08/11 22:58:18
-#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && defined(ASM_ILACING)
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && defined(ASM_ILACING) && \
+ !defined(PIC)
+ !defined(__PIC__)
static uint32_t ADMVideo_interlaceCount_MMX( uint8_t *src ,uint32_t w, uint32_t h);
static uint8_t *_l_p asm(MANGLE(_l_p)) =NULL;
@ -17,7 +17,7 @@ $OpenBSD: patch-avidemux_ADM_video_ADM_interlaced_cpp,v 1.1 2012/08/11 22:58:18
{
-#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && defined(ASM_ILACING)
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && defined(ASM_ILACING) && \
+ !defined(PIC)
+ !defined(__PIC__)
if(CpuCaps::hasMMX())
return ADMVideo_interlaceCount_MMX(src,w,h);
else
@ -27,7 +27,7 @@ $OpenBSD: patch-avidemux_ADM_video_ADM_interlaced_cpp,v 1.1 2012/08/11 22:58:18
-#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && defined(ASM_ILACING)
+#if (defined( ARCH_X86) || defined(ARCH_X86_64)) && defined(ASM_ILACING) && \
+ !defined(PIC)
+ !defined(__PIC__)
uint32_t ADMVideo_interlaceCount_MMX( uint8_t *src ,uint32_t w, uint32_t h)
{
uint32_t m=0,y,x;

6
security/aircrack-ng/patches/patch-src_aircrack-ng_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_aircrack-ng_c,v 1.1 2012/08/11 22:58:18 pascal Exp $
$OpenBSD: patch-src_aircrack-ng_c,v 1.2 2012/08/20 11:50:59 pascal Exp $
--- src/aircrack-ng.c.orig Fri Apr 9 16:50:14 2010
+++ src/aircrack-ng.c Mon Jul 23 18:31:48 2012
@@ -3852,7 +3852,7 @@ int crack_wpa_thread( void *arg )
@ -6,7 +6,7 @@ $OpenBSD: patch-src_aircrack-ng_c,v 1.1 2012/08/11 22:58:18 pascal Exp $
int nparallel = 1;
-#if defined(__i386__) || defined(__x86_64__)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(PIC)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__PIC__)
// Check for SSE2, with SSE2 the algorithm works with 4 keys
if (shasse2_cpuid()>=2)
nparallel = 4;
@ -15,7 +15,7 @@ $OpenBSD: patch-src_aircrack-ng_c,v 1.1 2012/08/11 22:58:18 pascal Exp $
case 'u' :
printf("Nb CPU detected: %d ", cpu_count);
-#if defined(__i386__) || defined(__x86_64__)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(PIC)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__PIC__)
unused = shasse2_cpuid();
if (unused == 1) {

4
security/aircrack-ng/patches/patch-src_common_h
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_common_h,v 1.1 2012/08/11 22:58:18 pascal Exp $
$OpenBSD: patch-src_common_h,v 1.2 2012/08/20 11:50:59 pascal Exp $
--- src/common.h.orig Mon Jul 23 18:27:36 2012
+++ src/common.h Mon Jul 23 18:27:57 2012
@@ -30,7 +30,7 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-src_common_h,v 1.1 2012/08/11 22:58:18 pascal Exp $
#define CPUID_NOTHING_AVAILABLE 0
-#if defined(__i386__) || defined(__x86_64__)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(PIC)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__PIC__)
#define CPUID() shasse2_cpuid()
#else
#define CPUID() CPUID_NOTHING_AVAILABLE

4
security/aircrack-ng/patches/patch-src_sha1-sse2_S
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_sha1-sse2_S,v 1.1 2012/08/11 22:58:18 pascal Exp $
$OpenBSD: patch-src_sha1-sse2_S,v 1.2 2012/08/20 11:50:59 pascal Exp $
--- src/sha1-sse2.S.orig Mon Jul 23 18:26:22 2012
+++ src/sha1-sse2.S Mon Jul 23 18:26:39 2012
@@ -13,7 +13,7 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-src_sha1-sse2_S,v 1.1 2012/08/11 22:58:18 pascal Exp $
#endif
-#if defined(__i386__) || defined(__x86_64__)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(PIC)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__PIC__)
.globl shasse2_init;
.globl shasse2_ends;

4
security/aircrack-ng/patches/patch-src_sha1-sse2_h
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_sha1-sse2_h,v 1.1 2012/08/11 22:58:18 pascal Exp $
$OpenBSD: patch-src_sha1-sse2_h,v 1.2 2012/08/20 11:50:59 pascal Exp $
--- src/sha1-sse2.h.orig Mon Jul 23 18:26:45 2012
+++ src/sha1-sse2.h Mon Jul 23 18:28:41 2012
@@ -15,7 +15,7 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-src_sha1-sse2_h,v 1.1 2012/08/11 22:58:18 pascal Exp $
-#if defined(__i386__) || defined(__x86_64__)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(PIC)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__PIC__)
void show_result(char* key, uchar* pmk)
{