diff options
| author | lloyd <[email protected]> | 2011-11-10 18:34:58 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2011-11-10 18:34:58 +0000 |
| commit | 5a76eb4c07f0caedde1a3d1d2824f2764a46a582 (patch) | |
| tree | 5de90f018fbcc7fb4af0811627b2e4d4d871d74d /src | |
| parent | 7939e91a733c8c50706de2fb090fcb60f7f229c8 (diff) | |
| parent | 8f590236f5f9bde3044fce715b69aac33e4a447a (diff) | |
propagate from branch 'net.randombit.botan' (head f13cb517b63aed4fcc4ad7013e5c905fae85796b)
to branch 'net.randombit.botan.cxx11' (head e330c6b33c4583b342a129336d27ce03c9e4e287)
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/cc/gcc.txt | 3 | ||||
| -rw-r--r-- | src/utils/cpuid.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index c7e4a3c14..dbf892dcf 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -31,6 +31,9 @@ default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)" # AIX doesn't seem to have soname support (weird...) aix -> "$(CXX) -shared -fPIC" +# OpenBSD doesn't use soname +openbsd -> "$(CXX) -shared -fPIC" + darwin -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)" hpux -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME)" solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)" diff --git a/src/utils/cpuid.cpp b/src/utils/cpuid.cpp index cb6fdaba5..917789f65 100644 --- a/src/utils/cpuid.cpp +++ b/src/utils/cpuid.cpp @@ -128,6 +128,7 @@ bool altivec_check_pvr_emul() const u16bit PVR_G5_970MP = 0x0044; const u16bit PVR_G5_970GX = 0x0045; const u16bit PVR_POWER6 = 0x003E; + const u16bit PVR_POWER7 = 0x003F; const u16bit PVR_CELL_PPU = 0x0070; // Motorola produced G4s with PVR 0x800[0123C] (at least) @@ -147,6 +148,7 @@ bool altivec_check_pvr_emul() altivec_capable |= (pvr == PVR_G5_970MP); altivec_capable |= (pvr == PVR_G5_970GX); altivec_capable |= (pvr == PVR_POWER6); + altivec_capable |= (pvr == PVR_POWER7); altivec_capable |= (pvr == PVR_CELL_PPU); #endif |