Thomas Renninger
28f81a89a4
Features: * Some System z functionality went into 2.15 * Updated man pages * Added basic events for core_i7 to oprofile_map_events Fixes: * Disable Unable to verify address range warning when offset < page_size * Remove sscanf in library setup to avoid heap allocation before _morecore override * Revert heap exhaustion patch * hugectl no longer clips LD_LIBRARY_PATH variable * Fix clean on failure code to avoid closing stdout OBS-URL: https://build.opensuse.org/package/show/Base:System/libhugetlbfs?expand=0&rev=28
44 lines
848 B
Diff
44 lines
848 B
Diff
---
|
|
Makefile | 12 ++++++++----
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
Index: libhugetlbfs-2.15/Makefile
|
|
===================================================================
|
|
--- libhugetlbfs-2.15.orig/Makefile
|
|
+++ libhugetlbfs-2.15/Makefile
|
|
@@ -69,19 +69,22 @@ else
|
|
ifeq ($(ARCH),ia64)
|
|
CC64 = gcc
|
|
TMPLIB64 = lib
|
|
-CFLAGS += -DNO_ELFLINK
|
|
+CPPFLAGS += -DNO_ELFLINK
|
|
else
|
|
ifeq ($(ARCH),sparc64)
|
|
CC64 = gcc -m64
|
|
TMPLIB64 = lib64
|
|
-CFLAGS += -DNO_ELFLINK
|
|
+CPPFLAGS += -DNO_ELFLINK
|
|
else
|
|
ifeq ($(ARCH),s390x)
|
|
CC64 = gcc -m64
|
|
-CC32 = gcc -m31
|
|
-ELF32 = elf_s390
|
|
ELF64 = elf64_s390
|
|
TMPLIB64 = lib64
|
|
+CUSTOM_LDSCRIPTS = no
|
|
+else
|
|
+ifeq ($(ARCH),s390)
|
|
+CC32 = gcc -m31
|
|
+ELF32 = elf_s390
|
|
TMPLIB32 = lib
|
|
CUSTOM_LDSCRIPTS = no
|
|
else
|
|
@@ -89,6 +92,7 @@ $(error "Unrecognized architecture ($(AR
|
|
endif
|
|
endif
|
|
endif
|
|
+endif
|
|
endif
|
|
endif
|
|
endif
|