From 390223bc32aa2d0075c1a3d80e2a8b759e9df9b8 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 15 Oct 2006 23:43:42 +0200 Subject: [PATCH] [BUILD] only enable regparm on x86 to avoid useless warnings It complains at least on Solaris/sparc64 and OpenBSD/vax. --- Makefile | 4 ++-- include/common/config.h | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 03e7917f2..d19ce34d9 100644 --- a/Makefile +++ b/Makefile @@ -57,8 +57,8 @@ LIBS.solaris = -lnsl -lsocket # CPU dependant optimizations COPTS.generic = -O2 -COPTS.i586 = -O2 -march=i586 -COPTS.i686 = -O2 -march=i686 +COPTS.i586 = -O2 -march=i586 -DCONFIG_HAP_USE_REGPARM +COPTS.i686 = -O2 -march=i686 -DCONFIG_HAP_USE_REGPARM COPTS.ultrasparc = -O6 -mcpu=v9 -mtune=ultrasparc # options for standard regex library diff --git a/include/common/config.h b/include/common/config.h index f46764193..e8d8ad26b 100644 --- a/include/common/config.h +++ b/include/common/config.h @@ -47,18 +47,18 @@ */ //#undef CONFIG_HAP_INLINE_FD_SET -/* CONFIG_HAP_DISABLE_REGPARM - * This disables the use of register parameters for some functions which - * use it by default to increase performance. +/* CONFIG_HAP_USE_REGPARM + * This enables the use of register parameters for some functions where + * it may improve performance by a measurable factor. */ -#ifdef CONFIG_HAP_DISABLE_REGPARM -#define REGPRM1 -#define REGPRM2 -#define REGPRM3 -#else +#ifdef CONFIG_HAP_USE_REGPARM #define REGPRM1 __attribute__((regparm(1))) #define REGPRM2 __attribute__((regparm(2))) #define REGPRM3 __attribute__((regparm(3))) +#else +#define REGPRM1 +#define REGPRM2 +#define REGPRM3 #endif #endif /* _COMMON_CONFIG_H */ -- 2.47.3